From 2660ee02e881821c563ef367d6c1d0a15cddab13 Mon Sep 17 00:00:00 2001 From: Chase Van Buskirk Date: Mon, 25 Oct 2021 17:02:27 -0700 Subject: [PATCH 1/6] add creationTime to properties for VM, VMSS, CR, DH resources + remove required location for Resources --- .../stable/2021-11-01/compute.json | 27 ++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/compute.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/compute.json index 30c7da4aa986..e47ce7b29d02 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/compute.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/compute.json @@ -8965,6 +8965,12 @@ "$ref": "#/definitions/DedicatedHostInstanceView", "readOnly": true, "description": "The dedicated host instance view." + }, + "creationTime": { + "readOnly": true, + "type": "string", + "format": "date-time", + "description": "Specifies the time at which the Dedicated Host resource was created." } }, "description": "Properties of the dedicated host." @@ -9198,6 +9204,12 @@ "$ref": "#/definitions/CapacityReservationInstanceView", "readOnly": true, "description": "The Capacity reservation instance view." + }, + "creationTime": { + "readOnly": true, + "type": "string", + "format": "date-time", + "description": "Specifies the time at which the Capacity Reservation resource was created." } }, "description": "Properties of the Capacity reservation." @@ -12088,6 +12100,12 @@ "applicationProfile": { "$ref": "#/definitions/ApplicationProfile", "description": "Specifies the gallery applications that should be made available to the VM/VMSS" + }, + "creationTime": { + "readOnly": true, + "type": "string", + "format": "date-time", + "description": "Specifies the time at which the Virtual Machine resource was created." } }, "description": "Describes the properties of a Virtual Machine." @@ -13640,6 +13658,12 @@ "spotRestorePolicy": { "$ref": "#/definitions/SpotRestorePolicy", "description": "Specifies the Spot Restore properties for the virtual machine scale set." + }, + "creationTime": { + "readOnly": true, + "type": "string", + "format": "date-time", + "description": "Specifies the time at which the Virtual Machine Scale Set resource was created." } }, "description": "Describes the properties of a Virtual Machine Scale Set." @@ -14656,9 +14680,6 @@ "description": "Resource tags" } }, - "required": [ - "location" - ], "x-ms-azure-resource": true }, "UpdateResource": { From 8ab7bcba2ed235255684b367adcc70487f7f4ba3 Mon Sep 17 00:00:00 2001 From: Chase Van Buskirk Date: Mon, 1 Nov 2021 09:16:32 -0700 Subject: [PATCH 2/6] rename creationTime to timeCreated --- .../Microsoft.Compute/stable/2021-11-01/compute.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/compute.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/compute.json index e47ce7b29d02..d74e931acc78 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/compute.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/compute.json @@ -8966,7 +8966,7 @@ "readOnly": true, "description": "The dedicated host instance view." }, - "creationTime": { + "timeCreated": { "readOnly": true, "type": "string", "format": "date-time", @@ -9205,7 +9205,7 @@ "readOnly": true, "description": "The Capacity reservation instance view." }, - "creationTime": { + "timeCreated": { "readOnly": true, "type": "string", "format": "date-time", @@ -12101,7 +12101,7 @@ "$ref": "#/definitions/ApplicationProfile", "description": "Specifies the gallery applications that should be made available to the VM/VMSS" }, - "creationTime": { + "timeCreated": { "readOnly": true, "type": "string", "format": "date-time", @@ -13659,7 +13659,7 @@ "$ref": "#/definitions/SpotRestorePolicy", "description": "Specifies the Spot Restore properties for the virtual machine scale set." }, - "creationTime": { + "timeCreated": { "readOnly": true, "type": "string", "format": "date-time", From 0c065b314ddd38441e3fff6d89617ef0c3f63a1f Mon Sep 17 00:00:00 2001 From: Chase Van Buskirk Date: Mon, 8 Nov 2021 10:33:23 -0800 Subject: [PATCH 3/6] examples for timeCreated --- .../stable/2021-11-01/compute/GetACapacityReservation.json | 3 ++- .../stable/2021-11-01/compute/GetADedicatedHost.json | 3 ++- .../stable/2021-11-01/compute/GetVirtualMachine.json | 3 ++- .../compute/GetVirtualMachineScaleSetWithUserData.json | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/compute/GetACapacityReservation.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/compute/GetACapacityReservation.json index 2f3070c5bdef..41d63fe0dc84 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/compute/GetACapacityReservation.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/compute/GetACapacityReservation.json @@ -42,7 +42,8 @@ "displayStatus": "Provisioning succeeded" } ] - } + }, + "timeCreated": "2021-06-27T01:02:38.3138469+00:00" }, "location": "westus", "tags": { diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/compute/GetADedicatedHost.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/compute/GetADedicatedHost.json index 09e02a9ebadb..0fd47ae24513 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/compute/GetADedicatedHost.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/compute/GetADedicatedHost.json @@ -42,7 +42,8 @@ "displayStatus": "Host available" } ] - } + }, + "timeCreated": "2019-06-27T01:02:38.3138469+00:00" }, "location": "westus", "tags": { diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/compute/GetVirtualMachine.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/compute/GetVirtualMachine.json index 1b01a2dff9ad..377ba9911f60 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/compute/GetVirtualMachine.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/compute/GetVirtualMachine.json @@ -107,7 +107,8 @@ } }, "extensionsTimeBudget": "PT50M", - "provisioningState": "Succeeded" + "provisioningState": "Succeeded", + "timeCreated": "2021-06-27T01:02:38.3138469+00:00" }, "resources": [ { diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/compute/GetVirtualMachineScaleSetWithUserData.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/compute/GetVirtualMachineScaleSetWithUserData.json index a3ec0db9874a..700d07a0a57d 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/compute/GetVirtualMachineScaleSetWithUserData.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/compute/GetVirtualMachineScaleSetWithUserData.json @@ -99,7 +99,8 @@ "platformFaultDomainCount": 1, "hostGroup": { "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/hostGroups/myHostGroup" - } + }, + "timeCreated": "2021-06-27T01:02:38.3138469+00:00" } } } From 2b86d3532e66022405bf9ded51728e836eda1760 Mon Sep 17 00:00:00 2001 From: Chase Van Buskirk Date: Tue, 9 Nov 2021 21:02:09 -0800 Subject: [PATCH 4/6] add minimum api-version to descriptions for timeCreated --- .../Microsoft.Compute/stable/2021-11-01/compute.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/compute.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/compute.json index e9ba10cf4b60..a87079c73e81 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/compute.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/compute.json @@ -8946,7 +8946,7 @@ "readOnly": true, "type": "string", "format": "date-time", - "description": "Specifies the time at which the Dedicated Host resource was created." + "description": "Specifies the time at which the Dedicated Host resource was created.

Minimum api-version: 2021-11-01." } }, "description": "Properties of the dedicated host." @@ -9185,7 +9185,7 @@ "readOnly": true, "type": "string", "format": "date-time", - "description": "Specifies the time at which the Capacity Reservation resource was created." + "description": "Specifies the time at which the Capacity Reservation resource was created.

Minimum api-version: 2021-11-01." } }, "description": "Properties of the Capacity reservation." @@ -12081,7 +12081,7 @@ "readOnly": true, "type": "string", "format": "date-time", - "description": "Specifies the time at which the Virtual Machine resource was created." + "description": "Specifies the time at which the Virtual Machine resource was created.

Minimum api-version: 2021-11-01." } }, "description": "Describes the properties of a Virtual Machine." @@ -13639,7 +13639,7 @@ "readOnly": true, "type": "string", "format": "date-time", - "description": "Specifies the time at which the Virtual Machine Scale Set resource was created." + "description": "Specifies the time at which the Virtual Machine Scale Set resource was created.

Minimum api-version: 2021-11-01." } }, "description": "Describes the properties of a Virtual Machine Scale Set." From e0598ecc66080a5764087c9f5cc9defa5ab7a556 Mon Sep 17 00:00:00 2001 From: Chase Van Buskirk Date: Fri, 12 Nov 2021 09:18:19 -0800 Subject: [PATCH 5/6] add GetVirtualMachineScaleSet example --- .../stable/2021-11-01/compute.json | 3 + .../compute/GetVirtualMachineScaleSet.json | 108 ++++++++++++++++++ ...GetVirtualMachineScaleSetWithUserData.json | 3 +- 3 files changed, 112 insertions(+), 2 deletions(-) create mode 100644 specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/examples/compute/GetVirtualMachineScaleSet.json diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/compute.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/compute.json index a87079c73e81..397b4e4b205a 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/compute.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/compute.json @@ -5584,6 +5584,9 @@ }, "Get a virtual machine scale set with UserData": { "$ref": "./examples/compute/GetVirtualMachineScaleSetWithUserData.json" + }, + "Get a virtual machine scale set": { + "$ref": "./examples/compute/GetVirtualMachineScaleSet.json" } } } diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/examples/compute/GetVirtualMachineScaleSet.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/examples/compute/GetVirtualMachineScaleSet.json new file mode 100644 index 000000000000..b9ac096ea3a6 --- /dev/null +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/examples/compute/GetVirtualMachineScaleSet.json @@ -0,0 +1,108 @@ +{ + "parameters": { + "subscriptionId": "{subscription-id}", + "resourceGroupName": "myResourceGroup", + "vmScaleSetName": "myVirtualMachineScaleSet", + "api-version": "2021-11-01" + }, + "responses": { + "200": { + "body": { + "name": "myVirtualMachineScaleSet", + "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/virtualMachineScaleSets/myVirtualMachineScaleSet", + "type": "Microsoft.Compute/virtualMachineScaleSets", + "location": "westus", + "tags": { + "myTag1": "tagValue1" + }, + "sku": { + "name": "Standard_D2s_v3", + "tier": "Standard", + "capacity": 4 + }, + "properties": { + "singlePlacementGroup": false, + "upgradePolicy": { + "mode": "Automatic", + "automaticOSUpgradePolicy": { + "enableAutomaticOSUpgrade": false + } + }, + "virtualMachineProfile": { + "storageProfile": { + "osDisk": { + "createOption": "FromImage", + "caching": "ReadWrite", + "managedDisk": { + "storageAccountType": "Premium_LRS" + }, + "diskSizeGB": 30 + }, + "imageReference": { + "publisher": "azuredatabricks", + "offer": "databricks", + "sku": "databricksworker", + "version": "3.15.2" + }, + "dataDisks": [] + }, + "applicationProfile": { + "galleryApplications": [ + { + "tags": "myTag1", + "order": 1, + "packageReferenceId": "/subscriptions/32c17a9e-aa7b-4ba5-a45b-e324116b6fdb/resourceGroups/myresourceGroupName2/providers/Microsoft.Compute/galleries/myGallery1/applications/MyApplication1/versions/1.0", + "configurationReference": "https://mystorageaccount.blob.core.windows.net/configurations/settings.config" + }, + { + "packageReferenceId": "/subscriptions/32c17a9e-aa7b-4ba5-a45b-e324116b6fdg/resourceGroups/myresourceGroupName3/providers/Microsoft.Compute/galleries/myGallery2/applications/MyApplication2/versions/1.1" + } + ] + }, + "userData": "RXhhbXBsZSBVc2VyRGF0YQ==", + "osProfile": { + "computerNamePrefix": "myVirtualMachineScaleSet", + "adminUsername": "admin", + "linuxConfiguration": { + "disablePasswordAuthentication": false + } + }, + "networkProfile": { + "networkInterfaceConfigurations": [ + { + "name": "myNic", + "properties": { + "primary": true, + "ipConfigurations": [ + { + "name": "myIPConfig", + "properties": { + "primary": true, + "subnet": { + "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVNet/subnets/mySubnet" + } + } + } + ], + "networkSecurityGroup": { + "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkSecurityGroups/myNetworkSecurityGroup" + } + } + } + ] + } + }, + "provisioningState": "succeeded", + "overprovision": false, + "doNotRunExtensionsOnOverprovisionedVMs": false, + "platformFaultDomainCount": 1, + "hostGroup": { + "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/hostGroups/myHostGroup" + }, + "timeCreated": "2021-06-27T01:02:38.3138469+00:00" + } + } + } + } + } + \ No newline at end of file diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/examples/compute/GetVirtualMachineScaleSetWithUserData.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/examples/compute/GetVirtualMachineScaleSetWithUserData.json index 700d07a0a57d..a3ec0db9874a 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/examples/compute/GetVirtualMachineScaleSetWithUserData.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/examples/compute/GetVirtualMachineScaleSetWithUserData.json @@ -99,8 +99,7 @@ "platformFaultDomainCount": 1, "hostGroup": { "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/hostGroups/myHostGroup" - }, - "timeCreated": "2021-06-27T01:02:38.3138469+00:00" + } } } } From 1cadaae1d4d95f5e4b675bc6bf5c0472c99a13ba Mon Sep 17 00:00:00 2001 From: Chase Van Buskirk Date: Fri, 12 Nov 2021 10:29:03 -0800 Subject: [PATCH 6/6] reformat example --- .../compute/GetVirtualMachineScaleSet.json | 185 +++++++++--------- 1 file changed, 92 insertions(+), 93 deletions(-) diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/examples/compute/GetVirtualMachineScaleSet.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/examples/compute/GetVirtualMachineScaleSet.json index b9ac096ea3a6..e9ee744e597c 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/examples/compute/GetVirtualMachineScaleSet.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/examples/compute/GetVirtualMachineScaleSet.json @@ -1,108 +1,107 @@ { - "parameters": { - "subscriptionId": "{subscription-id}", - "resourceGroupName": "myResourceGroup", - "vmScaleSetName": "myVirtualMachineScaleSet", - "api-version": "2021-11-01" - }, - "responses": { - "200": { - "body": { - "name": "myVirtualMachineScaleSet", - "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/virtualMachineScaleSets/myVirtualMachineScaleSet", - "type": "Microsoft.Compute/virtualMachineScaleSets", - "location": "westus", - "tags": { - "myTag1": "tagValue1" + "parameters": { + "subscriptionId": "{subscription-id}", + "resourceGroupName": "myResourceGroup", + "vmScaleSetName": "myVirtualMachineScaleSet", + "api-version": "2021-11-01" + }, + "responses": { + "200": { + "body": { + "name": "myVirtualMachineScaleSet", + "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/virtualMachineScaleSets/myVirtualMachineScaleSet", + "type": "Microsoft.Compute/virtualMachineScaleSets", + "location": "westus", + "tags": { + "myTag1": "tagValue1" + }, + "sku": { + "name": "Standard_D2s_v3", + "tier": "Standard", + "capacity": 4 + }, + "properties": { + "singlePlacementGroup": false, + "upgradePolicy": { + "mode": "Automatic", + "automaticOSUpgradePolicy": { + "enableAutomaticOSUpgrade": false + } }, - "sku": { - "name": "Standard_D2s_v3", - "tier": "Standard", - "capacity": 4 - }, - "properties": { - "singlePlacementGroup": false, - "upgradePolicy": { - "mode": "Automatic", - "automaticOSUpgradePolicy": { - "enableAutomaticOSUpgrade": false - } - }, - "virtualMachineProfile": { - "storageProfile": { - "osDisk": { - "createOption": "FromImage", - "caching": "ReadWrite", - "managedDisk": { - "storageAccountType": "Premium_LRS" - }, - "diskSizeGB": 30 + "virtualMachineProfile": { + "storageProfile": { + "osDisk": { + "createOption": "FromImage", + "caching": "ReadWrite", + "managedDisk": { + "storageAccountType": "Premium_LRS" }, - "imageReference": { - "publisher": "azuredatabricks", - "offer": "databricks", - "sku": "databricksworker", - "version": "3.15.2" - }, - "dataDisks": [] + "diskSizeGB": 30 }, - "applicationProfile": { - "galleryApplications": [ - { - "tags": "myTag1", - "order": 1, - "packageReferenceId": "/subscriptions/32c17a9e-aa7b-4ba5-a45b-e324116b6fdb/resourceGroups/myresourceGroupName2/providers/Microsoft.Compute/galleries/myGallery1/applications/MyApplication1/versions/1.0", - "configurationReference": "https://mystorageaccount.blob.core.windows.net/configurations/settings.config" - }, - { - "packageReferenceId": "/subscriptions/32c17a9e-aa7b-4ba5-a45b-e324116b6fdg/resourceGroups/myresourceGroupName3/providers/Microsoft.Compute/galleries/myGallery2/applications/MyApplication2/versions/1.1" - } - ] + "imageReference": { + "publisher": "azuredatabricks", + "offer": "databricks", + "sku": "databricksworker", + "version": "3.15.2" }, - "userData": "RXhhbXBsZSBVc2VyRGF0YQ==", - "osProfile": { - "computerNamePrefix": "myVirtualMachineScaleSet", - "adminUsername": "admin", - "linuxConfiguration": { - "disablePasswordAuthentication": false + "dataDisks": [] + }, + "applicationProfile": { + "galleryApplications": [ + { + "tags": "myTag1", + "order": 1, + "packageReferenceId": "/subscriptions/32c17a9e-aa7b-4ba5-a45b-e324116b6fdb/resourceGroups/myresourceGroupName2/providers/Microsoft.Compute/galleries/myGallery1/applications/MyApplication1/versions/1.0", + "configurationReference": "https://mystorageaccount.blob.core.windows.net/configurations/settings.config" + }, + { + "packageReferenceId": "/subscriptions/32c17a9e-aa7b-4ba5-a45b-e324116b6fdg/resourceGroups/myresourceGroupName3/providers/Microsoft.Compute/galleries/myGallery2/applications/MyApplication2/versions/1.1" } - }, - "networkProfile": { - "networkInterfaceConfigurations": [ - { - "name": "myNic", - "properties": { - "primary": true, - "ipConfigurations": [ - { - "name": "myIPConfig", - "properties": { - "primary": true, - "subnet": { - "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVNet/subnets/mySubnet" - } + ] + }, + "userData": "RXhhbXBsZSBVc2VyRGF0YQ==", + "osProfile": { + "computerNamePrefix": "myVirtualMachineScaleSet", + "adminUsername": "admin", + "linuxConfiguration": { + "disablePasswordAuthentication": false + } + }, + "networkProfile": { + "networkInterfaceConfigurations": [ + { + "name": "myNic", + "properties": { + "primary": true, + "ipConfigurations": [ + { + "name": "myIPConfig", + "properties": { + "primary": true, + "subnet": { + "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVNet/subnets/mySubnet" } } - ], - "networkSecurityGroup": { - "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkSecurityGroups/myNetworkSecurityGroup" } + ], + "networkSecurityGroup": { + "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkSecurityGroups/myNetworkSecurityGroup" } } - ] - } - }, - "provisioningState": "succeeded", - "overprovision": false, - "doNotRunExtensionsOnOverprovisionedVMs": false, - "platformFaultDomainCount": 1, - "hostGroup": { - "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/hostGroups/myHostGroup" - }, - "timeCreated": "2021-06-27T01:02:38.3138469+00:00" - } + } + ] + } + }, + "provisioningState": "succeeded", + "overprovision": false, + "doNotRunExtensionsOnOverprovisionedVMs": false, + "platformFaultDomainCount": 1, + "hostGroup": { + "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/hostGroups/myHostGroup" + }, + "timeCreated": "2021-06-27T01:02:38.3138469+00:00" } } } } - \ No newline at end of file +}