Generated from c921cf7ddc81cdc67b358506836f9e328623d568

Merge remote-tracking branch 'upstream/master'

Author: SDK Automation

sdk/compute/arm-compute/src/models/diskEncryptionSetsMappers.ts

@@ -121,6 +121,7 @@ export {
   ReplicationStatus,
   Resource,
   ResourceRange,
+  ResourceUriList,
   RollingUpgradePolicy,
   RollingUpgradeProgressInfo,
   RollingUpgradeRunningStatus,

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

@@ -4972,6 +4972,11 @@ export interface CreationData {
    * 35183298347520 bytes (32 TiB + 512 bytes for the VHD footer).
    */
   uploadSizeBytes?: number;
+  /**
+   * Logical sector size in bytes for Ultra disks. Supported values are 512 ad 4096. 4096 is the
+   * default.
+   */
+  logicalSectorSize?: number;
 }
 
 /**
@@ -5168,9 +5173,8 @@ export interface Disk extends Resource {
   /**
    * The state of the disk. Possible values include: 'Unattached', 'Attached', 'Reserved',
    * 'ActiveSAS', 'ReadyToUpload', 'ActiveUpload'
-   * **NOTE: This property will not be serialized. It can only be populated by the server.**
    */
-  readonly diskState?: DiskState;
+  diskState?: DiskState;
   /**
    * Encryption property can be used to encrypt data at rest with customer managed keys or platform
    * managed keys.
@@ -5195,6 +5199,12 @@ export interface Disk extends Resource {
    * ARM id of the DiskAccess resource for using private endpoints on disks.
    */
   diskAccessId?: string;
+  /**
+   * Performance tier of the disk (e.g, P4, S10) as described here:
+   * https://azure.microsoft.com/en-us/pricing/details/managed-disks/. Does not apply to Ultra
+   * disks.
+   */
+  tier?: string;
 }
 
 /**
@@ -5256,6 +5266,12 @@ export interface DiskUpdate {
    * ARM id of the DiskAccess resource for using private endpoints on disks.
    */
   diskAccessId?: string;
+  /**
+   * Performance tier of the disk (e.g, P4, S10) as described here:
+   * https://azure.microsoft.com/en-us/pricing/details/managed-disks/. Does not apply to Ultra
+   * disks.
+   */
+  tier?: string;
   /**
    * Resource tags
    */
@@ -5344,6 +5360,11 @@ export interface Snapshot extends Resource {
    * **NOTE: This property will not be serialized. It can only be populated by the server.**
    */
   readonly diskSizeBytes?: number;
+  /**
+   * The state of the snapshot. Possible values include: 'Unattached', 'Attached', 'Reserved',
+   * 'ActiveSAS', 'ReadyToUpload', 'ActiveUpload'
+   */
+  diskState?: DiskState;
   /**
    * Unique Guid identifying the resource.
    * **NOTE: This property will not be serialized. It can only be populated by the server.**
@@ -5451,10 +5472,10 @@ export interface EncryptionSetIdentity {
 export interface DiskEncryptionSet extends Resource {
   identity?: EncryptionSetIdentity;
   /**
-   * Possible values include: 'EncryptionAtRestWithPlatformKey', 'EncryptionAtRestWithCustomerKey',
+   * Possible values include: 'EncryptionAtRestWithCustomerKey',
    * 'EncryptionAtRestWithPlatformAndCustomerKeys'
    */
-  encryptionType?: EncryptionType;
+  encryptionType?: DiskEncryptionSetType;
   /**
    * The key vault key which is currently used by this disk encryption set.
    */
@@ -5477,10 +5498,10 @@ export interface DiskEncryptionSet extends Resource {
  */
 export interface DiskEncryptionSetUpdate {
   /**
-   * Possible values include: 'EncryptionAtRestWithPlatformKey', 'EncryptionAtRestWithCustomerKey',
+   * Possible values include: 'EncryptionAtRestWithCustomerKey',
    * 'EncryptionAtRestWithPlatformAndCustomerKeys'
    */
-  encryptionType?: EncryptionType;
+  encryptionType?: DiskEncryptionSetType;
   activeKey?: KeyVaultAndKeyReference;
   /**
    * Resource tags
@@ -7242,6 +7263,19 @@ export interface DiskEncryptionSetList extends Array<DiskEncryptionSet> {
   nextLink?: string;
 }
 
+/**
+ * @interface
+ * The List resources which are encrypted with the disk encryption set.
+ * @extends Array<string>
+ */
+export interface ResourceUriList extends Array<string> {
+  /**
+   * The uri to fetch the next page of encrypted resources. Call ListNext() with this to fetch the
+   * next page of encrypted resources.
+   */
+  nextLink?: string;
+}
+
 /**
  * @interface
  * The List disk access operation response.
@@ -7769,6 +7803,15 @@ export type NetworkAccessPolicy = 'AllowAll' | 'AllowPrivate' | 'DenyAll';
  */
 export type SnapshotStorageAccountTypes = 'Standard_LRS' | 'Premium_LRS' | 'Standard_ZRS';
 
+/**
+ * Defines values for DiskEncryptionSetType.
+ * Possible values include: 'EncryptionAtRestWithCustomerKey',
+ * 'EncryptionAtRestWithPlatformAndCustomerKeys'
+ * @readonly
+ * @enum {string}
+ */
+export type DiskEncryptionSetType = 'EncryptionAtRestWithCustomerKey' | 'EncryptionAtRestWithPlatformAndCustomerKeys';
+
 /**
  * Defines values for AccessLevel.
  * Possible values include: 'None', 'Read', 'Write'
@@ -11065,6 +11108,26 @@ export type DiskEncryptionSetsListResponse = DiskEncryptionSetList & {
     };
 };
 
+/**
+ * Contains response data for the listAssociatedResources operation.
+ */
+export type DiskEncryptionSetsListAssociatedResourcesResponse = ResourceUriList & {
+  /**
+   * The underlying HTTP response.
+   */
+  _response: msRest.HttpResponse & {
+      /**
+       * The response body as text (string format)
+       */
+      bodyAsText: string;
+
+      /**
+       * The response body as parsed JSON or XML
+       */
+      parsedBody: ResourceUriList;
+    };
+};
+
 /**
  * Contains response data for the beginCreateOrUpdate operation.
  */
@@ -11145,6 +11208,26 @@ export type DiskEncryptionSetsListNextResponse = DiskEncryptionSetList & {
     };
 };
 
+/**
+ * Contains response data for the listAssociatedResourcesNext operation.
+ */
+export type DiskEncryptionSetsListAssociatedResourcesNextResponse = ResourceUriList & {
+  /**
+   * The underlying HTTP response.
+   */
+  _response: msRest.HttpResponse & {
+      /**
+       * The response body as text (string format)
+       */
+      bodyAsText: string;
+
+      /**
+       * The response body as parsed JSON or XML
+       */
+      parsedBody: ResourceUriList;
+    };
+};
+
 /**
  * Contains response data for the createOrUpdate operation.
  */

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

@@ -7597,6 +7597,12 @@ export const CreationData: msRest.CompositeMapper = {
         type: {
           name: "Number"
         }
+      },
+      logicalSectorSize: {
+        serializedName: "logicalSectorSize",
+        type: {
+          name: "Number"
+        }
       }
     }
   }
@@ -7900,7 +7906,6 @@ export const Disk: msRest.CompositeMapper = {
         }
       },
       diskState: {
-        readOnly: true,
         serializedName: "properties.diskState",
         type: {
           name: "String"
@@ -7943,6 +7948,12 @@ export const Disk: msRest.CompositeMapper = {
         type: {
           name: "String"
         }
+      },
+      tier: {
+        serializedName: "properties.tier",
+        type: {
+          name: "String"
+        }
       }
     }
   }
@@ -8026,6 +8037,12 @@ export const DiskUpdate: msRest.CompositeMapper = {
           name: "String"
         }
       },
+      tier: {
+        serializedName: "properties.tier",
+        type: {
+          name: "String"
+        }
+      },
       tags: {
         serializedName: "tags",
         type: {
@@ -8177,6 +8194,12 @@ export const Snapshot: msRest.CompositeMapper = {
           name: "Number"
         }
       },
+      diskState: {
+        serializedName: "properties.diskState",
+        type: {
+          name: "String"
+        }
+      },
       uniqueId: {
         readOnly: true,
         serializedName: "properties.uniqueId",
@@ -10773,6 +10796,34 @@ export const DiskEncryptionSetList: msRest.CompositeMapper = {
   }
 };
 
+export const ResourceUriList: msRest.CompositeMapper = {
+  serializedName: "ResourceUriList",
+  type: {
+    name: "Composite",
+    className: "ResourceUriList",
+    modelProperties: {
+      value: {
+        required: true,
+        serializedName: "",
+        type: {
+          name: "Sequence",
+          element: {
+            type: {
+              name: "String"
+            }
+          }
+        }
+      },
+      nextLink: {
+        serializedName: "nextLink",
+        type: {
+          name: "String"
+        }
+      }
+    }
+  }
+};
+
 export const DiskAccessList: msRest.CompositeMapper = {
   serializedName: "DiskAccessList",
   type: {

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

@@ -50,7 +50,7 @@ export const apiVersion2: msRest.OperationQueryParameter = {
     required: true,
     isConstant: true,
     serializedName: "api-version",
-    defaultValue: '2020-05-01',
+    defaultValue: '2020-06-30',
     type: {
       name: "String"
     }