fixup! Port openshift-sdn-ovs script to go

Author: danwinship

pkg/sdn/plugin/pod.go

@@ -143,6 +143,15 @@ func (m *podManager) getRunningPods() []*kubehostport.RunningPod {
 	return pods
 }
 
+// Get the VNID of a namespace
+func (m *podManager) getVNID(namespace string) (uint32, error) {
+	if m.multitenant {
+		return m.vnids.GetVNID(namespace)
+	} else {
+		return 0, nil
+	}
+}
+
 // Add a request to the podManager CNI request queue
 func (m *podManager) addRequest(request *cniserver.PodRequest) {
 	m.requests <- request

pkg/sdn/plugin/pod_linux.go

@@ -13,6 +13,7 @@ import (
 
 	sdnapi "github.com/openshift/origin/pkg/sdn/api"
 	"github.com/openshift/origin/pkg/sdn/plugin/cniserver"
+	"github.com/openshift/origin/pkg/util/ovs"
 
 	"github.com/golang/glog"
 
@@ -190,21 +191,12 @@ func (m *podManager) ipamDel(id string) error {
 	return nil
 }
 
-func (m *podManager) ensureOvsPort(hostVeth string) (int, error) {
-	return m.ovs.AddPort(hostVeth, -1)
+func ensureOvsPort(ovsif *ovs.Interface, hostVeth string) (int, error) {
+	return ovsif.AddPort(hostVeth, -1)
 }
 
-func (m *podManager) setupPodFlows(ofport int, podIP, podMac, namespace string) error {
-	vnid := uint32(0)
-	if m.multitenant {
-		var err error
-		vnid, err = m.vnids.GetVNID(namespace)
-		if err != nil {
-			return err
-		}
-	}
-
-	otx := m.ovs.NewTransaction()
+func setupPodFlows(ovsif *ovs.Interface, ofport int, podIP, podMac string, vnid uint32) error {
+	otx := ovsif.NewTransaction()
 
 	// ARP/IP traffic from container
 	otx.AddFlow("table=2, priority=100, in_port=%d, arp, nw_src=%s, arp_sha=%s, actions=load:%d->NXM_NX_REG0[], goto_table:5", ofport, podIP, podMac, vnid)
@@ -224,7 +216,7 @@ func (m *podManager) setupPodFlows(ofport int, podIP, podMac, namespace string)
 	return otx.EndTransaction()
 }
 
-func (m *podManager) setupPodBandwidth(pod *kapi.Pod, hostVeth string) error {
+func setupPodBandwidth(ovsif *ovs.Interface, pod *kapi.Pod, hostVeth string) error {
 	podIngress, podEgress, err := kbandwidth.ExtractPodBandwidthResources(pod.Annotations)
 	if err != nil {
 		return fmt.Errorf("failed to parse pod bandwidth: %v", err)
@@ -243,17 +235,17 @@ func (m *podManager) setupPodBandwidth(pod *kapi.Pod, hostVeth string) error {
 	}
 
 	if ovsEgress > 0 {
-		qos, err := m.ovs.Create("qos", "type=linux-htb", fmt.Sprintf("other-config:max-rate=%d", ovsEgress))
+		qos, err := ovsif.Create("qos", "type=linux-htb", fmt.Sprintf("other-config:max-rate=%d", ovsEgress))
 		if err != nil {
 			return err
 		}
-		err = m.ovs.Set("port", hostVeth, fmt.Sprintf("qos=%s", qos))
+		err = ovsif.Set("port", hostVeth, fmt.Sprintf("qos=%s", qos))
 		if err != nil {
 			return err
 		}
 	}
 	if ovsIngress > 0 {
-		err := m.ovs.Set("interface", hostVeth, fmt.Sprintf("ingress_policing_rate=%d", ovsIngress))
+		err := ovsif.Set("interface", hostVeth, fmt.Sprintf("ingress_policing_rate=%d", ovsIngress))
 		if err != nil {
 			return err
 		}
@@ -262,25 +254,25 @@ func (m *podManager) setupPodBandwidth(pod *kapi.Pod, hostVeth string) error {
 	return nil
 }
 
-func (m *podManager) cleanupPodFlows(podIP string) error {
-	otx := m.ovs.NewTransaction()
+func cleanupPodFlows(ovsif *ovs.Interface, podIP string) error {
+	otx := ovsif.NewTransaction()
 	otx.DeleteFlows("ip, nw_dst=%s", podIP)
 	otx.DeleteFlows("ip, nw_src=%s", podIP)
 	otx.DeleteFlows("arp, nw_dst=%s", podIP)
 	otx.DeleteFlows("arp, nw_src=%s", podIP)
 	return otx.EndTransaction()
 }
 
-func (m *podManager) cleanupPodBandwidth(hostVeth string) error {
-	qos, err := m.ovs.Get("port", hostVeth, "qos")
+func cleanupPodBandwidth(ovsif *ovs.Interface, hostVeth string) error {
+	qos, err := ovsif.Get("port", hostVeth, "qos")
 	if err != nil || qos == "[]" {
 		return err
 	}
-	err = m.ovs.Clear("port", hostVeth, "qos")
+	err = ovsif.Clear("port", hostVeth, "qos")
 	if err != nil {
 		return err
 	}
-	return m.ovs.Destroy("qos", qos)
+	return ovsif.Destroy("qos", qos)
 }
 
 func vnidToString(vnid uint32) string {
@@ -448,18 +440,23 @@ func (m *podManager) setup(req *cniserver.PodRequest) (*cnitypes.Result, *kubeho
 		return nil, nil, err
 	}
 
+	vnid, err := m.getVNID(req.PodNamespace)
+	if err != nil {
+		return nil, nil, err
+	}
+
 	if err := maybeAddMacvlan(pod, req.Netns); err != nil {
 		return nil, nil, err
 	}
 
-	ofport, err := m.ensureOvsPort(hostVethName)
+	ofport, err := ensureOvsPort(m.ovs, hostVethName)
 	if err != nil {
 		return nil, nil, err
 	}
-	if err := m.setupPodFlows(ofport, podIP.String(), contVethMac, req.PodNamespace); err != nil {
+	if err := setupPodFlows(m.ovs, ofport, podIP.String(), contVethMac, vnid); err != nil {
 		return nil, nil, err
 	}
-	if err := m.setupPodBandwidth(pod, hostVethName); err != nil {
+	if err := setupPodBandwidth(m.ovs, pod, hostVethName); err != nil {
 		return nil, nil, err
 	}
 
@@ -497,21 +494,25 @@ func (m *podManager) update(req *cniserver.PodRequest) error {
 	if err != nil {
 		return err
 	}
+	vnid, err := m.getVNID(req.PodNamespace)
+	if err != nil {
+		return err
+	}
 
-	ofport, err := m.ensureOvsPort(hostVethName)
+	ofport, err := ensureOvsPort(m.ovs, hostVethName)
 	if err != nil {
 		return err
 	}
-	if err := m.cleanupPodFlows(podIP); err != nil {
+	if err := cleanupPodFlows(m.ovs, podIP); err != nil {
 		return err
 	}
-	if err := m.setupPodFlows(ofport, podIP, contVethMac, req.PodNamespace); err != nil {
+	if err := setupPodFlows(m.ovs, ofport, podIP, contVethMac, vnid); err != nil {
 		return err
 	}
-	if err := m.cleanupPodBandwidth(hostVethName); err != nil {
+	if err := cleanupPodBandwidth(m.ovs, hostVethName); err != nil {
 		return err
 	}
-	if err := m.setupPodBandwidth(pod, hostVethName); err != nil {
+	if err := setupPodBandwidth(m.ovs, pod, hostVethName); err != nil {
 		return err
 	}
 
@@ -536,10 +537,10 @@ func (m *podManager) teardown(req *cniserver.PodRequest) error {
 			return err
 		}
 
-		if err := m.cleanupPodFlows(podIP); err != nil {
+		if err := cleanupPodFlows(m.ovs, podIP); err != nil {
 			errList = append(errList, err)
 		}
-		if err := m.cleanupPodBandwidth(hostVethName); err != nil {
+		if err := cleanupPodBandwidth(m.ovs, hostVethName); err != nil {
 			errList = append(errList, err)
 		}
 		if err := m.ovs.DeletePort(hostVethName); err != nil {