Restructure location of various ncproxy apis to accomodate future cha…

…nges

Signed-off-by: Kathryn Baldauf <kabaldau@microsoft.com>

cmd/ncproxy/ncproxy.go

@@ -8,14 +8,14 @@ import (
  "time"
 
  "github.com/Microsoft/go-winio"
- "github.com/Microsoft/hcsshim/cmd/ncproxy/ncproxygrpc"
- "github.com/Microsoft/hcsshim/cmd/ncproxy/nodenetsvc"
  "github.com/Microsoft/hcsshim/hcn"
  "github.com/Microsoft/hcsshim/internal/computeagent"
  "github.com/Microsoft/hcsshim/internal/log"
  "github.com/Microsoft/hcsshim/internal/ncproxyttrpc"
  "github.com/Microsoft/hcsshim/internal/oc"
  "github.com/Microsoft/hcsshim/internal/uvm"
+ ncproxygrpc "github.com/Microsoft/hcsshim/pkg/ncproxy/ncproxygrpc/v1"
+ nodenetsvc "github.com/Microsoft/hcsshim/pkg/ncproxy/nodenetsvc/v1"
  "github.com/Microsoft/hcsshim/pkg/octtrpc"
  "github.com/containerd/ttrpc"
  "github.com/pkg/errors"

cmd/ncproxy/run.go

@@ -13,11 +13,11 @@ import (
  "github.com/Microsoft/go-winio/pkg/etw"
  "github.com/Microsoft/go-winio/pkg/etwlogrus"
  "github.com/Microsoft/go-winio/pkg/guid"
- "github.com/Microsoft/hcsshim/cmd/ncproxy/nodenetsvc"
  "github.com/Microsoft/hcsshim/internal/computeagent"
  "github.com/Microsoft/hcsshim/internal/debug"
  "github.com/Microsoft/hcsshim/internal/log"
  "github.com/Microsoft/hcsshim/internal/oc"
+ nodenetsvc "github.com/Microsoft/hcsshim/pkg/ncproxy/nodenetsvc/v1"
  "github.com/containerd/ttrpc"
  "github.com/pkg/errors"
  "github.com/sirupsen/logrus"

cmd/ncproxy/server.go

@@ -7,9 +7,9 @@ import (
  "sync"
 
  "github.com/Microsoft/go-winio"
- "github.com/Microsoft/hcsshim/cmd/ncproxy/ncproxygrpc"
  "github.com/Microsoft/hcsshim/internal/log"
  "github.com/Microsoft/hcsshim/internal/ncproxyttrpc"
+ ncproxygrpc "github.com/Microsoft/hcsshim/pkg/ncproxy/ncproxygrpc/v1"
  "github.com/Microsoft/hcsshim/pkg/octtrpc"
  "github.com/containerd/ttrpc"
  "github.com/pkg/errors"

cmd/ncproxy/server_test.go

@@ -11,13 +11,14 @@ import (
  "testing"
  "time"
 
- ncproxyMock "github.com/Microsoft/hcsshim/cmd/ncproxy/ncproxy_mock"
- "github.com/Microsoft/hcsshim/cmd/ncproxy/ncproxygrpc"
- "github.com/Microsoft/hcsshim/cmd/ncproxy/nodenetsvc"
  "github.com/Microsoft/hcsshim/hcn"
  "github.com/Microsoft/hcsshim/internal/computeagent"
+ computeagentMock "github.com/Microsoft/hcsshim/internal/computeagent/mock"
  "github.com/Microsoft/hcsshim/internal/ncproxyttrpc"
  "github.com/Microsoft/hcsshim/osversion"
+ ncproxygrpc "github.com/Microsoft/hcsshim/pkg/ncproxy/ncproxygrpc/v1"
+ nodenetsvc "github.com/Microsoft/hcsshim/pkg/ncproxy/nodenetsvc/v1"
+ nodenetsvcMock "github.com/Microsoft/hcsshim/pkg/ncproxy/nodenetsvc/v1/mock"
  "github.com/containerd/ttrpc"
  "github.com/golang/mock/gomock"
  "github.com/pkg/errors"
@@ -112,7 +113,7 @@ func TestAddNIC(t *testing.T) {
  // create mocked compute agent service
  computeAgentCtrl := gomock.NewController(t)
  defer computeAgentCtrl.Finish()
- mockedService := ncproxyMock.NewMockComputeAgentService(computeAgentCtrl)
+ mockedService := computeagentMock.NewMockComputeAgentService(computeAgentCtrl)
  mockedAgentClient := &computeAgentClient{nil, mockedService}
 
  // put mocked compute agent in agent cache for test
@@ -197,7 +198,7 @@ func TestDeleteNIC(t *testing.T) {
  // create mocked compute agent service
  computeAgentCtrl := gomock.NewController(t)
  defer computeAgentCtrl.Finish()
- mockedService := ncproxyMock.NewMockComputeAgentService(computeAgentCtrl)
+ mockedService := computeagentMock.NewMockComputeAgentService(computeAgentCtrl)
  mockedAgentClient := &computeAgentClient{nil, mockedService}
 
  // put mocked compute agent in agent cache for test
@@ -284,7 +285,7 @@ func TestModifyNIC(t *testing.T) {
  // create mock compute agent service
  computeAgentCtrl := gomock.NewController(t)
  defer computeAgentCtrl.Finish()
- mockedService := ncproxyMock.NewMockComputeAgentService(computeAgentCtrl)
+ mockedService := computeagentMock.NewMockComputeAgentService(computeAgentCtrl)
  mockedAgentClient := &computeAgentClient{nil, mockedService}
 
  // populate agent cache with mocked service for test
@@ -1111,7 +1112,7 @@ func TestConfigureNetworking(t *testing.T) {
  // setup mocked client and mocked calls for nodenetsvc
  nodeNetCtrl := gomock.NewController(t)
  defer nodeNetCtrl.Finish()
- mockedClient := ncproxyMock.NewMockNodeNetworkServiceClient(nodeNetCtrl)
+ mockedClient := nodenetsvcMock.NewMockNodeNetworkServiceClient(nodeNetCtrl)
  nodeNetSvcClient = &nodeNetSvcConn{
  addr: "",
  client: mockedClient,
@@ -1283,7 +1284,7 @@ func TestDisconnectComputeAgents(t *testing.T) {
  // create mocked compute agent service
  computeAgentCtrl := gomock.NewController(t)
  defer computeAgentCtrl.Finish()
- mockedService := ncproxyMock.NewMockComputeAgentService(computeAgentCtrl)
+ mockedService := computeagentMock.NewMockComputeAgentService(computeAgentCtrl)
  mockedAgentClient := &computeAgentClient{nil, mockedService}
 
  // put mocked compute agent in agent cache for test

internal/computeagent/doc.go

@@ -1 +1,11 @@
+// This package contains the proto and compiled go files for the compute
+// agent service.
+//
+// A mock service under `mock` is used for unit testing the various services
+// used for ncproxy.
+//
+// The mock service is compiled using the following command:
+//
+// mockgen -source="computeagent.pb.go" -package="computeagent_mock" > mock\computeagent_mock.pb.go
+
 package computeagent

internal/tools/networkagent/defs.go

@@ -4,7 +4,7 @@ import (
  "encoding/json"
  "io/ioutil"
 
- "github.com/Microsoft/hcsshim/cmd/ncproxy/ncproxygrpc"
+ ncproxygrpc "github.com/Microsoft/hcsshim/pkg/ncproxy/ncproxygrpc/v1"
  "github.com/pkg/errors"
 )
 

internal/tools/networkagent/main.go

@@ -12,10 +12,10 @@ import (
  "syscall"
 
  "github.com/Microsoft/go-winio/pkg/guid"
- "github.com/Microsoft/hcsshim/cmd/ncproxy/ncproxygrpc"
- "github.com/Microsoft/hcsshim/cmd/ncproxy/nodenetsvc"
  "github.com/Microsoft/hcsshim/hcn"
  "github.com/Microsoft/hcsshim/internal/log"
+ ncproxygrpc "github.com/Microsoft/hcsshim/pkg/ncproxy/ncproxygrpc/v1"
+ nodenetsvc "github.com/Microsoft/hcsshim/pkg/ncproxy/nodenetsvc/v1"
  "github.com/sirupsen/logrus"
  "google.golang.org/grpc"
 )

pkg/ncproxy/ncproxygrpc/v1/doc.go

@@ -0,0 +1 @@
+package v1