diff --git a/custom-words.txt b/custom-words.txt
index 91c9e472f526..b5446ceb73f5 100644
--- a/custom-words.txt
+++ b/custom-words.txt
@@ -1399,6 +1399,7 @@ preloading
 prem
 premieraddonoffers
 premieraddons
+Preprovisioned
 Prerelease
 prerestore
 pretrained
diff --git a/specification/azsadmin/resource-manager/compute/Microsoft.Compute.Admin/stable/2021-04-01/DiskMigrationJobs.json b/specification/azsadmin/resource-manager/compute/Microsoft.Compute.Admin/stable/2021-04-01/DiskMigrationJobs.json
new file mode 100644
index 000000000000..ebf93493cbd8
--- /dev/null
+++ b/specification/azsadmin/resource-manager/compute/Microsoft.Compute.Admin/stable/2021-04-01/DiskMigrationJobs.json
@@ -0,0 +1,489 @@
+{
+  "swagger": "2.0",
+  "info": {
+    "version": "2021-04-01",
+    "title": "ComputeDiskAdminManagementClient",
+    "description": "The Admin Compute Disk Management Client."
+  },
+  "host": "management.azure.com",
+  "schemes": [
+    "https"
+  ],
+  "consumes": [
+    "application/json"
+  ],
+  "produces": [
+    "application/json"
+  ],
+  "paths": {
+    "/subscriptions/{subscriptionId}/providers/Microsoft.Compute.Admin/locations/{location}/diskmigrationjobs": {
+      "get": {
+        "x-ms-examples": {
+          "Returns a list of disk migration jobs.": {
+            "$ref": "./examples/DiskMigrationJobs/List.json"
+          }
+        },
+        "tags": [
+          "DiskMigrationJobs"
+        ],
+        "operationId": "DiskMigrationJobs_List",
+        "description": "Returns a list of disk migration jobs.",
+        "parameters": [
+          {
+            "$ref": "Disks.json#/parameters/SubscriptionIdParameter"
+          },
+          {
+            "$ref": "Disks.json#/parameters/LocationParameter"
+          },
+          {
+            "$ref": "DiskMigrationJobs.json#/parameters/MigrationJobStatusParameter"
+          },
+          {
+            "$ref": "Disks.json#/parameters/ApiVersionParameter"
+          }
+        ],
+        "responses": {
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/ErrorResponse"
+            }
+          },
+          "200": {
+            "description": "OK -- The list of disk migration jobs has been returned.",
+            "schema": {
+              "$ref": "DiskMigrationJobs.json#/definitions/DiskMigrationJobList"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": null
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/providers/Microsoft.Compute.Admin/locations/{location}/diskmigrationjobs/{migrationId}": {
+      "get": {
+        "x-ms-examples": {
+          "Returns the requested disk migration job.": {
+            "$ref": "./examples/DiskMigrationJobs/Get.json"
+          }
+        },
+        "tags": [
+          "DiskMigrationJobs"
+        ],
+        "operationId": "DiskMigrationJobs_Get",
+        "description": "Returns the requested disk migration job.",
+        "parameters": [
+          {
+            "$ref": "Disks.json#/parameters/SubscriptionIdParameter"
+          },
+          {
+            "$ref": "Disks.json#/parameters/LocationParameter"
+          },
+          {
+            "$ref": "DiskMigrationJobs.json#/parameters/MigrationIdParameter"
+          },
+          {
+            "$ref": "Disks.json#/parameters/ApiVersionParameter"
+          }
+        ],
+        "responses": {
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/ErrorResponse"
+            }
+          },
+          "200": {
+            "description": "OK -- The disk migration job has been returned.",
+            "schema": {
+              "$ref": "DiskMigrationJobs.json#/definitions/DiskMigrationJob"
+            }
+          }
+        }
+      },
+      "put": {
+        "x-ms-examples": {
+          "Create a disk migration job.": {
+            "$ref": "./examples/DiskMigrationJobs/Create.json"
+          }
+        },
+        "tags": [
+          "DiskMigrationJobs"
+        ],
+        "operationId": "DiskMigrationJobs_Create",
+        "description": "Create a disk migration job.",
+        "parameters": [
+          {
+            "$ref": "Disks.json#/parameters/SubscriptionIdParameter"
+          },
+          {
+            "$ref": "Disks.json#/parameters/LocationParameter"
+          },
+          {
+            "$ref": "DiskMigrationJobs.json#/parameters/MigrationIdParameter"
+          },
+          {
+            "$ref": "DiskMigrationJobs.json#/parameters/TargetShareParameter"
+          },
+          {
+            "$ref": "DiskMigrationJobs.json#/parameters/TargetScaleUnitParameter"
+          },
+          {
+            "$ref": "DiskMigrationJobs.json#/parameters/TargetVolumeLabelParameter"
+          },
+          {
+            "$ref": "DiskMigrationJobs.json#/parameters/DiskListParameter"
+          },
+          {
+            "$ref": "Disks.json#/parameters/ApiVersionParameter"
+          }
+        ],
+        "responses": {
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/ErrorResponse"
+            }
+          },
+          "200": {
+            "description": "OK --  Disk migration job is created successfully.",
+            "schema": {
+              "$ref": "DiskMigrationJobs.json#/definitions/DiskMigrationJob"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/providers/Microsoft.Compute.Admin/locations/{location}/diskMigrationJobs/{migrationId}/cancel": {
+      "post": {
+        "x-ms-examples": {
+          "Cancel a disk migration job.": {
+            "$ref": "./examples/DiskMigrationJobs/Cancel.json"
+          }
+        },
+        "tags": [
+          "DiskMigrationJobs"
+        ],
+        "operationId": "DiskMigrationJobs_Cancel",
+        "description": "Cancel a disk migration job.",
+        "parameters": [
+          {
+            "$ref": "Disks.json#/parameters/SubscriptionIdParameter"
+          },
+          {
+            "$ref": "Disks.json#/parameters/LocationParameter"
+          },
+          {
+            "$ref": "DiskMigrationJobs.json#/parameters/MigrationIdParameter"
+          },
+          {
+            "$ref": "Disks.json#/parameters/ApiVersionParameter"
+          }
+        ],
+        "responses": {
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/ErrorResponse"
+            }
+          },
+          "200": {
+            "description": "OK --  Disk migration job cancellation is called.",
+            "schema": {
+              "$ref": "DiskMigrationJobs.json#/definitions/DiskMigrationJob"
+            }
+          }
+        }
+      }
+    }
+  },
+  "definitions": {
+    "ErrorResponse": {
+      "description": "Error response.",
+      "properties": {
+        "error": {
+          "description": "Error definition.",
+          "$ref": "#/definitions/ErrorDefinition"
+        }
+      }
+    },
+    "ErrorDefinition": {
+      "description": "Error definition.",
+      "readOnly": true,
+      "required": [
+        "message",
+        "code"
+      ],
+      "properties": {
+        "code": {
+          "description": "Service specific error code which serves as the substatus for the HTTP error code.",
+          "type": "string",
+          "minimum": 100,
+          "maximum": 600
+        },
+        "message": {
+          "description": "Description of the error.",
+          "type": "string"
+        }
+      }
+    },
+    "MigrationJobStatus": {
+      "description": "Migration job status.",
+      "type": "string",
+      "enum": [
+        "Undefined",
+        "Running",
+        "Succeeded",
+        "Failed",
+        "Canceled",
+        "Pending"
+      ],
+      "x-ms-enum": {
+        "name": "MigrationJobStatus",
+        "modelAsString": true
+      }
+    },
+    "MigrationSubTaskStatus": {
+      "description": "Migration child task status.",
+      "type": "string",
+      "enum": [
+        "Undefined",
+        "Running",
+        "Succeeded",
+        "Failed",
+        "Canceled",
+        "Pending",
+        "Skipped"
+      ],
+      "x-ms-enum": {
+        "name": "MigrationSubTaskStatus",
+        "modelAsString": true
+      }
+    },
+    "MigrationSubTaskProperties": {
+      "description": "Disk migration child task properties.",
+      "type": "object",
+      "properties": {
+        "migrationSubtaskStatus": {
+          "description": "The disk migration child task status.",
+          "$ref": "DiskMigrationJobs.json#/definitions/MigrationSubTaskStatus",
+          "readOnly": true
+        },
+        "reason": {
+          "description": "The reason of task failure.",
+          "type": "string",
+          "readOnly": true
+        },
+        "startTime": {
+          "description": "The task start time.",
+          "type": "string",
+          "format": "date-time",
+          "readOnly": true
+        },
+        "endTime": {
+          "description": "The task end time.",
+          "type": "string",
+          "format": "date-time",
+          "readOnly": true
+        },
+        "targetShare": {
+          "description": "The target share of migration task.",
+          "type": "string",
+          "readOnly": true
+        },
+        "sourceShare": {
+          "description": "The source share of migration task.",
+          "type": "string",
+          "readOnly": true
+        },
+        "targetDiskStateForMigration": {
+          "description": "The disk status.",
+          "$ref": "Disks.json#/definitions/DiskState",
+          "readOnly": true
+        },
+        "diskId": {
+          "description": "The id of disk.",
+          "type": "string",
+          "readOnly": true
+        }
+      }
+    },
+    "MigrationSubTaskList": {
+      "description": "List of disk migration tasks.",
+      "type": "array",
+      "items": {
+        "$ref": "DiskMigrationJobs.json#/definitions/MigrationSubTask"
+      }
+    },
+    "MigrationSubTask": {
+      "description": "Disk migration child task.",
+      "type": "object",
+      "properties": {
+        "migrationSubTaskId": {
+          "description": "The id of migration child task.",
+          "type": "string",
+          "readOnly": true
+        },
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "DiskMigrationJobs.json#/definitions/MigrationSubTaskProperties",
+          "description": "Disk migration child task properties."
+        }
+      }
+    },
+    "DiskMigrationJobProperties": {
+      "description": "Disk migration job properties.",
+      "type": "object",
+      "properties": {
+        "migrationId": {
+          "description": "The disk migration id.",
+          "type": "string"
+        },
+        "status": {
+          "description": "The current status of disk migration job.",
+          "$ref": "DiskMigrationJobs.json#/definitions/MigrationJobStatus",
+          "readOnly": true
+        },
+        "subtasks": {
+          "description": "The list of child migration tasks.",
+          "$ref": "DiskMigrationJobs.json#/definitions/MigrationSubTaskList",
+          "readOnly": true
+        },
+        "creationTime": {
+          "description": "The job creation time.",
+          "type": "string",
+          "format": "date-time",
+          "readOnly": true
+        },
+        "startTime": {
+          "description": "The job start time.",
+          "type": "string",
+          "format": "date-time",
+          "readOnly": true
+        },
+        "endTime": {
+          "description": "The job end time.",
+          "type": "string",
+          "format": "date-time",
+          "readOnly": true
+        },
+        "targetShare": {
+          "description": "The target share of migration job.",
+          "type": "string",
+          "readOnly": true
+        }
+      }
+    },
+    "DiskMigrationJob": {
+      "description": "Disk migration job.",
+      "type": "object",
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "DiskMigrationJobs.json#/definitions/DiskMigrationJobProperties",
+          "description": "Disk migration properties."
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "../../preview/2015-12-01-preview/Compute.json#/definitions/Resource"
+        }
+      ]
+    },
+    "DiskMigrationJobList": {
+      "type": "object",
+      "description": "List of disk migration jobs.",
+      "properties": {
+        "value": {
+          "description": "List of disk migration jobs.",
+          "type": "array",
+          "items": {
+            "$ref": "DiskMigrationJobs.json#/definitions/DiskMigrationJob"
+          }
+        },
+        "nextLink": {
+          "description": "URI to the next page.",
+          "type": "string"
+        }
+      }
+    },
+    "DiskListInput": {
+      "type": "array",
+      "description": "List of disks.",
+      "items": {
+        "$ref": "Disks.json#/definitions/Disk"
+      }
+    }
+  },
+  "parameters": {
+    "MigrationJobStatusParameter": {
+      "description": "The parameters of disk migration job status.",
+      "name": "status",
+      "in": "query",
+      "required": false,
+      "type": "string",
+      "x-ms-parameter-location": "method"
+    },
+    "MigrationIdParameter": {
+      "description": "The migration job guid name.",
+      "name": "migrationId",
+      "in": "path",
+      "required": true,
+      "type": "string",
+      "x-ms-parameter-location": "method"
+    },
+    "TargetShareParameter": {
+      "description": "The target share name.",
+      "name": "targetShare",
+      "in": "query",
+      "required": false,
+      "type": "string",
+      "x-ms-parameter-location": "method"
+    },
+    "TargetScaleUnitParameter": {
+      "description": "The target scale unit name.",
+      "name": "targetScaleUnit",
+      "in": "query",
+      "required": false,
+      "type": "string",
+      "x-ms-parameter-location": "method"
+    },
+    "TargetVolumeLabelParameter": {
+      "description": "The target volume label.",
+      "name": "targetVolumeLabel",
+      "in": "query",
+      "required": false,
+      "type": "string",
+      "x-ms-parameter-location": "method"
+    },
+    "DiskListParameter": {
+      "description": "The parameters of disk list.",
+      "name": "disks",
+      "in": "body",
+      "required": true,
+      "schema": {
+        "$ref": "DiskMigrationJobs.json#/definitions/DiskListInput"
+      },
+      "x-ms-parameter-location": "method"
+    }
+  },
+  "securityDefinitions": {
+    "azure_auth": {
+      "type": "oauth2",
+      "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize",
+      "flow": "implicit",
+      "description": "Authorization uses an Azure Active Directory OAuth2 flow.",
+      "scopes": {
+        "user_impersonation": "impersonate your user account"
+      }
+    }
+  },
+  "security": [
+    {
+      "azure_auth": [
+        "user_impersonation"
+      ]
+    }
+  ]
+}
diff --git a/specification/azsadmin/resource-manager/compute/Microsoft.Compute.Admin/stable/2021-04-01/Disks.json b/specification/azsadmin/resource-manager/compute/Microsoft.Compute.Admin/stable/2021-04-01/Disks.json
new file mode 100644
index 000000000000..575505b8c72d
--- /dev/null
+++ b/specification/azsadmin/resource-manager/compute/Microsoft.Compute.Admin/stable/2021-04-01/Disks.json
@@ -0,0 +1,447 @@
+{
+  "swagger": "2.0",
+  "info": {
+    "version": "2021-04-01",
+    "title": "ComputeDiskAdminManagementClient",
+    "description": "The Admin Compute Disk Management Client."
+  },
+  "host": "management.azure.com",
+  "schemes": [
+    "https"
+  ],
+  "consumes": [
+    "application/json"
+  ],
+  "produces": [
+    "application/json"
+  ],
+  "paths": {
+    "/subscriptions/{subscriptionId}/providers/Microsoft.Compute.Admin/locations/{location}/disks": {
+      "get": {
+        "x-ms-examples": {
+          "Returns a list of disks.": {
+            "$ref": "./examples/Disks/List.json"
+          }
+        },
+        "tags": [
+          "Disks"
+        ],
+        "operationId": "Disks_List",
+        "description": "Returns a list of disks.",
+        "parameters": [
+          {
+            "$ref": "Disks.json#/parameters/SubscriptionIdParameter"
+          },
+          {
+            "$ref": "Disks.json#/parameters/LocationParameter"
+          },
+          {
+            "$ref": "Disks.json#/parameters/UserSubscriptionIdParameter"
+          },
+          {
+            "$ref": "Disks.json#/parameters/DiskStateParameter"
+          },
+          {
+            "$ref": "Disks.json#/parameters/SourceSharePathParameter"
+          },
+          {
+            "$ref": "Disks.json#/parameters/SourceScaleUnitParameter"
+          },
+          {
+            "$ref": "Disks.json#/parameters/SourceVolumeLabelParameter"
+          },
+          {
+            "$ref": "Disks.json#/parameters/DiskCountParameter"
+          },
+          {
+            "$ref": "Disks.json#/parameters/DiskStartParameter"
+          },
+          {
+            "$ref": "Disks.json#/parameters/ApiVersionParameter"
+          }
+        ],
+        "responses": {
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/ErrorResponse"
+            }
+          },
+          "200": {
+            "description": "OK -- The list of disks has been returned.",
+            "schema": {
+              "$ref": "Disks.json#/definitions/DiskList"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": null
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/providers/Microsoft.Compute.Admin/locations/{location}/disks/{diskId}": {
+      "get": {
+        "x-ms-examples": {
+          "Returns the requested disk.": {
+            "$ref": "./examples/Disks/Get.json"
+          }
+        },
+        "tags": [
+          "Disks"
+        ],
+        "operationId": "Disks_Get",
+        "description": "Returns the disk.",
+        "parameters": [
+          {
+            "$ref": "Disks.json#/parameters/SubscriptionIdParameter"
+          },
+          {
+            "$ref": "Disks.json#/parameters/LocationParameter"
+          },
+          {
+            "$ref": "Disks.json#/parameters/DiskIdParameter"
+          },
+          {
+            "$ref": "Disks.json#/parameters/DiskSizeDetailParameter"
+          },
+          {
+            "$ref": "Disks.json#/parameters/ApiVersionParameter"
+          }
+        ],
+        "responses": {
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/ErrorResponse"
+            }
+          },
+          "200": {
+            "description": "OK -- The disk has been returned.",
+            "schema": {
+              "$ref": "Disks.json#/definitions/Disk"
+            }
+          }
+        }
+      }
+    }
+  },
+  "definitions": {
+    "ErrorResponse": {
+      "description": "Error response.",
+      "properties": {
+        "error": {
+          "description": "Error definition.",
+          "$ref": "#/definitions/ErrorDefinition"
+        }
+      }
+    },
+    "ErrorDefinition": {
+      "description": "Error definition.",
+      "readOnly": true,
+      "required": [
+        "message",
+        "code"
+      ],
+      "properties": {
+        "code": {
+          "description": "Service specific error code which serves as the substatus for the HTTP error code.",
+          "type": "string",
+          "minimum": 100,
+          "maximum": 600
+        },
+        "message": {
+          "description": "Description of the error.",
+          "type": "string"
+        }
+      }
+    },
+    "DiskProperties": {
+      "description": "Managed disk properties.",
+      "type": "object",
+      "properties": {
+        "diskId": {
+          "description": "The disk id.",
+          "type": "string"
+        },
+        "status": {
+          "description": "The disk status.",
+          "$ref": "Disks.json#/definitions/DiskState"
+        },
+        "sharePath": {
+          "description": "The disk share path.",
+          "type": "string"
+        },
+        "actualSizeGB": {
+          "description": "The actual size of disk in GB.",
+          "type": "integer",
+          "format": "int64",
+          "readOnly": true
+        },
+        "provisionSizeGB": {
+          "description": "The provision size of disk in GB.",
+          "type": "integer",
+          "format": "int64",
+          "readOnly": true
+        },
+        "managedBy": {
+          "description": "Compute resource Uri which owns this disk.",
+          "type": "string",
+          "readOnly": true
+        },
+        "userResourceId": {
+          "description": "The disk resource Uri from user view.",
+          "type": "string",
+          "readOnly": true
+        },
+        "diskType": {
+          "description": "The type of the disk resource.",
+          "$ref": "Disks.json#/definitions/DiskResourceType",
+          "readOnly": true
+        },
+        "diskSku": {
+          "description": "the disk sku.",
+          "$ref": "Disks.json#/definitions/AccountType",
+          "readOnly": true
+        },
+        "creationSourceUri": {
+          "description": "The disk creation source uri.",
+          "type": "string",
+          "readOnly": true
+        },
+        "creationOption": {
+          "description": "The disk creation option.",
+          "$ref": "Disks.json#/definitions/DiskCreationOption",
+          "readOnly": true
+        },
+        "exclusiveAllocatedSize": {
+          "description": "The exclusive allocated size for the disk.",
+          "type": "integer",
+          "format": "int64",
+          "readOnly": true
+        }
+      }
+    },
+    "Disk": {
+      "description": "Managed Disk.",
+      "type": "object",
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "Disks.json#/definitions/DiskProperties",
+          "description": "Disk properties."
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "../../preview/2015-12-01-preview/Compute.json#/definitions/Resource"
+        }
+      ]
+    },
+    "DiskList": {
+      "type": "object",
+      "description": "List of disks.",
+      "properties": {
+        "value": {
+          "description": "List of disks.",
+          "type": "array",
+          "items": {
+            "$ref": "Disks.json#/definitions/Disk"
+          }
+        },
+        "nextLink": {
+          "description": "URI to the next page.",
+          "type": "string"
+        }
+      }
+    },
+    "DiskState": {
+      "description": "Disk State.",
+      "type": "string",
+      "enum": [
+        "Undefined",
+        "Unattached",
+        "Attached",
+        "Reserved",
+        "ActiveSAS",
+        "Unknown",
+        "All",
+        "Recommended",
+        "OfflineMigration",
+        "OnlineMigration"
+      ],
+      "x-ms-enum": {
+        "name": "DiskState",
+        "modelAsString": true
+      }
+    },
+    "DiskResourceType": {
+      "description": "Disk resource type.",
+      "type": "string",
+      "enum": [
+        "Undefined",
+        "Disk",
+        "Snapshot",
+        "RestorePoint",
+        "ManagedBlob"
+      ],
+      "x-ms-enum": {
+        "name": "DiskResourceType",
+        "modelAsString": true
+      }
+    },
+    "AccountType": {
+      "description": "Disk Sku.",
+      "type": "string",
+      "enum": [
+        "Standard_LRS",
+        "Standard_ZRS",
+        "Standard_GRS",
+        "Standard_RAGRS",
+        "Premium_LRS",
+        "StandardSSD_LRS",
+        "UltraSSD_LRS"
+      ],
+      "x-ms-enum": {
+        "name": "AccountType",
+        "modelAsString": true
+      }
+    },
+    "DiskCreationOption": {
+      "description": "Disk creation option.",
+      "type": "string",
+      "enum": [
+        "Empty",
+        "FromImage",
+        "Import",
+        "Copy",
+        "Restore",
+        "FromPreprovisioned",
+        "Undelete",
+        "Upload",
+        "RecoverFromBlob"
+      ],
+      "x-ms-enum": {
+        "name": "DiskCreationOption",
+        "modelAsString": true
+      }
+    }
+  },
+  "parameters": {
+    "SubscriptionIdParameter": {
+      "name": "subscriptionId",
+      "in": "path",
+      "description": "Subscription credentials that uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call.",
+      "required": true,
+      "type": "string"
+    },
+    "LocationParameter": {
+      "description": "Location of the resource.",
+      "name": "location",
+      "in": "path",
+      "required": true,
+      "type": "string",
+      "x-ms-parameter-location": "method"
+    },
+    "ApiVersionParameter": {
+      "name": "api-version",
+      "in": "query",
+      "description": "Client API Version.",
+      "required": true,
+      "type": "string",
+      "default": "2021-04-01"
+    },
+    "UserSubscriptionIdParameter": {
+      "description": "User Subscription Id which the resource belongs to.",
+      "name": "userSubscriptionId",
+      "type": "string",
+      "in": "query",
+      "required": false,
+      "x-ms-parameter-location": "method"
+    },
+    "DiskStateParameter": {
+      "description": "The parameters of disk state.",
+      "name": "status",
+      "in": "query",
+      "required": false,
+      "type": "string",
+      "x-ms-parameter-location": "method"
+    },
+    "SourceSharePathParameter": {
+      "description": "The share which the resource belongs to.",
+      "name": "sharePath",
+      "in": "query",
+      "required": false,
+      "type": "string",
+      "x-ms-parameter-location": "method"
+    },
+    "SourceScaleUnitParameter": {
+      "description": "The scale unit which the resource belongs to.",
+      "name": "scaleUnit",
+      "in": "query",
+      "required": false,
+      "type": "string",
+      "x-ms-parameter-location": "method"
+    },
+    "SourceVolumeLabelParameter": {
+      "description": "The volume label of the volume which the resource belongs to.",
+      "name": "volumeLabel",
+      "in": "query",
+      "required": false,
+      "type": "string",
+      "x-ms-parameter-location": "method"
+    },
+    "DiskCountParameter": {
+      "description": "The maximum number of disks to return.",
+      "name": "count",
+      "in": "query",
+      "type": "integer",
+      "format": "int32",
+      "required": false,
+      "x-ms-parameter-location": "method"
+    },
+    "DiskStartParameter": {
+      "description": "The start index of disks in query.",
+      "name": "start",
+      "in": "query",
+      "type": "integer",
+      "format": "int32",
+      "required": false,
+      "x-ms-parameter-location": "method"
+    },
+    "DiskIdParameter": {
+      "description": "The disk guid as identity.",
+      "name": "diskId",
+      "type": "string",
+      "in": "path",
+      "required": true,
+      "x-ms-parameter-location": "method"
+    },
+    "DiskSizeDetailParameter": {
+      "description": "Switch for whether summary or detailed disk size information is returned.",
+      "name": "showSizeDetail",
+      "in": "query",
+      "required": false,
+      "type": "boolean",
+      "x-ms-parameter-location": "method",
+      "default": false
+    }
+  },
+  "securityDefinitions": {
+    "azure_auth": {
+      "type": "oauth2",
+      "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize",
+      "flow": "implicit",
+      "description": "Authorization uses an Azure Active Directory OAuth2 flow.",
+      "scopes": {
+        "user_impersonation": "impersonate your user account"
+      }
+    }
+  },
+  "security": [
+    {
+      "azure_auth": [
+        "user_impersonation"
+      ]
+    }
+  ]
+}
diff --git a/specification/azsadmin/resource-manager/compute/Microsoft.Compute.Admin/stable/2021-04-01/examples/DiskMigrationJobs/Cancel.json b/specification/azsadmin/resource-manager/compute/Microsoft.Compute.Admin/stable/2021-04-01/examples/DiskMigrationJobs/Cancel.json
new file mode 100644
index 000000000000..7b856e0967ec
--- /dev/null
+++ b/specification/azsadmin/resource-manager/compute/Microsoft.Compute.Admin/stable/2021-04-01/examples/DiskMigrationJobs/Cancel.json
@@ -0,0 +1,52 @@
+{
+  "parameters": {
+    "subscriptionId": "04666444-56f0-4d4f-afc5-dbd6b134b084",
+    "location": "redmond",
+    "migrationId": "ec9f79cf-e4d7-4d37-926a-e69c2198be8a",
+    "api-version": "2021-04-01"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/04666444-56f0-4d4f-afc5-dbd6b134b084/providers/Microsoft.Compute.Admin/locations/redmond/diskmigrationjobs/ec9f79cf-e4d7-4d37-926a-e69c2198be8a",
+        "name": "redmond/ec9f79cf-e4d7-4d37-926a-e69c2198be8a",
+        "type": "Microsoft.Compute.Admin/locations/diskmigrationjobs",
+        "location": "redmond",
+        "properties": {
+          "migrationId": "ec9f79cf-e4d7-4d37-926a-e69c2198be8a",
+          "status": "Canceled",
+          "subtasks": [
+            {
+              "migrationSubTaskId": "726dff1c-e765-44c6-b16d-f66f2c28e730",
+              "properties": {
+                "migrationSubtaskStatus": "Canceled",
+                "startTime": "2018-05-17T08:26:54.57146Z",
+                "endTime": "2018-05-17T08:27:35.0559255Z",
+                "targetShare": "\\\\SU1FileServer.mydomain.com\\SU1_ObjStore_1",
+                "sourceShare": "\\\\SU1FileServer.mydomain.com\\SU1_ObjStore_4",
+                "targetDiskStateForMigration": "Unattached",
+                "diskId": "423e4eb4-f791-4d13-ad5b-4d415733b0d6"
+              }
+            },
+            {
+              "migrationSubTaskId": "d6ab496c-4a76-474f-9ee2-9031053f06e8",
+              "properties": {
+                "migrationSubtaskStatus": "Succeeded",
+                "startTime": "2018-05-17T08:27:35.0871773Z",
+                "endTime": "2018-05-17T08:28:15.2842678Z",
+                "targetShare": "\\\\SU1FileServer.mydomain.com\\SU1_ObjStore_1",
+                "sourceShare": "\\\\SU1FileServer.mydomain.com\\SU1_ObjStore_2",
+                "targetDiskStateForMigration": "Unattached",
+                "diskId": "48dc9b56-5883-4011-9dc3-0e527f33e6ab"
+              }
+            }
+          ],
+          "creationTime": "2018-05-17T08:26:54.4777279Z",
+          "startTime": "2018-05-17T08:26:54.5402097Z",
+          "endTime": "0001-01-01T08:00:00Z",
+          "targetShare": "\\\\SU1FileServer.mydomain.com\\SU1_ObjStore_1"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/azsadmin/resource-manager/compute/Microsoft.Compute.Admin/stable/2021-04-01/examples/DiskMigrationJobs/Create.json b/specification/azsadmin/resource-manager/compute/Microsoft.Compute.Admin/stable/2021-04-01/examples/DiskMigrationJobs/Create.json
new file mode 100644
index 000000000000..846f93895812
--- /dev/null
+++ b/specification/azsadmin/resource-manager/compute/Microsoft.Compute.Admin/stable/2021-04-01/examples/DiskMigrationJobs/Create.json
@@ -0,0 +1,71 @@
+{
+  "parameters": {
+    "subscriptionId": "04666444-56f0-4d4f-afc5-dbd6b134b084",
+    "location": "redmond",
+    "migrationId": "ec9f79cf-e4d7-4d37-926a-e69c2198be8a",
+    "api-version": "2021-04-01",
+    "targetShare": "\\\\SU1FileServer.mydomain.com\\SU1_ObjStore_1",
+    "disks": [
+      {
+        "location": "redmond",
+        "properties": {
+          "diskId": "423e4eb4-f791-4d13-ad5b-4d415733b0d6",
+          "status": "Unattached",
+          "sharePath": "\\\\SU1FileServer.mydomain.com\\SU1_ObjStore_4"
+        }
+      },
+      {
+        "location": "redmond",
+        "properties": {
+          "diskId": "48dc9b56-5883-4011-9dc3-0e527f33e6ab",
+          "status": "Unattached",
+          "sharePath": "\\\\SU1FileServer.mydomain.com\\SU1_ObjStore_2"
+        }
+      }
+    ]
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/04666444-56f0-4d4f-afc5-dbd6b134b084/providers/Microsoft.Compute.Admin/locations/redmond/diskmigrationjobs/ec9f79cf-e4d7-4d37-926a-e69c2198be8a",
+        "name": "redmond/ec9f79cf-e4d7-4d37-926a-e69c2198be8a",
+        "type": "Microsoft.Compute.Admin/locations/diskmigrationjobs",
+        "location": "redmond",
+        "properties": {
+          "migrationId": "ec9f79cf-e4d7-4d37-926a-e69c2198be8a",
+          "status": "Pending",
+          "subtasks": [
+            {
+              "migrationSubTaskId": "726dff1c-e765-44c6-b16d-f66f2c28e730",
+              "properties": {
+                "migrationSubtaskStatus": "Pending",
+                "startTime": "0001-01-01T08:00:00Z",
+                "endTime": "0001-01-01T08:00:00Z",
+                "targetShare": "\\\\SU1FileServer.mydomain.com\\SU1_ObjStore_1",
+                "sourceShare": "\\\\SU1FileServer.mydomain.com\\SU1_ObjStore_4",
+                "targetDiskStateForMigration": "Unattached",
+                "diskId": "423e4eb4-f791-4d13-ad5b-4d415733b0d6"
+              }
+            },
+            {
+              "migrationSubTaskId": "d6ab496c-4a76-474f-9ee2-9031053f06e8",
+              "properties": {
+                "migrationSubtaskStatus": "Pending",
+                "startTime": "0001-01-01T08:00:00Z",
+                "endTime": "0001-01-01T08:00:00Z",
+                "targetShare": "\\\\SU1FileServer.mydomain.com\\SU1_ObjStore_1",
+                "sourceShare": "\\\\SU1FileServer.mydomain.com\\SU1_ObjStore_2",
+                "targetDiskStateForMigration": "Unattached",
+                "diskId": "48dc9b56-5883-4011-9dc3-0e527f33e6ab"
+              }
+            }
+          ],
+          "creationTime": "2018-05-17T08:26:54.4777279Z",
+          "startTime": "0001-01-01T08:00:00Z",
+          "endTime": "0001-01-01T08:00:00Z",
+          "targetShare": "\\\\SU1FileServer.mydomain.com\\SU1_ObjStore_1"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/azsadmin/resource-manager/compute/Microsoft.Compute.Admin/stable/2021-04-01/examples/DiskMigrationJobs/Get.json b/specification/azsadmin/resource-manager/compute/Microsoft.Compute.Admin/stable/2021-04-01/examples/DiskMigrationJobs/Get.json
new file mode 100644
index 000000000000..ea906e370aeb
--- /dev/null
+++ b/specification/azsadmin/resource-manager/compute/Microsoft.Compute.Admin/stable/2021-04-01/examples/DiskMigrationJobs/Get.json
@@ -0,0 +1,52 @@
+{
+  "parameters": {
+    "subscriptionId": "04666444-56f0-4d4f-afc5-dbd6b134b084",
+    "location": "redmond",
+    "migrationId": "ec9f79cf-e4d7-4d37-926a-e69c2198be8a",
+    "api-version": "2021-04-01"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/04666444-56f0-4d4f-afc5-dbd6b134b084/providers/Microsoft.Compute.Admin/locations/redmond/diskmigrationjobs/ec9f79cf-e4d7-4d37-926a-e69c2198be8a",
+        "name": "redmond/ec9f79cf-e4d7-4d37-926a-e69c2198be8a",
+        "type": "Microsoft.Compute.Admin/locations/diskmigrationjobs",
+        "location": "redmond",
+        "properties": {
+          "migrationId": "ec9f79cf-e4d7-4d37-926a-e69c2198be8a",
+          "status": "Running",
+          "subtasks": [
+            {
+              "migrationSubTaskId": "726dff1c-e765-44c6-b16d-f66f2c28e730",
+              "properties": {
+                "migrationSubtaskStatus": "Succeeded",
+                "startTime": "2018-05-17T08:26:54.57146Z",
+                "endTime": "2018-05-17T08:27:35.0559255Z",
+                "targetShare": "\\\\SU1FileServer.mydomain.com\\SU1_ObjStore_1",
+                "sourceShare": "\\\\SU1FileServer.mydomain.com\\SU1_ObjStore_4",
+                "targetDiskStateForMigration": "Unattached",
+                "diskId": "423e4eb4-f791-4d13-ad5b-4d415733b0d6"
+              }
+            },
+            {
+              "migrationSubTaskId": "d6ab496c-4a76-474f-9ee2-9031053f06e8",
+              "properties": {
+                "migrationSubtaskStatus": "Running",
+                "startTime": "2018-05-17T08:27:35.0871773Z",
+                "endTime": "0001-01-01T08:00:00Z",
+                "targetShare": "\\\\SU1FileServer.mydomain.com\\SU1_ObjStore_1",
+                "sourceShare": "\\\\SU1FileServer.mydomain.com\\SU1_ObjStore_2",
+                "targetDiskStateForMigration": "Unattached",
+                "diskId": "48dc9b56-5883-4011-9dc3-0e527f33e6ab"
+              }
+            }
+          ],
+          "creationTime": "2018-05-17T08:26:54.4777279Z",
+          "startTime": "2018-05-17T08:26:54.5402097Z",
+          "endTime": "0001-01-01T08:00:00Z",
+          "targetShare": "\\\\SU1FileServer.mydomain.com\\SU1_ObjStore_1"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/azsadmin/resource-manager/compute/Microsoft.Compute.Admin/stable/2021-04-01/examples/DiskMigrationJobs/List.json b/specification/azsadmin/resource-manager/compute/Microsoft.Compute.Admin/stable/2021-04-01/examples/DiskMigrationJobs/List.json
new file mode 100644
index 000000000000..63a0dd10ed85
--- /dev/null
+++ b/specification/azsadmin/resource-manager/compute/Microsoft.Compute.Admin/stable/2021-04-01/examples/DiskMigrationJobs/List.json
@@ -0,0 +1,95 @@
+{
+  "parameters": {
+    "subscriptionId": "04666444-56f0-4d4f-afc5-dbd6b134b084",
+    "location": "redmond",
+    "api-version": "2021-04-01"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/subscriptions/04666444-56f0-4d4f-afc5-dbd6b134b084/providers/Microsoft.Compute.Admin/locations/redmond/diskmigrationjobs/0050e481-63cd-4ad1-9c49-b8cbb992b75e",
+            "name": "redmond/0050e481-63cd-4ad1-9c49-b8cbb992b75e",
+            "type": "Microsoft.Compute.Admin/locations/diskmigrationjobs",
+            "location": "redmond",
+            "properties": {
+              "migrationId": "0050e481-63cd-4ad1-9c49-b8cbb992b75e",
+              "status": "Succeeded",
+              "subtasks": [
+                {
+                  "migrationSubTaskId": "607d1e44-48f5-418e-a263-ec60fb35d285",
+                  "properties": {
+                    "migrationSubtaskStatus": "Succeeded",
+                    "startTime": "2018-05-17T09:29:36.1290315Z",
+                    "endTime": "2018-05-17T09:30:16.3566829Z",
+                    "targetShare": "\\\\SU1FileServer.mydomain.com\\SU1_ObjStore_2",
+                    "sourceShare": "\\\\SU1FileServer.mydomain.com\\SU1_ObjStore_2",
+                    "targetDiskStateForMigration": "Unattached",
+                    "diskId": "5018f340-c41b-4e82-a553-248431c4df64"
+                  }
+                },
+                {
+                  "migrationSubTaskId": "cfe7b95e-d45c-4515-af2a-3a889e70559a",
+                  "properties": {
+                    "migrationSubtaskStatus": "Succeeded",
+                    "startTime": "2018-05-17T09:30:16.3723117Z",
+                    "endTime": "2018-05-17T09:30:56.5945261Z",
+                    "targetShare": "\\\\SU1FileServer.mydomain.com\\SU1_ObjStore_2",
+                    "sourceShare": "\\\\SU1FileServer.mydomain.com\\SU1_ObjStore_4",
+                    "targetDiskStateForMigration": "Unattached",
+                    "diskId": "4d9c7dd9-50ea-473d-87be-f7a57acd8aae"
+                  }
+                }
+              ],
+              "creationTime": "2018-05-17T09:29:36.0351498Z",
+              "startTime": "2018-05-17T09:29:36.0976561Z",
+              "endTime": "2018-05-17T09:31:06.6187954Z",
+              "targetShare": "\\\\SU1FileServer.mydomain.com\\SU1_ObjStore_2"
+            }
+          },
+          {
+            "id": "/subscriptions/04666444-56f0-4d4f-afc5-dbd6b134b084/providers/Microsoft.Compute.Admin/locations/redmond/diskmigrationjobs/9fbb98b2-fe81-449a-9d71-61bccb0d0489",
+            "name": "redmond/9fbb98b2-fe81-449a-9d71-61bccb0d0489",
+            "type": "Microsoft.Compute.Admin/locations/diskmigrationjobs",
+            "location": "redmond",
+            "properties": {
+              "migrationId": "9fbb98b2-fe81-449a-9d71-61bccb0d0489",
+              "status": "Succeeded",
+              "subtasks": [
+                {
+                  "migrationSubTaskId": "5a76680f-3788-492c-9840-ffb4c9f95729",
+                  "properties": {
+                    "migrationSubtaskStatus": "Succeeded",
+                    "startTime": "2018-05-18T02:18:49.1442797Z",
+                    "endTime": "2018-05-18T02:19:29.4948624Z",
+                    "targetShare": "\\\\SU1FileServer.mydomain.com\\SU1_ObjStore_2",
+                    "sourceShare": "\\\\SU1FileServer.mydomain.com\\SU1_ObjStore_1",
+                    "targetDiskStateForMigration": "Unattached",
+                    "diskId": "48dc9b56-5883-4011-9dc3-0e527f33e6ab"
+                  }
+                },
+                {
+                  "migrationSubTaskId": "c302a235-9e8c-431d-8a5e-8b1fc984b7ab",
+                  "properties": {
+                    "migrationSubtaskStatus": "Succeeded",
+                    "startTime": "2018-05-18T02:19:29.5104777Z",
+                    "endTime": "2018-05-18T02:20:09.7263314Z",
+                    "targetShare": "\\\\SU1FileServer.mydomain.com\\SU1_ObjStore_2",
+                    "sourceShare": "\\\\SU1FileServer.mydomain.com\\SU1_ObjStore_1",
+                    "targetDiskStateForMigration": "Unattached",
+                    "diskId": "423e4eb4-f791-4d13-ad5b-4d415733b0d6"
+                  }
+                }
+              ],
+              "creationTime": "2018-05-18T02:18:49.0978853Z",
+              "startTime": "2018-05-18T02:18:49.1286583Z",
+              "endTime": "2018-05-18T02:20:19.7823733Z",
+              "targetShare": "\\\\SU1FileServer.mydomain.com\\SU1_ObjStore_2"
+            }
+          }
+        ]
+      }
+    }
+  }
+}
diff --git a/specification/azsadmin/resource-manager/compute/Microsoft.Compute.Admin/stable/2021-04-01/examples/Disks/Get.json b/specification/azsadmin/resource-manager/compute/Microsoft.Compute.Admin/stable/2021-04-01/examples/Disks/Get.json
new file mode 100644
index 000000000000..0ff2b0d190d3
--- /dev/null
+++ b/specification/azsadmin/resource-manager/compute/Microsoft.Compute.Admin/stable/2021-04-01/examples/Disks/Get.json
@@ -0,0 +1,31 @@
+{
+  "parameters": {
+    "subscriptionId": "04666444-56f0-4d4f-afc5-dbd6b134b084",
+    "location": "redmond",
+    "diskId": "423e4eb4-f791-4d13-ad5b-4d415733b0d6",
+    "api-version": "2021-04-01"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/04666444-56f0-4d4f-afc5-dbd6b134b084/providers/Microsoft.Compute.Admin/locations/redmond/disks/423e4eb4-f791-4d13-ad5b-4d415733b0d6",
+        "name": "redmond/423e4eb4-f791-4d13-ad5b-4d415733b0d6",
+        "type": "Microsoft.Compute.Admin/locations/disks",
+        "location": "redmond",
+        "properties": {
+          "diskId": "423e4eb4-f791-4d13-ad5b-4d415733b0d6",
+          "status": "Unattached",
+          "sharePath": "\\\\SU1FileServer.mydomain.com\\SU1_ObjStore_4",
+          "actualSizeGB": 183,
+          "provisionSizeGB": 200,
+          "userResourceId": "/subscriptions/4496690e-348e-4dc0-addc-17395c3966ba/resourceGroups/DISKRG6ECD14E6/providers/Microsoft.Compute/Disks/diskrptest9vb55sb15w",
+          "diskType": "Disk",
+          "diskSku": "Standard_LRS",
+          "creationSourceUri": "/subscriptions/4496690e-348e-4dc0-addc-17395c3966ba/resourceGroups/diskrptest/providers/Microsoft.Compute/disks/testmd01",
+          "creationOption": "Copy",
+          "exclusiveAllocatedSize": 1073741824
+        }
+      }
+    }
+  }
+}
diff --git a/specification/azsadmin/resource-manager/compute/Microsoft.Compute.Admin/stable/2021-04-01/examples/Disks/List.json b/specification/azsadmin/resource-manager/compute/Microsoft.Compute.Admin/stable/2021-04-01/examples/Disks/List.json
new file mode 100644
index 000000000000..77605b095156
--- /dev/null
+++ b/specification/azsadmin/resource-manager/compute/Microsoft.Compute.Admin/stable/2021-04-01/examples/Disks/List.json
@@ -0,0 +1,143 @@
+{
+  "parameters": {
+    "subscriptionId": "04666444-56f0-4d4f-afc5-dbd6b134b084",
+    "location": "redmond",
+    "api-version": "2021-04-01",
+    "start": 1,
+    "count": 100,
+    "status": "Unattached"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/subscriptions/04666444-56f0-4d4f-afc5-dbd6b134b084/providers/Microsoft.Compute.Admin/locations/redmond/disks/423e4eb4-f791-4d13-ad5b-4d415733b0d6",
+            "name": "redmond/423e4eb4-f791-4d13-ad5b-4d415733b0d6",
+            "type": "Microsoft.Compute.Admin/locations/disks",
+            "location": "redmond",
+            "properties": {
+              "diskId": "423e4eb4-f791-4d13-ad5b-4d415733b0d6",
+              "status": "Unattached",
+              "sharePath": "\\\\SU1FileServer.mydomain.com\\SU1_ObjStore_4",
+              "actualSizeGB": 183,
+              "provisionSizeGB": 200,
+              "userResourceId": "/subscriptions/4496690e-348e-4dc0-addc-17395c3966ba/resourceGroups/DISKRG6ECD14E6/providers/Microsoft.Compute/Disks/diskrptest9vb55sb15w",
+              "diskType": "Disk",
+              "diskSku": "Standard_LRS",
+              "creationSourceUri": "/subscriptions/4496690e-348e-4dc0-addc-17395c3966ba/resourceGroups/diskrptest/providers/Microsoft.Compute/disks/testmd01",
+              "creationOption": "Copy"
+            }
+          },
+          {
+            "id": "/subscriptions/04666444-56f0-4d4f-afc5-dbd6b134b084/providers/Microsoft.Compute.Admin/locations/redmond/disks/48dc9b56-5883-4011-9dc3-0e527f33e6ab",
+            "name": "redmond/48dc9b56-5883-4011-9dc3-0e527f33e6ab",
+            "type": "Microsoft.Compute.Admin/locations/disks",
+            "location": "redmond",
+            "properties": {
+              "diskId": "48dc9b56-5883-4011-9dc3-0e527f33e6ab",
+              "status": "Unattached",
+              "sharePath": "\\\\SU1FileServer.mydomain.com\\SU1_ObjStore_2",
+              "actualSizeGB": 1,
+              "provisionSizeGB": 200,
+              "userResourceId": "/subscriptions/4496690e-348e-4dc0-addc-17395c3966ba/resourceGroups/DISKRG6ECD14E6/providers/Microsoft.Compute/Snapshots/diskrptestjrlt133h5g8t",
+              "diskType": "Snapshot",
+              "diskSku": "Standard_LRS",
+              "creationSourceUri": "/subscriptions/4496690e-348e-4dc0-addc-17395c3966ba/resourceGroups/diskrptest/providers/Microsoft.Compute/disks/testmd01",
+              "creationOption": "Copy"
+            }
+          },
+          {
+            "id": "/subscriptions/04666444-56f0-4d4f-afc5-dbd6b134b084/providers/Microsoft.Compute.Admin/locations/redmond/disks/5018f340-c41b-4e82-a553-248431c4df64",
+            "name": "redmond/5018f340-c41b-4e82-a553-248431c4df64",
+            "type": "Microsoft.Compute.Admin/locations/disks",
+            "location": "redmond",
+            "properties": {
+              "diskId": "5018f340-c41b-4e82-a553-248431c4df64",
+              "status": "Unattached",
+              "sharePath": "",
+              "actualSizeGB": 0,
+              "provisionSizeGB": 200,
+              "userResourceId": "/subscriptions/4496690e-348e-4dc0-addc-17395c3966ba/resourceGroups/DISKRG6ECD14E6/providers/Microsoft.Compute/Snapshots/diskrptestlhy3gmrez379",
+              "diskType": "Snapshot",
+              "diskSku": "Standard_LRS",
+              "creationSourceUri": "/subscriptions/4496690e-348e-4dc0-addc-17395c3966ba/resourceGroups/diskrptest/providers/Microsoft.Compute/disks/testmd01",
+              "creationOption": "Copy"
+            }
+          },
+          {
+            "id": "/subscriptions/04666444-56f0-4d4f-afc5-dbd6b134b084/providers/Microsoft.Compute.Admin/locations/redmond/disks/8b5a40f9-c5d0-4273-a5b2-7ec4be371e30",
+            "name": "redmond/8b5a40f9-c5d0-4273-a5b2-7ec4be371e30",
+            "type": "Microsoft.Compute.Admin/locations/disks",
+            "location": "redmond",
+            "properties": {
+              "diskId": "8b5a40f9-c5d0-4273-a5b2-7ec4be371e30",
+              "status": "Unattached",
+              "sharePath": "",
+              "actualSizeGB": 0,
+              "provisionSizeGB": 200,
+              "userResourceId": "/subscriptions/4496690e-348e-4dc0-addc-17395c3966ba/resourceGroups/DISKRG6ECD14E6/providers/Microsoft.Compute/Disks/diskrptest5wnmxirn",
+              "diskType": "Disk",
+              "diskSku": "Standard_LRS",
+              "creationSourceUri": "/subscriptions/4496690e-348e-4dc0-addc-17395c3966ba/resourceGroups/diskrptest/providers/Microsoft.Compute/disks/testmd01",
+              "creationOption": "Copy"
+            }
+          },
+          {
+            "id": "/subscriptions/04666444-56f0-4d4f-afc5-dbd6b134b084/providers/Microsoft.Compute.Admin/locations/redmond/disks/9664bba5-dcc1-4481-a85d-8a2dfca26c55",
+            "name": "redmond/9664bba5-dcc1-4481-a85d-8a2dfca26c55",
+            "type": "Microsoft.Compute.Admin/locations/disks",
+            "location": "redmond",
+            "properties": {
+              "diskId": "9664bba5-dcc1-4481-a85d-8a2dfca26c55",
+              "status": "Unattached",
+              "sharePath": "",
+              "actualSizeGB": 0,
+              "userResourceId": "/subscriptions/4496690e-348e-4dc0-addc-17395c3966ba/resourceGroups/DISKRG6ECD14E6/providers/Microsoft.Compute/Snapshots/diskrptestj32ckp6df9v",
+              "diskType": "Snapshot",
+              "diskSku": "Standard_LRS",
+              "creationSourceUri": "/subscriptions/4496690e-348e-4dc0-addc-17395c3966ba/resourceGroups/diskrptest/providers/Microsoft.Compute/disks/testmd01",
+              "creationOption": "Copy"
+            }
+          },
+          {
+            "id": "/subscriptions/04666444-56f0-4d4f-afc5-dbd6b134b084/providers/Microsoft.Compute.Admin/locations/redmond/disks/cc79941f-5f42-4ac7-8428-7553f5e47e4b",
+            "name": "redmond/cc79941f-5f42-4ac7-8428-7553f5e47e4b",
+            "type": "Microsoft.Compute.Admin/locations/disks",
+            "location": "redmond",
+            "properties": {
+              "diskId": "cc79941f-5f42-4ac7-8428-7553f5e47e4b",
+              "status": "Unattached",
+              "sharePath": "",
+              "actualSizeGB": 0,
+              "provisionSizeGB": 200,
+              "userResourceId": "/subscriptions/4496690e-348e-4dc0-addc-17395c3966ba/resourceGroups/DISKRG6ECD14E6/providers/Microsoft.Compute/Snapshots/diskrptestthml7uzd3hs2",
+              "diskType": "Snapshot",
+              "diskSku": "Standard_LRS",
+              "creationSourceUri": "/subscriptions/4496690e-348e-4dc0-addc-17395c3966ba/resourceGroups/diskrptest/providers/Microsoft.Compute/disks/testmd01",
+              "creationOption": "Copy"
+            }
+          },
+          {
+            "id": "/subscriptions/04666444-56f0-4d4f-afc5-dbd6b134b084/providers/Microsoft.Compute.Admin/locations/redmond/disks/dfee6038-fc35-4e0f-acd9-597b097a0b52",
+            "name": "redmond/dfee6038-fc35-4e0f-acd9-597b097a0b52",
+            "type": "Microsoft.Compute.Admin/locations/disks",
+            "location": "redmond",
+            "properties": {
+              "diskId": "dfee6038-fc35-4e0f-acd9-597b097a0b52",
+              "status": "Unattached",
+              "sharePath": "",
+              "actualSizeGB": 0,
+              "provisionSizeGB": 200,
+              "userResourceId": "/subscriptions/4496690e-348e-4dc0-addc-17395c3966ba/resourceGroups/DISKRG6ECD14E6/providers/Microsoft.Compute/Snapshots/diskrptestn9wefmbaqiu",
+              "diskType": "Snapshot",
+              "diskSku": "Standard_LRS",
+              "creationSourceUri": "/subscriptions/4496690e-348e-4dc0-addc-17395c3966ba/resourceGroups/diskrptest/providers/Microsoft.Compute/disks/testmd01",
+              "creationOption": "Copy"
+            }
+          }
+        ]
+      }
+    }
+  }
+}
diff --git a/specification/azsadmin/resource-manager/compute/readme.azsautogen.md b/specification/azsadmin/resource-manager/compute/readme.azsautogen.md
index 7376b5eb69c3..e37ff2fce66c 100644
--- a/specification/azsadmin/resource-manager/compute/readme.azsautogen.md
+++ b/specification/azsadmin/resource-manager/compute/readme.azsautogen.md
@@ -10,4 +10,6 @@ input-file:
     - Microsoft.Compute.Admin/preview/2015-12-01-preview/VMExtensions.json
     - Microsoft.Compute.Admin/preview/2018-07-30-preview/Disks.json
     - Microsoft.Compute.Admin/preview/2018-07-30-preview/DiskMigrationJobs.json
+    - Microsoft.Compute.Admin/stable/2021-04-01/Disks.json
+    - Microsoft.Compute.Admin/stable/2021-04-01/DiskMigrationJobs.json
 ```
diff --git a/specification/azsadmin/resource-manager/compute/readme.md b/specification/azsadmin/resource-manager/compute/readme.md
index dfbaaaa82be7..deeed7be84a1 100644
--- a/specification/azsadmin/resource-manager/compute/readme.md
+++ b/specification/azsadmin/resource-manager/compute/readme.md
@@ -24,22 +24,22 @@ These are the global settings for the Compute API.
 title: ComputeAdminClient
 description: Compute Admin Client
 openapi-type: arm
-tag: package-2021-01-01
+tag: package-2021-04-01
 ```
 
 ### Tag: package-2021-01-01
 
-These settings apply only when `--tag=package-2021-01-01` is specified on the command line.
+These settings apply only when `--tag=package-2021-04-01` is specified on the command line.
 
 ``` yaml $(tag) == 'package-2021-01-01'
 input-file:
     - Microsoft.Compute.Admin/preview/2015-12-01-preview/Compute.json
     - Microsoft.Compute.Admin/preview/2015-12-01-preview/PlatformImages.json
     - Microsoft.Compute.Admin/preview/2015-12-01-preview/VMExtensions.json
-    - Microsoft.Compute.Admin/preview/2018-07-30-preview/Disks.json
-    - Microsoft.Compute.Admin/preview/2018-07-30-preview/DiskMigrationJobs.json
     - Microsoft.Compute.Admin/stable/2020-11-01/Features.json
     - Microsoft.Compute.Admin/stable/2021-01-01/Quotas.json
+    - Microsoft.Compute.Admin/stable/2021-04-01/Disks.json
+    - Microsoft.Compute.Admin/stable/2021-04-01/DiskMigrationJobs.json
 ```
 
 ---
@@ -66,10 +66,10 @@ input-file:
     - Microsoft.Compute.Admin/preview/2015-12-01-preview/Compute.json
     - Microsoft.Compute.Admin/preview/2015-12-01-preview/PlatformImages.json
     - Microsoft.Compute.Admin/preview/2015-12-01-preview/VMExtensions.json
-    - Microsoft.Compute.Admin/preview/2018-07-30-preview/Disks.json
-    - Microsoft.Compute.Admin/preview/2018-07-30-preview/DiskMigrationJobs.json
     - Microsoft.Compute.Admin/stable/2020-11-01/Features.json
     - Microsoft.Compute.Admin/stable/2021-01-01/Quotas.json
+    - Microsoft.Compute.Admin/stable/2021-04-01/Disks.json
+    - Microsoft.Compute.Admin/stable/2021-04-01/DiskMigrationJobs.json
 ```
 
 ## Multi-API/Profile support for AutoRest v3 generators 
@@ -90,6 +90,8 @@ input-file:
   - $(this-folder)/Microsoft.Compute.Admin/preview/2015-12-01-preview/VMExtensions.json
   - $(this-folder)/Microsoft.Compute.Admin/preview/2018-07-30-preview/Disks.json
   - $(this-folder)/Microsoft.Compute.Admin/preview/2018-07-30-preview/DiskMigrationJobs.json
+  - $(this-folder)/Microsoft.Compute.Admin/stable/2021-04-01/Disks.json
+  - $(this-folder)/Microsoft.Compute.Admin/stable/2021-04-01/DiskMigrationJobs.json
 
 ```