Merge pull request #1067 from katiewasnothere/test_network_agent

Add test network agent for ncproxy dev work

.github/workflows/ci.yml

@@ -111,6 +111,7 @@ jobs:
       - run: go build ./cmd/ncproxy
       - run: go build ./cmd/dmverity-vhd
       - run: go build ./internal/tools/grantvmgroupaccess
+      - run: go build ./internal/tools/networkagent
       - run: go build ./internal/tools/securitypolicy
       - run: go build ./internal/tools/uvmboot
       - run: go build ./internal/tools/zapdir
@@ -125,6 +126,7 @@ jobs:
             device-util.exe
             wclayer.exe
             grantvmgroupaccess.exe
+            networkagent.exe
             uvmboot.exe
             zapdir.exe
             ncproxy.exe

.golangci.yml

@@ -24,6 +24,16 @@ issues:
       linters:
         - stylecheck
       Text: "ST1003:"
+
+    - path: cmd\\ncproxy\\nodenetsvc\\
+      linters:
+        - stylecheck
+      Text: "ST1003:"
+
+    - path: cmd\\ncproxy_mock\\
+      linters:
+        - stylecheck
+      Text: "ST1003:"
 
     - path: internal\\hcs\\schema2\\
       linters:

cmd/ncproxy/nodenetsvc/nodenetsvc.proto

@@ -6,36 +6,57 @@ service NodeNetworkService {
     rpc ConfigureNetworking(ConfigureNetworkingRequest) returns (ConfigureNetworkingResponse);
     rpc ConfigureContainerNetworking(ConfigureContainerNetworkingRequest) returns (ConfigureContainerNetworkingResponse);
     rpc PingNodeNetworkService(PingNodeNetworkServiceRequest) returns (PingNodeNetworkServiceResponse);
+    rpc GetHostLocalIpAddress(GetHostLocalIpAddressRequest) returns (GetHostLocalIpAddressResponse);
 }
-
-enum RequestType { 
-    Setup = 0; 
-    Teardown = 1; 
-}
-
+
 message ConfigureNetworkingRequest {
     string container_id = 1;
-    RequestType request_type = 2; // Setup for AddNIC and Teardown for DeleteNIC
+    RequestType request_type = 2;
 }
 
-message ConfigureNetworkingResponse{}
+message ConfigureNetworkingResponse {}
 
 message PingNodeNetworkServiceRequest {
-    string pingRequestMessage = 1;
+    string ping_request_message = 1;
 }
 
 message PingNodeNetworkServiceResponse {
-    string pingResponseMessage = 1;
+    string ping_response_message = 1;
+}
+
+enum RequestType { 
+    Setup = 0;
+    Teardown = 1;
 }
 
-message ConfigureContainerNetworkingRequest{
+message ConfigureContainerNetworkingRequest {    
     RequestType request_type = 1;
     string container_id = 2;
-    string network_namespace = 3;
+    string network_namespace_id = 3;
+}
+
+message ConfigureContainerNetworkingResponse {     
+    repeated ContainerNetworkInterface interfaces = 1;
 }
 
-message ConfigureContainerNetworkingResponse { 
-    bool success = 1; 
-    string response_json = 2; 
-    string error_json= 3; 
-}  
+message ContainerIPAddress {
+    string version = 1;        
+    string ip = 3;    
+    string prefix_length = 4;
+    string default_gateway = 5;
+}
+
+message ContainerNetworkInterface {
+    string name = 1;
+    string mac_address = 2;
+    string network_namespace_id = 3;    
+    repeated ContainerIPAddress ipaddresses = 4;
+}
+
+message GetHostLocalIpAddressRequest {
+    string container_id = 1;
+}
+
+message GetHostLocalIpAddressResponse {
+    string ip_addr = 1;
+}

internal/tools/networkagent/defs.go

@@ -0,0 +1,50 @@
+package main
+
+import (
+	"encoding/json"
+	"io/ioutil"
+
+	"github.com/Microsoft/hcsshim/cmd/ncproxy/ncproxygrpc"
+	"github.com/pkg/errors"
+)
+
+type service struct {
+	conf                 *config
+	client               ncproxygrpc.NetworkConfigProxyClient
+	containerToNamespace map[string]string
+	endpointToNicID      map[string]string
+	containerToNetwork   map[string]string
+}
+
+type hnsSettings struct {
+	SwitchName  string                                `json:"switch_name,omitempty"`
+	IOVSettings *ncproxygrpc.IovEndpointPolicySetting `json:"iov_settings,omitempty"`
+}
+
+type networkingSettings struct {
+	HNSSettings *hnsSettings `json:"hns_settings,omitempty"`
+}
+
+type config struct {
+	TTRPCAddr      string `json:"ttrpc,omitempty"`
+	GRPCAddr       string `json:"grpc,omitempty"`
+	NodeNetSvcAddr string `json:"node_net_svc_addr,omitempty"`
+	// 0 represents no timeout and networkagent will continuously try and connect in the
+	// background.
+	Timeout            uint32              `json:"timeout,omitempty"`
+	NetworkingSettings *networkingSettings `json:"networking_settings,omitempty"`
+}
+
+// Reads config from path and returns config struct if path is valid and marshaling
+// succeeds
+func readConfig(path string) (*config, error) {
+	data, err := ioutil.ReadFile(path)
+	if err != nil {
+		return nil, errors.Wrap(err, "failed to read config file")
+	}
+	conf := &config{}
+	if err := json.Unmarshal(data, conf); err != nil {
+		return nil, errors.New("failed to unmarshal config data")
+	}
+	return conf, nil
+}