Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Compute Swagger changes to include cross-region Restore Points scenarios #16682

Merged
merged 10 commits into from
Dec 28, 2021
Merged

Compute Swagger changes to include cross-region Restore Points scenarios #16682

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
37b03ef
RRP changes in swagger
sukodava13 Oct 27, 2021
d7745a3
fix conflict
sukodava13 Nov 2, 2021
9bf41b3
Fix conflicts
sukodava13 Nov 2, 2021
84f584c
fix validations
sukodava13 Nov 3, 2021
5e8e283
Fix instance view
sukodava13 Nov 3, 2021
2eed960
change instance view
sukodava13 Nov 9, 2021
15f790e
Fix example
sukodava13 Nov 9, 2021
04c6561
Fix prettier
sukodava13 Nov 12, 2021
3dd2a86
Fix and modify description
sukodava13 Nov 17, 2021
09421f0
Review comments
sukodava13 Nov 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...r/Microsoft.Compute/stable/2021-03-01/examples/CreateOrUpdateARestorePointCollection.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"location": "eastus"
},
"restorePointCollectionId": "638f052b-a7c2-450c-89e7-6a3b8f1d6a7c",
"provisioningState": "Successful"
"provisioningState": "Succeeded"
}
}
},
Expand All @@ -51,7 +51,7 @@
"location": "eastus"
},
"restorePointCollectionId": "638f052b-a7c2-450c-89e7-6a3b8f1d6a7c",
"provisioningState": "Successful"
"provisioningState": "Succeeded"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...ource-manager/Microsoft.Compute/stable/2021-03-01/examples/GetRestorePointCollection.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"location": "eastus"
},
"restorePointCollectionId": "59f04a5d-f783-4200-a1bd-d3f464e8c4b4",
"provisioningState": "Successful"
"provisioningState": "Succeeded"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...mpute/stable/2021-03-01/examples/GetRestorePointCollectionWithContainedRestorePoints.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"location": "eastus"
},
"restorePointCollectionId": "59f04a5d-f783-4200-a1bd-d3f464e8c4b4",
"provisioningState": "Successful",
"provisioningState": "Succeeded",
"restorePoints": [
{
"name": "restorePointName",
Expand Down
2 changes: 1 addition & 1 deletion ...rosoft.Compute/stable/2021-03-01/examples/GetRestorePointCollectionsInAResourceGroup.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"location": "westus"
},
"restorePointCollectionId": "59f04a5d-f783-4200-a1bd-d3f464e8c4b4",
"provisioningState": "Successful"
"provisioningState": "Succeeded"
}
},
{
Expand Down
2 changes: 1 addition & 1 deletion ...crosoft.Compute/stable/2021-03-01/examples/GetRestorePointCollectionsInASubscription.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"location": "westus"
},
"restorePointCollectionId": "59f04a5d-f783-4200-a1bd-d3f464e8c4b4",
"provisioningState": "Successful"
"provisioningState": "Succeeded"
}
},
{
Expand Down
4 changes: 2 additions & 2 deletions ...r/Microsoft.Compute/stable/2021-04-01/examples/CreateOrUpdateARestorePointCollection.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"location": "eastus"
},
"restorePointCollectionId": "638f052b-a7c2-450c-89e7-6a3b8f1d6a7c",
"provisioningState": "Successful"
"provisioningState": "Succeeded"
}
}
},
Expand All @@ -51,7 +51,7 @@
"location": "eastus"
},
"restorePointCollectionId": "638f052b-a7c2-450c-89e7-6a3b8f1d6a7c",
"provisioningState": "Successful"
"provisioningState": "Succeeded"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...ource-manager/Microsoft.Compute/stable/2021-04-01/examples/GetRestorePointCollection.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"location": "eastus"
},
"restorePointCollectionId": "59f04a5d-f783-4200-a1bd-d3f464e8c4b4",
"provisioningState": "Successful"
"provisioningState": "Succeeded"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...mpute/stable/2021-04-01/examples/GetRestorePointCollectionWithContainedRestorePoints.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"location": "eastus"
},
"restorePointCollectionId": "59f04a5d-f783-4200-a1bd-d3f464e8c4b4",
"provisioningState": "Successful",
"provisioningState": "Succeeded",
"restorePoints": [
{
"name": "restorePointName",
Expand Down
2 changes: 1 addition & 1 deletion ...rosoft.Compute/stable/2021-04-01/examples/GetRestorePointCollectionsInAResourceGroup.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"location": "westus"
},
"restorePointCollectionId": "59f04a5d-f783-4200-a1bd-d3f464e8c4b4",
"provisioningState": "Successful"
"provisioningState": "Succeeded"
}
},
{
Expand Down
2 changes: 1 addition & 1 deletion ...crosoft.Compute/stable/2021-04-01/examples/GetRestorePointCollectionsInASubscription.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"location": "westus"
},
"restorePointCollectionId": "59f04a5d-f783-4200-a1bd-d3f464e8c4b4",
"provisioningState": "Successful"
"provisioningState": "Succeeded"
}
},
{
Expand Down
4 changes: 2 additions & 2 deletions ...oft.Compute/stable/2021-07-01/examples/compute/CreateOrUpdateARestorePointCollection.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"location": "eastus"
},
"restorePointCollectionId": "638f052b-a7c2-450c-89e7-6a3b8f1d6a7c",
"provisioningState": "Successful"
"provisioningState": "Succeeded"
}
}
},
Expand All @@ -51,7 +51,7 @@
"location": "eastus"
},
"restorePointCollectionId": "638f052b-a7c2-450c-89e7-6a3b8f1d6a7c",
"provisioningState": "Successful"
"provisioningState": "Succeeded"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...nager/Microsoft.Compute/stable/2021-07-01/examples/compute/GetRestorePointCollection.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"location": "eastus"
},
"restorePointCollectionId": "59f04a5d-f783-4200-a1bd-d3f464e8c4b4",
"provisioningState": "Successful"
"provisioningState": "Succeeded"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...able/2021-07-01/examples/compute/GetRestorePointCollectionWithContainedRestorePoints.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"location": "eastus"
},
"restorePointCollectionId": "59f04a5d-f783-4200-a1bd-d3f464e8c4b4",
"provisioningState": "Successful",
"provisioningState": "Succeeded",
"restorePoints": [
{
"name": "restorePointName",
Expand Down
2 changes: 1 addition & 1 deletion ...ompute/stable/2021-07-01/examples/compute/GetRestorePointCollectionsInAResourceGroup.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"location": "westus"
},
"restorePointCollectionId": "59f04a5d-f783-4200-a1bd-d3f464e8c4b4",
"provisioningState": "Successful"
"provisioningState": "Succeeded"
}
},
{
Expand Down
2 changes: 1 addition & 1 deletion ...Compute/stable/2021-07-01/examples/compute/GetRestorePointCollectionsInASubscription.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"location": "westus"
},
"restorePointCollectionId": "59f04a5d-f783-4200-a1bd-d3f464e8c4b4",
"provisioningState": "Successful"
"provisioningState": "Succeeded"
}
},
{
Expand Down
82 changes: 82 additions & 0 deletions specification/compute/resource-manager/Microsoft.Compute/stable/2021-11-01/compute.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down Expand Up @@ -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": [
Expand Down Expand Up @@ -4024,13 +4030,30 @@
"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"
}
],
"x-ms-examples": {
"Get a restore point": {
"$ref": "./examples/compute/GetRestorePoint.json"
},
"Get restore point with instance view": {
"$ref": "./examples/compute/GetRestorePointWithInstanceView.json"
}
},
"responses": {
Expand Down Expand Up @@ -8340,6 +8363,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": {
"type": "string",
"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": {
Expand Down Expand Up @@ -8378,6 +8451,15 @@
"type": "string",
"format": "date-time",
"description": "Gets the creation time of the restore point."
},
"sourceRestorePoint": {
"$ref": "#/definitions/ApiEntityReference",
"description": "Resource Id of the source restore point from which a copy needs to be created."
},
"instanceView": {
"$ref": "#/definitions/RestorePointInstanceView",
"readOnly": true,
"description": "The restore point instance view."
}
},
"description": "The restore point properties."
Expand Down
83 changes: 83 additions & 0 deletions .../Microsoft.Compute/stable/2021-11-01/examples/compute/CopyRestorePointBetweenRegions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
{
"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"
}
}
}
}
}
4 changes: 2 additions & 2 deletions ...oft.Compute/stable/2021-11-01/examples/compute/CreateOrUpdateARestorePointCollection.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"location": "eastus"
},
"restorePointCollectionId": "638f052b-a7c2-450c-89e7-6a3b8f1d6a7c",
"provisioningState": "Successful"
"provisioningState": "Succeeded"
}
}
},
Expand All @@ -51,7 +51,7 @@
"location": "eastus"
},
"restorePointCollectionId": "638f052b-a7c2-450c-89e7-6a3b8f1d6a7c",
"provisioningState": "Successful"
"provisioningState": "Succeeded"
}
}
}
Expand Down
Loading