diff --git a/src/azure-cli/azure/cli/command_modules/acs/_consts.py b/src/azure-cli/azure/cli/command_modules/acs/_consts.py index 46b826b78d9..d507964e5b8 100644 --- a/src/azure-cli/azure/cli/command_modules/acs/_consts.py +++ b/src/azure-cli/azure/cli/command_modules/acs/_consts.py @@ -43,8 +43,8 @@ CONST_AVAILABILITY_SET = "AvailabilitySet" # vm size -CONST_DEFAULT_NODE_VM_SIZE = "Standard_DS2_v2" -CONST_DEFAULT_WINDOWS_NODE_VM_SIZE = "Standard_D2s_v3" +CONST_DEFAULT_NODE_VM_SIZE = "" +CONST_DEFAULT_WINDOWS_NODE_VM_SIZE = "" # gpu instance CONST_GPU_INSTANCE_PROFILE_MIG1_G = "MIG1g" diff --git a/src/azure-cli/azure/cli/command_modules/acs/tests/latest/test_aks_commands.py b/src/azure-cli/azure/cli/command_modules/acs/tests/latest/test_aks_commands.py index 5ad5ce8fa48..e4846f3a6d2 100644 --- a/src/azure-cli/azure/cli/command_modules/acs/tests/latest/test_aks_commands.py +++ b/src/azure-cli/azure/cli/command_modules/acs/tests/latest/test_aks_commands.py @@ -244,7 +244,7 @@ def test_aks_create_default(self, resource_group, resource_group_location): self.exists('fqdn'), self.check('agentPoolProfiles[0].count', 1), self.check('agentPoolProfiles[0].osType', 'Linux'), - self.check('agentPoolProfiles[0].vmSize', 'Standard_DS2_v2'), + self.check('agentPoolProfiles[0].vmSize', ''), self.check('agentPoolProfiles[0].nodeLabels.label1', 'value1'), self.check('agentPoolProfiles[0].nodeLabels.label2', 'value2'), self.check('agentPoolProfiles[0].tags.tag1', 'tv1'), @@ -334,7 +334,7 @@ def test_aks_create_default_sp(self, resource_group, resource_group_location, sp self.exists('fqdn'), self.check('agentPoolProfiles[0].count', 1), self.check('agentPoolProfiles[0].osType', 'Linux'), - self.check('agentPoolProfiles[0].vmSize', 'Standard_DS2_v2'), + self.check('agentPoolProfiles[0].vmSize', ''), self.check('agentPoolProfiles[0].nodeLabels.label1', 'value1'), self.check('agentPoolProfiles[0].nodeLabels.label2', 'value2'), self.check('agentPoolProfiles[0].tags.tag1', 'tv1'), @@ -750,7 +750,7 @@ def test_aks_create_default_service(self, resource_group, resource_group_locatio self.check('resourceGroup', '{resource_group}'), self.check('agentPoolProfiles[0].count', 1), self.check('agentPoolProfiles[0].osType', 'Linux'), - self.check('agentPoolProfiles[0].vmSize', 'Standard_DS2_v2'), + self.check('agentPoolProfiles[0].vmSize', ''), self.check('agentPoolProfiles[0].maxPods', 100), self.check('dnsPrefix', '{dns_name_prefix}'), self.check('agentPoolProfiles[0].nodeLabels.label1', 'value1'), @@ -828,7 +828,7 @@ def test_aks_create_service_no_wait(self, resource_group, resource_group_locatio self.check('name', '{name}'), self.check('resourceGroup', '{resource_group}'), self.check('agentPoolProfiles[0].count', 1), - self.check('agentPoolProfiles[0].vmSize', 'Standard_DS2_v2'), + self.check('agentPoolProfiles[0].vmSize', ''), self.check('dnsPrefix', '{dns_name_prefix}'), self.check('provisioningState', 'Succeeded'), ]) @@ -862,7 +862,7 @@ def test_aks_create_service_no_wait(self, resource_group, resource_group_locatio self.check('name', '{name}'), self.check('resourceGroup', '{resource_group}'), self.check('agentPoolProfiles[0].count', 1), - self.check('agentPoolProfiles[0].vmSize', 'Standard_DS2_v2'), + self.check('agentPoolProfiles[0].vmSize', ''), self.check('dnsPrefix', '{dns_name_prefix}'), self.check('provisioningState', 'Succeeded'), self.check('addonProfiles.httpApplicationRouting.enabled', True) @@ -1140,7 +1140,7 @@ def test_aks_create_default_service_with_monitoring_addon(self, resource_group, self.check('resourceGroup', '{resource_group}'), self.check('agentPoolProfiles[0].count', 1), self.check('agentPoolProfiles[0].osType', 'Linux'), - self.check('agentPoolProfiles[0].vmSize', 'Standard_DS2_v2'), + self.check('agentPoolProfiles[0].vmSize', ''), self.check('dnsPrefix', '{dns_name_prefix}'), self.exists('kubernetesVersion'), self.check('addonProfiles.omsagent.enabled', True), @@ -1181,7 +1181,7 @@ def test_aks_create_default_service_with_monitoring_addon(self, resource_group, self.check('resourceGroup', '{resource_group}'), self.check('agentPoolProfiles[0].count', 1), self.check('agentPoolProfiles[0].osType', 'Linux'), - self.check('agentPoolProfiles[0].vmSize', 'Standard_DS2_v2'), + self.check('agentPoolProfiles[0].vmSize', ''), self.check('dnsPrefix', '{dns_name_prefix}'), self.exists('kubernetesVersion'), self.check('addonProfiles.omsagent.enabled', True), @@ -1239,7 +1239,7 @@ def test_aks_create_default_service_with_virtual_node_addon(self, resource_group self.check('resourceGroup', '{resource_group}'), self.check('agentPoolProfiles[0].count', 1), self.check('agentPoolProfiles[0].osType', 'Linux'), - self.check('agentPoolProfiles[0].vmSize', 'Standard_DS2_v2'), + self.check('agentPoolProfiles[0].vmSize', ''), self.check('dnsPrefix', '{dns_name_prefix}'), self.exists('kubernetesVersion'), self.check('addonProfiles.aciConnectorLinux.enabled', True), @@ -1275,7 +1275,7 @@ def test_aks_create_default_service_with_virtual_node_addon(self, resource_group self.check('resourceGroup', '{resource_group}'), self.check('agentPoolProfiles[0].count', 1), self.check('agentPoolProfiles[0].osType', 'Linux'), - self.check('agentPoolProfiles[0].vmSize', 'Standard_DS2_v2'), + self.check('agentPoolProfiles[0].vmSize', ''), self.check('dnsPrefix', '{dns_name_prefix}'), self.exists('kubernetesVersion'), self.check('addonProfiles.aciConnectorLinux.enabled', True), @@ -1339,7 +1339,7 @@ def test_aks_create_blb_vmas(self, resource_group, resource_group_location, sp_n self.check('resourceGroup', '{resource_group}'), self.check('agentPoolProfiles[0].count', 1), self.check('agentPoolProfiles[0].osType', 'Linux'), - self.check('agentPoolProfiles[0].vmSize', 'Standard_DS2_v2'), + self.check('agentPoolProfiles[0].vmSize', ''), self.check('agentPoolProfiles[0].type', 'AvailabilitySet'), self.check('dnsPrefix', '{dns_name_prefix}'), self.exists('kubernetesVersion'), @@ -1413,7 +1413,7 @@ def test_aks_create_default_setting(self, resource_group, resource_group_locatio self.check('resourceGroup', '{resource_group}'), self.check('agentPoolProfiles[0].count', 1), self.check('agentPoolProfiles[0].osType', 'Linux'), - self.check('agentPoolProfiles[0].vmSize', 'Standard_DS2_v2'), + self.check('agentPoolProfiles[0].vmSize', ''), self.check('agentPoolProfiles[0].type', 'VirtualMachineScaleSets'), self.check('dnsPrefix', '{dns_name_prefix}'), self.exists('kubernetesVersion'), @@ -1504,7 +1504,7 @@ def test_aks_create_slb_vmss_with_default_mgd_outbound_ip_then_update(self, reso self.check('resourceGroup', '{resource_group}'), self.check('agentPoolProfiles[0].count', 1), self.check('agentPoolProfiles[0].osType', 'Linux'), - self.check('agentPoolProfiles[0].vmSize', 'Standard_DS2_v2'), + self.check('agentPoolProfiles[0].vmSize', ''), self.check('agentPoolProfiles[0].type', 'VirtualMachineScaleSets'), self.check('dnsPrefix', '{dns_name_prefix}'), self.exists('kubernetesVersion'), @@ -1620,7 +1620,7 @@ def test_aks_create_slb_vmss_with_outbound_ip_then_update(self, resource_group, self.check('resourceGroup', '{resource_group}'), self.check('agentPoolProfiles[0].count', 1), self.check('agentPoolProfiles[0].osType', 'Linux'), - self.check('agentPoolProfiles[0].vmSize', 'Standard_DS2_v2'), + self.check('agentPoolProfiles[0].vmSize', ''), self.check('agentPoolProfiles[0].type', 'VirtualMachineScaleSets'), self.check('dnsPrefix', '{dns_name_prefix}'), self.exists('kubernetesVersion'), @@ -1727,7 +1727,7 @@ def test_aks_create_slb_vmss_with_outbound_ip_prefixes_then_update(self, resourc self.check('resourceGroup', '{resource_group}'), self.check('agentPoolProfiles[0].count', 1), self.check('agentPoolProfiles[0].osType', 'Linux'), - self.check('agentPoolProfiles[0].vmSize', 'Standard_DS2_v2'), + self.check('agentPoolProfiles[0].vmSize', ''), self.check('agentPoolProfiles[0].type', 'VirtualMachineScaleSets'), self.check('dnsPrefix', '{dns_name_prefix}'), self.exists('kubernetesVersion'), @@ -1815,7 +1815,7 @@ def test_aks_nodepool_create_scale_delete(self, resource_group, resource_group_l self.check('resourceGroup', '{resource_group}'), self.check('agentPoolProfiles[0].count', 1), self.check('agentPoolProfiles[0].osType', 'Linux'), - self.check('agentPoolProfiles[0].vmSize', 'Standard_DS2_v2'), + self.check('agentPoolProfiles[0].vmSize', ''), self.check('agentPoolProfiles[0].mode', 'System'), self.check('dnsPrefix', '{dns_name_prefix}'), self.exists('kubernetesVersion') @@ -1947,7 +1947,7 @@ def test_aks_nodepool_system_pool(self, resource_group, resource_group_location, self.check('resourceGroup', '{resource_group}'), self.check('agentPoolProfiles[0].count', 1), self.check('agentPoolProfiles[0].osType', 'Linux'), - self.check('agentPoolProfiles[0].vmSize', 'Standard_DS2_v2'), + self.check('agentPoolProfiles[0].vmSize', ''), self.check('agentPoolProfiles[0].mode', 'System'), self.check('dnsPrefix', '{dns_name_prefix}'), self.exists('kubernetesVersion') @@ -2064,7 +2064,7 @@ def test_aks_availability_zones(self, resource_group, resource_group_location, s self.check('resourceGroup', '{resource_group}'), self.check('agentPoolProfiles[0].count', 3), self.check('agentPoolProfiles[0].osType', 'Linux'), - self.check('agentPoolProfiles[0].vmSize', 'Standard_DS2_v2'), + self.check('agentPoolProfiles[0].vmSize', ''), self.check('agentPoolProfiles[0].availabilityZones[0]', '1'), self.check('agentPoolProfiles[0].availabilityZones[1]', '2'), self.check('agentPoolProfiles[0].availabilityZones[2]', '3'), @@ -2836,7 +2836,7 @@ def test_aks_managed_identity_without_service_principal(self, resource_group, re self.check('resourceGroup', '{resource_group}'), self.check('agentPoolProfiles[0].count', 1), self.check('agentPoolProfiles[0].osType', 'Linux'), - self.check('agentPoolProfiles[0].vmSize', 'Standard_DS2_v2'), + self.check('agentPoolProfiles[0].vmSize', ''), self.check('dnsPrefix', '{dns_name_prefix}'), self.exists('kubernetesVersion'), self.exists('identity'), @@ -3513,7 +3513,7 @@ def test_aks_control_plane_user_assigned_identity(self, resource_group, resource self.check('resourceGroup', '{resource_group}'), self.check('agentPoolProfiles[0].count', 1), self.check('agentPoolProfiles[0].osType', 'Linux'), - self.check('agentPoolProfiles[0].vmSize', 'Standard_DS2_v2'), + self.check('agentPoolProfiles[0].vmSize', ''), self.check('dnsPrefix', '{dns_name_prefix}'), self.exists('kubernetesVersion'), self.exists('identityProfile'), @@ -3804,7 +3804,7 @@ def test_aks_create_default_service_msi(self, resource_group, resource_group_loc self.check('resourceGroup', '{resource_group}'), self.check('agentPoolProfiles[0].count', 1), self.check('agentPoolProfiles[0].osType', 'Linux'), - self.check('agentPoolProfiles[0].vmSize', 'Standard_DS2_v2'), + self.check('agentPoolProfiles[0].vmSize', ''), self.check('dnsPrefix', '{dns_name_prefix}'), self.check('agentPoolProfiles[0].nodeLabels.label1', 'value1'), self.check('agentPoolProfiles[0].nodeLabels.label2', 'value2'), @@ -3875,7 +3875,7 @@ def test_aks_create_service_no_wait_msi(self, resource_group, resource_group_loc self.check('name', '{name}'), self.check('resourceGroup', '{resource_group}'), self.check('agentPoolProfiles[0].count', 1), - self.check('agentPoolProfiles[0].vmSize', 'Standard_DS2_v2'), + self.check('agentPoolProfiles[0].vmSize', ''), self.check('dnsPrefix', '{dns_name_prefix}'), self.check('provisioningState', 'Succeeded'), ]) @@ -3909,7 +3909,7 @@ def test_aks_create_service_no_wait_msi(self, resource_group, resource_group_loc self.check('name', '{name}'), self.check('resourceGroup', '{resource_group}'), self.check('agentPoolProfiles[0].count', 1), - self.check('agentPoolProfiles[0].vmSize', 'Standard_DS2_v2'), + self.check('agentPoolProfiles[0].vmSize', ''), self.check('dnsPrefix', '{dns_name_prefix}'), self.check('provisioningState', 'Succeeded'), self.check('addonProfiles.httpApplicationRouting.enabled', True) @@ -4070,7 +4070,7 @@ def test_aks_create_default_service_with_monitoring_addon_msi(self, resource_gro self.check('resourceGroup', '{resource_group}'), self.check('agentPoolProfiles[0].count', 1), self.check('agentPoolProfiles[0].osType', 'Linux'), - self.check('agentPoolProfiles[0].vmSize', 'Standard_DS2_v2'), + self.check('agentPoolProfiles[0].vmSize', ''), self.check('dnsPrefix', '{dns_name_prefix}'), self.exists('kubernetesVersion'), self.check('addonProfiles.omsagent.enabled', True), @@ -4111,7 +4111,7 @@ def test_aks_create_default_service_with_monitoring_addon_msi(self, resource_gro self.check('resourceGroup', '{resource_group}'), self.check('agentPoolProfiles[0].count', 1), self.check('agentPoolProfiles[0].osType', 'Linux'), - self.check('agentPoolProfiles[0].vmSize', 'Standard_DS2_v2'), + self.check('agentPoolProfiles[0].vmSize', ''), self.check('dnsPrefix', '{dns_name_prefix}'), self.exists('kubernetesVersion'), self.check('addonProfiles.omsagent.enabled', True), @@ -4174,7 +4174,7 @@ def test_aks_create_blb_vmas_msi(self, resource_group, resource_group_location): self.check('resourceGroup', '{resource_group}'), self.check('agentPoolProfiles[0].count', 1), self.check('agentPoolProfiles[0].osType', 'Linux'), - self.check('agentPoolProfiles[0].vmSize', 'Standard_DS2_v2'), + self.check('agentPoolProfiles[0].vmSize', ''), self.check('agentPoolProfiles[0].type', 'AvailabilitySet'), self.check('dnsPrefix', '{dns_name_prefix}'), self.exists('kubernetesVersion'), @@ -4244,7 +4244,7 @@ def test_aks_create_default_setting_msi(self, resource_group, resource_group_loc self.check('resourceGroup', '{resource_group}'), self.check('agentPoolProfiles[0].count', 1), self.check('agentPoolProfiles[0].osType', 'Linux'), - self.check('agentPoolProfiles[0].vmSize', 'Standard_DS2_v2'), + self.check('agentPoolProfiles[0].vmSize', ''), self.check('agentPoolProfiles[0].type', 'VirtualMachineScaleSets'), self.check('dnsPrefix', '{dns_name_prefix}'), self.exists('kubernetesVersion'), @@ -4331,7 +4331,7 @@ def test_aks_create_slb_vmss_with_default_mgd_outbound_ip_then_update_msi(self, self.check('resourceGroup', '{resource_group}'), self.check('agentPoolProfiles[0].count', 1), self.check('agentPoolProfiles[0].osType', 'Linux'), - self.check('agentPoolProfiles[0].vmSize', 'Standard_DS2_v2'), + self.check('agentPoolProfiles[0].vmSize', ''), self.check('agentPoolProfiles[0].type', 'VirtualMachineScaleSets'), self.check('dnsPrefix', '{dns_name_prefix}'), self.exists('kubernetesVersion'), @@ -4443,7 +4443,7 @@ def test_aks_create_slb_vmss_with_outbound_ip_then_update_msi(self, resource_gro self.check('resourceGroup', '{resource_group}'), self.check('agentPoolProfiles[0].count', 1), self.check('agentPoolProfiles[0].osType', 'Linux'), - self.check('agentPoolProfiles[0].vmSize', 'Standard_DS2_v2'), + self.check('agentPoolProfiles[0].vmSize', ''), self.check('agentPoolProfiles[0].type', 'VirtualMachineScaleSets'), self.check('dnsPrefix', '{dns_name_prefix}'), self.exists('kubernetesVersion'), @@ -4546,7 +4546,7 @@ def test_aks_create_slb_vmss_with_outbound_ip_prefixes_then_update_msi(self, res self.check('resourceGroup', '{resource_group}'), self.check('agentPoolProfiles[0].count', 1), self.check('agentPoolProfiles[0].osType', 'Linux'), - self.check('agentPoolProfiles[0].vmSize', 'Standard_DS2_v2'), + self.check('agentPoolProfiles[0].vmSize', ''), self.check('agentPoolProfiles[0].type', 'VirtualMachineScaleSets'), self.check('dnsPrefix', '{dns_name_prefix}'), self.exists('kubernetesVersion'), @@ -4628,7 +4628,7 @@ def test_aks_nodepool_create_scale_delete_msi(self, resource_group, resource_gro self.check('resourceGroup', '{resource_group}'), self.check('agentPoolProfiles[0].count', 1), self.check('agentPoolProfiles[0].osType', 'Linux'), - self.check('agentPoolProfiles[0].vmSize', 'Standard_DS2_v2'), + self.check('agentPoolProfiles[0].vmSize', ''), self.check('agentPoolProfiles[0].mode', 'System'), self.check('dnsPrefix', '{dns_name_prefix}'), self.exists('kubernetesVersion') @@ -4750,7 +4750,7 @@ def test_aks_nodepool_system_pool_msi(self, resource_group, resource_group_locat self.check('resourceGroup', '{resource_group}'), self.check('agentPoolProfiles[0].count', 1), self.check('agentPoolProfiles[0].osType', 'Linux'), - self.check('agentPoolProfiles[0].vmSize', 'Standard_DS2_v2'), + self.check('agentPoolProfiles[0].vmSize', ''), self.check('agentPoolProfiles[0].mode', 'System'), self.check('dnsPrefix', '{dns_name_prefix}'), self.exists('kubernetesVersion') @@ -4864,7 +4864,7 @@ def test_aks_nodepool_update_label_msi(self, resource_group, resource_group_loca self.check('resourceGroup', '{resource_group}'), self.check('agentPoolProfiles[0].count', 1), self.check('agentPoolProfiles[0].osType', 'Linux'), - self.check('agentPoolProfiles[0].vmSize', 'Standard_DS2_v2'), + self.check('agentPoolProfiles[0].vmSize', ''), self.check('agentPoolProfiles[0].mode', 'System'), self.check('dnsPrefix', '{dns_name_prefix}'), self.exists('kubernetesVersion') @@ -4958,7 +4958,7 @@ def test_aks_nodepool_update_taints_msi(self, resource_group, resource_group_loc self.check('resourceGroup', '{resource_group}'), self.check('agentPoolProfiles[0].count', 1), self.check('agentPoolProfiles[0].osType', 'Linux'), - self.check('agentPoolProfiles[0].vmSize', 'Standard_DS2_v2'), + self.check('agentPoolProfiles[0].vmSize', ''), self.check('agentPoolProfiles[0].mode', 'System'), self.check('dnsPrefix', '{dns_name_prefix}'), self.exists('kubernetesVersion') @@ -5179,7 +5179,7 @@ def test_aks_nodepool_scale_down_mode(self, resource_group, resource_group_locat self.check('resourceGroup', '{resource_group}'), self.check('agentPoolProfiles[0].count', 1), self.check('agentPoolProfiles[0].osType', 'Linux'), - self.check('agentPoolProfiles[0].vmSize', 'Standard_DS2_v2'), + self.check('agentPoolProfiles[0].vmSize', ''), self.check('agentPoolProfiles[0].mode', 'System'), self.check('dnsPrefix', '{dns_name_prefix}'), self.exists('kubernetesVersion') @@ -5268,7 +5268,7 @@ def test_aks_availability_zones_msi(self, resource_group, resource_group_locatio self.check('resourceGroup', '{resource_group}'), self.check('agentPoolProfiles[0].count', 3), self.check('agentPoolProfiles[0].osType', 'Linux'), - self.check('agentPoolProfiles[0].vmSize', 'Standard_DS2_v2'), + self.check('agentPoolProfiles[0].vmSize', ''), self.check('agentPoolProfiles[0].availabilityZones[0]', '1'), self.check('agentPoolProfiles[0].availabilityZones[1]', '2'), self.check('agentPoolProfiles[0].availabilityZones[2]', '3'),