refactor: address comments

Author: santhoshmprabhu

cns/restserver/helper_for_nodesubnet_test.go

@@ -3,6 +3,7 @@ package restserver
 import (
 	"context"
 	"net/netip"
+	"testing"
 
 	"github.com/Azure/azure-container-networking/cns"
 	"github.com/Azure/azure-container-networking/cns/common"
@@ -13,7 +14,7 @@ import (
 	"github.com/Azure/azure-container-networking/store"
 )
 
-func GetRestServiceObjectForNodeSubnetTest(generator CNIConflistGenerator) *HTTPRestService {
+func GetRestServiceObjectForNodeSubnetTest(t *testing.T, generator CNIConflistGenerator) *HTTPRestService {
 	config := &common.ServiceConfig{
 		Name:        "test",
 		Version:     "1.0",
@@ -56,6 +57,8 @@ func GetRestServiceObjectForNodeSubnetTest(generator CNIConflistGenerator) *HTTP
 		return nil
 	}
 
+	t.Cleanup(func() { svc.Uninitialize() })
+
 	return &HTTPRestService{
 		Service:              svc,
 		cniConflistGenerator: generator,

cns/restserver/nodesubnet.go

@@ -24,7 +24,6 @@ func (service *HTTPRestService) UpdateIPsForNodeSubnet(secondaryIPs []netip.Addr
 
 	code, msg := service.saveNetworkContainerGoalState(*networkContainerRequest)
 	if code != types.Success {
-		logger.Debugf("Error in processing IP change")
 		return errors.Errorf("failed to save fetched ips. code: %d, message %s", code, msg)
 	}
 

cns/restserver/nodesubnet_test.go

@@ -18,11 +18,11 @@ func (m *MockPodInfoByIPProvider) PodInfoByIP() (res map[string]cns.PodInfo, err
 
 // Mock implementation of CNIConflistGenerator
 type MockCNIConflistGenerator struct {
-	GenerateCalled chan bool
+	GenerateCalled chan struct{}
 }
 
 func (m *MockCNIConflistGenerator) Generate() error {
-	m.GenerateCalled <- true
+	close(m.GenerateCalled)
 	return nil
 }
 
@@ -32,32 +32,30 @@ func (m *MockCNIConflistGenerator) Close() error {
 }
 
 func TestNodeSubnet(t *testing.T) {
-	mockPodInfoProvider := new(MockPodInfoByIPProvider)
+	mockPodInfoProvider := &MockPodInfoByIPProvider{}
 
 	// Create a real HTTPRestService object
 	mockCNIConflistGenerator := &MockCNIConflistGenerator{
-		GenerateCalled: make(chan bool),
+		GenerateCalled: make(chan struct{}),
 	}
-	service := restserver.GetRestServiceObjectForNodeSubnetTest(mockCNIConflistGenerator)
-	defer service.Service.Uninitialize()
-
+	service := restserver.GetRestServiceObjectForNodeSubnetTest(t, mockCNIConflistGenerator)
 	ctx, cancel := testContext(t)
 	defer cancel()
 
 	err := service.InitializeNodeSubnet(ctx, mockPodInfoProvider)
 	service.StartNodeSubnet(ctx)
 
-	if err != nil {
-		t.Errorf("InitializeNodeSubnet returned an error: %v", err)
-	}
-
 	if service.GetNodesubnetIPFetcher() == nil {
 		t.Error("NodeSubnetIPFetcher is not initialized")
 	}
 
+	if err != nil {
+		t.Fatalf("InitializeNodeSubnet returned an error: %v", err)
+	}
+
 	select {
 	case <-ctx.Done():
-		t.Error("Test context was canceled before conflist generation")
+		t.Errorf("test context done - %s", ctx.Err())
 		return
 	case <-mockCNIConflistGenerator.GenerateCalled:
 		break

cns/service/main.go

@@ -872,9 +872,10 @@ func main() {
 		}
 	}
 
+	// AzureHost channelmode indeicates Nodesubnet. IPs are to be fetched from NMagent.
 	if config.ChannelMode == cns.AzureHost {
 		if !cnsconfig.ManageEndpointState {
-			logger.Errorf("[Azure CNS] ManageEndpointState must be set to true for AzureHost mode")
+			logger.Errorf("ManageEndpointState must be set to true for AzureHost mode")
 			return
 		}
 

hack/aks/README.md

@@ -24,6 +24,7 @@ AKS Clusters
   byocni-up                                 Alias to swift-byocni-up
   cilium-up                                 Alias to swift-cilium-up
   up                                        Alias to swift-up
+  nodesubnet-byocni-nokubeproxy-up          Bring up a Nodesubnet BYO CNI cluster. Does not include secondary IP configs.
   overlay-byocni-up                         Bring up a Overlay BYO CNI cluster
   overlay-byocni-nokubeproxy-up             Bring up a Overlay BYO CNI cluster without kube-proxy
   overlay-cilium-up                         Bring up a Overlay Cilium cluster