Moved CNM specific logic to CNM package

Author: ofiliz

Makefile

@@ -1,6 +1,12 @@
 SOURCEFILES = \
 	$(wildcard cni/*.go) \
+	$(wildcard cni/ipam/*.go) \
+	$(wildcard cni/network/*.go) \
+	$(wildcard cni/plugin/*.go) \
 	$(wildcard cnm/*.go) \
+	$(wildcard cnm/ipam/*.go) \
+	$(wildcard cnm/network/*.go) \
+	$(wildcard cnm/plugin/*.go) \
 	$(wildcard common/*.go) \
 	$(wildcard ebtables/*.go) \
 	$(wildcard ipam/*.go) \
@@ -9,9 +15,9 @@ SOURCEFILES = \
 	$(wildcard network/*.go) \
 	$(wildcard store/*.go)
 
-CNIDIR = cni
+CNMDIR = cnm/plugin
 
-CNMDIR = cnm
+CNIDIR = cni/plugin
 
 OUTPUTDIR = out
 

cnm/plugin/api.go renamed to cnm/api.go

@@ -1,7 +1,7 @@
 // Copyright Microsoft Corp.
 // All rights reserved.
 
-package plugin
+package cnm
 
 const (
 	// Libnetwork remote plugin paths

cnm/ipam/ipam.go

@@ -6,7 +6,7 @@ package ipam
 import (
 	"net/http"
 
-	"github.com/Azure/azure-container-networking/cnm/plugin"
+	"github.com/Azure/azure-container-networking/cnm"
 	"github.com/Azure/azure-container-networking/common"
 	"github.com/Azure/azure-container-networking/ipam"
 	"github.com/Azure/azure-container-networking/log"
@@ -23,7 +23,7 @@ const (
 
 // IpamPlugin represents a CNM (libnetwork) IPAM plugin.
 type ipamPlugin struct {
-	*plugin.Plugin
+	*cnm.Plugin
 	am ipam.AddressManager
 }
 
@@ -34,7 +34,7 @@ type IpamPlugin interface {
 // NewPlugin creates a new IpamPlugin object.
 func NewPlugin(config *common.PluginConfig) (IpamPlugin, error) {
 	// Setup base plugin.
-	plugin, err := plugin.NewPlugin(name, config.Version, EndpointType)
+	plugin, err := cnm.NewPlugin(name, config.Version, EndpointType)
 	if err != nil {
 		return nil, err
 	}

cnm/network/network.go

@@ -6,7 +6,7 @@ package network
 import (
 	"net/http"
 
-	"github.com/Azure/azure-container-networking/cnm/plugin"
+	"github.com/Azure/azure-container-networking/cnm"
 	"github.com/Azure/azure-container-networking/common"
 	"github.com/Azure/azure-container-networking/log"
 	"github.com/Azure/azure-container-networking/network"
@@ -22,7 +22,7 @@ const (
 
 // NetPlugin represents a CNM (libnetwork) network plugin.
 type netPlugin struct {
-	*plugin.Plugin
+	*cnm.Plugin
 	scope string
 	nm    network.NetworkManager
 }
@@ -34,7 +34,7 @@ type NetPlugin interface {
 // NewPlugin creates a new NetPlugin object.
 func NewPlugin(config *common.PluginConfig) (NetPlugin, error) {
 	// Setup base plugin.
-	plugin, err := plugin.NewPlugin(name, config.Version, endpointType)
+	plugin, err := cnm.NewPlugin(name, config.Version, endpointType)
 	if err != nil {
 		return nil, err
 	}

cnm/plugin/plugin.go renamed to cnm/plugin.go

@@ -1,7 +1,7 @@
 // Copyright Microsoft Corp.
 // All rights reserved.
 
-package plugin
+package cnm
 
 import (
 	"net/http"