Skip to content

Commit db39f34

Browse files
pratimaupadhyay02pratimaupadhyay02
authored
Updating existing CRR APIs and protection APIs (#10962)
* Fixing bug in PrepareDataMoveResponse Class * Updating existing CRR and protection APIs * Adding examples * Updating APIs to 2020-07-01 * Updating conflict * Resolving failures * Update * Update * Update * Update * Adding workloadCRRAccessToken * Adding discriminator for CRRAccesToken * Update * Reverting change to 2020-07-01 * Update * Update * Fixing prettier
1 parent a3d10d3 commit db39f34

File tree

9 files changed

+770
-103
lines changed

9 files changed

+770
-103
lines changed

‎specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2018-12-20/bms.json‎

Lines changed: 650 additions & 50 deletions
Large diffs are not rendered by default.

‎specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2018-12-20/examples/AzureIaasVm/BackupProtectedItems_List.json‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,6 @@
1515
"name": "VM;iaasvmcontainer;iaasvm-rg;iaasvm-1",
1616
"type": "Microsoft.RecoveryServices/vaults/backupFabrics/protectionContainers/protectedItems",
1717
"properties": {
18-
"friendlyName": "iaasvm-1",
19-
"virtualMachineId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/providers/Microsoft.ClassicCompute/virtualMachines/iaasvm-1",
20-
"protectionStatus": "Healthy",
21-
"protectionState": "Protected",
22-
"healthStatus": "Passed",
23-
"lastBackupStatus": "Completed",
24-
"lastBackupTime": "2018-01-22T12:25:32.048723Z",
25-
"protectedItemDataId": "636482643132986882",
2618
"protectedItemType": "Microsoft.ClassicCompute/virtualMachines",
2719
"backupManagementType": "AzureIaasVM",
2820
"workloadType": "VM",

‎specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2018-12-20/examples/AzureIaasVm/GetAccessToken_Get.json‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,14 @@
77
"containerName": "IaasVMContainer;iaasvmcontainerv2;rshhtestmdvmrg;rshmdvmsmall",
88
"protectedItemName": "VM;iaasvmcontainerv2;rshhtestmdvmrg;rshmdvmsmall",
99
"recoveryPointId": "26083826328862",
10-
"api-version": "2018-12-20-preview"
10+
"api-version": "2018-12-20-preview",
11+
"parameters": {
12+
"properties": {
13+
"tenantId": "33e01921-4d64-4f8c-a055-5bdaffd5e33d",
14+
"audience": "https://RecoveryServices/IaasCoord/aadmgmt/ase",
15+
"servicePrincipalObjectId": "5ecd8123-cf74-4037-83e9-9246b227b351"
16+
}
17+
}
1118
},
1219
"responses": {
1320
"200": {
@@ -36,6 +43,7 @@
3643
"tokenExtendedInformation": "<IaaSVMRecoveryPointMetadataBase xmlns:i=\"http://www.w3.org/2001/XMLSchema-instance\" i:type=\"IaaSVMRecoveryPointMetadata_V2015_09\" xmlns=\"http://windowscloudbackup.com/CloudCommon/V2011_09\"><MetadataVersion>V2015_09</MetadataVersion><ContainerType i:nil=\"true\" /><InstantRpGCId>1a2311d9-66f5-47d3-a9fb-7a37da63934b;BackUpOperationJobId;e1ebcf24-81a5-434e-b64b-cc81be65ae16</InstantRpGCId><IsBlockBlobEnabled>false</IsBlockBlobEnabled><IsManagedVirtualMachine>false</IsManagedVirtualMachine><OriginalSAOption>true</OriginalSAOption><OsType>Windows</OsType><ReadMetadaFromConfigBlob i:nil=\"true\" /><RecoveryPointConsistencyType>CrashConsistent</RecoveryPointConsistencyType><RpDiskDetails i:nil=\"true\" /><SourceIaaSVMRPKeyAndSecret i:nil=\"true\" /><SourceIaaSVMStorageType>NormalStorage</SourceIaaSVMStorageType><VMSizeDescription>Standard_D2s_v3</VMSizeDescription></IaaSVMRecoveryPointMetadataBase>"
3744
}
3845
}
39-
}
46+
},
47+
"400": {}
4048
}
4149
}

‎specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2018-12-20/examples/AzureIaasVm/ListCrrJobs_Post.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
"azureRegion": "southeastasia",
55
"api-version": "2018-12-20",
66
"parameters": {
7-
"resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testRg/providers/Microsoft.Compute/VirtualMachines/testVm"
7+
"resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testRg/providers/Microsoft.Compute/VirtualMachines/testVm",
8+
"jobName": "02585cc9-d7f4-4b46-860c-14c048cce178"
89
}
910
},
1011
"responses": {

‎specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2018-12-20/examples/AzureIaasVm/TriggerCrossRegionRestore_Post.json‎

Lines changed: 38 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -4,50 +4,49 @@
44
"azureRegion": "southeastasia",
55
"api-version": "2018-12-20",
66
"parameters": {
7-
"properties": {
8-
"crossRegionRestoreAccessDetails": {
9-
"accessTokenString": "eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsIng1dCI6IkhqaUJHdVExa2lWV2hyc2lzLUhEckhyWVZNbyJ9.eyJVc2VySWRlbnRpdHlUeXBlIjoiQUFEIiwiQWFkVGVuYW50SWQiOiIzM2UwMTkyMS00ZDY0LTRmOGMtYTA1NS01YmRhZmZkNWUzM2QiLCJBYWRTUE9iamVjdElkIjoiOTMzMjc2ZmMtMWJiNy00ZWNiLTk0ZTYtYWY3ODMyNWY3MjZhIiwiUmVzdG9yZVBvaW50UGVybWlzc2lvbnMiOiJSZWFkIiwiUmVzdG9yZVBvaW50SUQiOiJyZXNvdXJjZXMvMTMzMDgzNzkwNjQxODEzODE2MC9wcm90ZWN0aW9uQ29udGFpbmVycy8xMTE0Ni9wcm90ZWN0ZWRJdGVtcy8xMTQyOTM3MDMxL3JlY292ZXJ5UG9pbnRzLzg3MTc4MzU1MzkyNzE2IiwiaXNzIjoiaHR0cHM6Ly9SZWNvdmVyeVNlcnZpY2UiLCJhdWQiOiJodHRwczovL1JlY292ZXJ5U2VydmljZXMvUHJvdGVjdGlvblNlcnZpY2UiLCJleHAiOjE1NzExMjE5ODYsIm5iZiI6MTU3MTAzNTI4Nn0.oNbeX8ueE6JRGU0IagFjkOlU-o48ez9gCeCrn1-8XEsaVtYJIFKq9FeHfPAoCMxiLQvwL7S0JTjDTjiEsZEvr_VM7tDVwW3sESo2oW-SZlxT_1dJiUBn0jVlQyfDcHEMzbkaTuZswgNWfowgOrnJ67y-ztSUcegf3eVKPEhN1enBBS7pIuL9bZ3SVwMuqznUen6dH54y9lN2w6H14X0UK2CwSN94Uh-spB27j9SbksxLY_tyZm6xsamZFTHpwbgZwR24-GDtElPSxpFL6n_tWLSCHQtN9s84o0X7PfFaMkVmGWbOf4AZmP9M6agagG0JLnlOwObr07YrzZRkg3s2eQ",
10-
"backupManagementType": "AzureIaasVM",
11-
"containerName": "iaasvmcontainerv2;srinivasccyrg;sriniccylinux",
12-
"containerType": "IaasVMContainer",
13-
"coordinatorServiceStampUri": "https://pod01-coord1.ccy.backup.windowsazure.com",
14-
"datasourceContainerName": "iaasvmcontainerv2;srinivasccyrg;sriniccylinux",
15-
"datasourceId": "1142937031",
16-
"datasourceName": "sriniccylinux",
17-
"datasourceType": "VM",
18-
"protectionServiceStampId": "90d98224-2ac6-4bda-9f35-33fb22841f2a",
19-
"protectionServiceStampUri": "https://pod01-prot1-int.ccy.backup.windowsazure.com",
20-
"recoveryPointId": "87178355392716",
21-
"recoveryPointTime": "10/9/2019 6:05:54 PM",
22-
"resourceGroupName": "srinivasccyrg",
23-
"resourceId": "1330837906418138160",
24-
"resourceName": "sriniccyvault",
25-
"subscriptionId": "f2edfd5d-5496-4683-b94f-b3588c579009",
26-
"tokenExtendedInformation": "<IaaSVMRecoveryPointMetadataBase xmlns:i=\"http://www.w3.org/2001/XMLSchema-instance\" i:type=\"IaaSVMRecoveryPointMetadata_V2015_09\" xmlns=\"http://windowscloudbackup.com/CloudCommon/V2011_09\"><MetadataVersion>V2015_09</MetadataVersion><ContainerType i:nil=\"true\" /><InstantRpGCId>f2edfd5d-5496-4683-b94f-b3588c579009;AzureBackup_sriniccylinux_1142937031;AzureBackup_20191009_060554;AzureBackupRG_centraluseuap_1</InstantRpGCId><IsBlockBlobEnabled>true</IsBlockBlobEnabled><IsManagedVirtualMachine>true</IsManagedVirtualMachine><OriginalSAOption>false</OriginalSAOption><OsType>Linux</OsType><ReadMetadaFromConfigBlob i:nil=\"true\" /><RecoveryPointConsistencyType>FileSystemConsistent</RecoveryPointConsistencyType><RpDiskDetails i:nil=\"true\" /><SourceIaaSVMRPKeyAndSecret i:nil=\"true\" /><SourceIaaSVMStorageType>PremiumVMOnPremiumStorage</SourceIaaSVMStorageType><VMSizeDescription>Standard_D2s_v3</VMSizeDescription></IaaSVMRecoveryPointMetadataBase>"
7+
"crossRegionRestoreAccessDetails": {
8+
"accessTokenString": "eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsIng1dCI6IkhqaUJHdVExa2lWV2hyc2lzLUhEckhyWVZNbyJ9.eyJVc2VySWRlbnRpdHlUeXBlIjoiQUFEIiwiQWFkVGVuYW50SWQiOiIzM2UwMTkyMS00ZDY0LTRmOGMtYTA1NS01YmRhZmZkNWUzM2QiLCJBYWRTUE9iamVjdElkIjoiOTMzMjc2ZmMtMWJiNy00ZWNiLTk0ZTYtYWY3ODMyNWY3MjZhIiwiUmVzdG9yZVBvaW50UGVybWlzc2lvbnMiOiJSZWFkIiwiUmVzdG9yZVBvaW50SUQiOiJyZXNvdXJjZXMvMTMzMDgzNzkwNjQxODEzODE2MC9wcm90ZWN0aW9uQ29udGFpbmVycy8xMTE0Ni9wcm90ZWN0ZWRJdGVtcy8xMTQyOTM3MDMxL3JlY292ZXJ5UG9pbnRzLzg3MTc4MzU1MzkyNzE2IiwiaXNzIjoiaHR0cHM6Ly9SZWNvdmVyeVNlcnZpY2UiLCJhdWQiOiJodHRwczovL1JlY292ZXJ5U2VydmljZXMvUHJvdGVjdGlvblNlcnZpY2UiLCJleHAiOjE1NzExMjE5ODYsIm5iZiI6MTU3MTAzNTI4Nn0.oNbeX8ueE6JRGU0IagFjkOlU-o48ez9gCeCrn1-8XEsaVtYJIFKq9FeHfPAoCMxiLQvwL7S0JTjDTjiEsZEvr_VM7tDVwW3sESo2oW-SZlxT_1dJiUBn0jVlQyfDcHEMzbkaTuZswgNWfowgOrnJ67y-ztSUcegf3eVKPEhN1enBBS7pIuL9bZ3SVwMuqznUen6dH54y9lN2w6H14X0UK2CwSN94Uh-spB27j9SbksxLY_tyZm6xsamZFTHpwbgZwR24-GDtElPSxpFL6n_tWLSCHQtN9s84o0X7PfFaMkVmGWbOf4AZmP9M6agagG0JLnlOwObr07YrzZRkg3s2eQ",
9+
"backupManagementType": "AzureIaasVM",
10+
"containerName": "iaasvmcontainerv2;srinivasccyrg;sriniccylinux",
11+
"containerType": "IaasVMContainer",
12+
"coordinatorServiceStampUri": "https://pod01-coord1.ccy.backup.windowsazure.com",
13+
"datasourceContainerName": "iaasvmcontainerv2;srinivasccyrg;sriniccylinux",
14+
"datasourceId": "1142937031",
15+
"datasourceName": "sriniccylinux",
16+
"datasourceType": "VM",
17+
"protectionServiceStampId": "90d98224-2ac6-4bda-9f35-33fb22841f2a",
18+
"protectionServiceStampUri": "https://pod01-prot1-int.ccy.backup.windowsazure.com",
19+
"recoveryPointId": "87178355392716",
20+
"recoveryPointTime": "10/9/2019 6:05:54 PM",
21+
"resourceGroupName": "srinivasccyrg",
22+
"resourceId": "1330837906418138160",
23+
"resourceName": "sriniccyvault",
24+
"subscriptionId": "f2edfd5d-5496-4683-b94f-b3588c579009",
25+
"tokenExtendedInformation": "<IaaSVMRecoveryPointMetadataBase xmlns:i=\"http://www.w3.org/2001/XMLSchema-instance\" i:type=\"IaaSVMRecoveryPointMetadata_V2015_09\" xmlns=\"http://windowscloudbackup.com/CloudCommon/V2011_09\"><MetadataVersion>V2015_09</MetadataVersion><ContainerType i:nil=\"true\" /><InstantRpGCId>f2edfd5d-5496-4683-b94f-b3588c579009;AzureBackup_sriniccylinux_1142937031;AzureBackup_20191009_060554;AzureBackupRG_centraluseuap_1</InstantRpGCId><IsBlockBlobEnabled>true</IsBlockBlobEnabled><IsManagedVirtualMachine>true</IsManagedVirtualMachine><OriginalSAOption>false</OriginalSAOption><OsType>Linux</OsType><ReadMetadaFromConfigBlob i:nil=\"true\" /><RecoveryPointConsistencyType>FileSystemConsistent</RecoveryPointConsistencyType><RpDiskDetails i:nil=\"true\" /><SourceIaaSVMRPKeyAndSecret i:nil=\"true\" /><SourceIaaSVMStorageType>PremiumVMOnPremiumStorage</SourceIaaSVMStorageType><VMSizeDescription>Standard_D2s_v3</VMSizeDescription></IaaSVMRecoveryPointMetadataBase>"
26+
},
27+
"restoreRequest": {
28+
"affinityGroup": "",
29+
"createNewCloudService": false,
30+
"encryptionDetails": {
31+
"encryptionEnabled": false
2732
},
28-
"restoreRequest": {
29-
"affinityGroup": "",
30-
"createNewCloudService": false,
31-
"encryptionDetails": {
32-
"encryptionEnabled": false
33-
},
34-
"objectType": "IaasVMRestoreRequest",
35-
"originalStorageAccountOption": false,
36-
"recoveryPointId": "87178355392716",
37-
"recoveryType": "AlternateLocation",
38-
"region": "eastus2euap",
39-
"sourceResourceId": "/subscriptions/f2edfd5d-5496-4683-b94f-b3588c579009/resourceGroups/srinivasccyrg/providers/Microsoft.Compute/virtualMachines/sriniccylinux",
40-
"storageAccountId": "/subscriptions/f2edfd5d-5496-4683-b94f-b3588c579009/resourceGroups/00prjaiTestRg1/providers/Microsoft.Storage/storageAccounts/00prjaitestrg1disks993",
41-
"subnetId": "/subscriptions/f2edfd5d-5496-4683-b94f-b3588c579009/resourceGroups/00networkAcklVaultCCY/providers/Microsoft.Network/virtualNetworks/00networkAcklVaultCCY-vnet/subnets/default",
42-
"targetDomainNameId": null,
43-
"targetResourceGroupId": "/subscriptions/f2edfd5d-5496-4683-b94f-b3588c579009/resourceGroups/00networkAckl",
44-
"targetVirtualMachineId": "/subscriptions/f2edfd5d-5496-4683-b94f-b3588c579009/resourceGroups/00networkAckl/providers/Microsoft.Compute/virtualMachines/gaallaVM",
45-
"virtualNetworkId": "/subscriptions/f2edfd5d-5496-4683-b94f-b3588c579009/resourceGroups/00networkAcklVaultCCY/providers/Microsoft.Network/virtualNetworks/00networkAcklVaultCCY-vnet"
46-
}
33+
"objectType": "IaasVMRestoreRequest",
34+
"originalStorageAccountOption": false,
35+
"recoveryPointId": "87178355392716",
36+
"recoveryType": "AlternateLocation",
37+
"region": "eastus2euap",
38+
"sourceResourceId": "/subscriptions/f2edfd5d-5496-4683-b94f-b3588c579009/resourceGroups/srinivasccyrg/providers/Microsoft.Compute/virtualMachines/sriniccylinux",
39+
"storageAccountId": "/subscriptions/f2edfd5d-5496-4683-b94f-b3588c579009/resourceGroups/00prjaiTestRg1/providers/Microsoft.Storage/storageAccounts/00prjaitestrg1disks993",
40+
"subnetId": "/subscriptions/f2edfd5d-5496-4683-b94f-b3588c579009/resourceGroups/00networkAcklVaultCCY/providers/Microsoft.Network/virtualNetworks/00networkAcklVaultCCY-vnet/subnets/default",
41+
"targetDomainNameId": null,
42+
"targetResourceGroupId": "/subscriptions/f2edfd5d-5496-4683-b94f-b3588c579009/resourceGroups/00networkAckl",
43+
"targetVirtualMachineId": "/subscriptions/f2edfd5d-5496-4683-b94f-b3588c579009/resourceGroups/00networkAckl/providers/Microsoft.Compute/virtualMachines/gaallaVM",
44+
"virtualNetworkId": "/subscriptions/f2edfd5d-5496-4683-b94f-b3588c579009/resourceGroups/00networkAcklVaultCCY/providers/Microsoft.Network/virtualNetworks/00networkAcklVaultCCY-vnet"
4745
}
4846
}
4947
},
5048
"responses": {
49+
"200": {},
5150
"202": {
5251
"headers": {
5352
"Location": "location: https://centraluseuap.management.azure.com/subscriptions/f2edfd5d-5496-4683-b94f-b3588c579009/providers/microsoft.recoveryservices/locations/eastus2euap/backupCrrOperationResults/MTMzMDgzNzkwNjQxODEzODE2MDtkMTY3MzM3Yy0yM2I1LTQ5ODgtODkwZC0xY2MyMmQ5MTYyZjA=?api-version=2018-12-20-preview",

‎specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2018-12-20/examples/Common/BackupStorageConfig_Get.json‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "00000000-0000-0000-0000-000000000000",
4+
"resourceGroupName": "PythonSDKBackupTestRg",
5+
"vaultName": "PySDKBackupTestRsVault",
6+
"api-version": "2016-12-01"
7+
},
8+
"responses": {
9+
"200": {
10+
"headers": {},
11+
"body": {
12+
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/PythonSDKBackupTestRg/providers/Microsoft.RecoveryServices/vaults/PySDKBackupTestRsVault/backupstorageconfig/vaultstorageconfig",
13+
"name": "vaultstorageconfig",
14+
"type": "Microsoft.RecoveryServices/vaults/backupstorageconfig",
15+
"properties": {
16+
"storageModelType": "GeoRedundant",
17+
"storageType": "GeoRedundant",
18+
"storageTypeState": "Locked"
19+
}
20+
}
21+
}
22+
}
23+
}

‎specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2018-12-20/examples/Common/BackupStorageConfig_Patch.json‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "00000000-0000-0000-0000-000000000000",
4+
"resourceGroupName": "PythonSDKBackupTestRg",
5+
"vaultName": "PySDKBackupTestRsVault",
6+
"api-version": "2016-12-01",
7+
"parameters": {
8+
"properties": {
9+
"storageType": "LocallyRedundant",
10+
"storageTypeState": "Unlocked"
11+
}
12+
}
13+
},
14+
"responses": {
15+
"204": {}
16+
}
17+
}

‎specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2018-12-20/examples/Common/BackupStorageConfig_Put.json‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "00000000-0000-0000-0000-000000000000",
4+
"resourceGroupName": "PythonSDKBackupTestRg",
5+
"vaultName": "PySDKBackupTestRsVault",
6+
"api-version": "2016-12-01",
7+
"parameters": {
8+
"properties": {
9+
"storageType": "LocallyRedundant",
10+
"storageTypeState": "Unlocked"
11+
}
12+
}
13+
},
14+
"responses": {
15+
"200": {
16+
"headers": {},
17+
"body": {
18+
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/PythonSDKBackupTestRg/providers/Microsoft.RecoveryServices/vaults/PySDKBackupTestRsVault/backupstorageconfig/vaultstorageconfig",
19+
"name": "vaultstorageconfig",
20+
"type": "Microsoft.RecoveryServices/vaults/backupstorageconfig",
21+
"properties": {
22+
"storageModelType": "LocallyRedundant",
23+
"storageType": "LocallyRedundant",
24+
"storageTypeState": "Unlocked"
25+
}
26+
}
27+
}
28+
}
29+
}

‎specification/recoveryservicesbackup/resource-manager/readme.md‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,8 @@ These settings apply only when `--tag=package-2020-07` is specified on the comma
6767
``` yaml $(tag) == 'package-2020-07'
6868
input-file:
6969
- Microsoft.RecoveryServices/stable/2020-07-01/bms.json
70-
- Microsoft.RecoveryServices/stable/2020-02-02/bms.json
71-
- Microsoft.RecoveryServices/stable/2019-06-15/bms.json
70+
- Microsoft.RecoveryServices/stable/2018-12-20/bms.json
7271
- Microsoft.RecoveryServices/stable/2017-07-01/bms.json
73-
- Microsoft.RecoveryServices/stable/2016-12-01/bms.json
7472
- Microsoft.RecoveryServices/stable/2016-08-10/operations.json
7573
```
7674

0 commit comments

Comments
 (0)