Add unit tests for computeagent

Signed-off-by: Kathryn Baldauf <[email protected]>
microsoft · Sep 29, 2021 · 4a4e5f9 · 4a4e5f9
1 parent 057bebe
commit 4a4e5f9
Show file tree

Hide file tree

Showing 8 changed files with 353 additions and 290 deletions.
diff --git a/cmd/ncproxy/ncproxy.go b/cmd/ncproxy/ncproxy.go
@@ -84,7 +84,6 @@ func (s *grpcService) AddNIC(ctx context.Context, req *ncproxygrpc.AddNICRequest
 	}
 	if agent, ok := s.containerIDToComputeAgent.get(req.ContainerID); ok {
 		caReq := &computeagent.AddNICInternalRequest{
-			ContainerID:  req.ContainerID,
 			NicID:        req.NicID,
 			EndpointName: req.EndpointName,
 		}
@@ -190,7 +189,6 @@ func (s *grpcService) DeleteNIC(ctx context.Context, req *ncproxygrpc.DeleteNICR
 	}
 	if agent, ok := s.containerIDToComputeAgent.get(req.ContainerID); ok {
 		caReq := &computeagent.DeleteNICInternalRequest{
-			ContainerID:  req.ContainerID,
 			NicID:        req.NicID,
 			EndpointName: req.EndpointName,
 		}

diff --git a/internal/computeagent/computeagent.pb.go b/internal/computeagent/computeagent.pb.go
diff --git a/internal/computeagent/computeagent.proto b/internal/computeagent/computeagent.proto
@@ -11,9 +11,8 @@ service ComputeAgent{
 }
 
 message AddNICInternalRequest {
-    string container_id = 1;
-    string nic_id = 2;
-    string endpoint_name = 3;
+    string nic_id = 1;
+    string endpoint_name = 2;
 }
 
 message AddNICInternalResponse {}
@@ -27,9 +26,8 @@ message ModifyNICInternalRequest {
 message ModifyNICInternalResponse {}
 
 message DeleteNICInternalRequest {
-    string container_id = 1;
-    string nic_id = 2;
-    string endpoint_name = 3;
+    string nic_id = 1;
+    string endpoint_name = 2;
 }
 
 message DeleteNICInternalResponse {}

diff --git a/internal/uvm/computeagent.go b/internal/uvm/computeagent.go
@@ -23,27 +23,38 @@ import (
 
 const ComputeAgentAddrFmt = "\\\\.\\pipe\\computeagent-%s"
 
+// create an interface here so we can mock out calls to the UtilityVM in our tests
+type agentComputeSystem interface {
+	AddEndpointToNSWithID(context.Context, string, string, *hns.HNSEndpoint) error
+	UpdateNIC(context.Context, string, *hcsschema.NetworkAdapter) error
+	RemoveEndpointFromNS(context.Context, string, *hns.HNSEndpoint) error
+}
+
+var _ agentComputeSystem = &UtilityVM{}
+
+// mock hcn function for tests
+var hnsGetHNSEndpointByName = hns.GetHNSEndpointByName
+
 // computeAgent implements the ComputeAgent ttrpc service for adding and deleting NICs to a
 // Utility VM.
 type computeAgent struct {
-	uvm *UtilityVM
+	uvm agentComputeSystem
 }
 
 var _ computeagent.ComputeAgentService = &computeAgent{}
 
 // AddNIC will add a NIC to the computeagent services hosting UVM.
 func (ca *computeAgent) AddNIC(ctx context.Context, req *computeagent.AddNICInternalRequest) (*computeagent.AddNICInternalResponse, error) {
 	log.G(ctx).WithFields(logrus.Fields{
-		"containerID": req.ContainerID,
-		"endpointID":  req.EndpointName,
-		"nicID":       req.NicID,
+		"endpointID": req.EndpointName,
+		"nicID":      req.NicID,
 	}).Info("AddNIC request")
 
 	if req.NicID == "" || req.EndpointName == "" {
 		return nil, status.Error(codes.InvalidArgument, "received empty field in request")
 	}
 
-	endpoint, err := hns.GetHNSEndpointByName(req.EndpointName)
+	endpoint, err := hnsGetHNSEndpointByName(req.EndpointName)
 	if err != nil {
 		return nil, errors.Wrapf(err, "failed to get endpoint with name %q", req.EndpointName)
 	}
@@ -64,7 +75,7 @@ func (ca *computeAgent) ModifyNIC(ctx context.Context, req *computeagent.ModifyN
 		return nil, status.Error(codes.InvalidArgument, "received empty field in request")
 	}
 
-	endpoint, err := hns.GetHNSEndpointByName(req.EndpointName)
+	endpoint, err := hnsGetHNSEndpointByName(req.EndpointName)
 	if err != nil {
 		return nil, errors.Wrapf(err, "failed to get endpoint with name `%s`", req.EndpointName)
 	}
@@ -94,7 +105,6 @@ func (ca *computeAgent) ModifyNIC(ctx context.Context, req *computeagent.ModifyN
 // DeleteNIC will delete a NIC from the computeagent services hosting UVM.
 func (ca *computeAgent) DeleteNIC(ctx context.Context, req *computeagent.DeleteNICInternalRequest) (*computeagent.DeleteNICInternalResponse, error) {
 	log.G(ctx).WithFields(logrus.Fields{
-		"containerID":  req.ContainerID,
 		"nicID":        req.NicID,
 		"endpointName": req.EndpointName,
 	}).Info("DeleteNIC request")
@@ -103,7 +113,7 @@ func (ca *computeAgent) DeleteNIC(ctx context.Context, req *computeagent.DeleteN
 		return nil, status.Error(codes.InvalidArgument, "received empty field in request")
 	}
 
-	endpoint, err := hns.GetHNSEndpointByName(req.EndpointName)
+	endpoint, err := hnsGetHNSEndpointByName(req.EndpointName)
 	if err != nil {
 		return nil, errors.Wrapf(err, "failed to get endpoint with name %q", req.EndpointName)
 	}