[AutoPR compute/resource-manager] Moved AdditionalCapabilities out from VM profile to VMSS and updated SKUs API to support zonal capabilities

sdk/compute/arm-compute/lib/models/index.ts

@@ -3272,14 +3272,6 @@ export interface VirtualMachineScaleSetVMProfile {
    * the storage settings for the virtual machine disks.
    */
   storageProfile?: VirtualMachineScaleSetStorageProfile;
-  /**
-   * @member {AdditionalCapabilities} [additionalCapabilities] 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.
-   */
-  additionalCapabilities?: AdditionalCapabilities;
   /**
    * @member {VirtualMachineScaleSetNetworkProfile} [networkProfile] Specifies
    * properties of the network interfaces of the virtual machines in the scale
@@ -3441,6 +3433,14 @@ export interface VirtualMachineScaleSet extends Resource {
    * should be assigned to. <br><br>Minimum api-version: 2018-04-01.
    */
   proximityPlacementGroup?: SubResource;
+  /**
+   * @member {AdditionalCapabilities} [additionalCapabilities] 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.
+   */
+  additionalCapabilities?: AdditionalCapabilities;
   /**
    * @member {VirtualMachineScaleSetIdentity} [identity] The identity of the
    * virtual machine scale set, if configured.
@@ -3515,6 +3515,14 @@ export interface VirtualMachineScaleSetUpdate extends UpdateResource {
    * set to a single placement group, of max size 100 virtual machines.
    */
   singlePlacementGroup?: boolean;
+  /**
+   * @member {AdditionalCapabilities} [additionalCapabilities] 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.
+   */
+  additionalCapabilities?: AdditionalCapabilities;
   /**
    * @member {VirtualMachineScaleSetIdentity} [identity] The identity of the
    * virtual machine scale set, if configured.
@@ -4629,6 +4637,29 @@ export interface ResourceSkuCapabilities {
   readonly value?: string;
 }
 
+/**
+ * @interface
+ * An interface representing ResourceSkuZoneDetails.
+ * Describes The zonal capabilities of a SKU.
+ *
+ */
+export interface ResourceSkuZoneDetails {
+  /**
+   * @member {string[]} [name] The set of zones that the SKU is available in
+   * with the specified capabilities.
+   * **NOTE: This property will not be serialized. It can only be populated by
+   * the server.**
+   */
+  readonly name?: string[];
+  /**
+   * @member {ResourceSkuCapabilities[]} [capabilities] A list of capabilities
+   * that are available for the SKU in the specified list of zones.
+   * **NOTE: This property will not be serialized. It can only be populated by
+   * the server.**
+   */
+  readonly capabilities?: ResourceSkuCapabilities[];
+}
+
 /**
  * @interface
  * An interface representing ResourceSkuRestrictionInfo.
@@ -4706,6 +4737,13 @@ export interface ResourceSkuLocationInfo {
    * the server.**
    */
   readonly zones?: string[];
+  /**
+   * @member {ResourceSkuZoneDetails[]} [zoneDetails] Details of capabilities
+   * available to a SKU in specific zones.
+   * **NOTE: This property will not be serialized. It can only be populated by
+   * the server.**
+   */
+  readonly zoneDetails?: ResourceSkuZoneDetails[];
 }
 
 /**

sdk/compute/arm-compute/lib/models/mappers.ts

@@ -3944,13 +3944,6 @@ export const VirtualMachineScaleSetVMProfile: msRest.CompositeMapper = {
           className: "VirtualMachineScaleSetStorageProfile"
         }
       },
-      additionalCapabilities: {
-        serializedName: "additionalCapabilities",
-        type: {
-          name: "Composite",
-          className: "AdditionalCapabilities"
-        }
-      },
       networkProfile: {
         serializedName: "networkProfile",
         type: {
@@ -4131,6 +4124,13 @@ export const VirtualMachineScaleSet: msRest.CompositeMapper = {
           className: "SubResource"
         }
       },
+      additionalCapabilities: {
+        serializedName: "properties.additionalCapabilities",
+        type: {
+          name: "Composite",
+          className: "AdditionalCapabilities"
+        }
+      },
       identity: {
         serializedName: "identity",
         type: {
@@ -4233,6 +4233,13 @@ export const VirtualMachineScaleSetUpdate: msRest.CompositeMapper = {
           name: "Boolean"
         }
       },
+      additionalCapabilities: {
+        serializedName: "properties.additionalCapabilities",
+        type: {
+          name: "Composite",
+          className: "AdditionalCapabilities"
+        }
+      },
       identity: {
         serializedName: "identity",
         type: {
@@ -5659,6 +5666,41 @@ export const ResourceSkuCapabilities: msRest.CompositeMapper = {
   }
 };
 
+export const ResourceSkuZoneDetails: msRest.CompositeMapper = {
+  serializedName: "ResourceSkuZoneDetails",
+  type: {
+    name: "Composite",
+    className: "ResourceSkuZoneDetails",
+    modelProperties: {
+      name: {
+        readOnly: true,
+        serializedName: "name",
+        type: {
+          name: "Sequence",
+          element: {
+            type: {
+              name: "String"
+            }
+          }
+        }
+      },
+      capabilities: {
+        readOnly: true,
+        serializedName: "capabilities",
+        type: {
+          name: "Sequence",
+          element: {
+            type: {
+              name: "Composite",
+              className: "ResourceSkuCapabilities"
+            }
+          }
+        }
+      }
+    }
+  }
+};
+
 export const ResourceSkuRestrictionInfo: msRest.CompositeMapper = {
   serializedName: "ResourceSkuRestrictionInfo",
   type: {
@@ -5769,6 +5811,19 @@ export const ResourceSkuLocationInfo: msRest.CompositeMapper = {
             }
           }
         }
+      },
+      zoneDetails: {
+        readOnly: true,
+        serializedName: "zoneDetails",
+        type: {
+          name: "Sequence",
+          element: {
+            type: {
+              name: "Composite",
+              className: "ResourceSkuZoneDetails"
+            }
+          }
+        }
       }
     }
   }

sdk/compute/arm-compute/lib/models/parameters.ts

@@ -38,7 +38,7 @@ export const apiVersion1: msRest.OperationQueryParameter = {
     required: true,
     isConstant: true,
     serializedName: "api-version",
-    defaultValue: '2017-09-01',
+    defaultValue: '2019-04-01',
     type: {
       name: "String"
     }

sdk/compute/arm-compute/lib/models/resourceSkusMappers.ts

@@ -13,8 +13,9 @@ export {
   ResourceSku,
   ResourceSkuCapacity,
   ResourceSkuLocationInfo,
-  ResourceSkuCosts,
+  ResourceSkuZoneDetails,
   ResourceSkuCapabilities,
+  ResourceSkuCosts,
   ResourceSkuRestrictions,
   ResourceSkuRestrictionInfo,
   CloudError

sdk/compute/arm-compute/lib/models/virtualMachineScaleSetsMappers.ts

@@ -36,7 +36,6 @@ export {
   VirtualHardDisk,
   VirtualMachineScaleSetManagedDiskParameters,
   VirtualMachineScaleSetDataDisk,
-  AdditionalCapabilities,
   VirtualMachineScaleSetNetworkProfile,
   ApiEntityReference,
   VirtualMachineScaleSetNetworkConfiguration,
@@ -50,6 +49,7 @@ export {
   VirtualMachineScaleSetExtensionProfile,
   VirtualMachineScaleSetExtension,
   SubResourceReadOnly,
+  AdditionalCapabilities,
   VirtualMachineScaleSetIdentity,
   VirtualMachineScaleSetIdentityUserAssignedIdentitiesValue,
   CloudError,