From 4570e2791b0d175981deb68572b0a337f4cbacb5 Mon Sep 17 00:00:00 2001
From: Dan Winship <danw@redhat.com>
Date: Mon, 17 Oct 2016 15:44:03 -0400
Subject: [PATCH] Split up SDN master/node/proxy/CNI code

---
 hack/lib/build/constants.sh                          |  2 +-
 pkg/cmd/server/kubernetes/node/node.go               |  8 ++++----
 pkg/cmd/server/kubernetes/node/node_config.go        | 12 ++++++------
 pkg/cmd/server/kubernetes/node/sdn_linux.go          |  7 ++++---
 pkg/cmd/server/origin/controller/network_linux.go    |  4 ++--
 pkg/cmd/server/start/start_node.go                   |  2 +-
 pkg/sdn/master/doc.go                                |  2 ++
 pkg/sdn/{plugin => master}/master.go                 |  7 ++++---
 pkg/sdn/{plugin => master}/master_test.go            |  2 +-
 pkg/sdn/{plugin => master}/netid/allocator.go        |  0
 pkg/sdn/{plugin => master}/netid/allocator_test.go   |  0
 pkg/sdn/{plugin => master}/netid/netid.go            |  0
 pkg/sdn/{plugin => master}/netid/netid_test.go       |  0
 .../{plugin/subnets_master.go => master/subnets.go}  |  2 +-
 pkg/sdn/{plugin/vnids_master.go => master/vnids.go}  |  4 ++--
 .../vnids_master_test.go => master/vnids_test.go}    |  2 +-
 pkg/sdn/{plugin => node}/cniserver/cniserver.go      |  0
 pkg/sdn/{plugin => node}/cniserver/cniserver_test.go |  0
 pkg/sdn/node/doc.go                                  |  2 ++
 pkg/sdn/{plugin => node}/egress_network_policy.go    |  2 +-
 .../{plugin/node_iptables.go => node/iptables.go}    |  2 +-
 pkg/sdn/{plugin => node}/multitenant.go              |  2 +-
 pkg/sdn/{plugin => node}/networkpolicy.go            |  2 +-
 pkg/sdn/{plugin => node}/node.go                     |  6 +++---
 pkg/sdn/{plugin => node}/ovscontroller.go            |  2 +-
 pkg/sdn/{plugin => node}/ovscontroller_test.go       |  2 +-
 pkg/sdn/{plugin => node}/pod.go                      |  4 ++--
 pkg/sdn/{plugin => node}/pod_test.go                 |  4 ++--
 pkg/sdn/{plugin => node}/runtime.go                  |  2 +-
 pkg/sdn/{plugin => node}/sdn_controller.go           |  2 +-
 pkg/sdn/{plugin => node}/singletenant.go             |  2 +-
 pkg/sdn/{plugin/subnets_node.go => node/subnets.go}  |  2 +-
 pkg/sdn/{plugin/vnids_node.go => node/vnids.go}      |  2 +-
 .../vnids_node_test.go => node/vnids_test.go}        |  2 +-
 pkg/sdn/proxy/doc.go                                 |  2 ++
 pkg/sdn/{plugin => proxy}/proxy.go                   |  4 ++--
 pkg/sdn/{plugin => }/sdn-cni-plugin/doc.go           |  0
 pkg/sdn/{plugin => }/sdn-cni-plugin/openshift-sdn.go |  2 +-
 .../sdn-cni-plugin/sdn_cni_plugin_test.go            |  2 +-
 39 files changed, 56 insertions(+), 48 deletions(-)
 mode change 100644 => 100755 hack/lib/build/constants.sh
 create mode 100644 pkg/sdn/master/doc.go
 rename pkg/sdn/{plugin => master}/master.go (95%)
 rename pkg/sdn/{plugin => master}/master_test.go (99%)
 rename pkg/sdn/{plugin => master}/netid/allocator.go (100%)
 rename pkg/sdn/{plugin => master}/netid/allocator_test.go (100%)
 rename pkg/sdn/{plugin => master}/netid/netid.go (100%)
 rename pkg/sdn/{plugin => master}/netid/netid_test.go (100%)
 rename pkg/sdn/{plugin/subnets_master.go => master/subnets.go} (99%)
 rename pkg/sdn/{plugin/vnids_master.go => master/vnids.go} (99%)
 rename pkg/sdn/{plugin/vnids_master_test.go => master/vnids_test.go} (99%)
 rename pkg/sdn/{plugin => node}/cniserver/cniserver.go (100%)
 rename pkg/sdn/{plugin => node}/cniserver/cniserver_test.go (100%)
 create mode 100644 pkg/sdn/node/doc.go
 rename pkg/sdn/{plugin => node}/egress_network_policy.go (99%)
 rename pkg/sdn/{plugin/node_iptables.go => node/iptables.go} (99%)
 rename pkg/sdn/{plugin => node}/multitenant.go (99%)
 rename pkg/sdn/{plugin => node}/networkpolicy.go (99%)
 rename pkg/sdn/{plugin => node}/node.go (99%)
 rename pkg/sdn/{plugin => node}/ovscontroller.go (99%)
 rename pkg/sdn/{plugin => node}/ovscontroller_test.go (99%)
 rename pkg/sdn/{plugin => node}/pod.go (99%)
 rename pkg/sdn/{plugin => node}/pod_test.go (99%)
 rename pkg/sdn/{plugin => node}/runtime.go (99%)
 rename pkg/sdn/{plugin => node}/sdn_controller.go (99%)
 rename pkg/sdn/{plugin => node}/singletenant.go (98%)
 rename pkg/sdn/{plugin/subnets_node.go => node/subnets.go} (99%)
 rename pkg/sdn/{plugin/vnids_node.go => node/vnids.go} (99%)
 rename pkg/sdn/{plugin/vnids_node_test.go => node/vnids_test.go} (99%)
 create mode 100644 pkg/sdn/proxy/doc.go
 rename pkg/sdn/{plugin => proxy}/proxy.go (98%)
 rename pkg/sdn/{plugin => }/sdn-cni-plugin/doc.go (100%)
 rename pkg/sdn/{plugin => }/sdn-cni-plugin/openshift-sdn.go (98%)
 rename pkg/sdn/{plugin => }/sdn-cni-plugin/sdn_cni_plugin_test.go (98%)

diff --git a/hack/lib/build/constants.sh b/hack/lib/build/constants.sh
old mode 100644
new mode 100755
index 0b6309c1999a..66d6982e6d74
--- a/hack/lib/build/constants.sh
+++ b/hack/lib/build/constants.sh
@@ -19,7 +19,7 @@ readonly OS_OUTPUT_PKGDIR="${OS_OUTPUT}/pkgdir"
 readonly OS_GO_PACKAGE=github.com/openshift/origin
 
 readonly OS_SDN_COMPILE_TARGETS_LINUX=(
-  pkg/sdn/plugin/sdn-cni-plugin
+  pkg/sdn/sdn-cni-plugin
   vendor/github.com/containernetworking/cni/plugins/ipam/host-local
   vendor/github.com/containernetworking/cni/plugins/main/loopback
 )
diff --git a/pkg/cmd/server/kubernetes/node/node.go b/pkg/cmd/server/kubernetes/node/node.go
index c4c41c1d5d38..e9343859aa09 100644
--- a/pkg/cmd/server/kubernetes/node/node.go
+++ b/pkg/cmd/server/kubernetes/node/node.go
@@ -301,12 +301,12 @@ func SetFakeContainerManagerInterfaceForIntegrationTest() {
 	defaultContainerManagerInterface = cm.NewStubContainerManager()
 }
 
-// RunPlugin starts the local SDN plugin, if enabled in configuration.
-func (c *NodeConfig) RunPlugin() {
-	if c.SDNPlugin == nil {
+// RunSDN starts the SDN, if the OpenShift SDN network plugin is enabled in configuration.
+func (c *NodeConfig) RunSDN() {
+	if c.SDNNode == nil {
 		return
 	}
-	if err := c.SDNPlugin.Start(); err != nil {
+	if err := c.SDNNode.Start(); err != nil {
 		glog.Fatalf("error: SDN node startup failed: %v", err)
 	}
 }
diff --git a/pkg/cmd/server/kubernetes/node/node_config.go b/pkg/cmd/server/kubernetes/node/node_config.go
index ce36246ee9b3..bf5a709eaf39 100644
--- a/pkg/cmd/server/kubernetes/node/node_config.go
+++ b/pkg/cmd/server/kubernetes/node/node_config.go
@@ -79,8 +79,8 @@ type NodeConfig struct {
 	// DNSConfig controls the DNS configuration.
 	DNSServer *dns.Server
 
-	// SDNPlugin is an optional SDN plugin
-	SDNPlugin sdn.NodeInterface
+	// SDNNode is an optional SDN node interface
+	SDNNode sdn.NodeInterface
 	// SDNProxy is an optional service endpoints filterer
 	SDNProxy sdn.ProxyInterface
 }
@@ -234,10 +234,10 @@ func BuildKubernetesNodeConfig(options configapi.NodeConfig, enableProxy, enable
 	internalKubeInformers := kinternalinformers.NewSharedInformerFactory(kubeClient, proxyconfig.ConfigSyncPeriod.Duration)
 
 	// Initialize SDN before building kubelet config so it can modify option
-	var sdnPlugin sdn.NodeInterface
+	var sdnNode sdn.NodeInterface
 	var sdnProxy sdn.ProxyInterface
 	if sdn.IsOpenShiftNetworkPlugin(options.NetworkConfig.NetworkPluginName) {
-		sdnPlugin, sdnProxy, err = NewSDNInterfaces(options, originClient, kubeClient, internalKubeInformers, proxyconfig)
+		sdnNode, sdnProxy, err = NewSDNInterfaces(options, originClient, kubeClient, internalKubeInformers, proxyconfig)
 		if err != nil {
 			return nil, fmt.Errorf("SDN initialization failed: %v", err)
 		}
@@ -312,8 +312,8 @@ func BuildKubernetesNodeConfig(options configapi.NodeConfig, enableProxy, enable
 		ProxyConfig:    proxyconfig,
 		EnableUnidling: options.EnableUnidling,
 
-		SDNPlugin: sdnPlugin,
-		SDNProxy:  sdnProxy,
+		SDNNode:  sdnNode,
+		SDNProxy: sdnProxy,
 	}
 
 	if enableDNS {
diff --git a/pkg/cmd/server/kubernetes/node/sdn_linux.go b/pkg/cmd/server/kubernetes/node/sdn_linux.go
index d2abd5cc75b5..66d7393936fc 100644
--- a/pkg/cmd/server/kubernetes/node/sdn_linux.go
+++ b/pkg/cmd/server/kubernetes/node/sdn_linux.go
@@ -8,11 +8,12 @@ import (
 	osclient "github.com/openshift/origin/pkg/client"
 	configapi "github.com/openshift/origin/pkg/cmd/server/api"
 	"github.com/openshift/origin/pkg/sdn"
-	sdnplugin "github.com/openshift/origin/pkg/sdn/plugin"
+	sdnnode "github.com/openshift/origin/pkg/sdn/node"
+	sdnproxy "github.com/openshift/origin/pkg/sdn/proxy"
 )
 
 func NewSDNInterfaces(options configapi.NodeConfig, originClient *osclient.Client, kubeClient kclientset.Interface, internalKubeInformers kinternalinformers.SharedInformerFactory, proxyconfig *componentconfig.KubeProxyConfiguration) (sdn.NodeInterface, sdn.ProxyInterface, error) {
-	node, err := sdnplugin.NewNodePlugin(&sdnplugin.OsdnNodeConfig{
+	node, err := sdnnode.New(&sdnnode.OsdnNodeConfig{
 		PluginName:         options.NetworkConfig.NetworkPluginName,
 		Hostname:           options.NodeName,
 		SelfIP:             options.NodeIP,
@@ -28,7 +29,7 @@ func NewSDNInterfaces(options configapi.NodeConfig, originClient *osclient.Clien
 		return nil, nil, err
 	}
 
-	proxy, err := sdnplugin.NewProxyPlugin(options.NetworkConfig.NetworkPluginName, originClient, kubeClient)
+	proxy, err := sdnproxy.New(options.NetworkConfig.NetworkPluginName, originClient, kubeClient)
 	if err != nil {
 		return nil, nil, err
 	}
diff --git a/pkg/cmd/server/origin/controller/network_linux.go b/pkg/cmd/server/origin/controller/network_linux.go
index f6f93dc20608..beee71203b5d 100644
--- a/pkg/cmd/server/origin/controller/network_linux.go
+++ b/pkg/cmd/server/origin/controller/network_linux.go
@@ -8,7 +8,7 @@ import (
 	osclient "github.com/openshift/origin/pkg/client"
 	configapi "github.com/openshift/origin/pkg/cmd/server/api"
 	"github.com/openshift/origin/pkg/cmd/server/bootstrappolicy"
-	sdnplugin "github.com/openshift/origin/pkg/sdn/plugin"
+	sdnmaster "github.com/openshift/origin/pkg/sdn/master"
 )
 
 type SDNControllerConfig struct {
@@ -29,7 +29,7 @@ func (c *SDNControllerConfig) RunController(ctx ControllerContext) (bool, error)
 	if err != nil {
 		return false, err
 	}
-	err = sdnplugin.StartMaster(
+	err = sdnmaster.Start(
 		c.NetworkConfig,
 		osClient,
 		kClient,
diff --git a/pkg/cmd/server/start/start_node.go b/pkg/cmd/server/start/start_node.go
index 1c98d6acfa41..fe95a7135033 100644
--- a/pkg/cmd/server/start/start_node.go
+++ b/pkg/cmd/server/start/start_node.go
@@ -365,7 +365,7 @@ func StartNode(nodeConfig configapi.NodeConfig, components *utilflags.ComponentF
 		config.RunKubelet()
 	}
 	if components.Enabled(ComponentPlugins) {
-		config.RunPlugin()
+		config.RunSDN()
 	}
 	if components.Enabled(ComponentProxy) {
 		config.RunProxy()
diff --git a/pkg/sdn/master/doc.go b/pkg/sdn/master/doc.go
new file mode 100644
index 000000000000..44eb3b9fcb94
--- /dev/null
+++ b/pkg/sdn/master/doc.go
@@ -0,0 +1,2 @@
+// Package master contains the OpenShift SDN code that runs on the master
+package master
diff --git a/pkg/sdn/plugin/master.go b/pkg/sdn/master/master.go
similarity index 95%
rename from pkg/sdn/plugin/master.go
rename to pkg/sdn/master/master.go
index 9d758ce23b6e..0932da3a4292 100644
--- a/pkg/sdn/plugin/master.go
+++ b/pkg/sdn/master/master.go
@@ -1,4 +1,4 @@
-package plugin
+package master
 
 import (
 	"fmt"
@@ -13,6 +13,7 @@ import (
 	osapi "github.com/openshift/origin/pkg/sdn/apis/network"
 	osapivalidation "github.com/openshift/origin/pkg/sdn/apis/network/validation"
 	"github.com/openshift/origin/pkg/sdn/common"
+	"github.com/openshift/origin/pkg/sdn/node"
 	"github.com/openshift/origin/pkg/util/netutils"
 
 	kapierrors "k8s.io/apimachinery/pkg/api/errors"
@@ -36,7 +37,7 @@ type OsdnMaster struct {
 	hostSubnetNodeIPs map[ktypes.UID]string
 }
 
-func StartMaster(networkConfig osconfigapi.MasterNetworkConfig, osClient *osclient.Client, kClient kclientset.Interface, informers kinternalinformers.SharedInformerFactory) error {
+func Start(networkConfig osconfigapi.MasterNetworkConfig, osClient *osclient.Client, kClient kclientset.Interface, informers kinternalinformers.SharedInformerFactory) error {
 	if !sdn.IsOpenShiftNetworkPlugin(networkConfig.NetworkPluginName) {
 		return nil
 	}
@@ -138,7 +139,7 @@ func StartMaster(networkConfig osconfigapi.MasterNetworkConfig, osClient *osclie
 }
 
 func (master *OsdnMaster) checkClusterNetworkAgainstLocalNetworks() error {
-	hostIPNets, _, err := netutils.GetHostIPNetworks([]string{Tun0})
+	hostIPNets, _, err := netutils.GetHostIPNetworks([]string{node.Tun0})
 	if err != nil {
 		return err
 	}
diff --git a/pkg/sdn/plugin/master_test.go b/pkg/sdn/master/master_test.go
similarity index 99%
rename from pkg/sdn/plugin/master_test.go
rename to pkg/sdn/master/master_test.go
index f2367db5d227..4f59f08686d1 100644
--- a/pkg/sdn/plugin/master_test.go
+++ b/pkg/sdn/master/master_test.go
@@ -1,4 +1,4 @@
-package plugin
+package master
 
 import (
 	"testing"
diff --git a/pkg/sdn/plugin/netid/allocator.go b/pkg/sdn/master/netid/allocator.go
similarity index 100%
rename from pkg/sdn/plugin/netid/allocator.go
rename to pkg/sdn/master/netid/allocator.go
diff --git a/pkg/sdn/plugin/netid/allocator_test.go b/pkg/sdn/master/netid/allocator_test.go
similarity index 100%
rename from pkg/sdn/plugin/netid/allocator_test.go
rename to pkg/sdn/master/netid/allocator_test.go
diff --git a/pkg/sdn/plugin/netid/netid.go b/pkg/sdn/master/netid/netid.go
similarity index 100%
rename from pkg/sdn/plugin/netid/netid.go
rename to pkg/sdn/master/netid/netid.go
diff --git a/pkg/sdn/plugin/netid/netid_test.go b/pkg/sdn/master/netid/netid_test.go
similarity index 100%
rename from pkg/sdn/plugin/netid/netid_test.go
rename to pkg/sdn/master/netid/netid_test.go
diff --git a/pkg/sdn/plugin/subnets_master.go b/pkg/sdn/master/subnets.go
similarity index 99%
rename from pkg/sdn/plugin/subnets_master.go
rename to pkg/sdn/master/subnets.go
index c7c0e0744fc5..1c6954dd0ea5 100644
--- a/pkg/sdn/plugin/subnets_master.go
+++ b/pkg/sdn/master/subnets.go
@@ -1,4 +1,4 @@
-package plugin
+package master
 
 import (
 	"fmt"
diff --git a/pkg/sdn/plugin/vnids_master.go b/pkg/sdn/master/vnids.go
similarity index 99%
rename from pkg/sdn/plugin/vnids_master.go
rename to pkg/sdn/master/vnids.go
index b060cd73b0a1..05dbbd125eef 100644
--- a/pkg/sdn/plugin/vnids_master.go
+++ b/pkg/sdn/master/vnids.go
@@ -1,4 +1,4 @@
-package plugin
+package master
 
 import (
 	"fmt"
@@ -17,7 +17,7 @@ import (
 	"github.com/openshift/origin/pkg/sdn"
 	osapi "github.com/openshift/origin/pkg/sdn/apis/network"
 	"github.com/openshift/origin/pkg/sdn/common"
-	pnetid "github.com/openshift/origin/pkg/sdn/plugin/netid"
+	pnetid "github.com/openshift/origin/pkg/sdn/master/netid"
 )
 
 type masterVNIDMap struct {
diff --git a/pkg/sdn/plugin/vnids_master_test.go b/pkg/sdn/master/vnids_test.go
similarity index 99%
rename from pkg/sdn/plugin/vnids_master_test.go
rename to pkg/sdn/master/vnids_test.go
index 67fc17e52b23..81eee352aec1 100644
--- a/pkg/sdn/plugin/vnids_master_test.go
+++ b/pkg/sdn/master/vnids_test.go
@@ -1,4 +1,4 @@
-package plugin
+package master
 
 import (
 	"testing"
diff --git a/pkg/sdn/plugin/cniserver/cniserver.go b/pkg/sdn/node/cniserver/cniserver.go
similarity index 100%
rename from pkg/sdn/plugin/cniserver/cniserver.go
rename to pkg/sdn/node/cniserver/cniserver.go
diff --git a/pkg/sdn/plugin/cniserver/cniserver_test.go b/pkg/sdn/node/cniserver/cniserver_test.go
similarity index 100%
rename from pkg/sdn/plugin/cniserver/cniserver_test.go
rename to pkg/sdn/node/cniserver/cniserver_test.go
diff --git a/pkg/sdn/node/doc.go b/pkg/sdn/node/doc.go
new file mode 100644
index 000000000000..c9c66480352d
--- /dev/null
+++ b/pkg/sdn/node/doc.go
@@ -0,0 +1,2 @@
+// Package node contains the OpenShift SDN networking code that runs on the nodes
+package node
diff --git a/pkg/sdn/plugin/egress_network_policy.go b/pkg/sdn/node/egress_network_policy.go
similarity index 99%
rename from pkg/sdn/plugin/egress_network_policy.go
rename to pkg/sdn/node/egress_network_policy.go
index 51587b711f1d..ec06817411f9 100644
--- a/pkg/sdn/plugin/egress_network_policy.go
+++ b/pkg/sdn/node/egress_network_policy.go
@@ -1,4 +1,4 @@
-package plugin
+package node
 
 import (
 	"fmt"
diff --git a/pkg/sdn/plugin/node_iptables.go b/pkg/sdn/node/iptables.go
similarity index 99%
rename from pkg/sdn/plugin/node_iptables.go
rename to pkg/sdn/node/iptables.go
index cada92f6b3ac..269c01998cef 100644
--- a/pkg/sdn/plugin/node_iptables.go
+++ b/pkg/sdn/node/iptables.go
@@ -1,4 +1,4 @@
-package plugin
+package node
 
 import (
 	"fmt"
diff --git a/pkg/sdn/plugin/multitenant.go b/pkg/sdn/node/multitenant.go
similarity index 99%
rename from pkg/sdn/plugin/multitenant.go
rename to pkg/sdn/node/multitenant.go
index a8a8f03d088c..8bb3ea3d8b8f 100644
--- a/pkg/sdn/plugin/multitenant.go
+++ b/pkg/sdn/node/multitenant.go
@@ -1,4 +1,4 @@
-package plugin
+package node
 
 import (
 	"sync"
diff --git a/pkg/sdn/plugin/networkpolicy.go b/pkg/sdn/node/networkpolicy.go
similarity index 99%
rename from pkg/sdn/plugin/networkpolicy.go
rename to pkg/sdn/node/networkpolicy.go
index 0d724cd21417..9845c9880606 100644
--- a/pkg/sdn/plugin/networkpolicy.go
+++ b/pkg/sdn/node/networkpolicy.go
@@ -1,4 +1,4 @@
-package plugin
+package node
 
 import (
 	"fmt"
diff --git a/pkg/sdn/plugin/node.go b/pkg/sdn/node/node.go
similarity index 99%
rename from pkg/sdn/plugin/node.go
rename to pkg/sdn/node/node.go
index a520fc7817cc..beebf72feacb 100644
--- a/pkg/sdn/plugin/node.go
+++ b/pkg/sdn/node/node.go
@@ -1,4 +1,4 @@
-package plugin
+package node
 
 import (
 	"fmt"
@@ -13,7 +13,7 @@ import (
 
 	log "github.com/golang/glog"
 
-	"github.com/openshift/origin/pkg/sdn/plugin/cniserver"
+	"github.com/openshift/origin/pkg/sdn/node/cniserver"
 
 	osclient "github.com/openshift/origin/pkg/client"
 	"github.com/openshift/origin/pkg/sdn"
@@ -112,7 +112,7 @@ type OsdnNode struct {
 }
 
 // Called by higher layers to create the plugin SDN node instance
-func NewNodePlugin(c *OsdnNodeConfig) (sdn.NodeInterface, error) {
+func New(c *OsdnNodeConfig) (sdn.NodeInterface, error) {
 	var policy osdnPolicy
 	var pluginId int
 	var minOvsVersion string
diff --git a/pkg/sdn/plugin/ovscontroller.go b/pkg/sdn/node/ovscontroller.go
similarity index 99%
rename from pkg/sdn/plugin/ovscontroller.go
rename to pkg/sdn/node/ovscontroller.go
index eea6bdbfaf8c..085d5ef83d03 100644
--- a/pkg/sdn/plugin/ovscontroller.go
+++ b/pkg/sdn/node/ovscontroller.go
@@ -1,4 +1,4 @@
-package plugin
+package node
 
 import (
 	"encoding/hex"
diff --git a/pkg/sdn/plugin/ovscontroller_test.go b/pkg/sdn/node/ovscontroller_test.go
similarity index 99%
rename from pkg/sdn/plugin/ovscontroller_test.go
rename to pkg/sdn/node/ovscontroller_test.go
index e1f2c3d84fbb..cbd6364d9f38 100644
--- a/pkg/sdn/plugin/ovscontroller_test.go
+++ b/pkg/sdn/node/ovscontroller_test.go
@@ -1,4 +1,4 @@
-package plugin
+package node
 
 import (
 	"fmt"
diff --git a/pkg/sdn/plugin/pod.go b/pkg/sdn/node/pod.go
similarity index 99%
rename from pkg/sdn/plugin/pod.go
rename to pkg/sdn/node/pod.go
index 766fc4cc1b57..48042747f1e4 100644
--- a/pkg/sdn/plugin/pod.go
+++ b/pkg/sdn/node/pod.go
@@ -1,4 +1,4 @@
-package plugin
+package node
 
 import (
 	"encoding/json"
@@ -9,7 +9,7 @@ import (
 	"syscall"
 
 	sdnapi "github.com/openshift/origin/pkg/sdn/apis/network"
-	"github.com/openshift/origin/pkg/sdn/plugin/cniserver"
+	"github.com/openshift/origin/pkg/sdn/node/cniserver"
 	"github.com/openshift/origin/pkg/util/ipcmd"
 	"github.com/openshift/origin/pkg/util/netutils"
 
diff --git a/pkg/sdn/plugin/pod_test.go b/pkg/sdn/node/pod_test.go
similarity index 99%
rename from pkg/sdn/plugin/pod_test.go
rename to pkg/sdn/node/pod_test.go
index 1d05a588426c..5f575b44ed14 100644
--- a/pkg/sdn/plugin/pod_test.go
+++ b/pkg/sdn/node/pod_test.go
@@ -1,4 +1,4 @@
-package plugin
+package node
 
 import (
 	"encoding/json"
@@ -10,7 +10,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/openshift/origin/pkg/sdn/plugin/cniserver"
+	"github.com/openshift/origin/pkg/sdn/node/cniserver"
 
 	utiltesting "k8s.io/client-go/util/testing"
 	khostport "k8s.io/kubernetes/pkg/kubelet/network/hostport"
diff --git a/pkg/sdn/plugin/runtime.go b/pkg/sdn/node/runtime.go
similarity index 99%
rename from pkg/sdn/plugin/runtime.go
rename to pkg/sdn/node/runtime.go
index 9ba8a5707e6f..e531584f3119 100644
--- a/pkg/sdn/plugin/runtime.go
+++ b/pkg/sdn/node/runtime.go
@@ -1,4 +1,4 @@
-package plugin
+package node
 
 import (
 	"fmt"
diff --git a/pkg/sdn/plugin/sdn_controller.go b/pkg/sdn/node/sdn_controller.go
similarity index 99%
rename from pkg/sdn/plugin/sdn_controller.go
rename to pkg/sdn/node/sdn_controller.go
index 053fee569a71..0e9d481d98cb 100644
--- a/pkg/sdn/plugin/sdn_controller.go
+++ b/pkg/sdn/node/sdn_controller.go
@@ -1,4 +1,4 @@
-package plugin
+package node
 
 import (
 	"fmt"
diff --git a/pkg/sdn/plugin/singletenant.go b/pkg/sdn/node/singletenant.go
similarity index 98%
rename from pkg/sdn/plugin/singletenant.go
rename to pkg/sdn/node/singletenant.go
index 1424b402e0c8..43067e191c42 100644
--- a/pkg/sdn/plugin/singletenant.go
+++ b/pkg/sdn/node/singletenant.go
@@ -1,4 +1,4 @@
-package plugin
+package node
 
 import (
 	"github.com/openshift/origin/pkg/sdn"
diff --git a/pkg/sdn/plugin/subnets_node.go b/pkg/sdn/node/subnets.go
similarity index 99%
rename from pkg/sdn/plugin/subnets_node.go
rename to pkg/sdn/node/subnets.go
index 67f58fe8810f..f429d4842d48 100644
--- a/pkg/sdn/plugin/subnets_node.go
+++ b/pkg/sdn/node/subnets.go
@@ -1,4 +1,4 @@
-package plugin
+package node
 
 import (
 	log "github.com/golang/glog"
diff --git a/pkg/sdn/plugin/vnids_node.go b/pkg/sdn/node/vnids.go
similarity index 99%
rename from pkg/sdn/plugin/vnids_node.go
rename to pkg/sdn/node/vnids.go
index 55a34268a340..2b46e2973b1f 100644
--- a/pkg/sdn/plugin/vnids_node.go
+++ b/pkg/sdn/node/vnids.go
@@ -1,4 +1,4 @@
-package plugin
+package node
 
 import (
 	"fmt"
diff --git a/pkg/sdn/plugin/vnids_node_test.go b/pkg/sdn/node/vnids_test.go
similarity index 99%
rename from pkg/sdn/plugin/vnids_node_test.go
rename to pkg/sdn/node/vnids_test.go
index ce4621649067..6146873d0fc8 100644
--- a/pkg/sdn/plugin/vnids_node_test.go
+++ b/pkg/sdn/node/vnids_test.go
@@ -1,4 +1,4 @@
-package plugin
+package node
 
 import (
 	"testing"
diff --git a/pkg/sdn/proxy/doc.go b/pkg/sdn/proxy/doc.go
new file mode 100644
index 000000000000..92cb752d608d
--- /dev/null
+++ b/pkg/sdn/proxy/doc.go
@@ -0,0 +1,2 @@
+// Package proxy contains the OpenShift SDN code that runs as part of the service proxy
+package proxy
diff --git a/pkg/sdn/plugin/proxy.go b/pkg/sdn/proxy/proxy.go
similarity index 98%
rename from pkg/sdn/plugin/proxy.go
rename to pkg/sdn/proxy/proxy.go
index 95e2993e9cb9..f7b7be608987 100644
--- a/pkg/sdn/plugin/proxy.go
+++ b/pkg/sdn/proxy/proxy.go
@@ -1,4 +1,4 @@
-package plugin
+package proxy
 
 import (
 	"fmt"
@@ -60,7 +60,7 @@ type OsdnProxy struct {
 }
 
 // Called by higher layers to create the proxy plugin instance; only used by nodes
-func NewProxyPlugin(pluginName string, osClient *osclient.Client, kClient kclientset.Interface) (sdn.ProxyInterface, error) {
+func New(pluginName string, osClient *osclient.Client, kClient kclientset.Interface) (sdn.ProxyInterface, error) {
 	if !sdn.IsOpenShiftMultitenantNetworkPlugin(pluginName) {
 		return nil, nil
 	}
diff --git a/pkg/sdn/plugin/sdn-cni-plugin/doc.go b/pkg/sdn/sdn-cni-plugin/doc.go
similarity index 100%
rename from pkg/sdn/plugin/sdn-cni-plugin/doc.go
rename to pkg/sdn/sdn-cni-plugin/doc.go
diff --git a/pkg/sdn/plugin/sdn-cni-plugin/openshift-sdn.go b/pkg/sdn/sdn-cni-plugin/openshift-sdn.go
similarity index 98%
rename from pkg/sdn/plugin/sdn-cni-plugin/openshift-sdn.go
rename to pkg/sdn/sdn-cni-plugin/openshift-sdn.go
index fede0f1c61d6..9e1a078850b1 100644
--- a/pkg/sdn/plugin/sdn-cni-plugin/openshift-sdn.go
+++ b/pkg/sdn/sdn-cni-plugin/openshift-sdn.go
@@ -14,7 +14,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/openshift/origin/pkg/sdn/plugin/cniserver"
+	"github.com/openshift/origin/pkg/sdn/node/cniserver"
 
 	"github.com/containernetworking/cni/pkg/skel"
 	"github.com/containernetworking/cni/pkg/types"
diff --git a/pkg/sdn/plugin/sdn-cni-plugin/sdn_cni_plugin_test.go b/pkg/sdn/sdn-cni-plugin/sdn_cni_plugin_test.go
similarity index 98%
rename from pkg/sdn/plugin/sdn-cni-plugin/sdn_cni_plugin_test.go
rename to pkg/sdn/sdn-cni-plugin/sdn_cni_plugin_test.go
index faf9f28316b3..53cf3abe0564 100644
--- a/pkg/sdn/plugin/sdn-cni-plugin/sdn_cni_plugin_test.go
+++ b/pkg/sdn/sdn-cni-plugin/sdn_cni_plugin_test.go
@@ -16,7 +16,7 @@ import (
 	cnitypes "github.com/containernetworking/cni/pkg/types"
 	cni020 "github.com/containernetworking/cni/pkg/types/020"
 
-	"github.com/openshift/origin/pkg/sdn/plugin/cniserver"
+	"github.com/openshift/origin/pkg/sdn/node/cniserver"
 	utiltesting "k8s.io/client-go/util/testing"
 )