Merge pull request #7281 from jackfrancis/azure-vms-pool-ut

azure: increase UT coverage in azure_vms_pool

Author: k8s-ci-robot

cluster-autoscaler/cloudprovider/azure/azure_agent_pool_test.go

@@ -172,7 +172,7 @@ func TestDeleteOutdatedDeployments(t *testing.T) {
 	}
 }
 
-func TestGetVMsFromCache(t *testing.T) {
+func TestAgentPoolGetVMsFromCache(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
 
@@ -309,7 +309,7 @@ func TestAgentPoolIncreaseSize(t *testing.T) {
 	assert.NoError(t, err)
 }
 
-func TestDecreaseTargetSize(t *testing.T) {
+func TestAgentPoolDecreaseTargetSize(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
 

cluster-autoscaler/cloudprovider/azure/azure_scale_set_test.go

@@ -151,7 +151,7 @@ func newApiNode(orchmode compute.OrchestrationMode, vmID int64) *apiv1.Node {
 	}
 	return node
 }
-func TestMaxSize(t *testing.T) {
+func TestScaleSetMaxSize(t *testing.T) {
 	provider := newTestProvider(t)
 	registered := provider.azureManager.RegisterNodeGroup(
 		newTestScaleSet(provider.azureManager, "test-asg"))
@@ -160,7 +160,7 @@ func TestMaxSize(t *testing.T) {
 	assert.Equal(t, provider.NodeGroups()[0].MaxSize(), 5)
 }
 
-func TestMinSize(t *testing.T) {
+func TestScaleSetMinSize(t *testing.T) {
 	provider := newTestProvider(t)
 	registered := provider.azureManager.RegisterNodeGroup(
 		newTestScaleSet(provider.azureManager, "test-asg"))
@@ -169,7 +169,7 @@ func TestMinSize(t *testing.T) {
 	assert.Equal(t, provider.NodeGroups()[0].MinSize(), 1)
 }
 
-func TestMinSizeZero(t *testing.T) {
+func TestScaleSetMinSizeZero(t *testing.T) {
 	provider := newTestProvider(t)
 	registered := provider.azureManager.RegisterNodeGroup(
 		newTestScaleSetMinSizeZero(provider.azureManager, testASG))
@@ -178,7 +178,7 @@ func TestMinSizeZero(t *testing.T) {
 	assert.Equal(t, provider.NodeGroups()[0].MinSize(), 0)
 }
 
-func TestTargetSize(t *testing.T) {
+func TestScaleSetTargetSize(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
 
@@ -248,7 +248,7 @@ func TestTargetSize(t *testing.T) {
 	}
 }
 
-func TestIncreaseSize(t *testing.T) {
+func TestScaleSetIncreaseSize(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
 
@@ -365,7 +365,7 @@ func TestIncreaseSize(t *testing.T) {
 
 // TestIncreaseSizeOnVMProvisioningFailed has been tweeked only for Uniform Orchestration mode.
 // If ProvisioningState == failed and power state is not running, Status.State == InstanceCreating with errorInfo populated.
-func TestIncreaseSizeOnVMProvisioningFailed(t *testing.T) {
+func TestScaleSetIncreaseSizeOnVMProvisioningFailed(t *testing.T) {
 	testCases := map[string]struct {
 		expectInstanceRunning    bool
 		isMissingInstanceView    bool
@@ -543,7 +543,7 @@ func TestIncreaseSizeOnVMProvisioningFailedWithFastDelete(t *testing.T) {
 	}
 }
 
-func TestIncreaseSizeOnVMSSUpdating(t *testing.T) {
+func TestScaleSetIncreaseSizeOnVMSSUpdating(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
 
@@ -593,7 +593,7 @@ func TestIncreaseSizeOnVMSSUpdating(t *testing.T) {
 	assert.NoError(t, err)
 }
 
-func TestBelongs(t *testing.T) {
+func TestScaleSetBelongs(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
 
@@ -645,7 +645,7 @@ func TestBelongs(t *testing.T) {
 	}
 }
 
-func TestDeleteNodes(t *testing.T) {
+func TestScaleSetDeleteNodes(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
 
@@ -783,7 +783,7 @@ func TestDeleteNodes(t *testing.T) {
 	}
 }
 
-func TestDeleteNodeUnregistered(t *testing.T) {
+func TestScaleSetDeleteNodeUnregistered(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
 
@@ -896,7 +896,7 @@ func TestDeleteNodeUnregistered(t *testing.T) {
 	}
 }
 
-func TestDeleteInstancesWithForceDeleteEnabled(t *testing.T) {
+func TestScaleSetDeleteInstancesWithForceDeleteEnabled(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
 	manager := newTestAzureManager(t)
@@ -1010,7 +1010,7 @@ func TestDeleteInstancesWithForceDeleteEnabled(t *testing.T) {
 
 }
 
-func TestDeleteNoConflictRequest(t *testing.T) {
+func TestScaleSetDeleteNoConflictRequest(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
 
@@ -1071,7 +1071,7 @@ func TestDeleteNoConflictRequest(t *testing.T) {
 	err = scaleSet.DeleteNodes([]*apiv1.Node{node})
 }
 
-func TestId(t *testing.T) {
+func TestScaleSetId(t *testing.T) {
 	provider := newTestProvider(t)
 	registered := provider.azureManager.RegisterNodeGroup(
 		newTestScaleSet(provider.azureManager, "test-asg"))
@@ -1080,7 +1080,7 @@ func TestId(t *testing.T) {
 	assert.Equal(t, provider.NodeGroups()[0].Id(), "test-asg")
 }
 
-func TestDebug(t *testing.T) {
+func TestAgentPoolDebug(t *testing.T) {
 	asg := ScaleSet{
 		manager: newTestAzureManager(t),
 		minSize: 5,
@@ -1159,7 +1159,7 @@ func TestScaleSetNodes(t *testing.T) {
 
 }
 
-func TestEnableVmssFlexNodesFlag(t *testing.T) {
+func TestScaleSetEnableVmssFlexNodesFlag(t *testing.T) {
 
 	// flag set to false
 	ctrl := gomock.NewController(t)
@@ -1191,7 +1191,7 @@ func TestEnableVmssFlexNodesFlag(t *testing.T) {
 	assert.NoError(t, err)
 }
 
-func TestTemplateNodeInfo(t *testing.T) {
+func TestScaleSetTemplateNodeInfo(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
 
@@ -1317,7 +1317,7 @@ func TestTemplateNodeInfo(t *testing.T) {
 	})
 
 }
-func TestCseErrors(t *testing.T) {
+func TestScaleSetCseErrors(t *testing.T) {
 	errorMessage := to.StringPtr("Error Message Test")
 	vmssVMs := compute.VirtualMachineScaleSetVM{
 		Name:       to.StringPtr("vmTest"),

cluster-autoscaler/cloudprovider/azure/azure_vms_pool.go

@@ -160,7 +160,7 @@ func (agentPool *VMsPool) Nodes() ([]cloudprovider.Instance, error) {
 
 	nodes := make([]cloudprovider.Instance, 0, len(vms))
 	for _, vm := range vms {
-		if len(*vm.ID) == 0 {
+		if vm.ID == nil || len(*vm.ID) == 0 {
 			continue
 		}
 		resourceID, err := convertResourceGroupNameToLower("azure://" + *vm.ID)