Port openshift-sdn-ovs script to go

Author: danwinship

contrib/node/install-sdn.sh

@@ -14,9 +14,7 @@ os::provision::install-sdn() {
   mkdir -p -m u+rwx,g+rwx,o+rx "${target_confdir}"
   mkdir -p -m u+rwx,g+rwx,o+rx "${target_cnidir}"
 
-  local osdn_plugin_path="${deployed_root}/pkg/sdn/plugin"
-  install -m u+rwx,g+rwx,o+rx "${osdn_plugin_path}/bin/openshift-sdn-ovs" "${target_bindir}"
-  install -m u+rw,g+rw,o+r "${osdn_plugin_path}/sdn-cni-plugin/80-openshift-sdn.conf" "${target_confdir}"
+  install -m u+rw,g+rw,o+r "${deployed_root}/pkg/sdn/plugin/sdn-cni-plugin/80-openshift-sdn.conf" "${target_confdir}"
 
   install -m u+rwx,g+rwx,o+rx "${binaries_path}/sdn-cni-plugin" "${target_cnidir}/openshift-sdn"
   install -m u+rwx,g+rwx,o+rx "${binaries_path}/host-local" "${target_cnidir}"

hack/dind-cluster.sh

@@ -203,9 +203,7 @@ function copy-runtime() {
   cp "$(os::util::find::built_binary host-local)" "${target}"
   cp "$(os::util::find::built_binary loopback)" "${target}"
   cp "$(os::util::find::built_binary sdn-cni-plugin)" "${target}/openshift-sdn"
-  local osdn_plugin_path="${origin_root}/pkg/sdn/plugin"
-  cp "${osdn_plugin_path}/bin/openshift-sdn-ovs" "${target}"
-  cp "${osdn_plugin_path}/sdn-cni-plugin/80-openshift-sdn.conf" "${target}"
+  cp "${origin_root}/pkg/sdn/plugin/sdn-cni-plugin/80-openshift-sdn.conf" "${target}"
 }
 
 function wait-for-cluster() {

origin.spec

@@ -301,9 +301,6 @@ install -d -m 0755 %{buildroot}%{_sysconfdir}/cni/net.d
 pushd pkg/sdn/plugin/sdn-cni-plugin
    install -p -m 0644 80-openshift-sdn.conf %{buildroot}%{_sysconfdir}/cni/net.d
 popd
-pushd pkg/sdn/plugin/bin
-   install -p -m 0755 openshift-sdn-ovs %{buildroot}%{_bindir}/openshift-sdn-ovs
-popd
 install -d -m 0755 %{buildroot}/opt/cni/bin
 install -p -m 0755 _output/local/bin/${PLATFORM}/sdn-cni-plugin %{buildroot}/opt/cni/bin/openshift-sdn
 install -p -m 0755 _output/local/bin/${PLATFORM}/host-local %{buildroot}/opt/cni/bin
@@ -474,7 +471,6 @@ fi
 %dir %{_unitdir}/%{name}-node.service.d/
 %dir %{_sysconfdir}/cni/net.d
 %dir /opt/cni/bin
-%{_bindir}/openshift-sdn-ovs
 %{_unitdir}/%{name}-node.service.d/openshift-sdn-ovs.conf
 %{_sysconfdir}/cni/net.d/80-openshift-sdn.conf
 /opt/cni/bin/*

pkg/sdn/plugin/bin/openshift-sdn-ovs

@@ -253,7 +253,7 @@ func (plugin *OsdnNode) SetupSDN() (bool, error) {
 	// eg, "table=10, priority=100, tun_src=${remote_node_ip}, actions=goto_table:30"
 	otx.AddFlow("table=10, priority=0, actions=drop")
 
-	// Table 20: from OpenShift container; validate IP/MAC, assign tenant-id; filled in by openshift-sdn-ovs
+	// Table 20: from OpenShift container; validate IP/MAC, assign tenant-id; filled in by setupPodFlows
 	// eg, "table=20, priority=100, in_port=${ovs_port}, arp, nw_src=${ipaddr}, arp_sha=${macaddr}, actions=load:${tenant_id}->NXM_NX_REG0[], goto_table:30"
 	//     "table=20, priority=100, in_port=${ovs_port}, ip, nw_src=${ipaddr}, actions=load:${tenant_id}->NXM_NX_REG0[], goto_table:30"
 	// (${tenant_id} is always 0 for single-tenant)
@@ -270,7 +270,7 @@ func (plugin *OsdnNode) SetupSDN() (bool, error) {
 	otx.AddFlow("table=30, priority=0, ip, actions=goto_table:100")
 	otx.AddFlow("table=30, priority=0, arp, actions=drop")
 
-	// Table 40: ARP to local container, filled in by openshift-sdn-ovs
+	// Table 40: ARP to local container, filled in by setupPodFlows
 	// eg, "table=40, priority=100, arp, nw_dst=${container_ip}, actions=output:${ovs_port}"
 	otx.AddFlow("table=40, priority=0, actions=drop")
 
@@ -283,7 +283,7 @@ func (plugin *OsdnNode) SetupSDN() (bool, error) {
 	// eg, "table=60, priority=100, reg0=${tenant_id}, ${service_proto}, nw_dst=${service_ip}, tp_dst=${service_port}, actions=load:${tenant_id}->NXM_NX_REG1[], load:2->NXM_NX_REG2[], goto_table:80"
 	otx.AddFlow("table=60, priority=0, actions=drop")
 
-	// Table 70: IP to local container: vnid/port mappings; filled in by openshift-sdn-ovs
+	// Table 70: IP to local container: vnid/port mappings; filled in by setupPodFlows
 	// eg, "table=70, priority=100, ip, nw_dst=${ipaddr}, actions=load:${tenant_id}->NXM_NX_REG1[], load:${ovs_port}->NXM_NX_REG2[], goto_table:80"
 	otx.AddFlow("table=70, priority=0, actions=drop")
 

pkg/sdn/plugin/controller.go

@@ -234,7 +234,7 @@ func (node *OsdnNode) Start() error {
 		})
 
 	log.V(5).Infof("Creating and initializing openshift-sdn pod manager")
-	node.podManager, err = newPodManager(node.host, node.localSubnetCIDR, node.networkInfo, node.kClient, node.policy, node.mtu)
+	node.podManager, err = newPodManager(node.host, node.localSubnetCIDR, node.networkInfo, node.kClient, node.policy, node.ovs, node.mtu)
 	if err != nil {
 		return err
 	}

pkg/sdn/plugin/node.go

@@ -7,6 +7,7 @@ import (
 
 	"github.com/openshift/origin/pkg/sdn/plugin/cniserver"
 	"github.com/openshift/origin/pkg/util/netutils"
+	"github.com/openshift/origin/pkg/util/ovs"
 
 	"github.com/golang/glog"
 
@@ -35,17 +36,19 @@ type podManager struct {
 	// Live pod setup/teardown stuff not used in testing code
 	kClient         *kclientset.Clientset
 	policy          osdnPolicy
+	ovs             *ovs.Interface
 	ipamConfig      []byte
 	mtu             uint32
 	hostportHandler kubehostport.HostportHandler
 	host            knetwork.Host
 }
 
 // Creates a new live podManager; used by node code
-func newPodManager(host knetwork.Host, localSubnetCIDR string, netInfo *NetworkInfo, kClient *kclientset.Clientset, policy osdnPolicy, mtu uint32) (*podManager, error) {
+func newPodManager(host knetwork.Host, localSubnetCIDR string, netInfo *NetworkInfo, kClient *kclientset.Clientset, policy osdnPolicy, ovsif *ovs.Interface, mtu uint32) (*podManager, error) {
 	pm := newDefaultPodManager(host)
 	pm.kClient = kClient
 	pm.policy = policy
+	pm.ovs = ovsif
 	pm.mtu = mtu
 	pm.hostportHandler = kubehostport.NewHostportHandler()
 	pm.podHandler = pm