From e1a86d44e0c41fe932513a0d2c96c0852c382aa0 Mon Sep 17 00:00:00 2001 From: Hyonho Lee Date: Tue, 29 May 2018 20:59:28 -0700 Subject: [PATCH 1/2] Fix List VM Extension API name, description updates and fix for 2018-06-01 version --- .../stable/2017-12-01/compute.json | 14 +- .../stable/2018-04-01/compute.json | 8 +- .../stable/2018-06-01/compute.json | 274 +++++------------- 3 files changed, 78 insertions(+), 218 deletions(-) diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2017-12-01/compute.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2017-12-01/compute.json index 79a41ac02d70..bf922898b940 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2017-12-01/compute.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2017-12-01/compute.json @@ -5153,7 +5153,7 @@ }, "CreateOption": { "type": "string", - "description": "Specifies how the virtual machine should be created.

Possible values are:

**Attach** This value is used when you are using a specialized disk to create the virtual machine.

**FromImage** This value is used when you are using an image to create the virtual machine. If you are using a platform image, you also use the imageReference element described above. If you are using a marketplace image, you also use the plan element previously described.", + "description": "Specifies how the virtual machine should be created.

Possible values are:

**Attach** \\u2013 This value is used when you are using a specialized disk to create the virtual machine.

**FromImage** \\u2013 This value is used when you are using an image to create the virtual machine. If you are using a platform image, you also use the imageReference element described above. If you are using a marketplace image, you also use the plan element previously described.", "enum": [ "FromImage", "Empty", @@ -5230,7 +5230,7 @@ }, "createOption": { "$ref": "#/definitions/CreateOption", - "description": "Specifies how the virtual machine should be created.

Possible values are:

**Attach** This value is used when you are using a specialized disk to create the virtual machine.

**FromImage** This value is used when you are using an image to create the virtual machine. If you are using a platform image, you also use the imageReference element described above. If you are using a marketplace image, you also use the plan element previously described." + "description": "Specifies how the virtual machine should be created.

Possible values are:

**Attach** \\u2013 This value is used when you are using a specialized disk to create the virtual machine.

**FromImage** \\u2013 This value is used when you are using an image to create the virtual machine. If you are using a platform image, you also use the imageReference element described above. If you are using a marketplace image, you also use the plan element previously described." }, "diskSizeGB": { "type": "integer", @@ -5276,7 +5276,7 @@ }, "createOption": { "$ref": "#/definitions/CreateOption", - "description": "Specifies how the virtual machine should be created.

Possible values are:

**Attach** This value is used when you are using a specialized disk to create the virtual machine.

**FromImage** This value is used when you are using an image to create the virtual machine. If you are using a platform image, you also use the imageReference element described above. If you are using a marketplace image, you also use the plan element previously described." + "description": "Specifies how the virtual machine should be created.

Possible values are:

**Attach** \\u2013 This value is used when you are using a specialized disk to create the virtual machine.

**FromImage** \\u2013 This value is used when you are using an image to create the virtual machine. If you are using a platform image, you also use the imageReference element described above. If you are using a marketplace image, you also use the plan element previously described." }, "diskSizeGB": { "type": "integer", @@ -5984,7 +5984,7 @@ "type": "boolean", "description": "Whether OS upgrades should automatically be applied to scale set instances in a rolling fashion when a newer version of the image becomes available." }, - "autoOSUpgradePolicy":{ + "autoOSUpgradePolicy": { "$ref": "#/definitions/AutoOSUpgradePolicy", "description": "Configuration parameters used for performing automatic OS Upgrade." } @@ -6341,7 +6341,7 @@ }, "createOption": { "$ref": "#/definitions/CreateOption", - "description": "Specifies how the virtual machines in the scale set should be created.

The only allowed value is: **FromImage** This value is used when you are using an image to create the virtual machine. If you are using a platform image, you also use the imageReference element described above. If you are using a marketplace image, you also use the plan element previously described." + "description": "Specifies how the virtual machines in the scale set should be created.

The only allowed value is: **FromImage** \\u2013 This value is used when you are using an image to create the virtual machine. If you are using a platform image, you also use the imageReference element described above. If you are using a marketplace image, you also use the plan element previously described." }, "osType": { "type": "string", @@ -7364,10 +7364,10 @@ "rollbackError" : { "$ref": "#/definitions/ApiError", "readOnly": true, - "description": "Error Details if OS rollback failed." + "description": "Error details if OS rollback failed." } }, - "description": "Information about rollback on failed VM instances after a OS Upgrade operation" + "description": "Information about rollback on failed VM instances after a OS Upgrade operation." }, "UpgradeOperationHistoryStatus": { "properties": { diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-04-01/compute.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-04-01/compute.json index 7f7d9474ee33..0351eac41bee 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-04-01/compute.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-04-01/compute.json @@ -688,7 +688,7 @@ "tags": [ "VirtualMachineExtensions" ], - "operationId": "VirtualMachines_GetExtensions", + "operationId": "VirtualMachineExtensions_List", "description": "The operation to get all extensions of a Virtual Machine.", "parameters": [ { @@ -5890,7 +5890,7 @@ "type": "boolean", "description": "Whether OS upgrades should automatically be applied to scale set instances in a rolling fashion when a newer version of the image becomes available." }, - "autoOSUpgradePolicy":{ + "autoOSUpgradePolicy": { "$ref": "#/definitions/AutoOSUpgradePolicy", "description": "Configuration parameters used for performing automatic OS Upgrade." } @@ -7270,10 +7270,10 @@ "rollbackError" : { "$ref": "#/definitions/ApiError", "readOnly": true, - "description": "Error Details if OS rollback failed." + "description": "Error details if OS rollback failed." } }, - "description": "Information about rollback on failed VM instances after a OS Upgrade operation" + "description": "Information about rollback on failed VM instances after a OS Upgrade operation." }, "UpgradeOperationHistoryStatus": { "properties": { diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/compute.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/compute.json index 59fe809e5ff0..1b0ba2f464eb 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/compute.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/compute.json @@ -187,10 +187,7 @@ ], "responses": { "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/OperationStatusResponse" - } + "description": "OK" }, "204": { "description": "No Content" @@ -623,10 +620,7 @@ ], "responses": { "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/OperationStatusResponse" - } + "description": "OK" }, "202": { "description": "Accepted" @@ -694,7 +688,7 @@ "tags": [ "VirtualMachineExtensions" ], - "operationId": "VirtualMachines_GetExtensions", + "operationId": "VirtualMachineExtensions_List", "description": "The operation to get all extensions of a Virtual Machine.", "parameters": [ { @@ -1230,10 +1224,7 @@ ], "responses": { "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/OperationStatusResponse" - } + "description": "OK" }, "202": { "description": "Accepted" @@ -1588,10 +1579,7 @@ ], "responses": { "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/OperationStatusResponse" - } + "description": "OK" }, "202": { "description": "Accepted" @@ -1724,10 +1712,7 @@ ], "responses": { "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/OperationStatusResponse" - } + "description": "OK" }, "202": { "description": "Accepted" @@ -1767,10 +1752,7 @@ ], "responses": { "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/OperationStatusResponse" - } + "description": "OK" }, "202": { "description": "Accepted" @@ -1810,10 +1792,7 @@ ], "responses": { "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/OperationStatusResponse" - } + "description": "OK" } } } @@ -1954,10 +1933,7 @@ ], "responses": { "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/OperationStatusResponse" - } + "description": "OK" }, "202": { "description": "Accepted" @@ -1997,10 +1973,7 @@ ], "responses": { "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/OperationStatusResponse" - } + "description": "OK" }, "202": { "description": "Accepted" @@ -2040,10 +2013,7 @@ ], "responses": { "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/OperationStatusResponse" - } + "description": "OK" }, "202": { "description": "Accepted" @@ -2083,10 +2053,7 @@ ], "responses": { "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/OperationStatusResponse" - } + "description": "OK" }, "202": { "description": "Accepted" @@ -2126,10 +2093,7 @@ ], "responses": { "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/OperationStatusResponse" - } + "description": "OK" }, "202": { "description": "Accepted" @@ -2304,10 +2268,7 @@ ], "responses": { "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/OperationStatusResponse" - } + "description": "OK" }, "202": { "description": "Accepted" @@ -2396,10 +2357,7 @@ ], "responses": { "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/OperationStatusResponse" - } + "description": "OK" }, "202": { "description": "Accepted" @@ -2448,10 +2406,7 @@ ], "responses": { "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/OperationStatusResponse" - } + "description": "OK" }, "202": { "description": "Accepted" @@ -2632,10 +2587,7 @@ ], "responses": { "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/OperationStatusResponse" - } + "description": "OK" }, "202": { "description": "Accepted" @@ -2892,10 +2844,7 @@ ], "responses": { "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/OperationStatusResponse" - } + "description": "OK" }, "202": { "description": "Accepted" @@ -2944,10 +2893,7 @@ ], "responses": { "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/OperationStatusResponse" - } + "description": "OK" }, "202": { "description": "Accepted" @@ -2996,10 +2942,7 @@ ], "responses": { "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/OperationStatusResponse" - } + "description": "OK" }, "202": { "description": "Accepted" @@ -3048,10 +2991,7 @@ ], "responses": { "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/OperationStatusResponse" - } + "description": "OK" }, "202": { "description": "Accepted" @@ -3100,10 +3040,7 @@ ], "responses": { "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/OperationStatusResponse" - } + "description": "OK" }, "202": { "description": "Accepted" @@ -3152,10 +3089,7 @@ ], "responses": { "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/OperationStatusResponse" - } + "description": "OK" }, "202": { "description": "Accepted" @@ -3204,10 +3138,7 @@ ], "responses": { "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/OperationStatusResponse" - } + "description": "OK" }, "202": { "description": "Accepted" @@ -3256,10 +3187,7 @@ ], "responses": { "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/OperationStatusResponse" - } + "description": "OK" }, "202": { "description": "Accepted" @@ -3299,10 +3227,7 @@ ], "responses": { "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/OperationStatusResponse" - } + "description": "OK" }, "202": { "description": "Accepted" @@ -3342,10 +3267,7 @@ ], "responses": { "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/OperationStatusResponse" - } + "description": "OK" }, "202": { "description": "Accepted" @@ -3477,10 +3399,7 @@ ], "responses": { "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/OperationStatusResponse" - } + "description": "OK" }, "202": { "description": "Accepted" @@ -3527,10 +3446,7 @@ ], "responses": { "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/OperationStatusResponse" - } + "description": "OK" }, "202": { "description": "Accepted" @@ -3577,10 +3493,7 @@ ], "responses": { "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/OperationStatusResponse" - } + "description": "OK" }, "202": { "description": "Accepted" @@ -3687,10 +3600,7 @@ ], "responses": { "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/OperationStatusResponse" - } + "description": "OK" }, "202": { "description": "Accepted" @@ -3894,10 +3804,7 @@ ], "responses": { "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/OperationStatusResponse" - } + "description": "OK" }, "202": { "description": "Accepted" @@ -3944,10 +3851,7 @@ ], "responses": { "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/OperationStatusResponse" - } + "description": "OK" }, "202": { "description": "Accepted" @@ -3994,10 +3898,7 @@ ], "responses": { "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/OperationStatusResponse" - } + "description": "OK" }, "202": { "description": "Accepted" @@ -4044,10 +3945,7 @@ ], "responses": { "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/OperationStatusResponse" - } + "description": "OK" }, "202": { "description": "Accepted" @@ -4094,10 +3992,7 @@ ], "responses": { "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/OperationStatusResponse" - } + "description": "OK" }, "202": { "description": "Accepted" @@ -4827,20 +4722,31 @@ ], "description": "Capture Virtual Machine parameters." }, - "VirtualMachineCaptureResultProperties": { - "properties": { - "output": { - "type": "object", - "description": "Operation output data (raw JSON)" - } - }, - "description": "Compute-specific operation properties, including output" - }, "VirtualMachineCaptureResult": { "properties": { - "properties": { - "x-ms-client-flatten": true, - "$ref": "#/definitions/VirtualMachineCaptureResultProperties" + "$schema": { + "readOnly": true, + "type": "string", + "description": "the schema of the captured virtual machine" + }, + "contentVersion": { + "readOnly": true, + "type": "string", + "description": "the version of the content" + }, + "parameters": { + "readOnly": true, + "type": "object", + "description": "parameters of the captured virtual machine" + }, + "resources": { + "readOnly": true, + "type": "array", + "items": { + "type": "object", + "description": "resource item" + }, + "description": "a list of resource items of the captured virtual machine" } }, "allOf": [ @@ -4848,7 +4754,7 @@ "$ref": "#/definitions/SubResource" } ], - "description": "Resource Id." + "description": "Output of virtual machine capture operation." }, "Plan": { "properties": { @@ -5153,7 +5059,7 @@ }, "CreateOption": { "type": "string", - "description": "Specifies how the virtual machine should be created.

Possible values are:

**Attach** This value is used when you are using a specialized disk to create the virtual machine.

**FromImage** This value is used when you are using an image to create the virtual machine. If you are using a platform image, you also use the imageReference element described above. If you are using a marketplace image, you also use the plan element previously described.", + "description": "Specifies how the virtual machine should be created.

Possible values are:

**Attach** \\u2013 This value is used when you are using a specialized disk to create the virtual machine.

**FromImage** \\u2013 This value is used when you are using an image to create the virtual machine. If you are using a platform image, you also use the imageReference element described above. If you are using a marketplace image, you also use the plan element previously described.", "enum": [ "FromImage", "Empty", @@ -5230,7 +5136,7 @@ }, "createOption": { "$ref": "#/definitions/CreateOption", - "description": "Specifies how the virtual machine should be created.

Possible values are:

**Attach** This value is used when you are using a specialized disk to create the virtual machine.

**FromImage** This value is used when you are using an image to create the virtual machine. If you are using a platform image, you also use the imageReference element described above. If you are using a marketplace image, you also use the plan element previously described." + "description": "Specifies how the virtual machine should be created.

Possible values are:

**Attach** \\u2013 This value is used when you are using a specialized disk to create the virtual machine.

**FromImage** \\u2013 This value is used when you are using an image to create the virtual machine. If you are using a platform image, you also use the imageReference element described above. If you are using a marketplace image, you also use the plan element previously described." }, "diskSizeGB": { "type": "integer", @@ -5276,7 +5182,7 @@ }, "createOption": { "$ref": "#/definitions/CreateOption", - "description": "Specifies how the virtual machine should be created.

Possible values are:

**Attach** This value is used when you are using a specialized disk to create the virtual machine.

**FromImage** This value is used when you are using an image to create the virtual machine. If you are using a platform image, you also use the imageReference element described above. If you are using a marketplace image, you also use the plan element previously described." + "description": "Specifies how the virtual machine should be created.

Possible values are:

**Attach** \\u2013 This value is used when you are using a specialized disk to create the virtual machine.

**FromImage** \\u2013 This value is used when you are using an image to create the virtual machine. If you are using a platform image, you also use the imageReference element described above. If you are using a marketplace image, you also use the plan element previously described." }, "diskSizeGB": { "type": "integer", @@ -5992,7 +5898,7 @@ "type": "boolean", "description": "Whether OS upgrades should automatically be applied to scale set instances in a rolling fashion when a newer version of the image becomes available." }, - "autoOSUpgradePolicy":{ + "autoOSUpgradePolicy": { "$ref": "#/definitions/AutoOSUpgradePolicy", "description": "Configuration parameters used for performing automatic OS Upgrade." } @@ -6349,7 +6255,7 @@ }, "createOption": { "$ref": "#/definitions/CreateOption", - "description": "Specifies how the virtual machines in the scale set should be created.

The only allowed value is: **FromImage** This value is used when you are using an image to create the virtual machine. If you are using a platform image, you also use the imageReference element described above. If you are using a marketplace image, you also use the plan element previously described." + "description": "Specifies how the virtual machines in the scale set should be created.

The only allowed value is: **FromImage** \\u2013 This value is used when you are using an image to create the virtual machine. If you are using a platform image, you also use the imageReference element described above. If you are using a marketplace image, you also use the plan element previously described." }, "osType": { "type": "string", @@ -7372,10 +7278,10 @@ "rollbackError" : { "$ref": "#/definitions/ApiError", "readOnly": true, - "description": "Error Details if OS rollback failed." + "description": "Error details if OS rollback failed." } }, - "description": "Information about rollback on failed VM instances after a OS Upgrade operation" + "description": "Information about rollback on failed VM instances after a OS Upgrade operation." }, "UpgradeOperationHistoryStatus": { "properties": { @@ -7842,15 +7748,6 @@ }, "description": "Api error." }, - "ComputeLongRunningOperationProperties": { - "properties": { - "output": { - "type": "object", - "description": "Operation output data (raw JSON)" - } - }, - "description": "Compute-specific operation properties, including output" - }, "Resource": { "description": "The Resource model definition.", "properties": { @@ -7933,38 +7830,6 @@ }, "description": "Response after calling a manual recovery walk" }, - "OperationStatusResponse": { - "properties": { - "name": { - "readOnly": true, - "type": "string", - "description": "Operation ID" - }, - "status": { - "readOnly": true, - "type": "string", - "description": "Operation status" - }, - "startTime": { - "readOnly": true, - "type": "string", - "format": "date-time", - "description": "Start time of the operation" - }, - "endTime": { - "readOnly": true, - "type": "string", - "format": "date-time", - "description": "End time of the operation" - }, - "error": { - "readOnly": true, - "$ref": "#/definitions/ApiError", - "description": "Api error" - } - }, - "description": "Operation status response" - }, "RequestRateByIntervalInput": { "properties": { "intervalLength": { @@ -8044,11 +7909,6 @@ "description": "LogAnalyticsOutput" } }, - "allOf": [ - { - "$ref": "#/definitions/OperationStatusResponse" - } - ], "description": "LogAnalytics operation status response" }, "LogAnalyticsOutput": { From d4855e2ca85a8ed773644fdb69da2a852097cca4 Mon Sep 17 00:00:00 2001 From: Hyonho Lee Date: Fri, 1 Jun 2018 15:59:37 -0700 Subject: [PATCH 2/2] Add VMSS Ip Tag --- .../stable/2018-04-01/compute.json | 20 +++++++++++++++++++ .../stable/2018-06-01/compute.json | 20 +++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-04-01/compute.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-04-01/compute.json index 0351eac41bee..508658983168 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-04-01/compute.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-04-01/compute.json @@ -6667,6 +6667,19 @@ ], "description": "Describes a virtual machines scale sets network configuration's DNS settings." }, + "VirtualMachineScaleSetIpTag": { + "properties": { + "ipTagType": { + "type": "string", + "description": "IP tag type. Example: FirstPartyUsage." + }, + "tag": { + "type": "string", + "description": "IP tag associated with the public IP. Example: SQL, Storage etc." + } + }, + "description": "Contains the IP tag associated with the public IP address." + }, "VirtualMachineScaleSetPublicIPAddressConfiguration": { "properties": { "name": { @@ -6706,6 +6719,13 @@ "dnsSettings": { "$ref": "#/definitions/VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings", "description": "The dns settings to be applied on the publicIP addresses ." + }, + "ipTags": { + "type": "array", + "items": { + "$ref": "#/definitions/VirtualMachineScaleSetIpTag" + }, + "description": "The list of IP tags associated with the public IP address." } }, "description": "Describes a virtual machines scale set IP Configuration's PublicIPAddress configuration" diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/compute.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/compute.json index 1b0ba2f464eb..d87125814040 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/compute.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/compute.json @@ -6675,6 +6675,19 @@ ], "description": "Describes a virtual machines scale sets network configuration's DNS settings." }, + "VirtualMachineScaleSetIpTag": { + "properties": { + "ipTagType": { + "type": "string", + "description": "IP tag type. Example: FirstPartyUsage." + }, + "tag": { + "type": "string", + "description": "IP tag associated with the public IP. Example: SQL, Storage etc." + } + }, + "description": "Contains the IP tag associated with the public IP address." + }, "VirtualMachineScaleSetPublicIPAddressConfiguration": { "properties": { "name": { @@ -6714,6 +6727,13 @@ "dnsSettings": { "$ref": "#/definitions/VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings", "description": "The dns settings to be applied on the publicIP addresses ." + }, + "ipTags": { + "type": "array", + "items": { + "$ref": "#/definitions/VirtualMachineScaleSetIpTag" + }, + "description": "The list of IP tags associated with the public IP address." } }, "description": "Describes a virtual machines scale set IP Configuration's PublicIPAddress configuration"