Cumulative commit message:

commit 4ec980f (azure/stackadmin) Author: Yuxing Zhou <[email protected]> Date: Wed Mar 18 15:14:57 2020 +0800 [Azure Stack] Add scaleUnit and volumeLabel parameter to Disks_List (Azure#8733) * add scaleUnit and volumeLabel to Disks_List * fix ref location * update parameter description commit c70efa6 Author: bganapa <[email protected]> Date: Tue Feb 25 19:33:53 2020 -0800 Updating ReadMe to include (this-folder) commit ac2ee55 Author: Yuxing Zhou <[email protected]> Date: Mon Feb 17 08:52:02 2020 +0800 Add TargetScaleUnitParameter and TargetVolumeLabelParameter (Azure#8409) commit 79944a3 Author: hannah-murphy-0 <[email protected]> Date: Thu Feb 13 17:25:47 2020 -0800 Adding publisher field to VMExtension model (Azure#8398) commit 8ef2c06 Merge: 4691c2a b53a498 Author: bganapa <[email protected]> Date: Tue Feb 4 22:11:56 2020 -0800 git merge upstream/master commit 9e551f0 Author: bganapa <[email protected]> Date: Tue Nov 12 11:44:22 2019 -0800 Reset to Stackadmin2 (Azure#7766)
viananth · Mar 25, 2020 · 2fabd58 · 2fabd58
1 parent 09d0f1f
commit 2fabd58
Show file tree

Hide file tree

Showing 5 changed files with 69 additions and 38 deletions.
diff --git a/...urce-manager/compute/Microsoft.Compute.Admin/preview/2015-12-01-preview/VMExtensions.json b/...urce-manager/compute/Microsoft.Compute.Admin/preview/2015-12-01-preview/VMExtensions.json
@@ -224,6 +224,10 @@
           "description": "Target virtual machine operating system type necessary for deploying the extension handler.",
           "$ref": "PlatformImages.json#/definitions/OsType"
         },
+        "publisher": {
+          "description": "The publisher of the VM Extension",
+          "type": "string"
+        },
         "computeRole": {
           "description": "Compute role",
           "type": "string"

diff --git a/...manager/compute/Microsoft.Compute.Admin/preview/2018-07-30-preview/DiskMigrationJobs.json b/...manager/compute/Microsoft.Compute.Admin/preview/2018-07-30-preview/DiskMigrationJobs.json
@@ -114,6 +114,12 @@
           {
             "$ref": "DiskMigrationJobs.json#/parameters/TargetShareParameter"
           },
+          {
+            "$ref": "DiskMigrationJobs.json#/parameters/TargetScaleUnitParameter"
+          },
+          {
+            "$ref": "DiskMigrationJobs.json#/parameters/TargetVolumeLabelParameter"
+          },
           {
             "$ref": "DiskMigrationJobs.json#/parameters/DiskListParameter"
           },
@@ -378,7 +384,23 @@
       "description": "The target share name.",
       "name": "targetShare",
       "in": "query",
-      "required": true,
+      "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"
     },

diff --git a/...in/resource-manager/compute/Microsoft.Compute.Admin/preview/2018-07-30-preview/Disks.json b/...in/resource-manager/compute/Microsoft.Compute.Admin/preview/2018-07-30-preview/Disks.json
@@ -44,6 +44,12 @@
           {
             "$ref": "Disks.json#/parameters/SourceSharePathParameter"
           },
+          {
+            "$ref": "Disks.json#/parameters/SourceScaleUnitParameter"
+          },
+          {
+            "$ref": "Disks.json#/parameters/SourceVolumeLabelParameter"
+          },
           {
             "$ref": "Disks.json#/parameters/DiskCountParameter"
           },
@@ -267,13 +273,29 @@
       "x-ms-parameter-location": "method"
     },
     "SourceSharePathParameter": {
-      "description": "The source share which the resource belongs to.",
+      "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",

diff --git a/specification/azsadmin/resource-manager/compute/readme.azsautogen.md b/specification/azsadmin/resource-manager/compute/readme.azsautogen.md
@@ -0,0 +1,13 @@
+# AutoRest v3 generators
+
+> see https://aka.ms/autorest
+
+``` yaml
+input-file:  
+    - $(this-folder)/Microsoft.Compute.Admin/preview/2015-12-01-preview/Compute.json
+    - $(this-folder)/Microsoft.Compute.Admin/preview/2015-12-01-preview/PlatformImages.json
+    - $(this-folder)/Microsoft.Compute.Admin/preview/2018-02-09/Quotas.json
+    - $(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
+```
diff --git a/specification/azsadmin/resource-manager/compute/readme.md b/specification/azsadmin/resource-manager/compute/readme.md
@@ -33,12 +33,12 @@ These settings apply only when `--tag=package-2018-02-09` is specified on the co
 
 ``` yaml $(tag) == 'package-2018-02-09'
 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/2018-02-09/Quotas.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
+    - $(this-folder)/Microsoft.Compute.Admin/preview/2015-12-01-preview/Compute.json
+    - $(this-folder)/Microsoft.Compute.Admin/preview/2015-12-01-preview/PlatformImages.json
+    - $(this-folder)/Microsoft.Compute.Admin/preview/2018-02-09/Quotas.json
+    - $(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
 ```
 
 ---
@@ -55,33 +55,3 @@ csharp:
   output-folder: $(csharp-sdks-folder)/Generated
   clear-output-folder: true
 ```
-
-## Multi-API/Profile support for AutoRest v3 generators 
-
-AutoRest V3 generators require the use of `--tag=all-api-versions` to select api files.
-
-This block is updated by an automatic script. Edits may be lost!
-
-``` yaml $(tag) == 'all-api-versions' /* autogenerated */
-# include the azure profile definitions from the standard location
-require: $(this-folder)/../../../../profiles/readme.md
-
-# all the input files across all versions
-input-file:
-  - $(this-folder)/Microsoft.Compute.Admin/preview/2015-12-01-preview/Compute.json
-  - $(this-folder)/Microsoft.Compute.Admin/preview/2015-12-01-preview/PlatformImages.json
-  - $(this-folder)/Microsoft.Compute.Admin/preview/2018-02-09/Quotas.json
-  - $(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
-
-```
-
-If there are files that should not be in the `all-api-versions` set, 
-uncomment the  `exclude-file` section below and add the file paths.
-
-``` yaml $(tag) == 'all-api-versions'
-#exclude-file: 
-#  - $(this-folder)/Microsoft.Example/stable/2010-01-01/somefile.json
-```
-