Skip to content

Commit 2fabd58

Browse files
committed
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)
1 parent 09d0f1f commit 2fabd58

File tree

5 files changed

+69
-38
lines changed

5 files changed

+69
-38
lines changed

specification/azsadmin/resource-manager/compute/Microsoft.Compute.Admin/preview/2015-12-01-preview/VMExtensions.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,10 @@
224224
"description": "Target virtual machine operating system type necessary for deploying the extension handler.",
225225
"$ref": "PlatformImages.json#/definitions/OsType"
226226
},
227+
"publisher": {
228+
"description": "The publisher of the VM Extension",
229+
"type": "string"
230+
},
227231
"computeRole": {
228232
"description": "Compute role",
229233
"type": "string"

specification/azsadmin/resource-manager/compute/Microsoft.Compute.Admin/preview/2018-07-30-preview/DiskMigrationJobs.json

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,12 @@
114114
{
115115
"$ref": "DiskMigrationJobs.json#/parameters/TargetShareParameter"
116116
},
117+
{
118+
"$ref": "DiskMigrationJobs.json#/parameters/TargetScaleUnitParameter"
119+
},
120+
{
121+
"$ref": "DiskMigrationJobs.json#/parameters/TargetVolumeLabelParameter"
122+
},
117123
{
118124
"$ref": "DiskMigrationJobs.json#/parameters/DiskListParameter"
119125
},
@@ -378,7 +384,23 @@
378384
"description": "The target share name.",
379385
"name": "targetShare",
380386
"in": "query",
381-
"required": true,
387+
"required": false,
388+
"type": "string",
389+
"x-ms-parameter-location": "method"
390+
},
391+
"TargetScaleUnitParameter": {
392+
"description": "The target scale unit name.",
393+
"name": "targetScaleUnit",
394+
"in": "query",
395+
"required": false,
396+
"type": "string",
397+
"x-ms-parameter-location": "method"
398+
},
399+
"TargetVolumeLabelParameter": {
400+
"description": "The target volume label.",
401+
"name": "targetVolumeLabel",
402+
"in": "query",
403+
"required": false,
382404
"type": "string",
383405
"x-ms-parameter-location": "method"
384406
},

specification/azsadmin/resource-manager/compute/Microsoft.Compute.Admin/preview/2018-07-30-preview/Disks.json

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,12 @@
4444
{
4545
"$ref": "Disks.json#/parameters/SourceSharePathParameter"
4646
},
47+
{
48+
"$ref": "Disks.json#/parameters/SourceScaleUnitParameter"
49+
},
50+
{
51+
"$ref": "Disks.json#/parameters/SourceVolumeLabelParameter"
52+
},
4753
{
4854
"$ref": "Disks.json#/parameters/DiskCountParameter"
4955
},
@@ -267,13 +273,29 @@
267273
"x-ms-parameter-location": "method"
268274
},
269275
"SourceSharePathParameter": {
270-
"description": "The source share which the resource belongs to.",
276+
"description": "The share which the resource belongs to.",
271277
"name": "sharePath",
272278
"in": "query",
273279
"required": false,
274280
"type": "string",
275281
"x-ms-parameter-location": "method"
276282
},
283+
"SourceScaleUnitParameter": {
284+
"description": "The scale unit which the resource belongs to.",
285+
"name": "scaleUnit",
286+
"in": "query",
287+
"required": false,
288+
"type": "string",
289+
"x-ms-parameter-location": "method"
290+
},
291+
"SourceVolumeLabelParameter": {
292+
"description": "The volume label of the volume which the resource belongs to.",
293+
"name": "volumeLabel",
294+
"in": "query",
295+
"required": false,
296+
"type": "string",
297+
"x-ms-parameter-location": "method"
298+
},
277299
"DiskCountParameter": {
278300
"description": "The maximum number of disks to return.",
279301
"name": "count",
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# AutoRest v3 generators
2+
3+
> see https://aka.ms/autorest
4+
5+
``` yaml
6+
input-file:
7+
- $(this-folder)/Microsoft.Compute.Admin/preview/2015-12-01-preview/Compute.json
8+
- $(this-folder)/Microsoft.Compute.Admin/preview/2015-12-01-preview/PlatformImages.json
9+
- $(this-folder)/Microsoft.Compute.Admin/preview/2018-02-09/Quotas.json
10+
- $(this-folder)/Microsoft.Compute.Admin/preview/2015-12-01-preview/VMExtensions.json
11+
- $(this-folder)/Microsoft.Compute.Admin/preview/2018-07-30-preview/Disks.json
12+
- $(this-folder)/Microsoft.Compute.Admin/preview/2018-07-30-preview/DiskMigrationJobs.json
13+
```

specification/azsadmin/resource-manager/compute/readme.md

Lines changed: 6 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ These settings apply only when `--tag=package-2018-02-09` is specified on the co
3333

3434
``` yaml $(tag) == 'package-2018-02-09'
3535
input-file:
36-
- Microsoft.Compute.Admin/preview/2015-12-01-preview/Compute.json
37-
- Microsoft.Compute.Admin/preview/2015-12-01-preview/PlatformImages.json
38-
- Microsoft.Compute.Admin/preview/2018-02-09/Quotas.json
39-
- Microsoft.Compute.Admin/preview/2015-12-01-preview/VMExtensions.json
40-
- Microsoft.Compute.Admin/preview/2018-07-30-preview/Disks.json
41-
- Microsoft.Compute.Admin/preview/2018-07-30-preview/DiskMigrationJobs.json
36+
- $(this-folder)/Microsoft.Compute.Admin/preview/2015-12-01-preview/Compute.json
37+
- $(this-folder)/Microsoft.Compute.Admin/preview/2015-12-01-preview/PlatformImages.json
38+
- $(this-folder)/Microsoft.Compute.Admin/preview/2018-02-09/Quotas.json
39+
- $(this-folder)/Microsoft.Compute.Admin/preview/2015-12-01-preview/VMExtensions.json
40+
- $(this-folder)/Microsoft.Compute.Admin/preview/2018-07-30-preview/Disks.json
41+
- $(this-folder)/Microsoft.Compute.Admin/preview/2018-07-30-preview/DiskMigrationJobs.json
4242
```
4343

4444
---
@@ -55,33 +55,3 @@ csharp:
5555
output-folder: $(csharp-sdks-folder)/Generated
5656
clear-output-folder: true
5757
```
58-
59-
## Multi-API/Profile support for AutoRest v3 generators
60-
61-
AutoRest V3 generators require the use of `--tag=all-api-versions` to select api files.
62-
63-
This block is updated by an automatic script. Edits may be lost!
64-
65-
``` yaml $(tag) == 'all-api-versions' /* autogenerated */
66-
# include the azure profile definitions from the standard location
67-
require: $(this-folder)/../../../../profiles/readme.md
68-
69-
# all the input files across all versions
70-
input-file:
71-
- $(this-folder)/Microsoft.Compute.Admin/preview/2015-12-01-preview/Compute.json
72-
- $(this-folder)/Microsoft.Compute.Admin/preview/2015-12-01-preview/PlatformImages.json
73-
- $(this-folder)/Microsoft.Compute.Admin/preview/2018-02-09/Quotas.json
74-
- $(this-folder)/Microsoft.Compute.Admin/preview/2015-12-01-preview/VMExtensions.json
75-
- $(this-folder)/Microsoft.Compute.Admin/preview/2018-07-30-preview/Disks.json
76-
- $(this-folder)/Microsoft.Compute.Admin/preview/2018-07-30-preview/DiskMigrationJobs.json
77-
78-
```
79-
80-
If there are files that should not be in the `all-api-versions` set,
81-
uncomment the `exclude-file` section below and add the file paths.
82-
83-
``` yaml $(tag) == 'all-api-versions'
84-
#exclude-file:
85-
# - $(this-folder)/Microsoft.Example/stable/2010-01-01/somefile.json
86-
```
87-

0 commit comments

Comments
 (0)