Adjusting logic on re-registering the Node in mDNC case

Author: vakalapa

cns/NetworkContainerContract.go

@@ -373,8 +373,7 @@ func (networkContainerRequestPolicy *NetworkContainerRequestPolicies) Validate()
 
 // NodeInfoResponse - Struct to hold the node info response.
 type NodeInfoResponse struct {
-	NetworkContainers  []CreateNetworkContainerRequest
-	NmAgentApisMissing bool
+	NetworkContainers []CreateNetworkContainerRequest
 }
 
 // NodeRegisterRequest - Struct to hold the node register request.

cns/restserver/internalapi.go

@@ -10,9 +10,6 @@ import (
 	"net/http"
 	"net/http/httptest"
 	"reflect"
-	"runtime"
-	"strconv"
-	"time"
 
 	"github.com/Azure/azure-container-networking/cns"
 	"github.com/Azure/azure-container-networking/cns/logger"
@@ -127,14 +124,6 @@ func (service *HTTPRestService) SyncNodeStatus(dncEP, infraVnet, nodeID string,
 	service.saveState()
 	service.Unlock()
 
-	if nodeInfoResponse.NmAgentApisMissing {
-		// RegisterNode again with NmAgent Apis list
-		retErr := RegisterNode(httpc, service, dncEP, infraVnet, nodeID)
-		if retErr != nil {
-			logger.Errorf("[Azure-CNS] Failed to register Node ID: %s with error: %s", nodeID, err.Error())
-		}
-	}
-
 	// delete dangling NCs
 	for nc := range ncsToBeDeleted {
 		var body bytes.Buffer
@@ -262,89 +251,3 @@ func (service *HTTPRestService) CreateOrUpdateNetworkContainerInternal(req cns.C
 
 	return returnCode
 }
-
-// RegisterNode - Tries to register node with DNC when CNS is started in managed DNC mode
-func RegisterNode(httpc *http.Client, httpRestService cns.HTTPService, dncEP, infraVnet, nodeID string) error {
-	logger.Printf("[Azure CNS] Registering node %s with Infrastructure Network: %s PrivateEndpoint: %s", nodeID, infraVnet, dncEP)
-
-	var (
-		numCPU              = runtime.NumCPU()
-		url                 = fmt.Sprintf(common.RegisterNodeURLFmt, dncEP, infraVnet, nodeID, dncApiVersion)
-		nodeRegisterRequest cns.NodeRegisterRequest
-	)
-
-	nodeRegisterRequest.NumCPU = numCPU
-	supportedApis, retErr := nmagentclient.GetNmAgentSupportedApis(httpc, "")
-
-	if retErr != nil {
-		logger.Errorf("[Azure CNS] Failed to retrieve SupportedApis from NMagent of node %s with Infrastructure Network: %s PrivateEndpoint: %s",
-			nodeID, infraVnet, dncEP)
-		return retErr
-	}
-
-	//To avoid any null-pointer deferencing errors.
-	if supportedApis == nil {
-		supportedApis = []string{}
-	}
-
-	nodeRegisterRequest.NmAgentSupportedApis = supportedApis
-
-	nodeRegisterTicker := time.NewTicker(common.FiveSeconds)
-	responseChan := make(chan error)
-
-	for {
-		select {
-		case responseErr := <-responseChan:
-			return responseErr
-		case <-nodeRegisterTicker.C:
-			go sendRegisterNodeRequest(httpc, httpRestService, nodeRegisterRequest, url, responseChan)
-		}
-	}
-}
-
-// sendRegisterNodeRequest func helps in registering the node until there is an error.
-func sendRegisterNodeRequest(
-	httpc *http.Client,
-	httpRestService cns.HTTPService,
-	nodeRegisterRequest cns.NodeRegisterRequest,
-	registerURL string,
-	responseChan chan<- error) {
-
-	var (
-		body     bytes.Buffer
-		response *http.Response
-		err      = fmt.Errorf("")
-	)
-
-	err = json.NewEncoder(&body).Encode(nodeRegisterRequest)
-	if err != nil {
-		log.Errorf("encoding json failed with %v", err)
-		responseChan <- err
-		return
-	}
-
-	response, err = httpc.Post(registerURL, "application/json", &body)
-	if err == nil {
-		if response.StatusCode == http.StatusCreated {
-			var req cns.SetOrchestratorTypeRequest
-			decodeErr := json.NewDecoder(response.Body).Decode(&req)
-			if decodeErr != nil {
-				log.Errorf("decoding Node Resgister response json failed with %v", err)
-				responseChan <- err
-				return
-			}
-			httpRestService.SetNodeOrchestrator(&req)
-
-			logger.Printf("[Azure CNS] Node Registered")
-			responseChan <- nil
-		} else {
-			err = fmt.Errorf("[Azure CNS] Failed to register node with http status code %s", strconv.Itoa(response.StatusCode))
-			logger.Errorf(err.Error())
-			responseChan <- err
-		}
-
-		response.Body.Close()
-	} else {
-		logger.Errorf("[Azure CNS] Failed to register node with err: %+v", err)
-	}
-}

cns/restserver/internalapi_test.go

@@ -4,15 +4,10 @@
 package restserver
 
 import (
-	"bytes"
 	"encoding/json"
 	"fmt"
-	"io"
-	"io/ioutil"
-	"net/http"
 	"reflect"
 	"strconv"
-	"strings"
 	"testing"
 
 	"github.com/Azure/azure-container-networking/cns"
@@ -221,17 +216,6 @@ func TestReconcileNCWithSystemPods(t *testing.T) {
 	validateNCStateAfterReconcile(t, &req, expectedNcCount, expectedAllocatedPods)
 }
 
-func TestRegisterNode(t *testing.T) {
-	restartService()
-	setEnv(t)
-	setOrchestratorTypeInternal(cns.KubernetesCRD)
-
-	err := RegisterNode(NewTestClient(), svc, "localhost", "dummyvnet", "dummyNodeId")
-	if err != nil {
-		t.Errorf("Unexpected failure on register Node %s", err)
-	}
-}
-
 func setOrchestratorTypeInternal(orchestratorType string) {
 	fmt.Println("setOrchestratorTypeInternal")
 	svc.state.OrchestratorType = orchestratorType
@@ -470,47 +454,3 @@ func restartService() {
 	service.Stop()
 	startService()
 }
-
-// RoundTripFunc .
-type RoundTripFunc func(req *http.Request) *http.Response
-
-// RoundTrip .
-func (f RoundTripFunc) RoundTrip(req *http.Request) (*http.Response, error) {
-	return f(req), nil
-}
-
-func mockRountTrip(req *http.Request) *http.Response {
-	var (
-		body       io.ReadCloser
-		returnCode = 200
-	)
-	// Test request parameters
-	switch {
-	case strings.Contains(req.URL.String(), "GetSupportedApis"):
-		// Handle Call to NMAgent
-		body = ioutil.NopCloser(bytes.NewBufferString(hostSupportedApis))
-
-	case strings.Contains(req.URL.String(), "dummyNodeId"):
-		//Handle Call to register Node
-		body = ioutil.NopCloser(bytes.NewBufferString("OK"))
-		returnCode = 201
-
-	default:
-		returnCode = 200
-	}
-
-	return &http.Response{
-		StatusCode: returnCode,
-		// Send response to be tested
-		Body: body,
-		// Must be set to non-nil value or it panics
-		Header: make(http.Header),
-	}
-}
-
-//NewTestClient returns *http.Client with Transport replaced to avoid making real calls
-func NewTestClient() *http.Client {
-	return &http.Client{
-		Transport: RoundTripFunc(mockRountTrip),
-	}
-}

cns/service/main.go

@@ -4,18 +4,23 @@
 package main
 
 import (
+	"bytes"
 	"context"
 	"encoding/json"
 	"fmt"
+	"net/http"
 	"os"
 	"os/signal"
+	"runtime"
+	"strconv"
 	"strings"
 	"syscall"
 	"time"
 
 	localtls "github.com/Azure/azure-container-networking/server/tls"
 
 	"github.com/Azure/azure-container-networking/cns/ipampoolmonitor"
+	"github.com/Azure/azure-container-networking/cns/nmagentclient"
 
 	"github.com/Azure/azure-container-networking/aitelemetry"
 	"github.com/Azure/azure-container-networking/cnm/ipam"
@@ -243,6 +248,92 @@ func printVersion() {
 	fmt.Printf("Version %v\n", version)
 }
 
+// RegisterNode - Tries to register node with DNC when CNS is started in managed DNC mode
+func registerNode(httpc *http.Client, httpRestService cns.HTTPService, dncEP, infraVnet, nodeID string) error {
+	logger.Printf("[Azure CNS] Registering node %s with Infrastructure Network: %s PrivateEndpoint: %s", nodeID, infraVnet, dncEP)
+
+	var (
+		numCPU              = runtime.NumCPU()
+		url                 = fmt.Sprintf(acn.RegisterNodeURLFmt, dncEP, infraVnet, nodeID, dncApiVersion)
+		nodeRegisterRequest cns.NodeRegisterRequest
+	)
+
+	nodeRegisterRequest.NumCPU = numCPU
+	supportedApis, retErr := nmagentclient.GetNmAgentSupportedApis(httpc, "")
+
+	if retErr != nil {
+		logger.Errorf("[Azure CNS] Failed to retrieve SupportedApis from NMagent of node %s with Infrastructure Network: %s PrivateEndpoint: %s",
+			nodeID, infraVnet, dncEP)
+		return retErr
+	}
+
+	//To avoid any null-pointer deferencing errors.
+	if supportedApis == nil {
+		supportedApis = []string{}
+	}
+
+	nodeRegisterRequest.NmAgentSupportedApis = supportedApis
+
+	nodeRegisterTicker := time.NewTicker(acn.FiveSeconds)
+	responseChan := make(chan error)
+
+	for {
+		select {
+		case responseErr := <-responseChan:
+			return responseErr
+		case <-nodeRegisterTicker.C:
+			go sendRegisterNodeRequest(httpc, httpRestService, nodeRegisterRequest, url, responseChan)
+		}
+	}
+}
+
+// sendRegisterNodeRequest func helps in registering the node until there is an error.
+func sendRegisterNodeRequest(
+	httpc *http.Client,
+	httpRestService cns.HTTPService,
+	nodeRegisterRequest cns.NodeRegisterRequest,
+	registerURL string,
+	responseChan chan<- error) {
+
+	var (
+		body     bytes.Buffer
+		response *http.Response
+		err      = fmt.Errorf("")
+	)
+
+	err = json.NewEncoder(&body).Encode(nodeRegisterRequest)
+	if err != nil {
+		log.Errorf("encoding json failed with %v", err)
+		responseChan <- err
+		return
+	}
+
+	response, err = httpc.Post(registerURL, "application/json", &body)
+	if err == nil {
+		if response.StatusCode == http.StatusCreated {
+			var req cns.SetOrchestratorTypeRequest
+			decodeErr := json.NewDecoder(response.Body).Decode(&req)
+			if decodeErr != nil {
+				log.Errorf("decoding Node Resgister response json failed with %v", err)
+				responseChan <- err
+				return
+			}
+			httpRestService.SetNodeOrchestrator(&req)
+
+			logger.Printf("[Azure CNS] Node Registered")
+			responseChan <- nil
+		} else {
+			err = fmt.Errorf("[Azure CNS] Failed to register node with http status code %s", strconv.Itoa(response.StatusCode))
+			logger.Errorf(err.Error())
+			responseChan <- err
+		}
+
+		response.Body.Close()
+	} else {
+		logger.Errorf("[Azure CNS] Failed to register node with err: %+v", err)
+	}
+}
+
 // Main is the entry point for CNS.
 func main() {
 	// Initialize and parse command line arguments.
@@ -418,7 +509,7 @@ func main() {
 		httpRestService.SetOption(acn.OptInfrastructureNetworkID, infravnet)
 		httpRestService.SetOption(acn.OptNodeID, nodeID)
 
-		registerErr := restserver.RegisterNode(acn.GetHttpClient(), httpRestService, privateEndpoint, infravnet, nodeID)
+		registerErr := registerNode(acn.GetHttpClient(), httpRestService, privateEndpoint, infravnet, nodeID)
 		if registerErr != nil {
 			logger.Errorf("[Azure CNS] Resgistering Node failed with error: %v PrivateEndpoint: %s InfrastructureNetworkID: %s NodeID: %s",
 				registerErr,