diff --git a/pkg/cloudprovider/providers/azure/BUILD b/pkg/cloudprovider/providers/azure/BUILD index cef365fad52..546b89a2016 100644 --- a/pkg/cloudprovider/providers/azure/BUILD +++ b/pkg/cloudprovider/providers/azure/BUILD @@ -16,6 +16,7 @@ go_library( "azure_client.go", "azure_controller_common.go", "azure_controller_standard.go", + "azure_controller_vmss.go", "azure_fakes.go", "azure_file.go", "azure_instance_metadata.go", @@ -92,6 +93,7 @@ go_test( "//vendor/github.com/Azure/azure-sdk-for-go/arm/compute:go_default_library", "//vendor/github.com/Azure/azure-sdk-for-go/arm/network:go_default_library", "//vendor/github.com/Azure/azure-sdk-for-go/arm/storage:go_default_library", + "//vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2017-12-01/compute:go_default_library", "//vendor/github.com/Azure/go-autorest/autorest:go_default_library", "//vendor/github.com/Azure/go-autorest/autorest/to:go_default_library", "//vendor/github.com/stretchr/testify/assert:go_default_library", diff --git a/pkg/cloudprovider/providers/azure/azure_vmss_test.go b/pkg/cloudprovider/providers/azure/azure_vmss_test.go index 4a170f2a3bf..e2403f25850 100644 --- a/pkg/cloudprovider/providers/azure/azure_vmss_test.go +++ b/pkg/cloudprovider/providers/azure/azure_vmss_test.go @@ -20,7 +20,7 @@ import ( "fmt" "testing" - "github.com/Azure/azure-sdk-for-go/arm/compute" + computepreview "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2017-12-01/compute" "github.com/stretchr/testify/assert" ) @@ -37,8 +37,8 @@ func newTestScaleSet(scaleSetName string, vmList []string) (*scaleSet, error) { func setTestVirtualMachineCloud(ss *Cloud, scaleSetName string, vmList []string) { virtualMachineScaleSetsClient := newFakeVirtualMachineScaleSetsClient() - scaleSets := make(map[string]map[string]compute.VirtualMachineScaleSet) - scaleSets["rg"] = map[string]compute.VirtualMachineScaleSet{ + scaleSets := make(map[string]map[string]computepreview.VirtualMachineScaleSet) + scaleSets["rg"] = map[string]computepreview.VirtualMachineScaleSet{ scaleSetName: { Name: &scaleSetName, }, @@ -46,24 +46,24 @@ func setTestVirtualMachineCloud(ss *Cloud, scaleSetName string, vmList []string) virtualMachineScaleSetsClient.setFakeStore(scaleSets) virtualMachineScaleSetVMsClient := newFakeVirtualMachineScaleSetVMsClient() - ssVMs := make(map[string]map[string]compute.VirtualMachineScaleSetVM) - ssVMs["rg"] = make(map[string]compute.VirtualMachineScaleSetVM) + ssVMs := make(map[string]map[string]computepreview.VirtualMachineScaleSetVM) + ssVMs["rg"] = make(map[string]computepreview.VirtualMachineScaleSetVM) for i := range vmList { ID := fmt.Sprintf("/subscriptions/script/resourceGroups/rg/providers/Microsoft.Compute/virtualMachineScaleSets/%s/virtualMachines/%d", scaleSetName, i) nodeName := vmList[i] instanceID := fmt.Sprintf("%d", i) vmName := fmt.Sprintf("%s_%s", scaleSetName, instanceID) - networkInterfaces := []compute.NetworkInterfaceReference{ + networkInterfaces := []computepreview.NetworkInterfaceReference{ { ID: &nodeName, }, } - ssVMs["rg"][vmName] = compute.VirtualMachineScaleSetVM{ - VirtualMachineScaleSetVMProperties: &compute.VirtualMachineScaleSetVMProperties{ - OsProfile: &compute.OSProfile{ + ssVMs["rg"][vmName] = computepreview.VirtualMachineScaleSetVM{ + VirtualMachineScaleSetVMProperties: &computepreview.VirtualMachineScaleSetVMProperties{ + OsProfile: &computepreview.OSProfile{ ComputerName: &nodeName, }, - NetworkProfile: &compute.NetworkProfile{ + NetworkProfile: &computepreview.NetworkProfile{ NetworkInterfaces: &networkInterfaces, }, },