add nc version check via NMA

Author: Jaeryn

cns/nmagentclient/nmagentclient.go

@@ -9,6 +9,10 @@ import (
 	"github.com/Azure/azure-container-networking/common"
 )
 
+const (
+	WireserverIP = "168.63.129.16"
+)
+
 // NetworkContainerResponse - NMAgent response.
 type NetworkContainerResponse struct {
 	ResponseCode       string `json:"httpStatusCode"`

cns/restserver/restserver.go

@@ -95,6 +95,7 @@ type networkInfo struct {
 type HTTPService interface {
 	common.ServiceAPI
 	SendNCSnapShotPeriodically(int, chan bool)
+	SetNodeOrchestrator(*cns.SetOrchestratorTypeRequest)
 	SyncNodeStatus(string, string, string, json.RawMessage) (int, string)
 }
 
@@ -2063,6 +2064,14 @@ func (service *HTTPRestService) SendNCSnapShotPeriodically(ncSnapshotIntervalInM
 	}
 }
 
+// SetNodeOrchestrator :- Set node orchestrator after registering with mDNC
+func (service *HTTPRestService) SetNodeOrchestrator(r *cns.SetOrchestratorTypeRequest) {
+	body, _ := json.Marshal(r)
+	req, _ := http.NewRequest(http.MethodPost, "", bytes.NewBuffer(body))
+	req.Header.Set("Content-Type", "application/json; charset=UTF-8")
+	service.setOrchestratorType(httptest.NewRecorder(), req)
+}
+
 // SyncNodeStatus :- Retrieve the latest node state from DNC & returns the first occurence of returnCode and error with respect to contextFromCNI
 func (service *HTTPRestService) SyncNodeStatus(dncEP, infraVnet, nodeID string, contextFromCNI json.RawMessage) (returnCode int, errStr string) {
 	logger.Printf("[Azure CNS] SyncNodeStatus")
@@ -2096,8 +2105,8 @@ func (service *HTTPRestService) SyncNodeStatus(dncEP, infraVnet, nodeID string,
 	}
 
 	var (
-		ncsToBeAdded   map[string]cns.CreateNetworkContainerRequest
-		ncsToBeDeleted map[string]bool
+		ncsToBeAdded   = make(map[string]cns.CreateNetworkContainerRequest)
+		ncsToBeDeleted = make(map[string]bool)
 	)
 
 	// determine new NCs and NCs to be deleted
@@ -2108,25 +2117,28 @@ func (service *HTTPRestService) SyncNodeStatus(dncEP, infraVnet, nodeID string,
 
 	for _, nc := range nodeInfoResponse.NetworkContainers {
 		ncid := cns.SwiftPrefix + nc.NetworkContainerid
+		delete(ncsToBeDeleted, ncid)
 		if _, exists := service.state.ContainerStatus[ncid]; !exists {
 			ncsToBeAdded[ncid] = nc
-		} else {
-			delete(ncsToBeDeleted, ncid)
 		}
 	}
 	service.lock.Unlock()
 
 	// check if the version is valid and save it to service state
 	for _, nc := range ncsToBeAdded {
 		response, err = nmagentclient.GetNetworkContainerVersion(nc.NetworkContainerid,
-			fmt.Sprintf(nodeInfoResponse.GetNCVersionURLFmt, nc.PrimaryInterfaceIdentifier, nc.NetworkContainerid, nc.AuthorizationToken))
+			fmt.Sprintf(nodeInfoResponse.GetNCVersionURLFmt,
+				nmagentclient.WireserverIP,
+				nc.PrimaryInterfaceIdentifier,
+				nc.NetworkContainerid,
+				nc.AuthorizationToken))
 		if err == nil {
 			if response.StatusCode == http.StatusOK {
 				var versionResponse nmagentclient.NetworkContainerResponse
-				if err = json.NewDecoder(response.Body).Decode(&versionResponse); err != nil {
-					response.Body.Close()
-
-					tmpErrStr = fmt.Sprintf("[Azure-CNS] Failed to decode GetNCVersion response for NC %s with error: %+v", nc.NetworkContainerid, err)
+				rBytes, _ := ioutil.ReadAll(response.Body)
+				json.Unmarshal(rBytes, &versionResponse)
+				if versionResponse.ResponseCode == "" {
+					tmpErrStr = fmt.Sprintf("[Azure-CNS] Failed to unmarshal GetNCVersion response %s for NC %s", rBytes, nc.NetworkContainerid)
 					if errStr == "" && bytes.Compare(nc.OrchestratorContext, contextFromCNI) == 0 {
 						returnCode = UnexpectedError
 						errStr = tmpErrStr
@@ -2144,7 +2156,7 @@ func (service *HTTPRestService) SyncNodeStatus(dncEP, infraVnet, nodeID string,
 					req.Header.Set("Content-Type", "application/json; charset=UTF-8")
 					service.createOrUpdateNetworkContainer(httptest.NewRecorder(), req)
 				} else {
-					tmpErrStr = fmt.Sprintf("[Azure-CNS] Network container %s v%d had not propagated to respective NMA", nc.NetworkContainerid, v1)
+					tmpErrStr = fmt.Sprintf("[Azure-CNS] Network container %s v%d had not propagated to respective NMA w/ v%d", nc.NetworkContainerid, v1, v2)
 					if errStr == "" && bytes.Compare(nc.OrchestratorContext, contextFromCNI) == 0 {
 						returnCode = NetworkContainerPendingStatePropagation
 						errStr = tmpErrStr

cns/service/main.go

@@ -19,6 +19,7 @@ import (
 	"github.com/Azure/azure-container-networking/aitelemetry"
 	"github.com/Azure/azure-container-networking/cnm/ipam"
 	"github.com/Azure/azure-container-networking/cnm/network"
+	"github.com/Azure/azure-container-networking/cns"
 	"github.com/Azure/azure-container-networking/cns/common"
 	"github.com/Azure/azure-container-networking/cns/configuration"
 	"github.com/Azure/azure-container-networking/cns/hnsclient"
@@ -216,8 +217,7 @@ func printVersion() {
 }
 
 // Try to register node with DNC when CNS is started in managed DNC mode
-func registerNode(dncEP, infraVnet, nodeID string) {
-	logger.Printf("[Azure CNS] SyncNodeStatus")
+func registerNode(httpRestService restserver.HTTPService, dncEP, infraVnet, nodeID string) {
 	var (
 		numCPU   = runtime.NumCPU()
 		response *http.Response
@@ -227,19 +227,21 @@ func registerNode(dncEP, infraVnet, nodeID string) {
 	)
 
 	for err != nil {
-		response, err = httpc.Post(fmt.Sprintf("%s/%s/node/%s/nclimit/%d%s", dncEP, infraVnet, nodeID, numCPU, dncApiVersion), "application/json", &body)
+		response, err = httpc.Post(fmt.Sprintf("%s/%s/node/%s/cores/%d%s", dncEP, infraVnet, nodeID, numCPU, dncApiVersion), "application/json", &body)
 		if err == nil {
-			break
+			if response.StatusCode == http.StatusCreated {
+				var req cns.SetOrchestratorTypeRequest
+				json.NewDecoder(response.Body).Decode(&req)
+				httpRestService.SetNodeOrchestrator(&req)
+			} else {
+				logger.Errorf("[Azure CNS] Failed to register node with managed DNC with http status code: " + strconv.Itoa(response.StatusCode))
+			}
+
+			response.Body.Close()
 		}
 		time.Sleep(time.Second * 5)
 	}
 
-	response.Body.Close()
-
-	if response.StatusCode != http.StatusOK {
-		panic("[Azure CNS] Failed to register node with managed DNC with http status code: " + strconv.Itoa(response.StatusCode))
-	}
-
 	logger.Printf("[Azure CNS] Node Registered")
 }
 
@@ -381,7 +383,7 @@ func main() {
 		httpRestService.SetOption(acn.OptInfrastructureNetwork, infravnet)
 		httpRestService.SetOption(acn.OptNodeID, nodeID)
 
-		registerNode(privateEndpoint, infravnet, nodeID)
+		registerNode(httpRestService, privateEndpoint, infravnet, nodeID)
 		go func(ep, vnet, node string) {
 			// Periodically poll (30s) DNC for node updates
 			for {