fix

Author: FumingZhang

src/azure-cli/azure/cli/command_modules/acs/agentpool_decorator.py

@@ -2056,7 +2056,10 @@ def set_up_vm_properties(self, agentpool: AgentPool) -> AgentPool:
         """
         self._ensure_agentpool(agentpool)
 
-        agentpool.type = self.context.get_vm_set_type()
+        if self.agentpool_decorator_mode == AgentPoolDecoratorMode.MANAGED_CLUSTER:
+            agentpool.type = self.context.get_vm_set_type()
+        else:
+            agentpool.type_properties_type = self.context.get_vm_set_type()
 
         agentpool.proximity_placement_group_id = self.context.get_ppg()
         agentpool.enable_encryption_at_host = self.context.get_enable_encryption_at_host()

src/azure-cli/azure/cli/command_modules/acs/managed_cluster_decorator.py

@@ -433,9 +433,9 @@ def __validate_cluster_autoscaler_profile(
                     )
                 )
             # verify keys
-            # pylint: disable=protected-access
+            from azure.core.serialization import attribute_list
             valid_keys = list(
-                k.replace("_", "-") for k in self.models.ManagedClusterPropertiesAutoScalerProfile()._attr_to_rest_field.keys()
+                k.replace("_", "-") for k in attribute_list(self.models.ManagedClusterPropertiesAutoScalerProfile())
             )
             for key in cluster_autoscaler_profile.keys():
                 if not key:

src/azure-cli/azure/cli/command_modules/acs/tests/latest/test_agentpool_decorator.py

@@ -2549,7 +2549,7 @@ def common_set_up_vm_properties(self):
         if self.agentpool_decorator_mode == AgentPoolDecoratorMode.MANAGED_CLUSTER:
             ground_truth_agentpool_1.type = CONST_VIRTUAL_MACHINE_SCALE_SETS
         else:
-            ground_truth_agentpool_1.type = CONST_VIRTUAL_MACHINE_SCALE_SETS
+            ground_truth_agentpool_1.type_properties_type = CONST_VIRTUAL_MACHINE_SCALE_SETS
         self.assertEqual(dec_agentpool_1, ground_truth_agentpool_1)
 
     def common_set_up_custom_node_config(self):
@@ -2862,7 +2862,6 @@ def test_construct_agentpool_profile_default(self):
             count=3,
             node_taints=[],
             upgrade_settings=ground_truth_upgrade_settings_1,
-            type=CONST_VIRTUAL_MACHINE_SCALE_SETS,
             enable_encryption_at_host=False,
             enable_ultra_ssd=False,
             enable_fips=False,
@@ -2872,6 +2871,10 @@ def test_construct_agentpool_profile_default(self):
             host_group_id=None,
             capacity_reservation_group_id=None,
         )
+        if self.agentpool_decorator_mode == AgentPoolDecoratorMode.MANAGED_CLUSTER:
+            ground_truth_agentpool_1.type = CONST_VIRTUAL_MACHINE_SCALE_SETS
+        else:
+            ground_truth_agentpool_1.type_properties_type = CONST_VIRTUAL_MACHINE_SCALE_SETS
         self.assertEqual(dec_agentpool_1, ground_truth_agentpool_1)
 
         dec_1.context.raw_param.print_usage_statistics()

src/azure-cli/azure/cli/command_modules/acs/tests/latest/test_aks_commands.py

@@ -14098,6 +14098,7 @@ def test_vms_agentpool_type(self, resource_group, resource_group_location):
             "--node-count 1",
             checks=[
                 self.check("provisioningState", "Succeeded"),
+                self.check("typePropertiesType", "VirtualMachines"),
                 self.check("vmSize", ""),
                 self.check("count", None),
                 self.check("virtualMachinesProfile.scale.manual[0].size", "Standard_D2s_v3", False),
@@ -14126,6 +14127,7 @@ def test_vms_agentpool_type(self, resource_group, resource_group_location):
             "--node-count 1",
             checks=[
                 self.check("provisioningState", "Succeeded"),
+                self.check("typePropertiesType", "VirtualMachines"),
                 self.check("vmSize", ""),
                 self.check("count", None),
                 self.check("virtualMachinesProfile.scale.manual[1].size", "Standard_DS2_v2", False),
@@ -14143,6 +14145,7 @@ def test_vms_agentpool_type(self, resource_group, resource_group_location):
             "--node-count 3",
             checks=[
                 self.check("provisioningState", "Succeeded"),
+                self.check("typePropertiesType", "VirtualMachines"),
                 self.check("vmSize", ""),
                 self.check("count", None),
                 self.check("virtualMachinesProfile.scale.manual[1].size", "Standard_D8s_v3", False),