CNS - Wireserver "proxy" (#1825)

* adding wireserver proxy

* using proxy for publish

* injecting dependency. refactoring unpublish nc

* default wireserver ip config

* setting content type

* better printing of requests and responses

* fixing unit tests

Author: ramiro-gamarra

cns/NetworkContainerContract.go

@@ -500,8 +500,15 @@ type PublishNetworkContainerRequest struct {
 	CreateNetworkContainerRequestBody []byte
 }
 
+func (p PublishNetworkContainerRequest) String() string {
+	// %q as a verb on a byte slice prints safely escaped text instead of individual bytes
+	return fmt.Sprintf("{NetworkID:%s NetworkContainerID:%s JoinNetworkURL:%s CreateNetworkContainerURL:%s CreateNetworkContainerRequestBody:%q}",
+		p.NetworkID, p.NetworkContainerID, p.JoinNetworkURL, p.CreateNetworkContainerURL, p.CreateNetworkContainerRequestBody)
+}
+
 // NetworkContainerParameters parameters available in network container operations
 type NetworkContainerParameters struct {
+	NCID                  string
 	AuthToken             string
 	AssociatedInterfaceID string
 }
@@ -514,6 +521,12 @@ type PublishNetworkContainerResponse struct {
 	PublishResponseBody []byte
 }
 
+func (p PublishNetworkContainerResponse) String() string {
+	// %q as a verb on a byte slice prints safely escaped text instead of individual bytes
+	return fmt.Sprintf("{Response:%+v PublishErrStr:%s PublishStatusCode:%d PublishResponseBody:%q}",
+		p.Response, p.PublishErrorStr, p.PublishStatusCode, p.PublishResponseBody)
+}
+
 // UnpublishNetworkContainerRequest specifies request to unpublish network container via NMAgent.
 type UnpublishNetworkContainerRequest struct {
 	NetworkID                 string
@@ -530,6 +543,12 @@ type UnpublishNetworkContainerResponse struct {
 	UnpublishResponseBody []byte
 }
 
+func (u UnpublishNetworkContainerResponse) String() string {
+	// %q as a verb on a byte slice prints safely escaped text instead of individual bytes
+	return fmt.Sprintf("{Response:%+v UnpublishErrorStr:%s UnpublishStatusCode:%d UnpublishResponseBody:%q}",
+		u.Response, u.UnpublishErrorStr, u.UnpublishStatusCode, u.UnpublishResponseBody)
+}
+
 // ValidAclPolicySetting - Used to validate ACL policy
 type ValidAclPolicySetting struct {
 	Protocols       string `json:","`

cns/client/client_test.go

@@ -169,7 +169,7 @@ func TestMain(m *testing.M) {
 	logger.InitLogger(logName, 0, 0, tmpLogDir+"/")
 	config := common.ServiceConfig{}
 
-	httpRestService, err := restserver.NewHTTPRestService(&config, &fakes.WireserverClientFake{}, &fakes.NMAgentClientFake{}, nil, nil, nil)
+	httpRestService, err := restserver.NewHTTPRestService(&config, &fakes.WireserverClientFake{}, &fakes.WireserverProxyFake{}, &fakes.NMAgentClientFake{}, nil, nil, nil)
 	svc = httpRestService.(*restserver.HTTPRestService)
 	svc.Name = "cns-test-server"
 	fakeNNC := v1alpha.NodeNetworkConfig{

cns/configuration/configuration.go

@@ -193,4 +193,7 @@ func SetCNSConfigDefaults(config *CNSConfig) {
 		// set the default PopulateHomeAzCache retry interval to 15 seconds
 		config.PopulateHomeAzCacheRetryIntervalSecs = 15
 	}
+	if config.WireserverIP == "" {
+		config.WireserverIP = "168.63.129.16"
+	}
 }

cns/configuration/configuration_test.go

@@ -207,6 +207,7 @@ func TestSetCNSConfigDefaults(t *testing.T) {
 					RefreshIntervalInHrs: 12,
 				},
 				PopulateHomeAzCacheRetryIntervalSecs: 15,
+				WireserverIP:                         "168.63.129.16",
 			},
 		},
 		{
@@ -250,6 +251,7 @@ func TestSetCNSConfigDefaults(t *testing.T) {
 					RefreshIntervalInHrs: 3,
 				},
 				PopulateHomeAzCacheRetryIntervalSecs: 10,
+				WireserverIP:                         "168.63.129.16",
 			},
 		},
 	}

cns/fakes/nmagentclientfake.go

@@ -14,24 +14,9 @@ import (
 
 // NMAgentClientFake can be used to query to VM Host info.
 type NMAgentClientFake struct {
-	PutNetworkContainerF    func(context.Context, *nmagent.PutNetworkContainerRequest) error
-	DeleteNetworkContainerF func(context.Context, nmagent.DeleteContainerRequest) error
-	JoinNetworkF            func(context.Context, nmagent.JoinNetworkRequest) error
-	SupportedAPIsF          func(context.Context) ([]string, error)
-	GetNCVersionListF       func(context.Context) (nmagent.NCVersionList, error)
-	GetHomeAzF              func(context.Context) (nmagent.AzResponse, error)
-}
-
-func (n *NMAgentClientFake) PutNetworkContainer(ctx context.Context, req *nmagent.PutNetworkContainerRequest) error {
-	return n.PutNetworkContainerF(ctx, req)
-}
-
-func (n *NMAgentClientFake) DeleteNetworkContainer(ctx context.Context, req nmagent.DeleteContainerRequest) error {
-	return n.DeleteNetworkContainerF(ctx, req)
-}
-
-func (n *NMAgentClientFake) JoinNetwork(ctx context.Context, req nmagent.JoinNetworkRequest) error {
-	return n.JoinNetworkF(ctx, req)
+	SupportedAPIsF    func(context.Context) ([]string, error)
+	GetNCVersionListF func(context.Context) (nmagent.NCVersionList, error)
+	GetHomeAzF        func(context.Context) (nmagent.AzResponse, error)
 }
 
 func (n *NMAgentClientFake) SupportedAPIs(ctx context.Context) ([]string, error) {

cns/fakes/wireserverproxyfake.go

@@ -0,0 +1,50 @@
+package fakes
+
+import (
+	"bytes"
+	"context"
+	"io"
+	"net/http"
+
+	"github.com/Azure/azure-container-networking/cns"
+)
+
+type WireserverProxyFake struct {
+	JoinNetworkFunc func(context.Context, string) (*http.Response, error)
+	PublishNCFunc   func(context.Context, cns.NetworkContainerParameters, []byte) (*http.Response, error)
+	UnpublishNCFunc func(context.Context, cns.NetworkContainerParameters) (*http.Response, error)
+}
+
+const defaultResponseBody = `{"httpStatusCode":"200"}`
+
+func defaultResponse() *http.Response {
+	return &http.Response{
+		StatusCode:    http.StatusOK,
+		Body:          io.NopCloser(bytes.NewBufferString(defaultResponseBody)),
+		ContentLength: int64(len(defaultResponseBody)),
+	}
+}
+
+func (w *WireserverProxyFake) JoinNetwork(ctx context.Context, vnetID string) (*http.Response, error) {
+	if w.JoinNetworkFunc != nil {
+		return w.JoinNetworkFunc(ctx, vnetID)
+	}
+
+	return defaultResponse(), nil
+}
+
+func (w *WireserverProxyFake) PublishNC(ctx context.Context, ncParams cns.NetworkContainerParameters, payload []byte) (*http.Response, error) {
+	if w.PublishNCFunc != nil {
+		return w.PublishNCFunc(ctx, ncParams, payload)
+	}
+
+	return defaultResponse(), nil
+}
+
+func (w *WireserverProxyFake) UnpublishNC(ctx context.Context, ncParams cns.NetworkContainerParameters) (*http.Response, error) {
+	if w.UnpublishNCFunc != nil {
+		return w.UnpublishNCFunc(ctx, ncParams)
+	}
+
+	return defaultResponse(), nil
+}