Move all ports in driver/ to one file.

This change moves every port interface into one place. This makes it
possible to see what the core logic interfaces with at a glance.

Change-Id: I00c78a4b8908aac91ec87e268eb1b57ad5709321
Partial-Bug: #1778671

agent/agent_test.go

@@ -19,7 +19,7 @@ import (
 	"net/url"
 
 	"github.com/Juniper/contrail-windows-docker-driver/agent"
-	"github.com/Juniper/contrail-windows-docker-driver/core/driver"
+	"github.com/Juniper/contrail-windows-docker-driver/core/ports"
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
@@ -56,7 +56,7 @@ func (h *httpHandler) ServeHTTP(res http.ResponseWriter, req *http.Request) {
 var _ = Describe("AgentRestApi", func() {
 	mockHandler := &httpHandler{}
 	var testServer *httptest.Server
-	var agentInstance driver.Agent
+	var agentInstance ports.Agent
 
 	const (
 		vmUUID    = "vmUUID"

core/driver/driver.go

@@ -31,6 +31,7 @@ import (
 
 	"github.com/Juniper/contrail-go-api/types"
 	"github.com/Juniper/contrail-windows-docker-driver/common"
+	"github.com/Juniper/contrail-windows-docker-driver/core/ports"
 	winio "github.com/Microsoft/go-winio"
 	"github.com/Microsoft/hcsshim"
 	dockerTypes "github.com/docker/docker/api/types"
@@ -44,11 +45,11 @@ import (
 const hnsEndpointWaitingTime = 5
 
 type ContrailDriver struct {
-	vrouter                    VRouter
-	controller                 Controller
-	agent                      Agent
-	localContrailNetworksRepo  LocalContrailNetworkRepository
-	localContrailEndpointsRepo LocalContrailEndpointRepository
+	vrouter                    ports.VRouter
+	controller                 ports.Controller
+	agent                      ports.Agent
+	localContrailNetworksRepo  ports.LocalContrailNetworkRepository
+	localContrailEndpointsRepo ports.LocalContrailEndpointRepository
 	listener                   net.Listener
 	PipeAddr                   string
 	stopReasonChan             chan error
@@ -62,8 +63,9 @@ type NetworkMeta struct {
 	subnetCIDR string
 }
 
-func NewDriver(vr VRouter, c Controller, agent Agent, networksRepo LocalContrailNetworkRepository,
-	endpointsRepo LocalContrailEndpointRepository) *ContrailDriver {
+func NewDriver(vr ports.VRouter, c ports.Controller, agent ports.Agent,
+	networksRepo ports.LocalContrailNetworkRepository,
+	endpointsRepo ports.LocalContrailEndpointRepository) *ContrailDriver {
 
 	d := &ContrailDriver{
 		vrouter:    vr,

core/driver/driver_test.go

@@ -35,6 +35,7 @@ import (
 	"github.com/Juniper/contrail-windows-docker-driver/agent"
 	"github.com/Juniper/contrail-windows-docker-driver/common"
 	"github.com/Juniper/contrail-windows-docker-driver/core/driver"
+	"github.com/Juniper/contrail-windows-docker-driver/core/ports"
 	"github.com/Juniper/contrail-windows-docker-driver/core/vrouter"
 	"github.com/Microsoft/hcsshim"
 	dockerTypes "github.com/docker/docker/api/types"
@@ -113,10 +114,10 @@ func getDockerNetwork(docker *dockerClient.Client, dockerNetID string) (dockerTy
 	return docker.NetworkInspect(context.Background(), dockerNetID, inspectOptions)
 }
 
-var fakeVRouter driver.VRouter
-var contrailController driver.Controller
+var fakeVRouter ports.VRouter
+var contrailController ports.Controller
 var contrailDriver *driver.ContrailDriver
-var localContrailNetworksRepo driver.LocalContrailNetworkRepository
+var localContrailNetworksRepo ports.LocalContrailNetworkRepository
 var project *types.Project
 
 const (
@@ -798,7 +799,7 @@ var _ = PDescribe("On requests from docker daemon", func() {
 	})
 })
 
-func newModulesUnderTest() (vr driver.VRouter, d *driver.ContrailDriver, c driver.Controller, h driver.LocalContrailNetworkRepository, p *types.Project) {
+func newModulesUnderTest() (vr ports.VRouter, d *driver.ContrailDriver, c ports.Controller, h ports.LocalContrailNetworkRepository, p *types.Project) {
 	var err error
 
 	ext := &hyperv_extension.HyperVExtensionSimulator{
@@ -913,7 +914,7 @@ func cleanupAllDockerNetworksAndContainers(docker *dockerClient.Client) {
 	}
 }
 
-func createTestContrailNetwork(c driver.Controller) *types.VirtualNetwork {
+func createTestContrailNetwork(c ports.Controller) *types.VirtualNetwork {
 	network, err := c.CreateNetworkWithSubnet(tenantName, networkName, subnetCIDR)
 	Expect(err).ToNot(HaveOccurred())
 	return network
@@ -939,7 +940,7 @@ func getTheOnlyHNSEndpoint(d *driver.ContrailDriver) (*hcsshim.HNSEndpoint, stri
 	return hnsEndpoint, hnsEndpointID
 }
 
-func setupNetworksAndEndpoints(c driver.Controller, docker *dockerClient.Client) (
+func setupNetworksAndEndpoints(c ports.Controller, docker *dockerClient.Client) (
 	*types.VirtualNetwork, string, string) {
 	contrailNet := createTestContrailNetwork(c)
 	dockerNetID := createValidDockerNetwork(docker)

core/driver/controller.go → core/ports/ports.go

@@ -13,13 +13,39 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package driver
+package ports
 
 import (
+	"github.com/Microsoft/hcsshim"
+
 	contrail "github.com/Juniper/contrail-go-api"
 	"github.com/Juniper/contrail-go-api/types"
 )
 
+type Agent interface {
+	AddPort(vmUUID, vifUUID, ifName, mac, dockerID, ipAddress, vnUUID string) error
+	DeletePort(vifUUID string) error
+}
+
+type VRouter interface {
+	Initialize() error
+}
+
+type LocalContrailNetworkRepository interface {
+	CreateNetwork(tenantName, networkName, subnetCIDR, defaultGW string) (*hcsshim.HNSNetwork,
+		error)
+	GetNetwork(tenantName, networkName, subnetCIDR string) (*hcsshim.HNSNetwork,
+		error)
+	DeleteNetwork(tenantName, networkName, subnetCIDR string) error
+	ListNetworks() ([]hcsshim.HNSNetwork, error)
+}
+
+type LocalContrailEndpointRepository interface {
+	CreateEndpoint(configuration *hcsshim.HNSEndpoint) (string, error)
+	GetEndpointByName(name string) (*hcsshim.HNSEndpoint, error)
+	DeleteEndpoint(endpointID string) error
+}
+
 // TODO: This interface can be simplified
 type Controller interface {
 	NewProject(domain, tenant string) (*types.Project, error)
@@ -36,8 +62,8 @@ type Controller interface {
 	GetOrCreateInterface(net *types.VirtualNetwork, tenantName, containerId string) (*types.VirtualMachineInterface, error)
 	GetInterfaceMac(iface *types.VirtualMachineInterface) (string, error)
 
-	GetOrCreateInstanceIp(net *types.VirtualNetwork,
-		iface *types.VirtualMachineInterface, subnetUuid string) (*types.InstanceIp, error)
+	GetOrCreateInstanceIp(net *types.VirtualNetwork, iface *types.VirtualMachineInterface,
+		subnetUuid string) (*types.InstanceIp, error)
 
 	DeleteElementRecursive(parent contrail.IObject) error
 }