Skip to content

Commit d88d1ab

Browse files
adding ut and changing logging level
1 parent 8e1b388 commit d88d1ab

File tree

3 files changed

+44
-4
lines changed

3 files changed

+44
-4
lines changed

cluster-autoscaler/cloudprovider/azure/azure_agent_pool.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -429,14 +429,14 @@ func (as *AgentPool) DeleteInstances(instances []*azureRef) error {
429429
}
430430
}
431431

432-
klog.V(6).Infof("DeleteInstances: invalidating cache")
432+
klog.V(3).Infof("DeleteInstances: invalidating cache")
433433
as.manager.invalidateCache()
434434
return nil
435435
}
436436

437437
// DeleteNodes deletes the nodes from the group.
438438
func (as *AgentPool) DeleteNodes(nodes []*apiv1.Node) error {
439-
klog.V(6).Infof("Delete nodes requested: %v\n", nodes)
439+
klog.V(3).Infof("Delete nodes requested: %v\n", nodes)
440440
indexes, _, err := as.GetVMIndexes()
441441
if err != nil {
442442
return err

cluster-autoscaler/cloudprovider/azure/azure_agent_pool_test.go

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -410,6 +410,46 @@ func TestDeleteInstances(t *testing.T) {
410410
assert.Equal(t, expectedErr, err)
411411
}
412412

413+
func TestForceDeleteNodes(t *testing.T) {
414+
ctrl := gomock.NewController(t)
415+
defer ctrl.Finish()
416+
417+
as := newTestAgentPool(newTestAzureManager(t), "as")
418+
as1 := newTestAgentPool(newTestAzureManager(t), "as1")
419+
as.manager.azureCache.instanceToNodeGroup[azureRef{Name: testValidProviderID0}] = as
420+
as.manager.azureCache.instanceToNodeGroup[azureRef{Name: testValidProviderID1}] = as1
421+
as.manager.azureCache.instanceToNodeGroup[azureRef{Name: testInvalidProviderID}] = as
422+
423+
mockVMClient := mockvmclient.NewMockInterface(ctrl)
424+
as.manager.azClient.virtualMachinesClient = mockVMClient
425+
426+
mockSAClient := mockstorageaccountclient.NewMockInterface(ctrl)
427+
as.manager.azClient.storageAccountsClient = mockSAClient
428+
429+
err := as.ForceDeleteNodes([]*apiv1.Node{})
430+
assert.NoError(t, err)
431+
432+
nodes := []*apiv1.Node{
433+
{
434+
Spec: apiv1.NodeSpec{ProviderID: testInvalidProviderID},
435+
ObjectMeta: v1.ObjectMeta{Name: "node"},
436+
},
437+
}
438+
err = as.ForceDeleteNodes(nodes)
439+
expectedErr := fmt.Errorf("resource name was missing from identifier")
440+
assert.Equal(t, expectedErr, err)
441+
442+
nodes = []*apiv1.Node{
443+
{
444+
Spec: apiv1.NodeSpec{ProviderID: testValidProviderID1},
445+
ObjectMeta: v1.ObjectMeta{Name: "node1"},
446+
},
447+
}
448+
err = as.ForceDeleteNodes(nodes)
449+
expectedErr = fmt.Errorf("node1 belongs to a different asg than as")
450+
assert.Equal(t, expectedErr, err)
451+
}
452+
413453
func TestAgentPoolDeleteNodes(t *testing.T) {
414454
ctrl := gomock.NewController(t)
415455
defer ctrl.Finish()

cluster-autoscaler/cloudprovider/azure/azure_scale_set.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -589,7 +589,7 @@ func (scaleSet *ScaleSet) waitForDeleteInstances(future *azure.Future, requiredI
589589

590590
// DeleteNodes deletes the nodes from the group.
591591
func (scaleSet *ScaleSet) DeleteNodes(nodes []*apiv1.Node) error {
592-
klog.V(8).Infof("Delete nodes requested: %q\n", nodes)
592+
klog.V(3).Infof("Delete nodes requested: %q\n", nodes)
593593
size, err := scaleSet.getScaleSetSize()
594594
if err != nil {
595595
return err
@@ -603,7 +603,7 @@ func (scaleSet *ScaleSet) DeleteNodes(nodes []*apiv1.Node) error {
603603

604604
// ForceDeleteNodes deletes nodes from the group regardless of constraints.
605605
func (scaleSet *ScaleSet) ForceDeleteNodes(nodes []*apiv1.Node) error {
606-
klog.V(5).Infof("Delete nodes requested: %q\n", nodes)
606+
klog.V(3).Infof("Delete nodes requested: %q\n", nodes)
607607
refs := make([]*azureRef, 0, len(nodes))
608608
hasUnregisteredNodes := false
609609
for _, node := range nodes {

0 commit comments

Comments
 (0)