Moved AdditionalCapabilities out from VM profile to VMSS and updated …

…SKUs API to support zonal capabilities (#5753) * Updated comments and introduced AvailabilitySetSkuType to help users use predefined constants * Moved AdditionalCapabilities out from VM profile to VMSS and updated SKUs API to support zonal capabilities * Fixed indentation * Fixed indentation in skus.json
Azure · Apr 24, 2019 · c17d5aa · c17d5aa
1 parent a5c4e51
commit c17d5aa
Show file tree

Hide file tree

Showing 3 changed files with 384 additions and 5 deletions.
diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-03-01/compute.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-03-01/compute.json
@@ -7649,10 +7649,6 @@
           "$ref": "#/definitions/VirtualMachineScaleSetStorageProfile",
           "description": "Specifies the storage settings for the virtual machine disks."
         },
-        "additionalCapabilities": {
-          "$ref": "#/definitions/AdditionalCapabilities",
-          "description": "Specifies additional capabilities enabled or disabled on the virtual machine in the scale set. For instance: whether the virtual machine has the capability to support attaching managed data disks with UltraSSD_LRS storage account type."
-        },
         "networkProfile": {
           "$ref": "#/definitions/VirtualMachineScaleSetNetworkProfile",
           "description": "Specifies properties of the network interfaces of the virtual machines in the scale set."
@@ -7769,6 +7765,10 @@
         "proximityPlacementGroup": {
           "$ref": "#/definitions/SubResource",
           "description": "Specifies information about the proximity placement group that the virtual machine scale set should be assigned to. <br><br>Minimum api-version: 2018-04-01."
+        },
+        "additionalCapabilities": {
+          "$ref": "#/definitions/AdditionalCapabilities",
+          "description": "Specifies additional capabilities enabled or disabled on the Virtual Machines in the Virtual Machine Scale Set. For instance: whether the Virtual Machines have the capability to support attaching managed data disks with UltraSSD_LRS storage account type."
         }
       },
       "description": "Describes the properties of a Virtual Machine Scale Set."
@@ -7790,6 +7790,10 @@
         "singlePlacementGroup": {
           "type": "boolean",
           "description": "When true this limits the scale set to a single placement group, of max size 100 virtual machines."
+        },
+        "additionalCapabilities": {
+          "$ref": "#/definitions/AdditionalCapabilities",
+          "description": "Specifies additional capabilities enabled or disabled on the Virtual Machines in the Virtual Machine Scale Set. For instance: whether the Virtual Machines have the capability to support attaching managed data disks with UltraSSD_LRS storage account type."
         }
       },
       "description": "Describes the properties of a Virtual Machine Scale Set."