From 37b03ef9fdbb12bc0c75de2b177459b4a00e419c Mon Sep 17 00:00:00 2001 From: Sudheera Kodavati Date: Thu, 28 Oct 2021 02:01:28 +0530 Subject: [PATCH 1/9] RRP changes in swagger --- .../stable/2021-11-01/compute.json | 36 ++---- .../CopyRestorePointBetweenRegions.json | 84 +++++++++++++ .../compute/CreateARestorePoint.json | 7 +- ...torePointCollectionForCrossRegionCopy.json | 59 ++++++++++ .../2021-11-01/compute/GetRestorePoint.json | 7 +- ...tCollectionWithContainedRestorePoints.json | 7 +- .../compute/GetRestorePointInstanceView.json | 111 ++++++++++++++++++ 7 files changed, 265 insertions(+), 46 deletions(-) create mode 100644 specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/compute/CopyRestorePointBetweenRegions.json create mode 100644 specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/compute/CreateOrUpdateARestorePointCollectionForCrossRegionCopy.json create mode 100644 specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/compute/GetRestorePointInstanceView.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 30c7da4aa986..756b7a43637c 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 @@ -8326,30 +8326,6 @@ }, "description": "Describes a data disk." }, - "RestorePointProvisioningDetails": { - "properties": { - "creationTime": { - "type": "string", - "format": "date-time", - "description": "Gets the creation time of the restore point." - }, - "totalUsedSizeInBytes": { - "type": "integer", - "format": "int64", - "description": "Gets the total size of the data in all the disks which are part of the restore point." - }, - "statusCode": { - "type": "integer", - "format": "int32", - "description": "Gets the status of the Create restore point operation." - }, - "statusMessage": { - "type": "string", - "description": "Gets the status message of the Create restore point operation." - } - }, - "description": "Restore Point Provisioning details." - }, "RestorePoint": { "properties": { "properties": { @@ -8398,10 +8374,14 @@ }, "description": "Gets the consistency mode for the restore point. Please refer to https://aka.ms/RestorePoints for more details." }, - "provisioningDetails": { - "$ref": "#/definitions/RestorePointProvisioningDetails", - "readOnly": true, - "description": "Gets the provisioning details set by the server during Create restore point operation." + "timeCreated": { + "type": "string", + "format": "date-time", + "description": "Gets the creation time of the restore point." + }, + "sourceRestorePoint": { + "$ref": "#/definitions/ApiEntityReference", + "description": "Source Restore point Id from which copy of the Restore point is to be created." } }, "description": "The restore point properties." diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/compute/CopyRestorePointBetweenRegions.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/compute/CopyRestorePointBetweenRegions.json new file mode 100644 index 000000000000..a3ffceae57dc --- /dev/null +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/compute/CopyRestorePointBetweenRegions.json @@ -0,0 +1,84 @@ +{ + "parameters": { + "subscriptionId": "{subscription-id}", + "resourceGroupName": "myResourceGroup", + "restorePointCollectionName": "rpcName", + "restorePointName": "rpName", + "api-version": "2021-11-01", + "parameters": { + "properties": { + "sourceRestorePoint": + { + "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/restorePointCollections/sourceRpcName/restorePoints/sourceRpName" + } + } + } + }, + "responses": { + "201": { + "body": { + "name": "rpName", + "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/restorePointCollections/rpcName/restorePoints/rpName", + "properties": { + "sourceRestorePoint": { + "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/restorePointCollections/sourceRpcName/restorePoints/sourceRpName" + }, + "sourceMetadata": { + "vmId": "76d6541e-80bd-4dc1-932b-3cae4cfb80e7", + "hardwareProfile": { + "vmSize": "Standard_B1s" + }, + "storageProfile": { + "osDisk": { + "osType": "Windows", + "name": "osDisk123", + "caching": "ReadWrite", + "managedDisk": { + "storageAccountType": "Standard_LRS", + "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/osDisk123" + }, + "diskRestorePoint": { + "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/restorePointCollections/rpcName/restorePoints/rpName/diskRestorePoints/osDisk123_22b4bdfe-6c54-4f72-84d8-85d8860f0c57" + } + }, + "dataDisks": [ + { + "lun": 1, + "name": "dataDisk123", + "caching": "None", + "managedDisk": { + "storageAccountType": "Standard_LRS", + "id": "/subscriptions/{subscription-id}/resourceGroups/userdata/providers/Microsoft.Compute/disks/dataDisk123" + }, + "diskRestorePoint": { + "id": "/subscriptions/{subscription-id}/resourceGroups/userdata/providers/Microsoft.Compute/restorePointCollections/mynewrpc/restorePoints/restorepointtwo/diskRestorePoints/dataDisk123_68785190-1acb-4d5e-a8ae-705b45f3dca5" + } + } + ] + }, + "osProfile": { + "computerName": "computerName", + "adminUsername": "admin", + "windowsConfiguration": { + "provisionVMAgent": true, + "enableAutomaticUpdates": true + }, + "secrets": [], + "allowExtensionOperations": true, + "requireGuestProvisionSignal": true + }, + "diagnosticsProfile": { + "bootDiagnostics": { + "enabled": true + } + }, + "location": "westus" + }, + "provisioningState": "Creating", + "consistencyMode": "ApplicationConsistent", + "timeCreated": "2021-10-25T23:54:29.2796325+00:00" + } + } + } + } +} diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/compute/CreateARestorePoint.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/compute/CreateARestorePoint.json index 99d7f7d5f1ce..b254cea633db 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/compute/CreateARestorePoint.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/compute/CreateARestorePoint.json @@ -79,12 +79,7 @@ }, "provisioningState": "Succeeded", "consistencyMode": "ApplicationConsistent", - "provisioningDetails": { - "creationTime": "2021-01-27T20:35:05.8401519+00:00", - "totalUsedSizeInBytes": 10835349504, - "statusCode": 0, - "statusMessage": "{\"jobMessage\":\"\",\"messageStr\":\"1/27/2021 8:35:56 PM , snapshotCreator=guestExtension, hostStatusCodePreSnapshot=200, Plugin enable Succeeded (command: Snapshot) Snapshot command completed \",\"snapshotConsistency\":2}" - } + "timeCreated": "2021-01-27T20:35:05.8401519+00:00" } } } diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/compute/CreateOrUpdateARestorePointCollectionForCrossRegionCopy.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/compute/CreateOrUpdateARestorePointCollectionForCrossRegionCopy.json new file mode 100644 index 000000000000..ba85809589d1 --- /dev/null +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/compute/CreateOrUpdateARestorePointCollectionForCrossRegionCopy.json @@ -0,0 +1,59 @@ +{ + "parameters": { + "subscriptionId": "{subscription-id}", + "resourceGroupName": "myResourceGroup", + "restorePointCollectionName": "myRpc", + "api-version": "2021-11-01", + "parameters": { + "location": "norwayeast", + "properties": { + "source": { + "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/restorePointCollections/sourceRpcName" + } + }, + "tags": { + "myTag1": "tagValue1" + } + } + }, + "responses": { + "200": { + "body": { + "name": "myRpc", + "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/restorePointCollections/myRpc", + "type": "Microsoft.Compute/restorePointCollections", + "location": "norwayeast", + "tags": { + "myTag1": "tagValue1" + }, + "properties": { + "source": { + "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/virtualMachines/myVM", + "location": "eastus" + }, + "restorePointCollectionId": "638f052b-a7c2-450c-89e7-6a3b8f1d6a7c", + "provisioningState": "Successful" + } + } + }, + "201": { + "body": { + "name": "myRpc", + "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/restorePointCollections/myRpc", + "type": "Microsoft.Compute/restorePointCollections", + "location": "norwayeast", + "tags": { + "myTag1": "tagValue1" + }, + "properties": { + "source": { + "id": "subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/restorePointCollections/sourceRpcName", + "location": "eastus" + }, + "restorePointCollectionId": "638f052b-a7c2-450c-89e7-6a3b8f1d6a7c", + "provisioningState": "Successful" + } + } + } + } +} diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/compute/GetRestorePoint.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/compute/GetRestorePoint.json index d2864129cb59..ec231839d910 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/compute/GetRestorePoint.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/compute/GetRestorePoint.json @@ -70,12 +70,7 @@ }, "provisioningState": "Succeeded", "consistencyMode": "ApplicationConsistent", - "provisioningDetails": { - "creationTime": "2021-01-27T20:35:05.8401519+00:00", - "totalUsedSizeInBytes": 10835349504, - "statusCode": 0, - "statusMessage": "{\"jobMessage\":\"\",\"messageStr\":\"1/27/2021 8:35:56 PM , snapshotCreator=guestExtension, hostStatusCodePreSnapshot=200, Plugin enable Succeeded (command: Snapshot) Snapshot command completed \",\"snapshotConsistency\":2}" - } + "timeCreated": "2021-10-25T23:54:29.2796325+00:00" } } } diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/compute/GetRestorePointCollectionWithContainedRestorePoints.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/compute/GetRestorePointCollectionWithContainedRestorePoints.json index acb9098168ef..656f199148b4 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/compute/GetRestorePointCollectionWithContainedRestorePoints.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/compute/GetRestorePointCollectionWithContainedRestorePoints.json @@ -86,12 +86,7 @@ }, "provisioningState": "Succeeded", "consistencyMode": "ApplicationConsistent", - "provisioningDetails": { - "creationTime": "2021-01-27T20:35:05.8401519+00:00", - "totalUsedSizeInBytes": 10835349504, - "statusCode": 0, - "statusMessage": "{\"jobMessage\":\"\",\"messageStr\":\"1/27/2021 8:35:56 PM , snapshotCreator=guestExtension, hostStatusCodePreSnapshot=200, Plugin enable Succeeded (command: Snapshot) Snapshot command completed \",\"snapshotConsistency\":2}" - } + "timeCreated": "2021-01-27T20:35:05.8401519+00:00" } } ] diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/compute/GetRestorePointInstanceView.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/compute/GetRestorePointInstanceView.json new file mode 100644 index 000000000000..f373bceb517b --- /dev/null +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/compute/GetRestorePointInstanceView.json @@ -0,0 +1,111 @@ +{ + "parameters": { + "subscriptionId": "{subscription-id}", + "resourceGroupName": "myResourceGroup", + "restorePointCollectionName": "rpcName", + "restorePointName": "rpName", + "api-version": "2021-11-01" + }, + "responses": { + "200": { + "body": { + "name": "rpName", + "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/restorePointCollections/rpcName/restorePoints/rpName", + "properties": { + "excludeDisks": [ + { + "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm8768_disk2_fe6ffde4f69b491ca33fb984d5bcd89f" + } + ], + "sourceMetadata": { + "vmId": "76d6541e-80bd-4dc1-932b-3cae4cfb80e7", + "hardwareProfile": { + "vmSize": "Standard_B1s" + }, + "storageProfile": { + "osDisk": { + "osType": "Windows", + "name": "testingexcludedisk_OsDisk_1_74cdaedcea50483d9833c96adefa100f", + "caching": "ReadWrite", + "managedDisk": { + "storageAccountType": "Standard_LRS", + "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/testingexcludedisk_OsDisk_1_74cdaedcea50483d9833c96adefa100f" + }, + "diskRestorePoint": { + "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/restorePointCollections/rpcName/restorePoints/rpName/diskRestorePoints/testingexcludedisk_OsDisk_1_74cdaedcea50483d9833c96adefa100f_22b4bdfe-6c54-4f72-84d8-85d8860f0c57" + } + }, + "dataDisks": [ + { + "lun": 1, + "name": "testingexcludedisk_DataDisk_1", + "caching": "None", + "managedDisk": { + "storageAccountType": "Standard_LRS", + "id": "/subscriptions/{subscription-id}/resourceGroups/userdata/providers/Microsoft.Compute/disks/testingexcludedisk_DataDisk_1" + }, + "diskRestorePoint": { + "id": "/subscriptions/{subscription-id}/resourceGroups/userdata/providers/Microsoft.Compute/restorePointCollections/mynewrpc/restorePoints/restorepointtwo/diskRestorePoints/testingexcludedisk_DataDisk_1_68785190-1acb-4d5e-a8ae-705b45f3dca5" + } + } + ] + }, + "osProfile": { + "computerName": "computerName", + "adminUsername": "admin", + "windowsConfiguration": { + "provisionVMAgent": true, + "enableAutomaticUpdates": true + }, + "secrets": [], + "allowExtensionOperations": true, + "requireGuestProvisionSignal": true + }, + "diagnosticsProfile": { + "bootDiagnostics": { + "enabled": true + } + }, + "location": "westus" + }, + "provisioningState": "Succeeded", + "consistencyMode": "ApplicationConsistent", + "timeCreated": "2021-10-25T23:54:29.2796325+00:00", + "instanceView": { + "diskRestorePoints": [ + { + "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/restorePointCollections/rpcName/restorePoints/rpName/diskRestorePoints/testingexcludedisk_OsDisk_1_74cdaedcea50483d9833c96adefa100f_22b4bdfe-6c54-4f72-84d8-85d8860f0c57", + "replicationStatus": { + "status": { + "code": "ReplicationState/succeeded", + "level": "Info", + "displayStatus": "Succeeded" + }, + "completionPercent": 100 + } + }, + { + "id": "/subscriptions/{subscription-id}/resourceGroups/userdata/providers/Microsoft.Compute/restorePointCollections/mynewrpc/restorePoints/restorepointtwo/diskRestorePoints/testingexcludedisk_DataDisk_1_68785190-1acb-4d5e-a8ae-705b45f3dca5", + "replicationStatus": { + "status": { + "code": "ReplicationState/succeeded", + "level": "Info", + "displayStatus": "Succeeded" + }, + "completionPercent": 100 + } + } + ], + "statuses": [ + { + "code": "ReplicationState/succeeded", + "level": "Info", + "displayStatus": "Succeeded" + } + ] + } + } + } + } + } +} From 9bf41b3fb123190678e3f2201660f134a9c9ee40 Mon Sep 17 00:00:00 2001 From: Sudheera Kodavati Date: Wed, 3 Nov 2021 02:28:53 +0530 Subject: [PATCH 2/9] Fix conflicts --- .../stable/2021-11-01/compute.json | 103 ++++++++++++++++++ .../CopyRestorePointBetweenRegions.json | 0 ...torePointCollectionForCrossRegionCopy.json | 0 .../compute/GetRestorePointInstanceView.json | 0 4 files changed, 103 insertions(+) rename specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/{ => examples}/compute/CopyRestorePointBetweenRegions.json (100%) rename specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/{ => examples}/compute/CreateOrUpdateARestorePointCollectionForCrossRegionCopy.json (100%) rename specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/{ => examples}/compute/GetRestorePointInstanceView.json (100%) 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 2bd3296a95c6..5df2b0b699eb 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 @@ -4049,6 +4049,54 @@ } } }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/restorePointCollections/{restorePointCollectionName}/restorePoints/{restorePointName}/instanceView": { + "get": { + "operationId": "RestorePoints_GetInstanceView", + "description": "Retrieves information about the run-time state of a restore point.", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "name": "resourceGroupName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the resource group." + }, + { + "name": "restorePointCollectionName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the restore point collection." + }, + { + "name": "restorePointName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the restore point." + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/RestorePointInstanceView" + } + } + }, + "x-ms-examples": { + "Get Restore Point Instance View.": { + "$ref": "./examples/compute/GetRestorePointInstanceView.json" + } + } + } + }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/vmSizes": { "get": { "tags": [ @@ -8340,6 +8388,56 @@ ], "description": "Restore Point details." }, + "RestorePointInstanceView": { + "type": "object", + "properties": { + "diskRestorePoints": { + "type": "array", + "items": { + "$ref": "#/definitions/DiskRestorePointInstanceView" + }, + "description": "The disk restore points information." + }, + "statuses": { + "type": "array", + "items": { + "$ref": "#/definitions/InstanceViewStatus" + }, + "description": "The resource status information." + } + }, + "description": "The instance view of a restore point." + }, + "DiskRestorePointInstanceView": { + "type": "object", + "properties": { + "id": { + "$ref": "#/definitions/ApiEntityReference", + "description": "Disk restore point Id." + }, + "replicationStatus": { + "type": "object", + "items": { + "$ref": "#/definitions/DiskRestorePointReplicationStatus" + }, + "description": "The disk restore point replication status information." + } + }, + "description": "The instance view of a disk restore point." + }, + "DiskRestorePointReplicationStatus": { + "type": "object", + "properties": { + "status": { + "type": "object", + "items": { + "$ref": "#/definitions/InstanceViewStatus" + }, + "description": "The resource status information." + } + }, + "description": "The instance view of a disk restore point." + }, "RestorePointProperties": { "type": "object", "properties": { @@ -8382,6 +8480,11 @@ "sourceRestorePoint": { "$ref": "#/definitions/ApiEntityReference", "description": "Source Restore point Id from which copy of the Restore point is to be created." + }, + "instanceView": { + "$ref": "#/definitions/RestorePointInstanceView", + "readOnly": true, + "description": "The restore point instance view." } }, "description": "The restore point properties." diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/compute/CopyRestorePointBetweenRegions.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/examples/compute/CopyRestorePointBetweenRegions.json similarity index 100% rename from specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/compute/CopyRestorePointBetweenRegions.json rename to specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/examples/compute/CopyRestorePointBetweenRegions.json diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/compute/CreateOrUpdateARestorePointCollectionForCrossRegionCopy.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/examples/compute/CreateOrUpdateARestorePointCollectionForCrossRegionCopy.json similarity index 100% rename from specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/compute/CreateOrUpdateARestorePointCollectionForCrossRegionCopy.json rename to specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/examples/compute/CreateOrUpdateARestorePointCollectionForCrossRegionCopy.json diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/compute/GetRestorePointInstanceView.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/examples/compute/GetRestorePointInstanceView.json similarity index 100% rename from specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/compute/GetRestorePointInstanceView.json rename to specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/examples/compute/GetRestorePointInstanceView.json From 84f584ced210baea77abcad16992a78c7a4b1a0e Mon Sep 17 00:00:00 2001 From: Sudheera Kodavati Date: Thu, 4 Nov 2021 00:05:59 +0530 Subject: [PATCH 3/9] fix validations --- .../stable/2021-11-01/compute.json | 12 ++ .../CopyRestorePointBetweenRegions.json | 9 +- .../compute/GetRestorePointInstanceView.json | 117 ++++-------------- 3 files changed, 43 insertions(+), 95 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 5df2b0b699eb..4f18890a82b1 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 @@ -3578,6 +3578,9 @@ "x-ms-examples": { "Create or update a restore point collection.": { "$ref": "./examples/compute/CreateOrUpdateARestorePointCollection.json" + }, + "Create or update a restore point collection for cross region copy.": { + "$ref": "./examples/compute/CreateOrUpdateARestorePointCollectionForCrossRegionCopy.json" } }, "parameters": [ @@ -3889,6 +3892,9 @@ "x-ms-examples": { "Create a restore point": { "$ref": "./examples/compute/CreateARestorePoint.json" + }, + "Copy a restore point to a different region": { + "$ref": "./examples/compute/CopyRestorePointBetweenRegions.json" } }, "parameters": [ @@ -4088,6 +4094,12 @@ "schema": { "$ref": "#/definitions/RestorePointInstanceView" } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } } }, "x-ms-examples": { diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/examples/compute/CopyRestorePointBetweenRegions.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/examples/compute/CopyRestorePointBetweenRegions.json index a3ffceae57dc..6fbef5f80dd8 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/examples/compute/CopyRestorePointBetweenRegions.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/examples/compute/CopyRestorePointBetweenRegions.json @@ -7,13 +7,12 @@ "api-version": "2021-11-01", "parameters": { "properties": { - "sourceRestorePoint": - { - "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/restorePointCollections/sourceRpcName/restorePoints/sourceRpName" - } + "sourceRestorePoint": { + "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/restorePointCollections/sourceRpcName/restorePoints/sourceRpName" } } - }, + } + }, "responses": { "201": { "body": { diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/examples/compute/GetRestorePointInstanceView.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/examples/compute/GetRestorePointInstanceView.json index f373bceb517b..542d802cf0b9 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/examples/compute/GetRestorePointInstanceView.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/examples/compute/GetRestorePointInstanceView.json @@ -9,101 +9,38 @@ "responses": { "200": { "body": { - "name": "rpName", - "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/restorePointCollections/rpcName/restorePoints/rpName", - "properties": { - "excludeDisks": [ + "instanceView": { + "diskRestorePoints": [ { - "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm8768_disk2_fe6ffde4f69b491ca33fb984d5bcd89f" - } - ], - "sourceMetadata": { - "vmId": "76d6541e-80bd-4dc1-932b-3cae4cfb80e7", - "hardwareProfile": { - "vmSize": "Standard_B1s" - }, - "storageProfile": { - "osDisk": { - "osType": "Windows", - "name": "testingexcludedisk_OsDisk_1_74cdaedcea50483d9833c96adefa100f", - "caching": "ReadWrite", - "managedDisk": { - "storageAccountType": "Standard_LRS", - "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/testingexcludedisk_OsDisk_1_74cdaedcea50483d9833c96adefa100f" + "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/restorePointCollections/rpcName/restorePoints/rpName/diskRestorePoints/testingexcludedisk_OsDisk_1_74cdaedcea50483d9833c96adefa100f_22b4bdfe-6c54-4f72-84d8-85d8860f0c57", + "replicationStatus": { + "status": { + "code": "ReplicationState/succeeded", + "level": "Info", + "displayStatus": "Succeeded" }, - "diskRestorePoint": { - "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/restorePointCollections/rpcName/restorePoints/rpName/diskRestorePoints/testingexcludedisk_OsDisk_1_74cdaedcea50483d9833c96adefa100f_22b4bdfe-6c54-4f72-84d8-85d8860f0c57" - } - }, - "dataDisks": [ - { - "lun": 1, - "name": "testingexcludedisk_DataDisk_1", - "caching": "None", - "managedDisk": { - "storageAccountType": "Standard_LRS", - "id": "/subscriptions/{subscription-id}/resourceGroups/userdata/providers/Microsoft.Compute/disks/testingexcludedisk_DataDisk_1" - }, - "diskRestorePoint": { - "id": "/subscriptions/{subscription-id}/resourceGroups/userdata/providers/Microsoft.Compute/restorePointCollections/mynewrpc/restorePoints/restorepointtwo/diskRestorePoints/testingexcludedisk_DataDisk_1_68785190-1acb-4d5e-a8ae-705b45f3dca5" - } - } - ] - }, - "osProfile": { - "computerName": "computerName", - "adminUsername": "admin", - "windowsConfiguration": { - "provisionVMAgent": true, - "enableAutomaticUpdates": true - }, - "secrets": [], - "allowExtensionOperations": true, - "requireGuestProvisionSignal": true - }, - "diagnosticsProfile": { - "bootDiagnostics": { - "enabled": true + "completionPercent": 100 } }, - "location": "westus" - }, - "provisioningState": "Succeeded", - "consistencyMode": "ApplicationConsistent", - "timeCreated": "2021-10-25T23:54:29.2796325+00:00", - "instanceView": { - "diskRestorePoints": [ - { - "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/restorePointCollections/rpcName/restorePoints/rpName/diskRestorePoints/testingexcludedisk_OsDisk_1_74cdaedcea50483d9833c96adefa100f_22b4bdfe-6c54-4f72-84d8-85d8860f0c57", - "replicationStatus": { - "status": { - "code": "ReplicationState/succeeded", - "level": "Info", - "displayStatus": "Succeeded" - }, - "completionPercent": 100 - } - }, - { - "id": "/subscriptions/{subscription-id}/resourceGroups/userdata/providers/Microsoft.Compute/restorePointCollections/mynewrpc/restorePoints/restorepointtwo/diskRestorePoints/testingexcludedisk_DataDisk_1_68785190-1acb-4d5e-a8ae-705b45f3dca5", - "replicationStatus": { - "status": { - "code": "ReplicationState/succeeded", - "level": "Info", - "displayStatus": "Succeeded" - }, - "completionPercent": 100 - } - } - ], - "statuses": [ - { - "code": "ReplicationState/succeeded", - "level": "Info", - "displayStatus": "Succeeded" + { + "id": "/subscriptions/{subscription-id}/resourceGroups/userdata/providers/Microsoft.Compute/restorePointCollections/mynewrpc/restorePoints/restorepointtwo/diskRestorePoints/testingexcludedisk_DataDisk_1_68785190-1acb-4d5e-a8ae-705b45f3dca5", + "replicationStatus": { + "status": { + "code": "ReplicationState/succeeded", + "level": "Info", + "displayStatus": "Succeeded" + }, + "completionPercent": 100 } - ] - } + } + ], + "statuses": [ + { + "code": "ReplicationState/succeeded", + "level": "Info", + "displayStatus": "Succeeded" + } + ] } } } From 5e8e283bdd490ffc7d3f7f5027aba630be16be3a Mon Sep 17 00:00:00 2001 From: Sudheera Kodavati Date: Thu, 4 Nov 2021 01:00:33 +0530 Subject: [PATCH 4/9] Fix instance view --- .../compute/GetRestorePointInstanceView.json | 60 +++++++++---------- 1 file changed, 29 insertions(+), 31 deletions(-) diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/examples/compute/GetRestorePointInstanceView.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/examples/compute/GetRestorePointInstanceView.json index 542d802cf0b9..7d6c51c70478 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/examples/compute/GetRestorePointInstanceView.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/examples/compute/GetRestorePointInstanceView.json @@ -9,39 +9,37 @@ "responses": { "200": { "body": { - "instanceView": { - "diskRestorePoints": [ - { - "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/restorePointCollections/rpcName/restorePoints/rpName/diskRestorePoints/testingexcludedisk_OsDisk_1_74cdaedcea50483d9833c96adefa100f_22b4bdfe-6c54-4f72-84d8-85d8860f0c57", - "replicationStatus": { - "status": { - "code": "ReplicationState/succeeded", - "level": "Info", - "displayStatus": "Succeeded" - }, - "completionPercent": 100 - } - }, - { - "id": "/subscriptions/{subscription-id}/resourceGroups/userdata/providers/Microsoft.Compute/restorePointCollections/mynewrpc/restorePoints/restorepointtwo/diskRestorePoints/testingexcludedisk_DataDisk_1_68785190-1acb-4d5e-a8ae-705b45f3dca5", - "replicationStatus": { - "status": { - "code": "ReplicationState/succeeded", - "level": "Info", - "displayStatus": "Succeeded" - }, - "completionPercent": 100 - } + "diskRestorePoints": [ + { + "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/restorePointCollections/rpcName/restorePoints/rpName/diskRestorePoints/testingexcludedisk_OsDisk_1_74cdaedcea50483d9833c96adefa100f_22b4bdfe-6c54-4f72-84d8-85d8860f0c57", + "replicationStatus": { + "status": { + "code": "ReplicationState/succeeded", + "level": "Info", + "displayStatus": "Succeeded" + }, + "completionPercent": 100 } - ], - "statuses": [ - { - "code": "ReplicationState/succeeded", - "level": "Info", - "displayStatus": "Succeeded" + }, + { + "id": "/subscriptions/{subscription-id}/resourceGroups/userdata/providers/Microsoft.Compute/restorePointCollections/mynewrpc/restorePoints/restorepointtwo/diskRestorePoints/testingexcludedisk_DataDisk_1_68785190-1acb-4d5e-a8ae-705b45f3dca5", + "replicationStatus": { + "status": { + "code": "ReplicationState/succeeded", + "level": "Info", + "displayStatus": "Succeeded" + }, + "completionPercent": 100 } - ] - } + } + ], + "statuses": [ + { + "code": "ReplicationState/succeeded", + "level": "Info", + "displayStatus": "Succeeded" + } + ] } } } From 2eed960f40f07b74e75ddf30ce814abc75a64a78 Mon Sep 17 00:00:00 2001 From: Sudheera Kodavati Date: Tue, 9 Nov 2021 13:54:14 +0530 Subject: [PATCH 5/9] change instance view --- .../stable/2021-11-01/compute.json | 73 +++++-------------- 1 file changed, 18 insertions(+), 55 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 4f18890a82b1..9e05163b43e2 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 @@ -4030,6 +4030,20 @@ "type": "string", "description": "The name of the restore point." }, + { + "name": "$expand", + "in": "query", + "required": false, + "type": "string", + "description": "The expand expression to apply on the operation. 'InstanceView' retrieves information about the run-time state of a restore point.", + "enum": [ + "instanceView" + ], + "x-ms-enum": { + "name": "RestorePointExpandOptions", + "modelAsString": true + } + }, { "$ref": "#/parameters/ApiVersionParameter" } @@ -4037,6 +4051,9 @@ "x-ms-examples": { "Get a restore point": { "$ref": "./examples/compute/GetRestorePoint.json" + }, + "Get restore point instance view": { + "$ref": "./examples/compute/GetRestorePointInstanceView.json" } }, "responses": { @@ -4054,61 +4071,7 @@ } } } - }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/restorePointCollections/{restorePointCollectionName}/restorePoints/{restorePointName}/instanceView": { - "get": { - "operationId": "RestorePoints_GetInstanceView", - "description": "Retrieves information about the run-time state of a restore point.", - "parameters": [ - { - "$ref": "#/parameters/SubscriptionIdParameter" - }, - { - "name": "resourceGroupName", - "in": "path", - "required": true, - "type": "string", - "description": "The name of the resource group." - }, - { - "name": "restorePointCollectionName", - "in": "path", - "required": true, - "type": "string", - "description": "The name of the restore point collection." - }, - { - "name": "restorePointName", - "in": "path", - "required": true, - "type": "string", - "description": "The name of the restore point." - }, - { - "$ref": "#/parameters/ApiVersionParameter" - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/RestorePointInstanceView" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "#/definitions/CloudError" - } - } - }, - "x-ms-examples": { - "Get Restore Point Instance View.": { - "$ref": "./examples/compute/GetRestorePointInstanceView.json" - } - } - } - }, + }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/vmSizes": { "get": { "tags": [ From 15f790ee6f6a58fd3fea6a231443c757863d9536 Mon Sep 17 00:00:00 2001 From: Sudheera Kodavati Date: Tue, 9 Nov 2021 15:43:55 +0530 Subject: [PATCH 6/9] Fix example --- .../compute/GetRestorePointInstanceView.json | 118 ++++++++++++++---- 1 file changed, 92 insertions(+), 26 deletions(-) diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/examples/compute/GetRestorePointInstanceView.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/examples/compute/GetRestorePointInstanceView.json index 7d6c51c70478..90796de78c44 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/examples/compute/GetRestorePointInstanceView.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/examples/compute/GetRestorePointInstanceView.json @@ -4,42 +4,108 @@ "resourceGroupName": "myResourceGroup", "restorePointCollectionName": "rpcName", "restorePointName": "rpName", - "api-version": "2021-11-01" + "api-version": "2021-11-01", + "expand": "instanceView" }, "responses": { "200": { "body": { - "diskRestorePoints": [ - { - "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/restorePointCollections/rpcName/restorePoints/rpName/diskRestorePoints/testingexcludedisk_OsDisk_1_74cdaedcea50483d9833c96adefa100f_22b4bdfe-6c54-4f72-84d8-85d8860f0c57", - "replicationStatus": { - "status": { - "code": "ReplicationState/succeeded", - "level": "Info", - "displayStatus": "Succeeded" - }, - "completionPercent": 100 + "name": "rpName", + "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/restorePointCollections/rpcName/restorePoints/rpName", + "properties": { + "excludeDisks": [ + { + "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm8768_disk2_fe6ffde4f69b491ca33fb984d5bcd89f" } + ], + "sourceMetadata": { + "vmId": "76d6541e-80bd-4dc1-932b-3cae4cfb80e7", + "hardwareProfile": { + "vmSize": "Standard_B1s" + }, + "storageProfile": { + "osDisk": { + "osType": "Windows", + "name": "testingexcludedisk_OsDisk_1_74cdaedcea50483d9833c96adefa100f", + "caching": "ReadWrite", + "managedDisk": { + "storageAccountType": "Standard_LRS", + "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/testingexcludedisk_OsDisk_1_74cdaedcea50483d9833c96adefa100f" + }, + "diskRestorePoint": { + "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/restorePointCollections/rpcName/restorePoints/rpName/diskRestorePoints/testingexcludedisk_OsDisk_1_74cdaedcea50483d9833c96adefa100f_22b4bdfe-6c54-4f72-84d8-85d8860f0c57" + } + }, + "dataDisks": [ + { + "lun": 1, + "name": "testingexcludedisk_DataDisk_1", + "caching": "None", + "managedDisk": { + "storageAccountType": "Standard_LRS", + "id": "/subscriptions/{subscription-id}/resourceGroups/userdata/providers/Microsoft.Compute/disks/testingexcludedisk_DataDisk_1" + }, + "diskRestorePoint": { + "id": "/subscriptions/{subscription-id}/resourceGroups/userdata/providers/Microsoft.Compute/restorePointCollections/mynewrpc/restorePoints/restorepointtwo/diskRestorePoints/testingexcludedisk_DataDisk_1_68785190-1acb-4d5e-a8ae-705b45f3dca5" + } + } + ] + }, + "osProfile": { + "computerName": "computerName", + "adminUsername": "admin", + "windowsConfiguration": { + "provisionVMAgent": true, + "enableAutomaticUpdates": true + }, + "secrets": [], + "allowExtensionOperations": true, + "requireGuestProvisionSignal": true + }, + "diagnosticsProfile": { + "bootDiagnostics": { + "enabled": true + } + }, + "location": "westus" }, - { - "id": "/subscriptions/{subscription-id}/resourceGroups/userdata/providers/Microsoft.Compute/restorePointCollections/mynewrpc/restorePoints/restorepointtwo/diskRestorePoints/testingexcludedisk_DataDisk_1_68785190-1acb-4d5e-a8ae-705b45f3dca5", - "replicationStatus": { - "status": { + "provisioningState": "Succeeded", + "consistencyMode": "ApplicationConsistent", + "timeCreated": "2021-01-27T20:35:05.8401519+00:00", + "instanceView": { + "diskRestorePoints": [ + { + "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/restorePointCollections/rpcName/restorePoints/rpName/diskRestorePoints/testingexcludedisk_OsDisk_1_74cdaedcea50483d9833c96adefa100f_22b4bdfe-6c54-4f72-84d8-85d8860f0c57", + "replicationStatus": { + "status": { + "code": "ReplicationState/succeeded", + "level": "Info", + "displayStatus": "Succeeded" + }, + "completionPercent": 100 + } + }, + { + "id": "/subscriptions/{subscription-id}/resourceGroups/userdata/providers/Microsoft.Compute/restorePointCollections/mynewrpc/restorePoints/restorepointtwo/diskRestorePoints/testingexcludedisk_DataDisk_1_68785190-1acb-4d5e-a8ae-705b45f3dca5", + "replicationStatus": { + "status": { + "code": "ReplicationState/succeeded", + "level": "Info", + "displayStatus": "Succeeded" + }, + "completionPercent": 100 + } + } + ], + "statuses": [ + { "code": "ReplicationState/succeeded", "level": "Info", "displayStatus": "Succeeded" - }, - "completionPercent": 100 - } - } - ], - "statuses": [ - { - "code": "ReplicationState/succeeded", - "level": "Info", - "displayStatus": "Succeeded" + } + ] } - ] + } } } } From 04c6561b7cac29ab077907e3abfa92e94b6fdda2 Mon Sep 17 00:00:00 2001 From: Sudheera Kodavati Date: Fri, 12 Nov 2021 18:15:36 +0530 Subject: [PATCH 7/9] Fix prettier --- .../Microsoft.Compute/stable/2021-11-01/compute.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 9e05163b43e2..ee285e866ad1 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 @@ -4071,7 +4071,7 @@ } } } - }, + }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/vmSizes": { "get": { "tags": [ From 3dd2a86c3a06b123a09eb34dd6c24a483bc4f132 Mon Sep 17 00:00:00 2001 From: Sudheera Kodavati Date: Wed, 17 Nov 2021 18:47:41 +0530 Subject: [PATCH 8/9] Fix and modify description --- .../Microsoft.Compute/stable/2021-11-01/compute.json | 4 ++-- 1 file changed, 2 insertions(+), 2 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 ee285e866ad1..cb153270b57e 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 @@ -8387,7 +8387,7 @@ "type": "object", "properties": { "id": { - "$ref": "#/definitions/ApiEntityReference", + "type": "string", "description": "Disk restore point Id." }, "replicationStatus": { @@ -8454,7 +8454,7 @@ }, "sourceRestorePoint": { "$ref": "#/definitions/ApiEntityReference", - "description": "Source Restore point Id from which copy of the Restore point is to be created." + "description": "Resource Id of the source restore point from which a copy needs to be created." }, "instanceView": { "$ref": "#/definitions/RestorePointInstanceView", From 09421f0499972b8c6436329b4c9d62d59a142a7e Mon Sep 17 00:00:00 2001 From: Sudheera Kodavati Date: Mon, 29 Nov 2021 23:51:24 +0530 Subject: [PATCH 9/9] Review comments --- .../examples/CreateOrUpdateARestorePointCollection.json | 4 ++-- .../stable/2021-03-01/examples/GetRestorePointCollection.json | 2 +- .../GetRestorePointCollectionWithContainedRestorePoints.json | 2 +- .../examples/GetRestorePointCollectionsInAResourceGroup.json | 2 +- .../examples/GetRestorePointCollectionsInASubscription.json | 2 +- .../examples/CreateOrUpdateARestorePointCollection.json | 4 ++-- .../stable/2021-04-01/examples/GetRestorePointCollection.json | 2 +- .../GetRestorePointCollectionWithContainedRestorePoints.json | 2 +- .../examples/GetRestorePointCollectionsInAResourceGroup.json | 2 +- .../examples/GetRestorePointCollectionsInASubscription.json | 2 +- .../compute/CreateOrUpdateARestorePointCollection.json | 4 ++-- .../examples/compute/GetRestorePointCollection.json | 2 +- .../GetRestorePointCollectionWithContainedRestorePoints.json | 2 +- .../compute/GetRestorePointCollectionsInAResourceGroup.json | 2 +- .../compute/GetRestorePointCollectionsInASubscription.json | 2 +- .../Microsoft.Compute/stable/2021-11-01/compute.json | 4 ++-- .../compute/CreateOrUpdateARestorePointCollection.json | 4 ++-- ...eateOrUpdateARestorePointCollectionForCrossRegionCopy.json | 4 ++-- .../examples/compute/GetRestorePointCollection.json | 2 +- .../GetRestorePointCollectionWithContainedRestorePoints.json | 2 +- .../compute/GetRestorePointCollectionsInAResourceGroup.json | 2 +- .../compute/GetRestorePointCollectionsInASubscription.json | 2 +- ...InstanceView.json => GetRestorePointWithInstanceView.json} | 0 23 files changed, 28 insertions(+), 28 deletions(-) rename specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/examples/compute/{GetRestorePointInstanceView.json => GetRestorePointWithInstanceView.json} (100%) diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-03-01/examples/CreateOrUpdateARestorePointCollection.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-03-01/examples/CreateOrUpdateARestorePointCollection.json index b073df954152..aa242d771647 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-03-01/examples/CreateOrUpdateARestorePointCollection.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-03-01/examples/CreateOrUpdateARestorePointCollection.json @@ -32,7 +32,7 @@ "location": "eastus" }, "restorePointCollectionId": "638f052b-a7c2-450c-89e7-6a3b8f1d6a7c", - "provisioningState": "Successful" + "provisioningState": "Succeeded" } } }, @@ -51,7 +51,7 @@ "location": "eastus" }, "restorePointCollectionId": "638f052b-a7c2-450c-89e7-6a3b8f1d6a7c", - "provisioningState": "Successful" + "provisioningState": "Succeeded" } } } diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-03-01/examples/GetRestorePointCollection.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-03-01/examples/GetRestorePointCollection.json index 4d2f9a04c3ef..940c96754cc2 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-03-01/examples/GetRestorePointCollection.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-03-01/examples/GetRestorePointCollection.json @@ -21,7 +21,7 @@ "location": "eastus" }, "restorePointCollectionId": "59f04a5d-f783-4200-a1bd-d3f464e8c4b4", - "provisioningState": "Successful" + "provisioningState": "Succeeded" } } } diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-03-01/examples/GetRestorePointCollectionWithContainedRestorePoints.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-03-01/examples/GetRestorePointCollectionWithContainedRestorePoints.json index fcdefbc18c78..0efac5f02c08 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-03-01/examples/GetRestorePointCollectionWithContainedRestorePoints.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-03-01/examples/GetRestorePointCollectionWithContainedRestorePoints.json @@ -22,7 +22,7 @@ "location": "eastus" }, "restorePointCollectionId": "59f04a5d-f783-4200-a1bd-d3f464e8c4b4", - "provisioningState": "Successful", + "provisioningState": "Succeeded", "restorePoints": [ { "name": "restorePointName", diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-03-01/examples/GetRestorePointCollectionsInAResourceGroup.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-03-01/examples/GetRestorePointCollectionsInAResourceGroup.json index 057dc3450953..fbc50abdb307 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-03-01/examples/GetRestorePointCollectionsInAResourceGroup.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-03-01/examples/GetRestorePointCollectionsInAResourceGroup.json @@ -22,7 +22,7 @@ "location": "westus" }, "restorePointCollectionId": "59f04a5d-f783-4200-a1bd-d3f464e8c4b4", - "provisioningState": "Successful" + "provisioningState": "Succeeded" } }, { diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-03-01/examples/GetRestorePointCollectionsInASubscription.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-03-01/examples/GetRestorePointCollectionsInASubscription.json index 1a84836d7ced..b052cc9f0497 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-03-01/examples/GetRestorePointCollectionsInASubscription.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-03-01/examples/GetRestorePointCollectionsInASubscription.json @@ -21,7 +21,7 @@ "location": "westus" }, "restorePointCollectionId": "59f04a5d-f783-4200-a1bd-d3f464e8c4b4", - "provisioningState": "Successful" + "provisioningState": "Succeeded" } }, { diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-04-01/examples/CreateOrUpdateARestorePointCollection.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-04-01/examples/CreateOrUpdateARestorePointCollection.json index 6deefcfb3ec2..92020067a27d 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-04-01/examples/CreateOrUpdateARestorePointCollection.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-04-01/examples/CreateOrUpdateARestorePointCollection.json @@ -32,7 +32,7 @@ "location": "eastus" }, "restorePointCollectionId": "638f052b-a7c2-450c-89e7-6a3b8f1d6a7c", - "provisioningState": "Successful" + "provisioningState": "Succeeded" } } }, @@ -51,7 +51,7 @@ "location": "eastus" }, "restorePointCollectionId": "638f052b-a7c2-450c-89e7-6a3b8f1d6a7c", - "provisioningState": "Successful" + "provisioningState": "Succeeded" } } } diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-04-01/examples/GetRestorePointCollection.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-04-01/examples/GetRestorePointCollection.json index f2eb99cedd97..c3b7c882d94b 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-04-01/examples/GetRestorePointCollection.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-04-01/examples/GetRestorePointCollection.json @@ -21,7 +21,7 @@ "location": "eastus" }, "restorePointCollectionId": "59f04a5d-f783-4200-a1bd-d3f464e8c4b4", - "provisioningState": "Successful" + "provisioningState": "Succeeded" } } } diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-04-01/examples/GetRestorePointCollectionWithContainedRestorePoints.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-04-01/examples/GetRestorePointCollectionWithContainedRestorePoints.json index e8c954c155b9..a4f0a5862b1e 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-04-01/examples/GetRestorePointCollectionWithContainedRestorePoints.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-04-01/examples/GetRestorePointCollectionWithContainedRestorePoints.json @@ -22,7 +22,7 @@ "location": "eastus" }, "restorePointCollectionId": "59f04a5d-f783-4200-a1bd-d3f464e8c4b4", - "provisioningState": "Successful", + "provisioningState": "Succeeded", "restorePoints": [ { "name": "restorePointName", diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-04-01/examples/GetRestorePointCollectionsInAResourceGroup.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-04-01/examples/GetRestorePointCollectionsInAResourceGroup.json index c6ea66b87dde..5dbf5d2f7dd1 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-04-01/examples/GetRestorePointCollectionsInAResourceGroup.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-04-01/examples/GetRestorePointCollectionsInAResourceGroup.json @@ -22,7 +22,7 @@ "location": "westus" }, "restorePointCollectionId": "59f04a5d-f783-4200-a1bd-d3f464e8c4b4", - "provisioningState": "Successful" + "provisioningState": "Succeeded" } }, { diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-04-01/examples/GetRestorePointCollectionsInASubscription.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-04-01/examples/GetRestorePointCollectionsInASubscription.json index b6aa117b9ecf..c78361ae1fd7 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-04-01/examples/GetRestorePointCollectionsInASubscription.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-04-01/examples/GetRestorePointCollectionsInASubscription.json @@ -21,7 +21,7 @@ "location": "westus" }, "restorePointCollectionId": "59f04a5d-f783-4200-a1bd-d3f464e8c4b4", - "provisioningState": "Successful" + "provisioningState": "Succeeded" } }, { diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/examples/compute/CreateOrUpdateARestorePointCollection.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/examples/compute/CreateOrUpdateARestorePointCollection.json index ac8949d6dba6..031ddca3e21d 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/examples/compute/CreateOrUpdateARestorePointCollection.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/examples/compute/CreateOrUpdateARestorePointCollection.json @@ -32,7 +32,7 @@ "location": "eastus" }, "restorePointCollectionId": "638f052b-a7c2-450c-89e7-6a3b8f1d6a7c", - "provisioningState": "Successful" + "provisioningState": "Succeeded" } } }, @@ -51,7 +51,7 @@ "location": "eastus" }, "restorePointCollectionId": "638f052b-a7c2-450c-89e7-6a3b8f1d6a7c", - "provisioningState": "Successful" + "provisioningState": "Succeeded" } } } diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/examples/compute/GetRestorePointCollection.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/examples/compute/GetRestorePointCollection.json index 8bab495ef3f9..c7baf975753b 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/examples/compute/GetRestorePointCollection.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/examples/compute/GetRestorePointCollection.json @@ -21,7 +21,7 @@ "location": "eastus" }, "restorePointCollectionId": "59f04a5d-f783-4200-a1bd-d3f464e8c4b4", - "provisioningState": "Successful" + "provisioningState": "Succeeded" } } } diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/examples/compute/GetRestorePointCollectionWithContainedRestorePoints.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/examples/compute/GetRestorePointCollectionWithContainedRestorePoints.json index ce9d3b156fa8..b0c9e6718384 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/examples/compute/GetRestorePointCollectionWithContainedRestorePoints.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/examples/compute/GetRestorePointCollectionWithContainedRestorePoints.json @@ -22,7 +22,7 @@ "location": "eastus" }, "restorePointCollectionId": "59f04a5d-f783-4200-a1bd-d3f464e8c4b4", - "provisioningState": "Successful", + "provisioningState": "Succeeded", "restorePoints": [ { "name": "restorePointName", diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/examples/compute/GetRestorePointCollectionsInAResourceGroup.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/examples/compute/GetRestorePointCollectionsInAResourceGroup.json index 48de1d9546d2..0441df2134cd 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/examples/compute/GetRestorePointCollectionsInAResourceGroup.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/examples/compute/GetRestorePointCollectionsInAResourceGroup.json @@ -22,7 +22,7 @@ "location": "westus" }, "restorePointCollectionId": "59f04a5d-f783-4200-a1bd-d3f464e8c4b4", - "provisioningState": "Successful" + "provisioningState": "Succeeded" } }, { diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/examples/compute/GetRestorePointCollectionsInASubscription.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/examples/compute/GetRestorePointCollectionsInASubscription.json index 2cbf30e1c627..e5d404d45c34 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/examples/compute/GetRestorePointCollectionsInASubscription.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/examples/compute/GetRestorePointCollectionsInASubscription.json @@ -21,7 +21,7 @@ "location": "westus" }, "restorePointCollectionId": "59f04a5d-f783-4200-a1bd-d3f464e8c4b4", - "provisioningState": "Successful" + "provisioningState": "Succeeded" } }, { 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 cb153270b57e..429979f9f342 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 @@ -4052,8 +4052,8 @@ "Get a restore point": { "$ref": "./examples/compute/GetRestorePoint.json" }, - "Get restore point instance view": { - "$ref": "./examples/compute/GetRestorePointInstanceView.json" + "Get restore point with instance view": { + "$ref": "./examples/compute/GetRestorePointWithInstanceView.json" } }, "responses": { diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/examples/compute/CreateOrUpdateARestorePointCollection.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/examples/compute/CreateOrUpdateARestorePointCollection.json index c7819e088b9c..b1f7be030a9a 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/examples/compute/CreateOrUpdateARestorePointCollection.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/examples/compute/CreateOrUpdateARestorePointCollection.json @@ -32,7 +32,7 @@ "location": "eastus" }, "restorePointCollectionId": "638f052b-a7c2-450c-89e7-6a3b8f1d6a7c", - "provisioningState": "Successful" + "provisioningState": "Succeeded" } } }, @@ -51,7 +51,7 @@ "location": "eastus" }, "restorePointCollectionId": "638f052b-a7c2-450c-89e7-6a3b8f1d6a7c", - "provisioningState": "Successful" + "provisioningState": "Succeeded" } } } diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/examples/compute/CreateOrUpdateARestorePointCollectionForCrossRegionCopy.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/examples/compute/CreateOrUpdateARestorePointCollectionForCrossRegionCopy.json index ba85809589d1..89256a5a5bee 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/examples/compute/CreateOrUpdateARestorePointCollectionForCrossRegionCopy.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/examples/compute/CreateOrUpdateARestorePointCollectionForCrossRegionCopy.json @@ -32,7 +32,7 @@ "location": "eastus" }, "restorePointCollectionId": "638f052b-a7c2-450c-89e7-6a3b8f1d6a7c", - "provisioningState": "Successful" + "provisioningState": "Succeeded" } } }, @@ -51,7 +51,7 @@ "location": "eastus" }, "restorePointCollectionId": "638f052b-a7c2-450c-89e7-6a3b8f1d6a7c", - "provisioningState": "Successful" + "provisioningState": "Succeeded" } } } diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/examples/compute/GetRestorePointCollection.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/examples/compute/GetRestorePointCollection.json index f643520ebaab..21850f8f3420 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/examples/compute/GetRestorePointCollection.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/examples/compute/GetRestorePointCollection.json @@ -21,7 +21,7 @@ "location": "eastus" }, "restorePointCollectionId": "59f04a5d-f783-4200-a1bd-d3f464e8c4b4", - "provisioningState": "Successful" + "provisioningState": "Succeeded" } } } diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/examples/compute/GetRestorePointCollectionWithContainedRestorePoints.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/examples/compute/GetRestorePointCollectionWithContainedRestorePoints.json index 656f199148b4..9f9ae3f70538 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/examples/compute/GetRestorePointCollectionWithContainedRestorePoints.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/examples/compute/GetRestorePointCollectionWithContainedRestorePoints.json @@ -22,7 +22,7 @@ "location": "eastus" }, "restorePointCollectionId": "59f04a5d-f783-4200-a1bd-d3f464e8c4b4", - "provisioningState": "Successful", + "provisioningState": "Succeeded", "restorePoints": [ { "name": "restorePointName", diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/examples/compute/GetRestorePointCollectionsInAResourceGroup.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/examples/compute/GetRestorePointCollectionsInAResourceGroup.json index f977c5ff02fa..c335c53285b2 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/examples/compute/GetRestorePointCollectionsInAResourceGroup.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/examples/compute/GetRestorePointCollectionsInAResourceGroup.json @@ -22,7 +22,7 @@ "location": "westus" }, "restorePointCollectionId": "59f04a5d-f783-4200-a1bd-d3f464e8c4b4", - "provisioningState": "Successful" + "provisioningState": "Succeeded" } }, { diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/examples/compute/GetRestorePointCollectionsInASubscription.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/examples/compute/GetRestorePointCollectionsInASubscription.json index 902cefff6679..0f2c398ea622 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/examples/compute/GetRestorePointCollectionsInASubscription.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/examples/compute/GetRestorePointCollectionsInASubscription.json @@ -21,7 +21,7 @@ "location": "westus" }, "restorePointCollectionId": "59f04a5d-f783-4200-a1bd-d3f464e8c4b4", - "provisioningState": "Successful" + "provisioningState": "Succeeded" } }, { diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/examples/compute/GetRestorePointInstanceView.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/examples/compute/GetRestorePointWithInstanceView.json similarity index 100% rename from specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/examples/compute/GetRestorePointInstanceView.json rename to specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/examples/compute/GetRestorePointWithInstanceView.json