Skip to content

Commit

Permalink
Updating existing CRR APIs and protection APIs (#10962)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
pratimaupadhyay02 authored Nov 27, 2020
1 parent a3d10d3 commit db39f34
Show file tree
Hide file tree
Showing 9 changed files with 770 additions and 103 deletions.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,6 @@
"name": "VM;iaasvmcontainer;iaasvm-rg;iaasvm-1",
"type": "Microsoft.RecoveryServices/vaults/backupFabrics/protectionContainers/protectedItems",
"properties": {
"friendlyName": "iaasvm-1",
"virtualMachineId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/providers/Microsoft.ClassicCompute/virtualMachines/iaasvm-1",
"protectionStatus": "Healthy",
"protectionState": "Protected",
"healthStatus": "Passed",
"lastBackupStatus": "Completed",
"lastBackupTime": "2018-01-22T12:25:32.048723Z",
"protectedItemDataId": "636482643132986882",
"protectedItemType": "Microsoft.ClassicCompute/virtualMachines",
"backupManagementType": "AzureIaasVM",
"workloadType": "VM",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,14 @@
"containerName": "IaasVMContainer;iaasvmcontainerv2;rshhtestmdvmrg;rshmdvmsmall",
"protectedItemName": "VM;iaasvmcontainerv2;rshhtestmdvmrg;rshmdvmsmall",
"recoveryPointId": "26083826328862",
"api-version": "2018-12-20-preview"
"api-version": "2018-12-20-preview",
"parameters": {
"properties": {
"tenantId": "33e01921-4d64-4f8c-a055-5bdaffd5e33d",
"audience": "https://RecoveryServices/IaasCoord/aadmgmt/ase",
"servicePrincipalObjectId": "5ecd8123-cf74-4037-83e9-9246b227b351"
}
}
},
"responses": {
"200": {
Expand Down Expand Up @@ -36,6 +43,7 @@
"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>"
}
}
}
},
"400": {}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
"azureRegion": "southeastasia",
"api-version": "2018-12-20",
"parameters": {
"resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testRg/providers/Microsoft.Compute/VirtualMachines/testVm"
"resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testRg/providers/Microsoft.Compute/VirtualMachines/testVm",
"jobName": "02585cc9-d7f4-4b46-860c-14c048cce178"
}
},
"responses": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,50 +4,49 @@
"azureRegion": "southeastasia",
"api-version": "2018-12-20",
"parameters": {
"properties": {
"crossRegionRestoreAccessDetails": {
"accessTokenString": "eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsIng1dCI6IkhqaUJHdVExa2lWV2hyc2lzLUhEckhyWVZNbyJ9.eyJVc2VySWRlbnRpdHlUeXBlIjoiQUFEIiwiQWFkVGVuYW50SWQiOiIzM2UwMTkyMS00ZDY0LTRmOGMtYTA1NS01YmRhZmZkNWUzM2QiLCJBYWRTUE9iamVjdElkIjoiOTMzMjc2ZmMtMWJiNy00ZWNiLTk0ZTYtYWY3ODMyNWY3MjZhIiwiUmVzdG9yZVBvaW50UGVybWlzc2lvbnMiOiJSZWFkIiwiUmVzdG9yZVBvaW50SUQiOiJyZXNvdXJjZXMvMTMzMDgzNzkwNjQxODEzODE2MC9wcm90ZWN0aW9uQ29udGFpbmVycy8xMTE0Ni9wcm90ZWN0ZWRJdGVtcy8xMTQyOTM3MDMxL3JlY292ZXJ5UG9pbnRzLzg3MTc4MzU1MzkyNzE2IiwiaXNzIjoiaHR0cHM6Ly9SZWNvdmVyeVNlcnZpY2UiLCJhdWQiOiJodHRwczovL1JlY292ZXJ5U2VydmljZXMvUHJvdGVjdGlvblNlcnZpY2UiLCJleHAiOjE1NzExMjE5ODYsIm5iZiI6MTU3MTAzNTI4Nn0.oNbeX8ueE6JRGU0IagFjkOlU-o48ez9gCeCrn1-8XEsaVtYJIFKq9FeHfPAoCMxiLQvwL7S0JTjDTjiEsZEvr_VM7tDVwW3sESo2oW-SZlxT_1dJiUBn0jVlQyfDcHEMzbkaTuZswgNWfowgOrnJ67y-ztSUcegf3eVKPEhN1enBBS7pIuL9bZ3SVwMuqznUen6dH54y9lN2w6H14X0UK2CwSN94Uh-spB27j9SbksxLY_tyZm6xsamZFTHpwbgZwR24-GDtElPSxpFL6n_tWLSCHQtN9s84o0X7PfFaMkVmGWbOf4AZmP9M6agagG0JLnlOwObr07YrzZRkg3s2eQ",
"backupManagementType": "AzureIaasVM",
"containerName": "iaasvmcontainerv2;srinivasccyrg;sriniccylinux",
"containerType": "IaasVMContainer",
"coordinatorServiceStampUri": "https://pod01-coord1.ccy.backup.windowsazure.com",
"datasourceContainerName": "iaasvmcontainerv2;srinivasccyrg;sriniccylinux",
"datasourceId": "1142937031",
"datasourceName": "sriniccylinux",
"datasourceType": "VM",
"protectionServiceStampId": "90d98224-2ac6-4bda-9f35-33fb22841f2a",
"protectionServiceStampUri": "https://pod01-prot1-int.ccy.backup.windowsazure.com",
"recoveryPointId": "87178355392716",
"recoveryPointTime": "10/9/2019 6:05:54 PM",
"resourceGroupName": "srinivasccyrg",
"resourceId": "1330837906418138160",
"resourceName": "sriniccyvault",
"subscriptionId": "f2edfd5d-5496-4683-b94f-b3588c579009",
"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>"
"crossRegionRestoreAccessDetails": {
"accessTokenString": "eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsIng1dCI6IkhqaUJHdVExa2lWV2hyc2lzLUhEckhyWVZNbyJ9.eyJVc2VySWRlbnRpdHlUeXBlIjoiQUFEIiwiQWFkVGVuYW50SWQiOiIzM2UwMTkyMS00ZDY0LTRmOGMtYTA1NS01YmRhZmZkNWUzM2QiLCJBYWRTUE9iamVjdElkIjoiOTMzMjc2ZmMtMWJiNy00ZWNiLTk0ZTYtYWY3ODMyNWY3MjZhIiwiUmVzdG9yZVBvaW50UGVybWlzc2lvbnMiOiJSZWFkIiwiUmVzdG9yZVBvaW50SUQiOiJyZXNvdXJjZXMvMTMzMDgzNzkwNjQxODEzODE2MC9wcm90ZWN0aW9uQ29udGFpbmVycy8xMTE0Ni9wcm90ZWN0ZWRJdGVtcy8xMTQyOTM3MDMxL3JlY292ZXJ5UG9pbnRzLzg3MTc4MzU1MzkyNzE2IiwiaXNzIjoiaHR0cHM6Ly9SZWNvdmVyeVNlcnZpY2UiLCJhdWQiOiJodHRwczovL1JlY292ZXJ5U2VydmljZXMvUHJvdGVjdGlvblNlcnZpY2UiLCJleHAiOjE1NzExMjE5ODYsIm5iZiI6MTU3MTAzNTI4Nn0.oNbeX8ueE6JRGU0IagFjkOlU-o48ez9gCeCrn1-8XEsaVtYJIFKq9FeHfPAoCMxiLQvwL7S0JTjDTjiEsZEvr_VM7tDVwW3sESo2oW-SZlxT_1dJiUBn0jVlQyfDcHEMzbkaTuZswgNWfowgOrnJ67y-ztSUcegf3eVKPEhN1enBBS7pIuL9bZ3SVwMuqznUen6dH54y9lN2w6H14X0UK2CwSN94Uh-spB27j9SbksxLY_tyZm6xsamZFTHpwbgZwR24-GDtElPSxpFL6n_tWLSCHQtN9s84o0X7PfFaMkVmGWbOf4AZmP9M6agagG0JLnlOwObr07YrzZRkg3s2eQ",
"backupManagementType": "AzureIaasVM",
"containerName": "iaasvmcontainerv2;srinivasccyrg;sriniccylinux",
"containerType": "IaasVMContainer",
"coordinatorServiceStampUri": "https://pod01-coord1.ccy.backup.windowsazure.com",
"datasourceContainerName": "iaasvmcontainerv2;srinivasccyrg;sriniccylinux",
"datasourceId": "1142937031",
"datasourceName": "sriniccylinux",
"datasourceType": "VM",
"protectionServiceStampId": "90d98224-2ac6-4bda-9f35-33fb22841f2a",
"protectionServiceStampUri": "https://pod01-prot1-int.ccy.backup.windowsazure.com",
"recoveryPointId": "87178355392716",
"recoveryPointTime": "10/9/2019 6:05:54 PM",
"resourceGroupName": "srinivasccyrg",
"resourceId": "1330837906418138160",
"resourceName": "sriniccyvault",
"subscriptionId": "f2edfd5d-5496-4683-b94f-b3588c579009",
"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>"
},
"restoreRequest": {
"affinityGroup": "",
"createNewCloudService": false,
"encryptionDetails": {
"encryptionEnabled": false
},
"restoreRequest": {
"affinityGroup": "",
"createNewCloudService": false,
"encryptionDetails": {
"encryptionEnabled": false
},
"objectType": "IaasVMRestoreRequest",
"originalStorageAccountOption": false,
"recoveryPointId": "87178355392716",
"recoveryType": "AlternateLocation",
"region": "eastus2euap",
"sourceResourceId": "/subscriptions/f2edfd5d-5496-4683-b94f-b3588c579009/resourceGroups/srinivasccyrg/providers/Microsoft.Compute/virtualMachines/sriniccylinux",
"storageAccountId": "/subscriptions/f2edfd5d-5496-4683-b94f-b3588c579009/resourceGroups/00prjaiTestRg1/providers/Microsoft.Storage/storageAccounts/00prjaitestrg1disks993",
"subnetId": "/subscriptions/f2edfd5d-5496-4683-b94f-b3588c579009/resourceGroups/00networkAcklVaultCCY/providers/Microsoft.Network/virtualNetworks/00networkAcklVaultCCY-vnet/subnets/default",
"targetDomainNameId": null,
"targetResourceGroupId": "/subscriptions/f2edfd5d-5496-4683-b94f-b3588c579009/resourceGroups/00networkAckl",
"targetVirtualMachineId": "/subscriptions/f2edfd5d-5496-4683-b94f-b3588c579009/resourceGroups/00networkAckl/providers/Microsoft.Compute/virtualMachines/gaallaVM",
"virtualNetworkId": "/subscriptions/f2edfd5d-5496-4683-b94f-b3588c579009/resourceGroups/00networkAcklVaultCCY/providers/Microsoft.Network/virtualNetworks/00networkAcklVaultCCY-vnet"
}
"objectType": "IaasVMRestoreRequest",
"originalStorageAccountOption": false,
"recoveryPointId": "87178355392716",
"recoveryType": "AlternateLocation",
"region": "eastus2euap",
"sourceResourceId": "/subscriptions/f2edfd5d-5496-4683-b94f-b3588c579009/resourceGroups/srinivasccyrg/providers/Microsoft.Compute/virtualMachines/sriniccylinux",
"storageAccountId": "/subscriptions/f2edfd5d-5496-4683-b94f-b3588c579009/resourceGroups/00prjaiTestRg1/providers/Microsoft.Storage/storageAccounts/00prjaitestrg1disks993",
"subnetId": "/subscriptions/f2edfd5d-5496-4683-b94f-b3588c579009/resourceGroups/00networkAcklVaultCCY/providers/Microsoft.Network/virtualNetworks/00networkAcklVaultCCY-vnet/subnets/default",
"targetDomainNameId": null,
"targetResourceGroupId": "/subscriptions/f2edfd5d-5496-4683-b94f-b3588c579009/resourceGroups/00networkAckl",
"targetVirtualMachineId": "/subscriptions/f2edfd5d-5496-4683-b94f-b3588c579009/resourceGroups/00networkAckl/providers/Microsoft.Compute/virtualMachines/gaallaVM",
"virtualNetworkId": "/subscriptions/f2edfd5d-5496-4683-b94f-b3588c579009/resourceGroups/00networkAcklVaultCCY/providers/Microsoft.Network/virtualNetworks/00networkAcklVaultCCY-vnet"
}
}
},
"responses": {
"200": {},
"202": {
"headers": {
"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",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"parameters": {
"subscriptionId": "00000000-0000-0000-0000-000000000000",
"resourceGroupName": "PythonSDKBackupTestRg",
"vaultName": "PySDKBackupTestRsVault",
"api-version": "2016-12-01"
},
"responses": {
"200": {
"headers": {},
"body": {
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/PythonSDKBackupTestRg/providers/Microsoft.RecoveryServices/vaults/PySDKBackupTestRsVault/backupstorageconfig/vaultstorageconfig",
"name": "vaultstorageconfig",
"type": "Microsoft.RecoveryServices/vaults/backupstorageconfig",
"properties": {
"storageModelType": "GeoRedundant",
"storageType": "GeoRedundant",
"storageTypeState": "Locked"
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"parameters": {
"subscriptionId": "00000000-0000-0000-0000-000000000000",
"resourceGroupName": "PythonSDKBackupTestRg",
"vaultName": "PySDKBackupTestRsVault",
"api-version": "2016-12-01",
"parameters": {
"properties": {
"storageType": "LocallyRedundant",
"storageTypeState": "Unlocked"
}
}
},
"responses": {
"204": {}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
"parameters": {
"subscriptionId": "00000000-0000-0000-0000-000000000000",
"resourceGroupName": "PythonSDKBackupTestRg",
"vaultName": "PySDKBackupTestRsVault",
"api-version": "2016-12-01",
"parameters": {
"properties": {
"storageType": "LocallyRedundant",
"storageTypeState": "Unlocked"
}
}
},
"responses": {
"200": {
"headers": {},
"body": {
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/PythonSDKBackupTestRg/providers/Microsoft.RecoveryServices/vaults/PySDKBackupTestRsVault/backupstorageconfig/vaultstorageconfig",
"name": "vaultstorageconfig",
"type": "Microsoft.RecoveryServices/vaults/backupstorageconfig",
"properties": {
"storageModelType": "LocallyRedundant",
"storageType": "LocallyRedundant",
"storageTypeState": "Unlocked"
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,8 @@ These settings apply only when `--tag=package-2020-07` is specified on the comma
``` yaml $(tag) == 'package-2020-07'
input-file:
- Microsoft.RecoveryServices/stable/2020-07-01/bms.json
- Microsoft.RecoveryServices/stable/2020-02-02/bms.json
- Microsoft.RecoveryServices/stable/2019-06-15/bms.json
- Microsoft.RecoveryServices/stable/2018-12-20/bms.json
- Microsoft.RecoveryServices/stable/2017-07-01/bms.json
- Microsoft.RecoveryServices/stable/2016-12-01/bms.json
- Microsoft.RecoveryServices/stable/2016-08-10/operations.json
```

Expand Down

0 comments on commit db39f34

Please sign in to comment.