Skip to content

Commit

Permalink
Compute Swagger changes to include cross-region Restore Points scenar…
Browse files Browse the repository at this point in the history
…ios (Azure#16570)

* RRP changes in swagger

* Fix conflicts

* fix validations

* Fix instance view
  • Loading branch information
sukodava authored Nov 4, 2021
1 parent 5c18a17 commit 70a8729
Show file tree
Hide file tree
Showing 4 changed files with 307 additions and 0 deletions.
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 @@ -4049,6 +4055,60 @@
}
}
},
"/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": [
Expand Down Expand Up @@ -8340,6 +8400,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": {
Expand Down Expand Up @@ -8378,6 +8488,15 @@
"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."
},
"instanceView": {
"$ref": "#/definitions/RestorePointInstanceView",
"readOnly": true,
"description": "The restore point instance view."
}
},
"description": "The restore point properties."
Expand Down
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"
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -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"
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
{
"parameters": {
"subscriptionId": "{subscription-id}",
"resourceGroupName": "myResourceGroup",
"restorePointCollectionName": "rpcName",
"restorePointName": "rpName",
"api-version": "2021-11-01"
},
"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
}
},
{
"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"
}
]
}
}
}
}

0 comments on commit 70a8729

Please sign in to comment.