@@ -10,8 +10,7 @@ os::provision::install-sdn() {

     mkdir -p ${target}

   fi

-  local osdn_base_path="${deployed_root}/Godeps/_workspace/src/github.com/openshift/openshift-sdn"

-  local osdn_plugin_path="${osdn_base_path}/plugins/osdn"

+  local osdn_plugin_path="${deployed_root}/pkg/sdn/plugin"

   mkdir -p "${target}/bin/"

   pushd "${osdn_plugin_path}" > /dev/null

     install bin/openshift-sdn-ovs "${target}/bin/"

@@ -5,7 +5,6 @@

 %global gopath      %{_datadir}/gocode

 %global import_path github.com/openshift/origin

-%global sdn_import_path github.com/openshift/openshift-sdn

 # The following should only be used for cleanup of sdn-ovs upgrades

 %global kube_plugin_path /usr/libexec/kubernetes/kubelet-plugins/net/exec/redhat~openshift-ovs-subnet

@@ -283,7 +282,7 @@ mkdir -p %{buildroot}%{_sharedstatedir}/origin

 # Install sdn scripts

 install -d -m 0755 %{buildroot}%{_unitdir}/docker.service.d

 install -p -m 0644 contrib/systemd/docker-sdn-ovs.conf %{buildroot}%{_unitdir}/docker.service.d/

-pushd _thirdpartyhacks/src/%{sdn_import_path}/plugins/osdn/bin

+pushd pkg/sdn/plugin/bin

    install -p -m 755 openshift-sdn-ovs %{buildroot}%{_bindir}/openshift-sdn-ovs

    install -p -m 755 openshift-sdn-docker-setup.sh %{buildroot}%{_bindir}/openshift-sdn-docker-setup.sh

 popd

@@ -6,10 +6,10 @@ import (

 	"github.com/spf13/cobra"

-	"github.com/openshift/openshift-sdn/pkg/cmd/admin/network"

 	"github.com/openshift/origin/pkg/cmd/admin/cert"

 	diagnostics "github.com/openshift/origin/pkg/cmd/admin/diagnostics"

 	"github.com/openshift/origin/pkg/cmd/admin/groups"

+	"github.com/openshift/origin/pkg/cmd/admin/network"

 	"github.com/openshift/origin/pkg/cmd/admin/node"

 	"github.com/openshift/origin/pkg/cmd/admin/policy"

 	"github.com/openshift/origin/pkg/cmd/admin/project"

@@ -27,8 +27,6 @@ import (

 	kcrypto "k8s.io/kubernetes/pkg/util/crypto"

 	kerrors "k8s.io/kubernetes/pkg/util/errors"

-	"github.com/openshift/openshift-sdn/plugins/osdn"

-	osdnapi "github.com/openshift/openshift-sdn/plugins/osdn/api"

 	osclient "github.com/openshift/origin/pkg/client"

 	configapi "github.com/openshift/origin/pkg/cmd/server/api"

 	"github.com/openshift/origin/pkg/cmd/server/crypto"

@@ -38,6 +36,8 @@ import (

 	"github.com/openshift/origin/pkg/cmd/util/variable"

 	"github.com/openshift/origin/pkg/dns"

 	sdnapi "github.com/openshift/origin/pkg/sdn/api"

+	sdnplugin "github.com/openshift/origin/pkg/sdn/plugin"

+	sdnpluginapi "github.com/openshift/origin/pkg/sdn/plugin/api"

 )

 // NodeConfig represents the required parameters to start the OpenShift node

@@ -76,9 +76,9 @@ type NodeConfig struct {

 	DNSServer *dns.Server

 	// SDNPlugin is an optional SDN plugin

-	SDNPlugin osdnapi.OsdnNodePlugin

+	SDNPlugin sdnpluginapi.OsdnNodePlugin

 	// EndpointsFilterer is an optional endpoints filterer

-	FilteringEndpointsHandler osdnapi.FilteringEndpointsConfigHandler

+	FilteringEndpointsHandler sdnpluginapi.FilteringEndpointsConfigHandler

 }

 func BuildKubernetesNodeConfig(options configapi.NodeConfig, enableProxy, enableDNS bool) (*NodeConfig, error) {

@@ -171,7 +171,7 @@ func BuildKubernetesNodeConfig(options configapi.NodeConfig, enableProxy, enable

 		server.ResolverConfig = ""

 	}

-	if osdn.IsOpenShiftNetworkPlugin(server.NetworkPluginName) {

+	if sdnplugin.IsOpenShiftNetworkPlugin(server.NetworkPluginName) {

 		// set defaults for openshift-sdn

 		server.HairpinMode = componentconfig.HairpinNone

 		server.ConfigureCBR0 = false

@@ -275,7 +275,7 @@ func BuildKubernetesNodeConfig(options configapi.NodeConfig, enableProxy, enable

 	if err != nil {

 		return nil, fmt.Errorf("Cannot parse the provided ip-tables sync period (%s) : %v", options.IPTablesSyncPeriod, err)

 	}

-	sdnPlugin, err := osdn.NewNodePlugin(options.NetworkConfig.NetworkPluginName, originClient, kubeClient, options.NodeName, options.NodeIP, iptablesSyncPeriod, options.NetworkConfig.MTU)

+	sdnPlugin, err := sdnplugin.NewNodePlugin(options.NetworkConfig.NetworkPluginName, originClient, kubeClient, options.NodeName, options.NodeIP, iptablesSyncPeriod, options.NetworkConfig.MTU)

 	if err != nil {

 		return nil, fmt.Errorf("SDN initialization failed: %v", err)

 	}

@@ -283,7 +283,7 @@ func BuildKubernetesNodeConfig(options configapi.NodeConfig, enableProxy, enable

 		cfg.NetworkPlugins = append(cfg.NetworkPlugins, sdnPlugin)

 	}

-	endpointFilter, err := osdn.NewProxyPlugin(options.NetworkConfig.NetworkPluginName, originClient, kubeClient)

+	endpointFilter, err := sdnplugin.NewProxyPlugin(options.NetworkConfig.NetworkPluginName, originClient, kubeClient)

 	if err != nil {

 		return nil, fmt.Errorf("SDN proxy initialization failed: %v", err)

 	}

@@ -413,7 +413,7 @@ func buildKubeProxyConfig(options configapi.NodeConfig) (*proxyoptions.ProxyServ

 }

 func validateAndGetNetworkPluginName(originClient *osclient.Client, pluginName string) (string, error) {

-	if osdn.IsOpenShiftNetworkPlugin(pluginName) {

+	if sdnplugin.IsOpenShiftNetworkPlugin(pluginName) {

 		// Detect any plugin mismatches between node and master

 		clusterNetwork, err := originClient.ClusterNetwork().Get(sdnapi.ClusterNetworkDefault)

 		if kerrs.IsNotFound(err) {

@@ -47,12 +47,12 @@ import (

 	"github.com/openshift/origin/pkg/security/uidallocator"

 	servingcertcontroller "github.com/openshift/origin/pkg/service/controller/servingcert"

-	"github.com/openshift/openshift-sdn/plugins/osdn"

 	configapi "github.com/openshift/origin/pkg/cmd/server/api"

 	"github.com/openshift/origin/pkg/cmd/server/bootstrappolicy"

 	imageapi "github.com/openshift/origin/pkg/image/api"

 	quota "github.com/openshift/origin/pkg/quota"

 	quotacontroller "github.com/openshift/origin/pkg/quota/controller"

+	sdnplugin "github.com/openshift/origin/pkg/sdn/plugin"

 	serviceaccountcontrollers "github.com/openshift/origin/pkg/serviceaccounts/controllers"

 )

@@ -380,7 +380,7 @@ func (c *MasterConfig) RunDeploymentImageChangeTriggerController() {

 // RunSDNController runs openshift-sdn if the said network plugin is provided

 func (c *MasterConfig) RunSDNController() {

 	oClient, kClient := c.SDNControllerClients()

-	if err := osdn.StartMaster(c.Options.NetworkConfig, oClient, kClient); err != nil {

+	if err := sdnplugin.StartMaster(c.Options.NetworkConfig, oClient, kClient); err != nil {

 		glog.Fatalf("SDN initialization failed: %v", err)

 	}

 }

@@ -15,7 +15,6 @@ import (

 	kerrors "k8s.io/kubernetes/pkg/api/errors"

 	kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"

-	"github.com/openshift/openshift-sdn/plugins/osdn"

 	"github.com/openshift/origin/pkg/cmd/server/admin"

 	configapi "github.com/openshift/origin/pkg/cmd/server/api"

 	configapilatest "github.com/openshift/origin/pkg/cmd/server/api/latest"

@@ -23,6 +22,7 @@ import (

 	cmdutil "github.com/openshift/origin/pkg/cmd/util"

 	"github.com/openshift/origin/pkg/cmd/util/docker"

 	utilflags "github.com/openshift/origin/pkg/cmd/util/flags"

+	sdnplugin "github.com/openshift/origin/pkg/sdn/plugin"

 	"github.com/openshift/origin/pkg/version"

 )

@@ -288,7 +288,7 @@ func StartNode(nodeConfig configapi.NodeConfig, components *utilflags.ComponentF

 	// In case of openshift network plugin, nodeConfig.networkPluginName is optional and is auto detected/finalized

 	// once we build kubernetes node config. So perform plugin name related check here.

-	if osdn.IsOpenShiftNetworkPlugin(config.KubeletServer.NetworkPluginName) {

+	if sdnplugin.IsOpenShiftNetworkPlugin(config.KubeletServer.NetworkPluginName) {

 		// TODO: SDN plugin depends on the Kubelet registering as a Node and doesn't retry cleanly,

 		// and Kubelet also can't start the PodSync loop until the SDN plugin has loaded.

 		if components.Enabled(ComponentKubelet) != components.Enabled(ComponentPlugins) {

@@ -10,10 +10,10 @@ import (

 	"github.com/golang/glog"

-	"github.com/openshift/openshift-sdn/pkg/ipcmd"

-	"github.com/openshift/openshift-sdn/pkg/netutils"

-	"github.com/openshift/openshift-sdn/pkg/ovs"

 	osapi "github.com/openshift/origin/pkg/sdn/api"

+	"github.com/openshift/origin/pkg/util/ipcmd"

+	"github.com/openshift/origin/pkg/util/netutils"

+	"github.com/openshift/origin/pkg/util/ovs"

 	kapi "k8s.io/kubernetes/pkg/api"

 	kexec "k8s.io/kubernetes/pkg/util/exec"

@@ -6,10 +6,9 @@ import (

 	log "github.com/golang/glog"

-	"github.com/openshift/openshift-sdn/pkg/netutils"

-

 	osclient "github.com/openshift/origin/pkg/client"

 	osconfigapi "github.com/openshift/origin/pkg/cmd/server/api"

+	"github.com/openshift/origin/pkg/util/netutils"

 	kclient "k8s.io/kubernetes/pkg/client/unversioned"

 	kerrors "k8s.io/kubernetes/pkg/util/errors"

@@ -7,11 +7,10 @@ import (

 	log "github.com/golang/glog"

-	"github.com/openshift/openshift-sdn/pkg/netutils"

-	"github.com/openshift/openshift-sdn/plugins/osdn/api"

-

 	osclient "github.com/openshift/origin/pkg/client"

 	osapi "github.com/openshift/origin/pkg/sdn/api"

+	"github.com/openshift/origin/pkg/sdn/plugin/api"

+	"github.com/openshift/origin/pkg/util/netutils"

 	kapi "k8s.io/kubernetes/pkg/api"

 	kclient "k8s.io/kubernetes/pkg/client/unversioned"

@@ -8,9 +8,8 @@ import (

 	"github.com/golang/glog"

-	"github.com/openshift/openshift-sdn/plugins/osdn/api"

-

 	osclient "github.com/openshift/origin/pkg/client"

+	"github.com/openshift/origin/pkg/sdn/plugin/api"

 	kapi "k8s.io/kubernetes/pkg/api"

 	kclient "k8s.io/kubernetes/pkg/client/unversioned"

@@ -14,8 +14,8 @@ import (

 	utilwait "k8s.io/kubernetes/pkg/util/wait"

 	"k8s.io/kubernetes/pkg/watch"

-	"github.com/openshift/openshift-sdn/pkg/netutils"

 	osapi "github.com/openshift/origin/pkg/sdn/api"

+	"github.com/openshift/origin/pkg/util/netutils"

 )

 func (master *OsdnMaster) SubnetStartMaster(clusterNetwork *net.IPNet, hostSubnetLength uint) error {

@@ -16,8 +16,8 @@ import (

 	utilwait "k8s.io/kubernetes/pkg/util/wait"

 	"k8s.io/kubernetes/pkg/watch"

-	"github.com/openshift/openshift-sdn/pkg/netutils"

 	osapi "github.com/openshift/origin/pkg/sdn/api"

+	"github.com/openshift/origin/pkg/util/netutils"

 )

 const (