podManager simplification

Since the CNI_UPDATE code no longer needs a runningPod object, just
return the changed vnid from update() instead, so we don't need to
call ovs.GetOFPort() again.

Author: danwinship

pkg/sdn/plugin/pod.go

@@ -22,7 +22,7 @@ import (
 
 type podHandler interface {
 	setup(req *cniserver.PodRequest) (*cnitypes.Result, *runningPod, error)
-	update(req *cniserver.PodRequest) (*runningPod, error)
+	update(req *cniserver.PodRequest) (uint32, error)
 	teardown(req *cniserver.PodRequest) error
 }
 
@@ -259,9 +259,11 @@ func (m *podManager) processRequest(request *cniserver.PodRequest) *cniserver.Po
 			result.Err = err
 		}
 	case cniserver.CNI_UPDATE:
-		runningPod, err := m.podHandler.update(request)
+		vnid, err := m.podHandler.update(request)
 		if err == nil {
-			m.runningPods[pk] = runningPod
+			if runningPod, exists := m.runningPods[pk]; exists {
+				runningPod.vnid = vnid
+			}
 		}
 		result.Err = err
 	case cniserver.CNI_DEL:

pkg/sdn/plugin/pod_linux.go

@@ -466,51 +466,39 @@ func (m *podManager) getContainerNetnsPath(id string) (string, error) {
 }
 
 // Update OVS flows when something (like the pod's namespace VNID) changes
-func (m *podManager) update(req *cniserver.PodRequest) (*runningPod, error) {
+func (m *podManager) update(req *cniserver.PodRequest) (uint32, error) {
 	// Updates may come at startup and thus we may not have the pod's
 	// netns from kubelet (since kubelet doesn't have UPDATE actions).
 	// Read the missing netns from the pod's file.
 	if req.Netns == "" {
 		netns, err := m.getContainerNetnsPath(req.ContainerId)
 		if err != nil {
-			return nil, err
+			return 0, err
 		}
 		req.Netns = netns
 	}
 
-	podConfig, pod, err := m.getPodConfig(req)
+	podConfig, _, err := m.getPodConfig(req)
 	if err != nil {
-		return nil, err
+		return 0, err
 	}
 
 	hostVethName, contVethMac, podIP, err := getVethInfo(req.Netns, podInterfaceName)
 	if err != nil {
-		return nil, err
+		return 0, err
 	}
 
 	vnidStr := vnidToString(podConfig.vnid)
 	out, err := exec.Command(sdnScript, updateCmd, hostVethName, contVethMac, podIP, vnidStr, podConfig.ingressBandwidth, podConfig.egressBandwidth).CombinedOutput()
 	glog.V(5).Infof("UpdatePod network plugin output: %s, %v", string(out), err)
 
 	if isScriptError(err) {
-		return nil, fmt.Errorf("error running network update script: %s", getScriptError(out))
+		return 0, fmt.Errorf("error running network update script: %s", getScriptError(out))
 	} else if err != nil {
-		return nil, err
+		return 0, err
 	}
 
-	ofport, err := m.ovs.GetOFPort(hostVethName)
-	if err != nil {
-		return nil, err
-	}
-
-	return &runningPod{
-		activePod: &kubehostport.ActivePod{
-			Pod: pod,
-			IP:  net.ParseIP(podIP),
-		},
-		vnid:   podConfig.vnid,
-		ofport: ofport,
-	}, nil
+	return podConfig.vnid, nil
 }
 
 // Clean up all pod networking (clear OVS flows, release IPAM lease, remove host/container veth)

pkg/sdn/plugin/pod_test.go

@@ -146,13 +146,13 @@ func (pt *podTester) setup(req *cniserver.PodRequest) (*cnitypes.Result, *runnin
 	return result, fakeRunningPod(req.PodNamespace, req.PodName, ip), nil
 }
 
-func (pt *podTester) update(req *cniserver.PodRequest) (*runningPod, error) {
+func (pt *podTester) update(req *cniserver.PodRequest) (uint32, error) {
 	pod, err := pt.getExpectedPod(req.PodNamespace, req.PodName, req.Command)
 	if err != nil {
-		return nil, err
+		return 0, err
 	}
 	pod.updated += 1
-	return fakeRunningPod(req.PodNamespace, req.PodName, net.ParseIP(pod.cidr)), nil
+	return 0, nil
 }
 
 func (pt *podTester) teardown(req *cniserver.PodRequest) error {