@@ -41,7 +41,7 @@ func NewCmdIsolateProjectsNetwork(commandName, fullName string, f *clientcmd.Fac

 	cmd := &cobra.Command{

 		Use:     commandName,

 		Short:   "Isolate project network",

-		Long:    fmt.Sprintf(isolateProjectsNetworkLong, ovsPluginName),

+		Long:    fmt.Sprintf(isolateProjectsNetworkLong, sdnapi.MultiTenantPluginName),

 		Example: fmt.Sprintf(isolateProjectsNetworkExample, fullName),

 		Run: func(c *cobra.Command, args []string) {

 			if err := opts.Complete(f, c, args, out); err != nil {

@@ -45,7 +45,7 @@ func NewCmdJoinProjectsNetwork(commandName, fullName string, f *clientcmd.Factor

 	cmd := &cobra.Command{

 		Use:     commandName,

 		Short:   "Join project network",

-		Long:    fmt.Sprintf(joinProjectsNetworkLong, ovsPluginName),

+		Long:    fmt.Sprintf(joinProjectsNetworkLong, sdnapi.MultiTenantPluginName),

 		Example: fmt.Sprintf(joinProjectsNetworkExample, fullName),

 		Run: func(c *cobra.Command, args []string) {

 			if err := opts.Complete(f, c, args, out); err != nil {

@@ -42,7 +42,7 @@ func NewCmdMakeGlobalProjectsNetwork(commandName, fullName string, f *clientcmd.

 	cmd := &cobra.Command{

 		Use:     commandName,

 		Short:   "Make project network global",

-		Long:    fmt.Sprintf(makeGlobalProjectsNetworkLong, ovsPluginName),

+		Long:    fmt.Sprintf(makeGlobalProjectsNetworkLong, sdnapi.MultiTenantPluginName),

 		Example: fmt.Sprintf(makeGlobalProjectsNetworkExample, fullName),

 		Run: func(c *cobra.Command, args []string) {

 			if err := opts.Complete(f, c, args, out); err != nil {

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

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

 )

-const (

-	ovsPluginName = "redhat/openshift-ovs-multitenant"

-)

-

 type ProjectOptions struct {

 	DefaultNamespace string

 	Oclient          *osclient.Client

@@ -479,11 +479,11 @@ func (c *NodeConfig) RunProxy() {

 	endpointsConfig := pconfig.NewEndpointsConfig()

 	// customized handling registration that inserts a filter if needed

-	if c.FilteringEndpointsHandler != nil {

-		if err := c.FilteringEndpointsHandler.Start(endpointsHandler); err != nil {

+	if c.SDNProxy != nil {

+		if err := c.SDNProxy.Start(endpointsHandler); err != nil {

 			glog.Fatalf("error: node proxy plugin startup failed: %v", err)

 		}

-		endpointsHandler = c.FilteringEndpointsHandler

+		endpointsHandler = c.SDNProxy

 	}

 	endpointsConfig.RegisterHandler(endpointsHandler)

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

 	"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

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

 	DNSServer *dns.Server

 	// SDNPlugin is an optional SDN plugin

-	SDNPlugin sdnpluginapi.OsdnNodePlugin

-	// EndpointsFilterer is an optional endpoints filterer

-	FilteringEndpointsHandler sdnpluginapi.FilteringEndpointsConfigHandler

+	SDNPlugin *sdnplugin.OsdnNode

+	// SDNProxy is an optional service endpoints filterer

+	SDNProxy *sdnplugin.OsdnProxy

 }

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

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

 	}

 	server.DockerExecHandlerName = string(options.DockerConfig.ExecHandlerName)

-	if sdnplugin.IsOpenShiftNetworkPlugin(server.NetworkPluginName) {

+	if sdnapi.IsOpenShiftNetworkPlugin(server.NetworkPluginName) {

 		// set defaults for openshift-sdn

 		server.HairpinMode = componentconfig.HairpinNone

 		server.ConfigureCBR0 = false

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

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

 	}

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

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

 	if err != nil {

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

 	}

@@ -286,8 +285,8 @@ func BuildKubernetesNodeConfig(options configapi.NodeConfig, enableProxy, enable

 		ProxyConfig:    proxyconfig,

 		EnableUnidling: options.EnableUnidling,

-		SDNPlugin:                 sdnPlugin,

-		FilteringEndpointsHandler: endpointFilter,

+		SDNPlugin: sdnPlugin,

+		SDNProxy:  sdnProxy,

 	}

 	if enableDNS {

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

 }

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

-	if sdnplugin.IsOpenShiftNetworkPlugin(pluginName) {

+	if sdnapi.IsOpenShiftNetworkPlugin(pluginName) {

 		// Detect any plugin mismatches between node and master

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

 		if kerrs.IsNotFound(err) {

@@ -23,7 +23,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"

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

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

 )

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

 		return err

 	}

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

+	if sdnapi.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) {

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

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

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

 	"github.com/openshift/origin/pkg/diagnostics/types"

+

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

 )

 const masterNotRunningAsANode = `Unable to find a node matching the cluster server IP.

@@ -21,9 +23,6 @@ This may indicate the master is not also running a node, and is unable

 to proxy to pods over the Open vSwitch SDN.

 `

-const ovsSubnetPluginName = "redhat/openshift-ovs-subnet"

-const ovsMultiTenantPluginName = "redhat/openshift-ovs-multitenant"

-

 // MasterNode is a Diagnostic for checking that the OpenShift master is also running as node.

 // This is currently required to have the master on the Open vSwitch SDN and able to communicate

 // with other nodes.

@@ -62,18 +61,8 @@ func (d *MasterNode) CanRun() (bool, error) {

 			return false, types.DiagnosticError{ID: "DClu3008",

 				LogMessage: fmt.Sprintf("Master config provided but unable to parse: %s", masterErr), Cause: masterErr}

 		}

-		networkPluginName := masterCfg.NetworkConfig.NetworkPluginName

-

-		// Make sure this is an OVS network plugin:

-		ovsNetworkPlugins := [2]string{ovsSubnetPluginName, ovsMultiTenantPluginName}

-		usingOvsNetworkPlugin := false

-		for _, plugin := range ovsNetworkPlugins {

-			if plugin == networkPluginName {

-				usingOvsNetworkPlugin = true

-			}

-		}

-		if !usingOvsNetworkPlugin {

-			return false, errors.New(fmt.Sprintf("Network plugin does not require master to also run node: %s", networkPluginName))

+		if !sdnapi.IsOpenShiftNetworkPlugin(masterCfg.NetworkConfig.NetworkPluginName) {

+			return false, errors.New(fmt.Sprintf("Network plugin does not require master to also run node: %s", masterCfg.NetworkConfig.NetworkPluginName))

 		}

 	}

@@ -17,14 +17,13 @@ import (

 	"github.com/openshift/origin/pkg/diagnostics/networkpod/util"

 	diagutil "github.com/openshift/origin/pkg/diagnostics/util"

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

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

 )

 func (d *NetworkDiagnostic) TestSetup() error {

 	d.nsName = kapi.SimpleNameGenerator.GenerateName(fmt.Sprintf("%s-", util.NetworkDiagNamespacePrefix))

 	nsList := []string{d.nsName}

-	if sdnplugin.IsOpenShiftMultitenantNetworkPlugin(d.pluginName) {

+	if sdnapi.IsOpenShiftMultitenantNetworkPlugin(d.pluginName) {

 		d.globalnsName = kapi.SimpleNameGenerator.GenerateName(fmt.Sprintf("%s-", util.NetworkDiagGlobalNamespacePrefix))

 		nsList = append(nsList, d.globalnsName)

 	}

@@ -13,7 +13,7 @@ import (

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

 	"github.com/openshift/origin/pkg/diagnostics/networkpod/util"

 	"github.com/openshift/origin/pkg/diagnostics/types"

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

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

 )

 const (

@@ -69,7 +69,7 @@ func (d CheckPodNetwork) Check() types.DiagnosticResult {

 		return d.res

 	}

-	if sdnplugin.IsOpenShiftMultitenantNetworkPlugin(pluginName) {

+	if sdnapi.IsOpenShiftMultitenantNetworkPlugin(pluginName) {

 		netnsList, err := d.OSClient.NetNamespaces().List(kapi.ListOptions{})

 		if err != nil {

 			d.res.Error("DPodNet1004", err, fmt.Sprintf("Getting all network namespaces failed. Error: %s", err))

@@ -13,7 +13,7 @@ import (

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

 	"github.com/openshift/origin/pkg/diagnostics/networkpod/util"

 	"github.com/openshift/origin/pkg/diagnostics/types"

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

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

 )

 const (

@@ -79,7 +79,7 @@ func (d CheckServiceNetwork) Check() types.DiagnosticResult {

 		return d.res

 	}

-	if sdnplugin.IsOpenShiftMultitenantNetworkPlugin(pluginName) {

+	if sdnapi.IsOpenShiftMultitenantNetworkPlugin(pluginName) {

 		netnsList, err := d.OSClient.NetNamespaces().List(kapi.ListOptions{})

 		if err != nil {

 			d.res.Error("DSvcNet1006", err, fmt.Sprintf("Getting all network namespaces failed. Error: %s", err))

@@ -13,7 +13,7 @@ import (

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

 	osclientcmd "github.com/openshift/origin/pkg/cmd/util/clientcmd"

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

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

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

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

 )

@@ -41,7 +41,7 @@ func GetOpenShiftNetworkPlugin(osClient *osclient.Client) (string, bool, error)

 		}

 		return "", false, err

 	}

-	return cn.PluginName, sdnplugin.IsOpenShiftNetworkPlugin(cn.PluginName), nil

+	return cn.PluginName, sdnapi.IsOpenShiftNetworkPlugin(cn.PluginName), nil

 }

 func GetNodes(kubeClient *kclient.Client) ([]kapi.Node, error) {

new file mode 100644

@@ -0,0 +1,30 @@

+package api

+

+import (

+	"strings"

+)

+

+const (

+	SingleTenantPluginName = "redhat/openshift-ovs-subnet"

+	MultiTenantPluginName  = "redhat/openshift-ovs-multitenant"

+

+	IngressBandwidthAnnotation = "kubernetes.io/ingress-bandwidth"

+	EgressBandwidthAnnotation  = "kubernetes.io/egress-bandwidth"

+	AssignMacvlanAnnotation    = "pod.network.openshift.io/assign-macvlan"

+	AssignHostSubnetAnnotation = "pod.network.openshift.io/assign-subnet"

+)

+

+func IsOpenShiftNetworkPlugin(pluginName string) bool {

+	switch strings.ToLower(pluginName) {

+	case SingleTenantPluginName, MultiTenantPluginName:

+		return true

+	}

+	return false

+}

+

+func IsOpenShiftMultitenantNetworkPlugin(pluginName string) bool {

+	if strings.ToLower(pluginName) == MultiTenantPluginName {

+		return true

+	}

+	return false

+}

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

 	oapi "github.com/openshift/origin/pkg/api"

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

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

 )

 // ValidateClusterNetwork tests if required fields in the ClusterNetwork are set.

@@ -88,7 +87,7 @@ func ValidateHostSubnet(hs *sdnapi.HostSubnet) field.ErrorList {

 	if hs.Subnet == "" {

 		// check if annotation exists, then let the Subnet field be empty

-		if _, ok := hs.Annotations[sdnplugin.AssignHostSubnetAnnotation]; !ok {

+		if _, ok := hs.Annotations[sdnapi.AssignHostSubnetAnnotation]; !ok {

 			allErrs = append(allErrs, field.Invalid(field.NewPath("subnet"), hs.Subnet, "Field cannot be empty"))

 		}

 	} else {

deleted file mode 100644

@@ -1,17 +0,0 @@

-package api

-

-import (

-	knetwork "k8s.io/kubernetes/pkg/kubelet/network"

-	pconfig "k8s.io/kubernetes/pkg/proxy/config"

-)

-

-type OsdnNodePlugin interface {

-	knetwork.NetworkPlugin

-

-	Start() error

-}

-

-type FilteringEndpointsConfigHandler interface {

-	pconfig.EndpointsConfigHandler

-	Start(baseHandler pconfig.EndpointsConfigHandler) error

-}

@@ -26,7 +26,7 @@ type OsdnMaster struct {

 }

 func StartMaster(networkConfig osconfigapi.MasterNetworkConfig, osClient *osclient.Client, kClient *kclient.Client) error {

-	if !IsOpenShiftNetworkPlugin(networkConfig.NetworkPluginName) {

+	if !osapi.IsOpenShiftNetworkPlugin(networkConfig.NetworkPluginName) {

 		return nil

 	}

@@ -92,7 +92,7 @@ func StartMaster(networkConfig osconfigapi.MasterNetworkConfig, osClient *osclie

 		return err

 	}

-	if IsOpenShiftMultitenantNetworkPlugin(networkConfig.NetworkPluginName) {

+	if osapi.IsOpenShiftMultitenantNetworkPlugin(networkConfig.NetworkPluginName) {

 		master.vnids = newMasterVNIDMap()

 		if err = master.VnidStartMaster(); err != nil {

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

 	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"

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

@@ -39,8 +38,8 @@ type OsdnNode struct {

 }

 // Called by higher layers to create the plugin SDN node instance

-func NewNodePlugin(pluginName string, osClient *osclient.Client, kClient *kclient.Client, hostname string, selfIP string, iptablesSyncPeriod time.Duration, mtu uint32) (api.OsdnNodePlugin, error) {

-	if !IsOpenShiftNetworkPlugin(pluginName) {

+func NewNodePlugin(pluginName string, osClient *osclient.Client, kClient *kclient.Client, hostname string, selfIP string, iptablesSyncPeriod time.Duration, mtu uint32) (*OsdnNode, error) {

+	if !osapi.IsOpenShiftNetworkPlugin(pluginName) {

 		return nil, nil

 	}

@@ -74,7 +73,7 @@ func NewNodePlugin(pluginName string, osClient *osclient.Client, kClient *kclien

 	}

 	plugin := &OsdnNode{

-		multitenant:        IsOpenShiftMultitenantNetworkPlugin(pluginName),

+		multitenant:        osapi.IsOpenShiftMultitenantNetworkPlugin(pluginName),

 		kClient:            kClient,

 		osClient:           osClient,

 		ovs:                ovsif,

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

 	"github.com/golang/glog"

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

+

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

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

 	"k8s.io/kubernetes/pkg/apis/componentconfig"

@@ -19,33 +21,6 @@ import (

 )

 const (

-	SingleTenantPluginName string = "redhat/openshift-ovs-subnet"

-	MultiTenantPluginName  string = "redhat/openshift-ovs-multitenant"

-

-	IngressBandwidthAnnotation string = "kubernetes.io/ingress-bandwidth"

-	EgressBandwidthAnnotation  string = "kubernetes.io/egress-bandwidth"

-	AssignMacVlanAnnotation    string = "pod.network.openshift.io/assign-macvlan"

-	AssignHostSubnetAnnotation string = "pod.network.openshift.io/assign-subnet"

-)

-

-func IsOpenShiftNetworkPlugin(pluginName string) bool {

-	switch strings.ToLower(pluginName) {

-	case SingleTenantPluginName, MultiTenantPluginName:

-		return true

-	}

-	return false

-}

-

-func IsOpenShiftMultitenantNetworkPlugin(pluginName string) bool {

-	if strings.ToLower(pluginName) == MultiTenantPluginName {

-		return true

-	}

-	return false

-}

-

-//-----------------------------------------------

-

-const (

 	setUpCmd    = "setup"

 	tearDownCmd = "teardown"

 	statusCmd   = "status"

@@ -62,9 +37,9 @@ func (plugin *OsdnNode) Init(host knetwork.Host, _ componentconfig.HairpinMode,

 func (plugin *OsdnNode) Name() string {

 	if plugin.multitenant {

-		return MultiTenantPluginName

+		return osapi.MultiTenantPluginName

 	} else {

-		return SingleTenantPluginName

+		return osapi.SingleTenantPluginName

 	}

 }

@@ -103,14 +78,14 @@ func parseAndValidateBandwidth(value string) (int64, error) {

 }

 func extractBandwidthResources(pod *kapi.Pod) (ingress, egress int64, err error) {

-	str, found := pod.Annotations[IngressBandwidthAnnotation]

+	str, found := pod.Annotations[osapi.IngressBandwidthAnnotation]

 	if found {

 		ingress, err = parseAndValidateBandwidth(str)

 		if err != nil {

 			return -1, -1, err

 		}

 	}

-	str, found = pod.Annotations[EgressBandwidthAnnotation]

+	str, found = pod.Annotations[osapi.EgressBandwidthAnnotation]

 	if found {

 		egress, err = parseAndValidateBandwidth(str)

 		if err != nil {

@@ -121,7 +96,7 @@ func extractBandwidthResources(pod *kapi.Pod) (ingress, egress int64, err error)

 }

 func wantsMacvlan(pod *kapi.Pod) (bool, error) {

-	val, found := pod.Annotations[AssignMacVlanAnnotation]

+	val, found := pod.Annotations[osapi.AssignMacvlanAnnotation]

 	if !found || val != "true" {

 		return false, nil

 	}

@@ -130,7 +105,7 @@ func wantsMacvlan(pod *kapi.Pod) (bool, error) {

 			return true, nil

 		}

 	}

-	return false, fmt.Errorf("Pod has %q annotation but is not privileged", AssignMacVlanAnnotation)

+	return false, fmt.Errorf("Pod has %q annotation but is not privileged", osapi.AssignMacvlanAnnotation)

 }

 func isScriptError(err error) bool {

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

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

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

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

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

 	"k8s.io/kubernetes/pkg/client/cache"

@@ -23,7 +22,7 @@ type proxyFirewallItem struct {

 	net    *net.IPNet

 }

-type ovsProxyPlugin struct {

+type OsdnProxy struct {

 	kClient              *kclient.Client

 	osClient             *osclient.Client

 	networkInfo          *NetworkInfo

@@ -35,19 +34,19 @@ type ovsProxyPlugin struct {

 }

 // Called by higher layers to create the proxy plugin instance; only used by nodes

-func NewProxyPlugin(pluginName string, osClient *osclient.Client, kClient *kclient.Client) (api.FilteringEndpointsConfigHandler, error) {

-	if !IsOpenShiftMultitenantNetworkPlugin(pluginName) {

+func NewProxyPlugin(pluginName string, osClient *osclient.Client, kClient *kclient.Client) (*OsdnProxy, error) {

+	if !osapi.IsOpenShiftMultitenantNetworkPlugin(pluginName) {

 		return nil, nil

 	}

-	return &ovsProxyPlugin{

+	return &OsdnProxy{

 		kClient:  kClient,

 		osClient: osClient,

 		firewall: make(map[string][]proxyFirewallItem),

 	}, nil

 }

-func (proxy *ovsProxyPlugin) Start(baseHandler pconfig.EndpointsConfigHandler) error {

+func (proxy *OsdnProxy) Start(baseHandler pconfig.EndpointsConfigHandler) error {

 	glog.Infof("Starting multitenant SDN proxy endpoint filter")

 	var err error

@@ -69,7 +68,7 @@ func (proxy *ovsProxyPlugin) Start(baseHandler pconfig.EndpointsConfigHandler) e

 	return nil

 }

-func (proxy *ovsProxyPlugin) watchEgressNetworkPolicies() {

+func (proxy *OsdnProxy) watchEgressNetworkPolicies() {

 	RunEventQueue(proxy.osClient, EgressNetworkPolicies, func(delta cache.Delta) error {

 		policy := delta.Object.(*osapi.EgressNetworkPolicy)

 		if delta.Type == cache.Deleted {

@@ -88,7 +87,7 @@ func (proxy *ovsProxyPlugin) watchEgressNetworkPolicies() {

 	})

 }

-func (proxy *ovsProxyPlugin) updateNetworkPolicy(policy osapi.EgressNetworkPolicy) {

+func (proxy *OsdnProxy) updateNetworkPolicy(policy osapi.EgressNetworkPolicy) {

 	firewall := make([]proxyFirewallItem, len(policy.Spec.Egress))

 	for i, rule := range policy.Spec.Egress {

 		_, cidr, err := net.ParseCIDR(rule.To.CIDRSelector)

@@ -107,7 +106,7 @@ func (proxy *ovsProxyPlugin) updateNetworkPolicy(policy osapi.EgressNetworkPolic

 	}

 }

-func (proxy *ovsProxyPlugin) firewallBlocksIP(namespace string, ip net.IP) bool {

+func (proxy *OsdnProxy) firewallBlocksIP(namespace string, ip net.IP) bool {

 	for _, item := range proxy.firewall[namespace] {

 		if item.net.Contains(ip) {

 			return item.policy == osapi.EgressNetworkPolicyRuleDeny

@@ -116,14 +115,14 @@ func (proxy *ovsProxyPlugin) firewallBlocksIP(namespace string, ip net.IP) bool

 	return false

 }

-func (proxy *ovsProxyPlugin) OnEndpointsUpdate(allEndpoints []kapi.Endpoints) {

+func (proxy *OsdnProxy) OnEndpointsUpdate(allEndpoints []kapi.Endpoints) {

 	proxy.lock.Lock()

 	defer proxy.lock.Unlock()

 	proxy.allEndpoints = allEndpoints

 	proxy.updateEndpoints()

 }

-func (proxy *ovsProxyPlugin) updateEndpoints() {

+func (proxy *OsdnProxy) updateEndpoints() {

 	if len(proxy.firewall) == 0 {

 		proxy.baseEndpointsHandler.OnEndpointsUpdate(proxy.allEndpoints)

 		return

@@ -213,7 +213,7 @@ func (master *OsdnMaster) watchSubnets() {

 		log.V(5).Infof("Watch %s event for HostSubnet %q", delta.Type, hs.ObjectMeta.Name)

 		switch delta.Type {

 		case cache.Sync, cache.Added, cache.Updated:

-			if _, ok := hs.Annotations[AssignHostSubnetAnnotation]; ok {

+			if _, ok := hs.Annotations[osapi.AssignHostSubnetAnnotation]; ok {

 				// Delete the annotated hostsubnet and create a new one with an assigned subnet

 				// We do not update (instead of delete+create) because the watchSubnets on the nodes

 				// will skip the event if it finds that the hostsubnet has the same host

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

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

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

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

 	testutil "github.com/openshift/origin/test/util"

 	testserver "github.com/openshift/origin/test/util/server"

 )

@@ -81,7 +80,7 @@ func TestOadmPodNetwork(t *testing.T) {

 	if err != nil {

 		t.Fatalf("error creating config: %v", err)

 	}

-	masterConfig.NetworkConfig.NetworkPluginName = sdnplugin.MultiTenantPluginName

+	masterConfig.NetworkConfig.NetworkPluginName = sdnapi.MultiTenantPluginName

 	kubeConfigFile, err := testserver.StartConfiguredMaster(masterConfig)

 	if err != nil {

 		t.Fatalf("error starting server: %v", err)