mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 20:24:09 +00:00
Tests fixes for Azure per-VMSS VMs caches
Signed-off-by: Benjamin Pineau <benjamin.pineau@datadoghq.com>
This commit is contained in:
parent
85ecd0e17c
commit
fcb3f1f64c
@ -98,7 +98,7 @@ func TestAttachDiskWithVMSS(t *testing.T) {
|
|||||||
assert.NoError(t, err, test.desc)
|
assert.NoError(t, err, test.desc)
|
||||||
testCloud := ss.cloud
|
testCloud := ss.cloud
|
||||||
testCloud.PrimaryScaleSetName = scaleSetName
|
testCloud.PrimaryScaleSetName = scaleSetName
|
||||||
expectedVMSS := buildTestVMSS(scaleSetName, []string{testLBBackendpoolID0}, false)
|
expectedVMSS := buildTestVMSSWithLB(scaleSetName, "vmss00-vm-", []string{testLBBackendpoolID0}, false)
|
||||||
mockVMSSClient := testCloud.VirtualMachineScaleSetsClient.(*mockvmssclient.MockInterface)
|
mockVMSSClient := testCloud.VirtualMachineScaleSetsClient.(*mockvmssclient.MockInterface)
|
||||||
mockVMSSClient.EXPECT().List(gomock.Any(), testCloud.ResourceGroup).Return([]compute.VirtualMachineScaleSet{expectedVMSS}, nil).AnyTimes()
|
mockVMSSClient.EXPECT().List(gomock.Any(), testCloud.ResourceGroup).Return([]compute.VirtualMachineScaleSet{expectedVMSS}, nil).AnyTimes()
|
||||||
mockVMSSClient.EXPECT().Get(gomock.Any(), testCloud.ResourceGroup, scaleSetName).Return(expectedVMSS, nil).MaxTimes(1)
|
mockVMSSClient.EXPECT().Get(gomock.Any(), testCloud.ResourceGroup, scaleSetName).Return(expectedVMSS, nil).MaxTimes(1)
|
||||||
@ -194,7 +194,7 @@ func TestDetachDiskWithVMSS(t *testing.T) {
|
|||||||
assert.NoError(t, err, test.desc)
|
assert.NoError(t, err, test.desc)
|
||||||
testCloud := ss.cloud
|
testCloud := ss.cloud
|
||||||
testCloud.PrimaryScaleSetName = scaleSetName
|
testCloud.PrimaryScaleSetName = scaleSetName
|
||||||
expectedVMSS := buildTestVMSS(scaleSetName, []string{testLBBackendpoolID0}, false)
|
expectedVMSS := buildTestVMSSWithLB(scaleSetName, "vmss00-vm-", []string{testLBBackendpoolID0}, false)
|
||||||
mockVMSSClient := testCloud.VirtualMachineScaleSetsClient.(*mockvmssclient.MockInterface)
|
mockVMSSClient := testCloud.VirtualMachineScaleSetsClient.(*mockvmssclient.MockInterface)
|
||||||
mockVMSSClient.EXPECT().List(gomock.Any(), testCloud.ResourceGroup).Return([]compute.VirtualMachineScaleSet{expectedVMSS}, nil).AnyTimes()
|
mockVMSSClient.EXPECT().List(gomock.Any(), testCloud.ResourceGroup).Return([]compute.VirtualMachineScaleSet{expectedVMSS}, nil).AnyTimes()
|
||||||
mockVMSSClient.EXPECT().Get(gomock.Any(), testCloud.ResourceGroup, scaleSetName).Return(expectedVMSS, nil).MaxTimes(1)
|
mockVMSSClient.EXPECT().Get(gomock.Any(), testCloud.ResourceGroup, scaleSetName).Return(expectedVMSS, nil).MaxTimes(1)
|
||||||
@ -297,7 +297,7 @@ func TestGetDataDisksWithVMSS(t *testing.T) {
|
|||||||
assert.NoError(t, err, test.desc)
|
assert.NoError(t, err, test.desc)
|
||||||
testCloud := ss.cloud
|
testCloud := ss.cloud
|
||||||
testCloud.PrimaryScaleSetName = scaleSetName
|
testCloud.PrimaryScaleSetName = scaleSetName
|
||||||
expectedVMSS := buildTestVMSS(scaleSetName, []string{testLBBackendpoolID0}, false)
|
expectedVMSS := buildTestVMSSWithLB(scaleSetName, "vmss00-vm-", []string{testLBBackendpoolID0}, false)
|
||||||
mockVMSSClient := testCloud.VirtualMachineScaleSetsClient.(*mockvmssclient.MockInterface)
|
mockVMSSClient := testCloud.VirtualMachineScaleSetsClient.(*mockvmssclient.MockInterface)
|
||||||
mockVMSSClient.EXPECT().List(gomock.Any(), testCloud.ResourceGroup).Return([]compute.VirtualMachineScaleSet{expectedVMSS}, nil).AnyTimes()
|
mockVMSSClient.EXPECT().List(gomock.Any(), testCloud.ResourceGroup).Return([]compute.VirtualMachineScaleSet{expectedVMSS}, nil).AnyTimes()
|
||||||
mockVMSSClient.EXPECT().Get(gomock.Any(), testCloud.ResourceGroup, scaleSetName).Return(expectedVMSS, nil).MaxTimes(1)
|
mockVMSSClient.EXPECT().Get(gomock.Any(), testCloud.ResourceGroup, scaleSetName).Return(expectedVMSS, nil).MaxTimes(1)
|
||||||
|
@ -91,12 +91,7 @@ func TestVMSSVMCache(t *testing.T) {
|
|||||||
ss.cloud.VirtualMachineScaleSetsClient = mockVMSSClient
|
ss.cloud.VirtualMachineScaleSetsClient = mockVMSSClient
|
||||||
ss.cloud.VirtualMachineScaleSetVMsClient = mockVMSSVMClient
|
ss.cloud.VirtualMachineScaleSetVMsClient = mockVMSSVMClient
|
||||||
|
|
||||||
expectedScaleSet := compute.VirtualMachineScaleSet{
|
expectedScaleSet := buildTestVMSS(vmssName, "vmssee6c2")
|
||||||
Name: &vmssName,
|
|
||||||
VirtualMachineScaleSetProperties: &compute.VirtualMachineScaleSetProperties{
|
|
||||||
VirtualMachineProfile: &compute.VirtualMachineScaleSetVMProfile{},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
mockVMSSClient.EXPECT().List(gomock.Any(), gomock.Any()).Return([]compute.VirtualMachineScaleSet{expectedScaleSet}, nil).AnyTimes()
|
mockVMSSClient.EXPECT().List(gomock.Any(), gomock.Any()).Return([]compute.VirtualMachineScaleSet{expectedScaleSet}, nil).AnyTimes()
|
||||||
|
|
||||||
expectedVMs, _, _ := buildTestVirtualMachineEnv(ss.cloud, vmssName, "", 0, vmList, "", false)
|
expectedVMs, _, _ := buildTestVirtualMachineEnv(ss.cloud, vmssName, "", 0, vmList, "", false)
|
||||||
@ -120,7 +115,9 @@ func TestVMSSVMCache(t *testing.T) {
|
|||||||
assert.NoError(t, err)
|
assert.NoError(t, err)
|
||||||
|
|
||||||
// the VM should be removed from cache after deleteCacheForNode().
|
// the VM should be removed from cache after deleteCacheForNode().
|
||||||
cached, err := ss.vmssVMCache.Get(vmssVirtualMachinesKey, azcache.CacheReadTypeDefault)
|
cacheKey, cache, err := ss.getVMSSVMCache("rg", vmssName)
|
||||||
|
assert.NoError(t, err)
|
||||||
|
cached, err := cache.Get(cacheKey, azcache.CacheReadTypeDefault)
|
||||||
assert.NoError(t, err)
|
assert.NoError(t, err)
|
||||||
cachedVirtualMachines := cached.(*sync.Map)
|
cachedVirtualMachines := cached.(*sync.Map)
|
||||||
_, ok := cachedVirtualMachines.Load(vmName)
|
_, ok := cachedVirtualMachines.Load(vmName)
|
||||||
|
@ -67,7 +67,7 @@ func newTestScaleSetWithState(ctrl *gomock.Controller) (*scaleSet, error) {
|
|||||||
return ss.(*scaleSet), nil
|
return ss.(*scaleSet), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func buildTestVMSS(name string, lbBackendpoolIDs []string, ipv6 bool) compute.VirtualMachineScaleSet {
|
func buildTestVMSSWithLB(name, namePrefix string, lbBackendpoolIDs []string, ipv6 bool) compute.VirtualMachineScaleSet {
|
||||||
lbBackendpools := make([]compute.SubResource, 0)
|
lbBackendpools := make([]compute.SubResource, 0)
|
||||||
for _, id := range lbBackendpoolIDs {
|
for _, id := range lbBackendpoolIDs {
|
||||||
lbBackendpools = append(lbBackendpools, compute.SubResource{ID: to.StringPtr(id)})
|
lbBackendpools = append(lbBackendpools, compute.SubResource{ID: to.StringPtr(id)})
|
||||||
@ -93,6 +93,9 @@ func buildTestVMSS(name string, lbBackendpoolIDs []string, ipv6 bool) compute.Vi
|
|||||||
VirtualMachineScaleSetProperties: &compute.VirtualMachineScaleSetProperties{
|
VirtualMachineScaleSetProperties: &compute.VirtualMachineScaleSetProperties{
|
||||||
ProvisioningState: to.StringPtr("Running"),
|
ProvisioningState: to.StringPtr("Running"),
|
||||||
VirtualMachineProfile: &compute.VirtualMachineScaleSetVMProfile{
|
VirtualMachineProfile: &compute.VirtualMachineScaleSetVMProfile{
|
||||||
|
OsProfile: &compute.VirtualMachineScaleSetOSProfile{
|
||||||
|
ComputerNamePrefix: &namePrefix,
|
||||||
|
},
|
||||||
NetworkProfile: &compute.VirtualMachineScaleSetNetworkProfile{
|
NetworkProfile: &compute.VirtualMachineScaleSetNetworkProfile{
|
||||||
NetworkInterfaceConfigurations: &[]compute.VirtualMachineScaleSetNetworkConfiguration{
|
NetworkInterfaceConfigurations: &[]compute.VirtualMachineScaleSetNetworkConfiguration{
|
||||||
{
|
{
|
||||||
@ -110,6 +113,19 @@ func buildTestVMSS(name string, lbBackendpoolIDs []string, ipv6 bool) compute.Vi
|
|||||||
return expectedVMSS
|
return expectedVMSS
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func buildTestVMSS(name, computerNamePrefix string) compute.VirtualMachineScaleSet {
|
||||||
|
return compute.VirtualMachineScaleSet{
|
||||||
|
Name: &name,
|
||||||
|
VirtualMachineScaleSetProperties: &compute.VirtualMachineScaleSetProperties{
|
||||||
|
VirtualMachineProfile: &compute.VirtualMachineScaleSetVMProfile{
|
||||||
|
OsProfile: &compute.VirtualMachineScaleSetOSProfile{
|
||||||
|
ComputerNamePrefix: &computerNamePrefix,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func buildTestVirtualMachineEnv(ss *Cloud, scaleSetName, zone string, faultDomain int32, vmList []string, state string, isIPv6 bool) ([]compute.VirtualMachineScaleSetVM, network.Interface, network.PublicIPAddress) {
|
func buildTestVirtualMachineEnv(ss *Cloud, scaleSetName, zone string, faultDomain int32, vmList []string, state string, isIPv6 bool) ([]compute.VirtualMachineScaleSetVM, network.Interface, network.PublicIPAddress) {
|
||||||
expectedVMSSVMs := make([]compute.VirtualMachineScaleSetVM, 0)
|
expectedVMSSVMs := make([]compute.VirtualMachineScaleSetVM, 0)
|
||||||
expectedInterface := network.Interface{}
|
expectedInterface := network.Interface{}
|
||||||
@ -261,6 +277,82 @@ func TestGetScaleSetVMInstanceID(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestGetNodeIdentityByNodeName(t *testing.T) {
|
||||||
|
ctrl := gomock.NewController(t)
|
||||||
|
defer ctrl.Finish()
|
||||||
|
|
||||||
|
testCases := []struct {
|
||||||
|
description string
|
||||||
|
vmList []string
|
||||||
|
nodeName string
|
||||||
|
expected *nodeIdentity
|
||||||
|
scaleSet string
|
||||||
|
computerName string
|
||||||
|
expectError bool
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
description: "scaleSet should get node identity by node name",
|
||||||
|
vmList: []string{"vmssee6c2000000", "vmssee6c2000001"},
|
||||||
|
nodeName: "vmssee6c2000001",
|
||||||
|
scaleSet: "vmssee6c2",
|
||||||
|
computerName: "vmssee6c2",
|
||||||
|
expected: &nodeIdentity{"rg", "vmssee6c2", "vmssee6c2000001"},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
description: "scaleSet should get node identity when computerNamePrefix differs from vmss name",
|
||||||
|
vmList: []string{"vmssee6c2000000", "vmssee6c2000001"},
|
||||||
|
nodeName: "vmssee6c2000001",
|
||||||
|
scaleSet: "ss",
|
||||||
|
computerName: "vmssee6c2",
|
||||||
|
expected: &nodeIdentity{"rg", "ss", "vmssee6c2000001"},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
description: "scaleSet should get node identity by node name with upper cases hostname",
|
||||||
|
vmList: []string{"VMSSEE6C2000000", "VMSSEE6C2000001"},
|
||||||
|
nodeName: "vmssee6c2000001",
|
||||||
|
scaleSet: "ss",
|
||||||
|
computerName: "vmssee6c2",
|
||||||
|
expected: &nodeIdentity{"rg", "ss", "vmssee6c2000001"},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
description: "scaleSet should not get node identity for non-existing nodes",
|
||||||
|
vmList: []string{"vmssee6c2000000", "vmssee6c2000001"},
|
||||||
|
nodeName: "agente6c2000005",
|
||||||
|
scaleSet: "ss",
|
||||||
|
computerName: "vmssee6c2",
|
||||||
|
expectError: true,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, test := range testCases {
|
||||||
|
ss, err := newTestScaleSet(ctrl)
|
||||||
|
assert.NoError(t, err, test.description)
|
||||||
|
|
||||||
|
mockVMSSClient := mockvmssclient.NewMockInterface(ctrl)
|
||||||
|
mockVMSSVMClient := mockvmssvmclient.NewMockInterface(ctrl)
|
||||||
|
ss.cloud.VirtualMachineScaleSetsClient = mockVMSSClient
|
||||||
|
ss.cloud.VirtualMachineScaleSetVMsClient = mockVMSSVMClient
|
||||||
|
|
||||||
|
expectedScaleSet := buildTestVMSS(test.scaleSet, test.computerName)
|
||||||
|
mockVMSSClient.EXPECT().List(gomock.Any(), gomock.Any()).Return([]compute.VirtualMachineScaleSet{expectedScaleSet}, nil).AnyTimes()
|
||||||
|
|
||||||
|
expectedVMs, _, _ := buildTestVirtualMachineEnv(ss.cloud, test.scaleSet, "", 0, test.vmList, "", false)
|
||||||
|
mockVMSSVMClient.EXPECT().List(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return(expectedVMs, nil).AnyTimes()
|
||||||
|
|
||||||
|
mockVMsClient := ss.cloud.VirtualMachinesClient.(*mockvmclient.MockInterface)
|
||||||
|
mockVMsClient.EXPECT().List(gomock.Any(), gomock.Any()).Return([]compute.VirtualMachine{}, nil).AnyTimes()
|
||||||
|
|
||||||
|
nodeID, err := ss.getNodeIdentityByNodeName(test.nodeName, azcache.CacheReadTypeDefault)
|
||||||
|
if test.expectError {
|
||||||
|
assert.Error(t, err, test.description)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
assert.NoError(t, err, test.description)
|
||||||
|
assert.Equal(t, test.expected, nodeID, test.description)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func TestGetInstanceIDByNodeName(t *testing.T) {
|
func TestGetInstanceIDByNodeName(t *testing.T) {
|
||||||
ctrl := gomock.NewController(t)
|
ctrl := gomock.NewController(t)
|
||||||
defer ctrl.Finish()
|
defer ctrl.Finish()
|
||||||
@ -305,12 +397,7 @@ func TestGetInstanceIDByNodeName(t *testing.T) {
|
|||||||
ss.cloud.VirtualMachineScaleSetsClient = mockVMSSClient
|
ss.cloud.VirtualMachineScaleSetsClient = mockVMSSClient
|
||||||
ss.cloud.VirtualMachineScaleSetVMsClient = mockVMSSVMClient
|
ss.cloud.VirtualMachineScaleSetVMsClient = mockVMSSVMClient
|
||||||
|
|
||||||
expectedScaleSet := compute.VirtualMachineScaleSet{
|
expectedScaleSet := buildTestVMSS(test.scaleSet, "vmssee6c2")
|
||||||
Name: &test.scaleSet,
|
|
||||||
VirtualMachineScaleSetProperties: &compute.VirtualMachineScaleSetProperties{
|
|
||||||
VirtualMachineProfile: &compute.VirtualMachineScaleSetVMProfile{},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
mockVMSSClient.EXPECT().List(gomock.Any(), gomock.Any()).Return([]compute.VirtualMachineScaleSet{expectedScaleSet}, nil).AnyTimes()
|
mockVMSSClient.EXPECT().List(gomock.Any(), gomock.Any()).Return([]compute.VirtualMachineScaleSet{expectedScaleSet}, nil).AnyTimes()
|
||||||
|
|
||||||
expectedVMs, _, _ := buildTestVirtualMachineEnv(ss.cloud, test.scaleSet, "", 0, test.vmList, "", false)
|
expectedVMs, _, _ := buildTestVirtualMachineEnv(ss.cloud, test.scaleSet, "", 0, test.vmList, "", false)
|
||||||
@ -395,12 +482,7 @@ func TestGetZoneByNodeName(t *testing.T) {
|
|||||||
ss.cloud.VirtualMachineScaleSetsClient = mockVMSSClient
|
ss.cloud.VirtualMachineScaleSetsClient = mockVMSSClient
|
||||||
ss.cloud.VirtualMachineScaleSetVMsClient = mockVMSSVMClient
|
ss.cloud.VirtualMachineScaleSetVMsClient = mockVMSSVMClient
|
||||||
|
|
||||||
expectedScaleSet := compute.VirtualMachineScaleSet{
|
expectedScaleSet := buildTestVMSS(test.scaleSet, "vmssee6c2")
|
||||||
Name: &test.scaleSet,
|
|
||||||
VirtualMachineScaleSetProperties: &compute.VirtualMachineScaleSetProperties{
|
|
||||||
VirtualMachineProfile: &compute.VirtualMachineScaleSetVMProfile{},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
mockVMSSClient.EXPECT().List(gomock.Any(), gomock.Any()).Return([]compute.VirtualMachineScaleSet{expectedScaleSet}, nil).AnyTimes()
|
mockVMSSClient.EXPECT().List(gomock.Any(), gomock.Any()).Return([]compute.VirtualMachineScaleSet{expectedScaleSet}, nil).AnyTimes()
|
||||||
|
|
||||||
expectedVMs, _, _ := buildTestVirtualMachineEnv(ss.cloud, test.scaleSet, test.zone, test.faultDomain, test.vmList, "", false)
|
expectedVMs, _, _ := buildTestVirtualMachineEnv(ss.cloud, test.scaleSet, test.zone, test.faultDomain, test.vmList, "", false)
|
||||||
@ -462,12 +544,7 @@ func TestGetIPByNodeName(t *testing.T) {
|
|||||||
ss.cloud.InterfacesClient = mockInterfaceClient
|
ss.cloud.InterfacesClient = mockInterfaceClient
|
||||||
ss.cloud.PublicIPAddressesClient = mockPIPClient
|
ss.cloud.PublicIPAddressesClient = mockPIPClient
|
||||||
|
|
||||||
expectedScaleSet := compute.VirtualMachineScaleSet{
|
expectedScaleSet := buildTestVMSS(test.scaleSet, "vmssee6c2")
|
||||||
Name: &test.scaleSet,
|
|
||||||
VirtualMachineScaleSetProperties: &compute.VirtualMachineScaleSetProperties{
|
|
||||||
VirtualMachineProfile: &compute.VirtualMachineScaleSetVMProfile{},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
mockVMSSClient.EXPECT().List(gomock.Any(), gomock.Any()).Return([]compute.VirtualMachineScaleSet{expectedScaleSet}, nil).AnyTimes()
|
mockVMSSClient.EXPECT().List(gomock.Any(), gomock.Any()).Return([]compute.VirtualMachineScaleSet{expectedScaleSet}, nil).AnyTimes()
|
||||||
|
|
||||||
expectedVMs, expectedInterface, expectedPIP := buildTestVirtualMachineEnv(ss.cloud, test.scaleSet, "", 0, test.vmList, "", false)
|
expectedVMs, expectedInterface, expectedPIP := buildTestVirtualMachineEnv(ss.cloud, test.scaleSet, "", 0, test.vmList, "", false)
|
||||||
@ -535,12 +612,7 @@ func TestGetNodeNameByIPConfigurationID(t *testing.T) {
|
|||||||
ss.cloud.VirtualMachineScaleSetsClient = mockVMSSClient
|
ss.cloud.VirtualMachineScaleSetsClient = mockVMSSClient
|
||||||
ss.cloud.VirtualMachineScaleSetVMsClient = mockVMSSVMClient
|
ss.cloud.VirtualMachineScaleSetVMsClient = mockVMSSVMClient
|
||||||
|
|
||||||
expectedScaleSet := compute.VirtualMachineScaleSet{
|
expectedScaleSet := buildTestVMSS(test.scaleSet, "vmssee6c2")
|
||||||
Name: &test.scaleSet,
|
|
||||||
VirtualMachineScaleSetProperties: &compute.VirtualMachineScaleSetProperties{
|
|
||||||
VirtualMachineProfile: &compute.VirtualMachineScaleSetVMProfile{},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
mockVMSSClient.EXPECT().List(gomock.Any(), gomock.Any()).Return([]compute.VirtualMachineScaleSet{expectedScaleSet}, nil).AnyTimes()
|
mockVMSSClient.EXPECT().List(gomock.Any(), gomock.Any()).Return([]compute.VirtualMachineScaleSet{expectedScaleSet}, nil).AnyTimes()
|
||||||
|
|
||||||
expectedVMs, _, _ := buildTestVirtualMachineEnv(ss.cloud, test.scaleSet, "", 0, test.vmList, "", false)
|
expectedVMs, _, _ := buildTestVirtualMachineEnv(ss.cloud, test.scaleSet, "", 0, test.vmList, "", false)
|
||||||
@ -679,12 +751,7 @@ func TestGetVmssVM(t *testing.T) {
|
|||||||
ss, err := newTestScaleSet(ctrl)
|
ss, err := newTestScaleSet(ctrl)
|
||||||
assert.NoError(t, err, test.description)
|
assert.NoError(t, err, test.description)
|
||||||
|
|
||||||
expectedVMSS := compute.VirtualMachineScaleSet{
|
expectedVMSS := buildTestVMSS(test.existedVMSSName, "vmss-vm-")
|
||||||
Name: to.StringPtr(test.existedVMSSName),
|
|
||||||
VirtualMachineScaleSetProperties: &compute.VirtualMachineScaleSetProperties{
|
|
||||||
VirtualMachineProfile: &compute.VirtualMachineScaleSetVMProfile{},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
mockVMSSClient := ss.cloud.VirtualMachineScaleSetsClient.(*mockvmssclient.MockInterface)
|
mockVMSSClient := ss.cloud.VirtualMachineScaleSetsClient.(*mockvmssclient.MockInterface)
|
||||||
mockVMSSClient.EXPECT().List(gomock.Any(), ss.ResourceGroup).Return([]compute.VirtualMachineScaleSet{expectedVMSS}, nil).AnyTimes()
|
mockVMSSClient.EXPECT().List(gomock.Any(), ss.ResourceGroup).Return([]compute.VirtualMachineScaleSet{expectedVMSS}, nil).AnyTimes()
|
||||||
|
|
||||||
@ -735,12 +802,7 @@ func TestGetPowerStatusByNodeName(t *testing.T) {
|
|||||||
ss, err := newTestScaleSet(ctrl)
|
ss, err := newTestScaleSet(ctrl)
|
||||||
assert.NoError(t, err, "unexpected error when creating test VMSS")
|
assert.NoError(t, err, "unexpected error when creating test VMSS")
|
||||||
|
|
||||||
expectedVMSS := compute.VirtualMachineScaleSet{
|
expectedVMSS := buildTestVMSS(testVMSSName, "vmss-vm-")
|
||||||
Name: to.StringPtr(testVMSSName),
|
|
||||||
VirtualMachineScaleSetProperties: &compute.VirtualMachineScaleSetProperties{
|
|
||||||
VirtualMachineProfile: &compute.VirtualMachineScaleSetVMProfile{},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
mockVMSSClient := ss.cloud.VirtualMachineScaleSetsClient.(*mockvmssclient.MockInterface)
|
mockVMSSClient := ss.cloud.VirtualMachineScaleSetsClient.(*mockvmssclient.MockInterface)
|
||||||
mockVMSSClient.EXPECT().List(gomock.Any(), ss.ResourceGroup).Return([]compute.VirtualMachineScaleSet{expectedVMSS}, nil).AnyTimes()
|
mockVMSSClient.EXPECT().List(gomock.Any(), ss.ResourceGroup).Return([]compute.VirtualMachineScaleSet{expectedVMSS}, nil).AnyTimes()
|
||||||
|
|
||||||
@ -829,12 +891,7 @@ func TestGetInstanceTypeByNodeName(t *testing.T) {
|
|||||||
ss, err := newTestScaleSet(ctrl)
|
ss, err := newTestScaleSet(ctrl)
|
||||||
assert.NoError(t, err, "unexpected error when creating test VMSS")
|
assert.NoError(t, err, "unexpected error when creating test VMSS")
|
||||||
|
|
||||||
expectedVMSS := compute.VirtualMachineScaleSet{
|
expectedVMSS := buildTestVMSS(testVMSSName, "vmss-vm-")
|
||||||
Name: to.StringPtr(testVMSSName),
|
|
||||||
VirtualMachineScaleSetProperties: &compute.VirtualMachineScaleSetProperties{
|
|
||||||
VirtualMachineProfile: &compute.VirtualMachineScaleSetVMProfile{},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
mockVMSSClient := ss.cloud.VirtualMachineScaleSetsClient.(*mockvmssclient.MockInterface)
|
mockVMSSClient := ss.cloud.VirtualMachineScaleSetsClient.(*mockvmssclient.MockInterface)
|
||||||
mockVMSSClient.EXPECT().List(gomock.Any(), ss.ResourceGroup).Return([]compute.VirtualMachineScaleSet{expectedVMSS}, nil).AnyTimes()
|
mockVMSSClient.EXPECT().List(gomock.Any(), ss.ResourceGroup).Return([]compute.VirtualMachineScaleSet{expectedVMSS}, nil).AnyTimes()
|
||||||
|
|
||||||
@ -987,11 +1044,7 @@ func TestGetPrimaryInterface(t *testing.T) {
|
|||||||
ss, err := newTestScaleSet(ctrl)
|
ss, err := newTestScaleSet(ctrl)
|
||||||
assert.NoError(t, err, "unexpected error when creating test VMSS")
|
assert.NoError(t, err, "unexpected error when creating test VMSS")
|
||||||
|
|
||||||
expectedVMSS := compute.VirtualMachineScaleSet{
|
expectedVMSS := buildTestVMSS(testVMSSName, "vmss-vm-")
|
||||||
Name: to.StringPtr(testVMSSName),
|
|
||||||
VirtualMachineScaleSetProperties: &compute.VirtualMachineScaleSetProperties{
|
|
||||||
VirtualMachineProfile: &compute.VirtualMachineScaleSetVMProfile{}},
|
|
||||||
}
|
|
||||||
mockVMSSClient := ss.cloud.VirtualMachineScaleSetsClient.(*mockvmssclient.MockInterface)
|
mockVMSSClient := ss.cloud.VirtualMachineScaleSetsClient.(*mockvmssclient.MockInterface)
|
||||||
mockVMSSClient.EXPECT().List(gomock.Any(), ss.ResourceGroup).Return([]compute.VirtualMachineScaleSet{expectedVMSS}, test.vmssClientErr).AnyTimes()
|
mockVMSSClient.EXPECT().List(gomock.Any(), ss.ResourceGroup).Return([]compute.VirtualMachineScaleSet{expectedVMSS}, test.vmssClientErr).AnyTimes()
|
||||||
|
|
||||||
@ -1114,12 +1167,7 @@ func TestGetPrivateIPsByNodeName(t *testing.T) {
|
|||||||
ss, err := newTestScaleSet(ctrl)
|
ss, err := newTestScaleSet(ctrl)
|
||||||
assert.NoError(t, err, "unexpected error when creating test VMSS")
|
assert.NoError(t, err, "unexpected error when creating test VMSS")
|
||||||
|
|
||||||
expectedVMSS := compute.VirtualMachineScaleSet{
|
expectedVMSS := buildTestVMSS(testVMSSName, "vmss-vm-")
|
||||||
Name: to.StringPtr(testVMSSName),
|
|
||||||
VirtualMachineScaleSetProperties: &compute.VirtualMachineScaleSetProperties{
|
|
||||||
VirtualMachineProfile: &compute.VirtualMachineScaleSetVMProfile{},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
mockVMSSClient := ss.cloud.VirtualMachineScaleSetsClient.(*mockvmssclient.MockInterface)
|
mockVMSSClient := ss.cloud.VirtualMachineScaleSetsClient.(*mockvmssclient.MockInterface)
|
||||||
mockVMSSClient.EXPECT().List(gomock.Any(), ss.ResourceGroup).Return([]compute.VirtualMachineScaleSet{expectedVMSS}, nil).AnyTimes()
|
mockVMSSClient.EXPECT().List(gomock.Any(), ss.ResourceGroup).Return([]compute.VirtualMachineScaleSet{expectedVMSS}, nil).AnyTimes()
|
||||||
|
|
||||||
@ -1318,12 +1366,7 @@ func TestGetAgentPoolScaleSets(t *testing.T) {
|
|||||||
ss, err := newTestScaleSet(ctrl)
|
ss, err := newTestScaleSet(ctrl)
|
||||||
assert.NoError(t, err, "unexpected error when creating test VMSS")
|
assert.NoError(t, err, "unexpected error when creating test VMSS")
|
||||||
|
|
||||||
expectedVMSS := compute.VirtualMachineScaleSet{
|
expectedVMSS := buildTestVMSS(testVMSSName, "vmss-vm-")
|
||||||
Name: to.StringPtr(testVMSSName),
|
|
||||||
VirtualMachineScaleSetProperties: &compute.VirtualMachineScaleSetProperties{
|
|
||||||
VirtualMachineProfile: &compute.VirtualMachineScaleSetVMProfile{},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
mockVMSSClient := ss.cloud.VirtualMachineScaleSetsClient.(*mockvmssclient.MockInterface)
|
mockVMSSClient := ss.cloud.VirtualMachineScaleSetsClient.(*mockvmssclient.MockInterface)
|
||||||
mockVMSSClient.EXPECT().List(gomock.Any(), ss.ResourceGroup).Return([]compute.VirtualMachineScaleSet{expectedVMSS}, nil).AnyTimes()
|
mockVMSSClient.EXPECT().List(gomock.Any(), ss.ResourceGroup).Return([]compute.VirtualMachineScaleSet{expectedVMSS}, nil).AnyTimes()
|
||||||
|
|
||||||
@ -1419,12 +1462,7 @@ func TestGetVMSetNames(t *testing.T) {
|
|||||||
ss, err := newTestScaleSet(ctrl)
|
ss, err := newTestScaleSet(ctrl)
|
||||||
assert.NoError(t, err, "unexpected error when creating test VMSS")
|
assert.NoError(t, err, "unexpected error when creating test VMSS")
|
||||||
|
|
||||||
expectedVMSS := compute.VirtualMachineScaleSet{
|
expectedVMSS := buildTestVMSS(testVMSSName, "vmss-vm-")
|
||||||
Name: to.StringPtr(testVMSSName),
|
|
||||||
VirtualMachineScaleSetProperties: &compute.VirtualMachineScaleSetProperties{
|
|
||||||
VirtualMachineProfile: &compute.VirtualMachineScaleSetVMProfile{},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
mockVMSSClient := ss.cloud.VirtualMachineScaleSetsClient.(*mockvmssclient.MockInterface)
|
mockVMSSClient := ss.cloud.VirtualMachineScaleSetsClient.(*mockvmssclient.MockInterface)
|
||||||
mockVMSSClient.EXPECT().List(gomock.Any(), ss.ResourceGroup).Return([]compute.VirtualMachineScaleSet{expectedVMSS}, nil).AnyTimes()
|
mockVMSSClient.EXPECT().List(gomock.Any(), ss.ResourceGroup).Return([]compute.VirtualMachineScaleSet{expectedVMSS}, nil).AnyTimes()
|
||||||
|
|
||||||
@ -1703,12 +1741,7 @@ func TestEnsureHostInPool(t *testing.T) {
|
|||||||
ss.LoadBalancerSku = loadBalancerSkuStandard
|
ss.LoadBalancerSku = loadBalancerSkuStandard
|
||||||
}
|
}
|
||||||
|
|
||||||
expectedVMSS := compute.VirtualMachineScaleSet{
|
expectedVMSS := buildTestVMSS(testVMSSName, "vmss-vm-")
|
||||||
Name: to.StringPtr(testVMSSName),
|
|
||||||
VirtualMachineScaleSetProperties: &compute.VirtualMachineScaleSetProperties{
|
|
||||||
VirtualMachineProfile: &compute.VirtualMachineScaleSetVMProfile{},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
mockVMSSClient := ss.cloud.VirtualMachineScaleSetsClient.(*mockvmssclient.MockInterface)
|
mockVMSSClient := ss.cloud.VirtualMachineScaleSetsClient.(*mockvmssclient.MockInterface)
|
||||||
mockVMSSClient.EXPECT().List(gomock.Any(), ss.ResourceGroup).Return([]compute.VirtualMachineScaleSet{expectedVMSS}, nil).AnyTimes()
|
mockVMSSClient.EXPECT().List(gomock.Any(), ss.ResourceGroup).Return([]compute.VirtualMachineScaleSet{expectedVMSS}, nil).AnyTimes()
|
||||||
|
|
||||||
@ -1876,7 +1909,7 @@ func TestEnsureVMSSInPool(t *testing.T) {
|
|||||||
ss.LoadBalancerSku = loadBalancerSkuStandard
|
ss.LoadBalancerSku = loadBalancerSkuStandard
|
||||||
}
|
}
|
||||||
|
|
||||||
expectedVMSS := buildTestVMSS(testVMSSName, []string{testLBBackendpoolID0}, test.setIPv6Config)
|
expectedVMSS := buildTestVMSSWithLB(testVMSSName, "vmss-vm-", []string{testLBBackendpoolID0}, test.setIPv6Config)
|
||||||
if test.isVMSSDeallocating {
|
if test.isVMSSDeallocating {
|
||||||
expectedVMSS.ProvisioningState = &virtualMachineScaleSetsDeallocating
|
expectedVMSS.ProvisioningState = &virtualMachineScaleSetsDeallocating
|
||||||
}
|
}
|
||||||
@ -1973,7 +2006,7 @@ func TestEnsureHostsInPool(t *testing.T) {
|
|||||||
ss.LoadBalancerSku = loadBalancerSkuStandard
|
ss.LoadBalancerSku = loadBalancerSkuStandard
|
||||||
ss.ExcludeMasterFromStandardLB = to.BoolPtr(true)
|
ss.ExcludeMasterFromStandardLB = to.BoolPtr(true)
|
||||||
|
|
||||||
expectedVMSS := buildTestVMSS(testVMSSName, []string{testLBBackendpoolID0}, false)
|
expectedVMSS := buildTestVMSSWithLB(testVMSSName, "vmss-vm-", []string{testLBBackendpoolID0}, false)
|
||||||
mockVMSSClient := ss.cloud.VirtualMachineScaleSetsClient.(*mockvmssclient.MockInterface)
|
mockVMSSClient := ss.cloud.VirtualMachineScaleSetsClient.(*mockvmssclient.MockInterface)
|
||||||
mockVMSSClient.EXPECT().List(gomock.Any(), ss.ResourceGroup).Return([]compute.VirtualMachineScaleSet{expectedVMSS}, nil).AnyTimes()
|
mockVMSSClient.EXPECT().List(gomock.Any(), ss.ResourceGroup).Return([]compute.VirtualMachineScaleSet{expectedVMSS}, nil).AnyTimes()
|
||||||
mockVMSSClient.EXPECT().Get(gomock.Any(), ss.ResourceGroup, testVMSSName).Return(expectedVMSS, nil).MaxTimes(1)
|
mockVMSSClient.EXPECT().Get(gomock.Any(), ss.ResourceGroup, testVMSSName).Return(expectedVMSS, nil).MaxTimes(1)
|
||||||
@ -2061,12 +2094,7 @@ func TestEnsureBackendPoolDeletedFromNode(t *testing.T) {
|
|||||||
ss, err := newTestScaleSet(ctrl)
|
ss, err := newTestScaleSet(ctrl)
|
||||||
assert.NoError(t, err, test.description)
|
assert.NoError(t, err, test.description)
|
||||||
|
|
||||||
expectedVMSS := compute.VirtualMachineScaleSet{
|
expectedVMSS := buildTestVMSS(testVMSSName, "vmss-vm-")
|
||||||
Name: to.StringPtr(testVMSSName),
|
|
||||||
VirtualMachineScaleSetProperties: &compute.VirtualMachineScaleSetProperties{
|
|
||||||
VirtualMachineProfile: &compute.VirtualMachineScaleSetVMProfile{},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
mockVMSSClient := ss.cloud.VirtualMachineScaleSetsClient.(*mockvmssclient.MockInterface)
|
mockVMSSClient := ss.cloud.VirtualMachineScaleSetsClient.(*mockvmssclient.MockInterface)
|
||||||
mockVMSSClient.EXPECT().List(gomock.Any(), ss.ResourceGroup).Return([]compute.VirtualMachineScaleSet{expectedVMSS}, nil).AnyTimes()
|
mockVMSSClient.EXPECT().List(gomock.Any(), ss.ResourceGroup).Return([]compute.VirtualMachineScaleSet{expectedVMSS}, nil).AnyTimes()
|
||||||
|
|
||||||
@ -2155,7 +2183,7 @@ func TestEnsureBackendPoolDeletedFromVMSS(t *testing.T) {
|
|||||||
|
|
||||||
ss.LoadBalancerSku = loadBalancerSkuStandard
|
ss.LoadBalancerSku = loadBalancerSkuStandard
|
||||||
|
|
||||||
expectedVMSS := buildTestVMSS(testVMSSName, []string{testLBBackendpoolID0}, false)
|
expectedVMSS := buildTestVMSSWithLB(testVMSSName, "vmss-vm-", []string{testLBBackendpoolID0}, false)
|
||||||
if test.isVMSSDeallocating {
|
if test.isVMSSDeallocating {
|
||||||
expectedVMSS.ProvisioningState = &virtualMachineScaleSetsDeallocating
|
expectedVMSS.ProvisioningState = &virtualMachineScaleSetsDeallocating
|
||||||
}
|
}
|
||||||
@ -2249,7 +2277,7 @@ func TestEnsureBackendPoolDeleted(t *testing.T) {
|
|||||||
ss, err := newTestScaleSet(ctrl)
|
ss, err := newTestScaleSet(ctrl)
|
||||||
assert.NoError(t, err, test.description)
|
assert.NoError(t, err, test.description)
|
||||||
|
|
||||||
expectedVMSS := buildTestVMSS(testVMSSName, []string{testLBBackendpoolID0}, false)
|
expectedVMSS := buildTestVMSSWithLB(testVMSSName, "vmss-vm-", []string{testLBBackendpoolID0}, false)
|
||||||
mockVMSSClient := ss.cloud.VirtualMachineScaleSetsClient.(*mockvmssclient.MockInterface)
|
mockVMSSClient := ss.cloud.VirtualMachineScaleSetsClient.(*mockvmssclient.MockInterface)
|
||||||
mockVMSSClient.EXPECT().List(gomock.Any(), ss.ResourceGroup).Return([]compute.VirtualMachineScaleSet{expectedVMSS}, nil).AnyTimes()
|
mockVMSSClient.EXPECT().List(gomock.Any(), ss.ResourceGroup).Return([]compute.VirtualMachineScaleSet{expectedVMSS}, nil).AnyTimes()
|
||||||
mockVMSSClient.EXPECT().Get(gomock.Any(), ss.ResourceGroup, testVMSSName).Return(expectedVMSS, nil).MaxTimes(1)
|
mockVMSSClient.EXPECT().Get(gomock.Any(), ss.ResourceGroup, testVMSSName).Return(expectedVMSS, nil).MaxTimes(1)
|
||||||
@ -2308,11 +2336,12 @@ func TestEnsureBackendPoolDeletedConcurrently(t *testing.T) {
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
vmss0 := buildTestVMSS("vmss-0", []string{testLBBackendpoolID0, testLBBackendpoolID1}, false)
|
|
||||||
vmss1 := buildTestVMSS("vmss-1", []string{testLBBackendpoolID0, testLBBackendpoolID1}, false)
|
|
||||||
|
|
||||||
expectedVMSSVMsOfVMSS0, _, _ := buildTestVirtualMachineEnv(ss.cloud, "vmss-0", "", 0, []string{"vmss-vm-000000"}, "succeeded", false)
|
vmss0 := buildTestVMSSWithLB("vmss-0", "vmss-0-vm-", []string{testLBBackendpoolID0, testLBBackendpoolID1}, false)
|
||||||
expectedVMSSVMsOfVMSS1, _, _ := buildTestVirtualMachineEnv(ss.cloud, "vmss-1", "", 0, []string{"vmss-vm-000001"}, "succeeded", false)
|
vmss1 := buildTestVMSSWithLB("vmss-1", "vmss-1-vm-", []string{testLBBackendpoolID0, testLBBackendpoolID1}, false)
|
||||||
|
|
||||||
|
expectedVMSSVMsOfVMSS0, _, _ := buildTestVirtualMachineEnv(ss.cloud, "vmss-0", "", 0, []string{"vmss-0-vm-000000"}, "succeeded", false)
|
||||||
|
expectedVMSSVMsOfVMSS1, _, _ := buildTestVirtualMachineEnv(ss.cloud, "vmss-1", "", 0, []string{"vmss-1-vm-000001"}, "succeeded", false)
|
||||||
for _, expectedVMSSVMs := range [][]compute.VirtualMachineScaleSetVM{expectedVMSSVMsOfVMSS0, expectedVMSSVMsOfVMSS1} {
|
for _, expectedVMSSVMs := range [][]compute.VirtualMachineScaleSetVM{expectedVMSSVMsOfVMSS0, expectedVMSSVMsOfVMSS1} {
|
||||||
vmssVMNetworkConfigs := expectedVMSSVMs[0].NetworkProfileConfiguration
|
vmssVMNetworkConfigs := expectedVMSSVMs[0].NetworkProfileConfiguration
|
||||||
vmssVMIPConfigs := (*vmssVMNetworkConfigs.NetworkInterfaceConfigurations)[0].VirtualMachineScaleSetNetworkConfigurationProperties.IPConfigurations
|
vmssVMIPConfigs := (*vmssVMNetworkConfigs.NetworkInterfaceConfigurations)[0].VirtualMachineScaleSetNetworkConfigurationProperties.IPConfigurations
|
||||||
@ -2322,11 +2351,13 @@ func TestEnsureBackendPoolDeletedConcurrently(t *testing.T) {
|
|||||||
|
|
||||||
mockVMSSClient := ss.cloud.VirtualMachineScaleSetsClient.(*mockvmssclient.MockInterface)
|
mockVMSSClient := ss.cloud.VirtualMachineScaleSetsClient.(*mockvmssclient.MockInterface)
|
||||||
mockVMSSClient.EXPECT().List(gomock.Any(), ss.ResourceGroup).Return([]compute.VirtualMachineScaleSet{vmss0, vmss1}, nil).AnyTimes()
|
mockVMSSClient.EXPECT().List(gomock.Any(), ss.ResourceGroup).Return([]compute.VirtualMachineScaleSet{vmss0, vmss1}, nil).AnyTimes()
|
||||||
|
mockVMSSClient.EXPECT().List(gomock.Any(), "rg1").Return(nil, nil).AnyTimes()
|
||||||
mockVMSSClient.EXPECT().Get(gomock.Any(), ss.ResourceGroup, "vmss-0").Return(vmss0, nil).MaxTimes(2)
|
mockVMSSClient.EXPECT().Get(gomock.Any(), ss.ResourceGroup, "vmss-0").Return(vmss0, nil).MaxTimes(2)
|
||||||
mockVMSSClient.EXPECT().Get(gomock.Any(), ss.ResourceGroup, "vmss-1").Return(vmss1, nil).MaxTimes(2)
|
mockVMSSClient.EXPECT().Get(gomock.Any(), ss.ResourceGroup, "vmss-1").Return(vmss1, nil).MaxTimes(2)
|
||||||
mockVMSSClient.EXPECT().CreateOrUpdate(gomock.Any(), ss.ResourceGroup, gomock.Any(), gomock.Any()).Return(nil).Times(2)
|
mockVMSSClient.EXPECT().CreateOrUpdate(gomock.Any(), ss.ResourceGroup, gomock.Any(), gomock.Any()).Return(nil).Times(2)
|
||||||
|
|
||||||
mockVMSSVMClient := ss.cloud.VirtualMachineScaleSetVMsClient.(*mockvmssvmclient.MockInterface)
|
mockVMSSVMClient := ss.cloud.VirtualMachineScaleSetVMsClient.(*mockvmssvmclient.MockInterface)
|
||||||
|
mockVMSSVMClient.EXPECT().List(gomock.Any(), "rg1", "vmss-0", gomock.Any()).Return(nil, nil).AnyTimes()
|
||||||
mockVMSSVMClient.EXPECT().List(gomock.Any(), ss.ResourceGroup, "vmss-0", gomock.Any()).Return(expectedVMSSVMsOfVMSS0, nil).AnyTimes()
|
mockVMSSVMClient.EXPECT().List(gomock.Any(), ss.ResourceGroup, "vmss-0", gomock.Any()).Return(expectedVMSSVMsOfVMSS0, nil).AnyTimes()
|
||||||
mockVMSSVMClient.EXPECT().List(gomock.Any(), ss.ResourceGroup, "vmss-1", gomock.Any()).Return(expectedVMSSVMsOfVMSS1, nil).AnyTimes()
|
mockVMSSVMClient.EXPECT().List(gomock.Any(), ss.ResourceGroup, "vmss-1", gomock.Any()).Return(expectedVMSSVMsOfVMSS1, nil).AnyTimes()
|
||||||
mockVMSSVMClient.EXPECT().UpdateVMs(gomock.Any(), ss.ResourceGroup, gomock.Any(), gomock.Any(), gomock.Any()).Return(nil).Times(2)
|
mockVMSSVMClient.EXPECT().UpdateVMs(gomock.Any(), ss.ResourceGroup, gomock.Any(), gomock.Any(), gomock.Any()).Return(nil).Times(2)
|
||||||
|
Loading…
Reference in New Issue
Block a user