From 4b3b012a4c684afd2e931bb2ac4c01bbf894eec4 Mon Sep 17 00:00:00 2001 From: Kai Han Date: Thu, 25 Jul 2019 16:37:10 -0700 Subject: [PATCH 1/2] add HyperVGeneation in SharedVMImageVersion --- .../stable/2019-03-01/compute.json | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-03-01/compute.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-03-01/compute.json index 9afb3356de34..5677439e56da 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-03-01/compute.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-03-01/compute.json @@ -6030,6 +6030,18 @@ ], "description": "Describes automatic OS upgrade properties on the image." }, + "HyperVGeneration": { + "type": "string", + "description": "Specifies the HyperVGeneration for the VM image", + "enum": [ + "V1", + "V2" + ], + "x-ms-enum": { + "name": "HyperVGeneration", + "modelAsString": true + } + }, "VirtualMachineImageProperties": { "properties": { "plan": { @@ -6046,6 +6058,9 @@ }, "automaticOSUpgradeProperties": { "$ref": "#/definitions/AutomaticOSUpgradeProperties" + }, + "hyperVGeneration": { + "$ref": "#/definitions/HyperVGeneration" } }, "description": "Describes the properties of a Virtual Machine Image." From c34793bd9910de785d31e7bf8e6da1fd7e30de8b Mon Sep 17 00:00:00 2001 From: Kai Han Date: Thu, 25 Jul 2019 17:09:51 -0700 Subject: [PATCH 2/2] reuse HyperVGenerationType --- .../stable/2019-03-01/compute.json | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-03-01/compute.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-03-01/compute.json index 5677439e56da..3d8032a629ed 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-03-01/compute.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-03-01/compute.json @@ -5220,7 +5220,7 @@ }, "HyperVGenerationType": { "type": "string", - "description": "Specifies the HyperVGeneration Type for the Virtual Machine created from the image", + "description": "Specifies the HyperVGeneration Type", "enum": [ "V1", "V2" @@ -6030,18 +6030,6 @@ ], "description": "Describes automatic OS upgrade properties on the image." }, - "HyperVGeneration": { - "type": "string", - "description": "Specifies the HyperVGeneration for the VM image", - "enum": [ - "V1", - "V2" - ], - "x-ms-enum": { - "name": "HyperVGeneration", - "modelAsString": true - } - }, "VirtualMachineImageProperties": { "properties": { "plan": { @@ -6060,7 +6048,7 @@ "$ref": "#/definitions/AutomaticOSUpgradeProperties" }, "hyperVGeneration": { - "$ref": "#/definitions/HyperVGeneration" + "$ref": "#/definitions/HyperVGenerationType" } }, "description": "Describes the properties of a Virtual Machine Image."