hide more methods drive more coverage

Author: paulgmiller

cns/restserver/internalapi_test.go

@@ -304,7 +304,7 @@ func TestCreateAndUpdateNCWithSecondaryIPNCVersion(t *testing.T) {
 	}
 }
 
-func TestSyncHostNCVersion(t *testing.T) {
+func TestStartSyncHostNCVersionLoop(t *testing.T) {
 	// cns.KubernetesCRD has one more logic compared to other orchestrator type, so test both of them
 	orchestratorTypes := []string{cns.Kubernetes, cns.KubernetesCRD}
 	for _, orchestratorType := range orchestratorTypes {
@@ -349,7 +349,12 @@ func TestSyncHostNCVersion(t *testing.T) {
 			defer cleanupIMDS()
 
 			// When syncing the host NC version, it will use the orchestratorType passed in.
-			svc.SyncHostNCVersion(context.Background(), orchestratorType)
+			cnsconf := configuration.CNSConfig{
+				SyncHostNCVersionIntervalMs: 100,
+				ChannelMode:                 orchestratorType,
+			}
+			svc.StartSyncHostNCVersionLoop(t.Context(), cnsconf)
+			svc.ncSyncState.Wait(t.Context()) // wait for at leat one run
 			containerStatus = svc.state.ContainerStatus[req.NetworkContainerid]
 			if containerStatus.HostVersion != "0" {
 				t.Errorf("Unexpected containerStatus.HostVersion %s, expected host version should be 0 in string", containerStatus.HostVersion)
@@ -400,7 +405,8 @@ func TestPendingIPsGotUpdatedWhenSyncHostNCVersion(t *testing.T) {
 	cleanup := setMockNMAgent(svc, mnma)
 	defer cleanup()
 
-	svc.SyncHostNCVersion(context.Background(), cns.CRD)
+	svc.StartSyncHostNCVersionLoop(t.Context(), fastcnsconf)
+	svc.ncSyncState.Wait(t.Context()) // wait for at leat one run
 	containerStatus = svc.state.ContainerStatus[req.NetworkContainerid]
 
 	receivedSecondaryIPConfigs = containerStatus.CreateNetworkContainerRequest.SecondaryIPConfigs

cns/restserver/synchostnc.go

@@ -71,14 +71,14 @@ func (service *HTTPRestService) StartSyncHostNCVersionLoop(ctx context.Context,
 		timeout := time.Duration(cnsconfig.SyncHostNCVersionIntervalMs) * time.Millisecond
 		for {
 			timedCtx, cancel := context.WithTimeout(ctx, timeout)
-			if service.SyncHostNCVersion(timedCtx, cnsconfig.ChannelMode) {
+			if service.syncHostNCVersionWrapper(timedCtx, cnsconfig.ChannelMode) {
 				one.Do(service.ncSyncState.NotifyReady)
 			}
 			cancel()
 			select {
 			case <-ticker.C:
 				timedCtx, cancel := context.WithTimeout(ctx, timeout)
-				if service.SyncHostNCVersion(timedCtx, cnsconfig.ChannelMode) {
+				if service.syncHostNCVersionWrapper(timedCtx, cnsconfig.ChannelMode) {
 					one.Do(service.ncSyncState.NotifyReady)
 				}
 				cancel()
@@ -95,7 +95,7 @@ func (service *HTTPRestService) StartSyncHostNCVersionLoop(ctx context.Context,
 // SyncHostNCVersion will check NC version from NMAgent and save it as host NC version in container status.
 // If NMAgent NC version got updated, CNS will refresh the pending programming IP status.
 // returns true if soemthing was progammeed
-func (service *HTTPRestService) SyncHostNCVersion(ctx context.Context, channelMode string) bool {
+func (service *HTTPRestService) syncHostNCVersionWrapper(ctx context.Context, channelMode string) bool {
 	service.Lock()
 	defer service.Unlock()
 	start := time.Now()