Skip to content

Protection intent changes and bug fixes #3909

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

Merged
anuchandy merged 5 commits into from
Sep 29, 2018
Merged

Protection intent changes and bug fixes #3909

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d340e8b
Swagger spec changes for 1808 release of recovery services backup.
AdityaTulasi-xx Sep 14, 2018
ae35d67
Adding new lines at the end of newly added examples
AdityaTulasi-xx Sep 14, 2018
39cf7c2
Undoing unintended change to njsproj
AdityaTulasi-xx Sep 18, 2018
2fe1e36
Removing VaultID and adding response type for HttpStatus.OK
AdityaTulasi-xx Sep 27, 2018
974a229
Adding discriminator value for AzureWorkloadContainer
AdityaTulasi-xx Sep 28, 2018
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
79 changes: 72 additions & 7 deletions ...veryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/bms.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@
"tags": [
"ProtectableContainers"
],
"description": "Lists the containers registered to Recovery Services Vault.",
"description": "Lists the containers that can be registered to Recovery Services Vault.",
"operationId": "ProtectableContainers_List",
"produces": [
"application/json"
Expand Down Expand Up @@ -512,8 +512,8 @@
"tags": [
"ProtectionContainers"
],
"summary": "Inquires all the protectable item in the given container that can be protected.",
"description": "Inquires all the protectable items that are protectable under the given container.",
"summary": "Inquires all the protectable items under the given container.",
"description": "This is an async operation and the results should be tracked using location header or Azure-async-url.",
"operationId": "ProtectionContainers_Inquire",
"produces": [
"application/json"
Expand Down Expand Up @@ -831,6 +831,12 @@
}
],
"responses": {
"200": {
"description": "OK",
"schema": {
"$ref": "#/definitions/ProtectedItemResource"
}
},
"202": {
"description": "Accepted"
}
Expand All @@ -839,6 +845,9 @@
"x-ms-examples": {
"Enable Protection on Azure IaasVm": {
"$ref": "./examples/AzureIaasVm/ConfigureProtection.json"
},
"Stop Protection with retain data on Azure IaasVm": {
"$ref": "./examples/AzureIaasVm/StopProtection.json"
}
}
},
Expand Down Expand Up @@ -2414,7 +2423,27 @@
"properties": {
"workLoadType": {
"description": "Type of workload for the backup management",
"type": "string"
"enum": [
"Invalid",
"VM",
"FileFolder",
"AzureSqlDb",
"SQLDB",
"Exchange",
"Sharepoint",
"VMwareVM",
"SystemState",
"Client",
"GenericDataSource",
"SQLDataBase",
"AzureFileShare",
"SAPHanaDatabase"
],
"type": "string",
"x-ms-enum": {
"name": "WorkloadType",
"modelAsString": true
}
},
"schedulePolicy": {
"$ref": "#/definitions/SchedulePolicy",
Expand Down Expand Up @@ -2946,6 +2975,10 @@
"description": "Indicates if protectable item is auto-protectable",
"type": "boolean"
},
"isAutoProtected": {
"description": "Indicates if protectable item is auto-protected",
"type": "boolean"
},
"subinquireditemcount": {
"format": "int32",
"description": "For instance or AG, indicates number of DB's present",
Expand Down Expand Up @@ -3086,7 +3119,27 @@
"properties": {
"workLoadType": {
"description": "Type of workload for the backup management",
"type": "string"
"enum": [
"Invalid",
"VM",
"FileFolder",
"AzureSqlDb",
"SQLDB",
"Exchange",
"Sharepoint",
"VMwareVM",
"SystemState",
"Client",
"GenericDataSource",
"SQLDataBase",
"AzureFileShare",
"SAPHanaDatabase"
],
"type": "string",
"x-ms-enum": {
"name": "WorkloadType",
"modelAsString": true
}
},
"settings": {
"$ref": "#/definitions/Settings",
Expand Down Expand Up @@ -3387,7 +3440,8 @@
"modelAsString": true
}
}
}
},
"x-ms-discriminator-value": "AzureWorkloadBackupRequest"
},
"AzureWorkloadContainerExtendedInfo": {
"description": "Extended information of the container.",
Expand Down Expand Up @@ -6410,7 +6464,18 @@
"properties": {
"policyType": {
"description": "Type of backup policy type",
"type": "string"
"enum": [
"Invalid",
"Full",
"Differential",
"Log",
"CopyOnlyFull"
],
"type": "string",
"x-ms-enum": {
"name": "PolicyType",
"modelAsString": true
}
},
"schedulePolicy": {
"$ref": "#/definitions/SchedulePolicy",
Expand Down
28 changes: 28 additions & 0 deletions ...ger/Microsoft.RecoveryServices/stable/2016-12-01/examples/AzureIaasVm/StopProtection.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"parameters": {
"subscriptionId": "00000000-0000-0000-0000-000000000000",
"resourceGroupName": "SwaggerTestRg",
"vaultName": "NetSDKTestRsVault",
"fabricName": "Azure",
"containerName": "IaasVMContainer;iaasvmcontainerv2;netsdktestrg;netvmtestv2vm1",
"protectedItemName": "VM;iaasvmcontainerv2;netsdktestrg;netvmtestv2vm1",
"api-version": "2016-12-01",
"parameters": {
"properties": {
"protectedItemType": "Microsoft.Compute/virtualMachines",
"sourceResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/netsdktestrg/providers/Microsoft.Compute/virtualMachines/netvmtestv2vm1",
"protectionState": "ProtectionStopped"
}
}
},
"responses": {
"202": {
"headers": {
"Location": "https://management.azure.com/Subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/SwaggerTestRg/providers/Microsoft.RecoveryServices/vaults/NetSDKTestRsVault/backupFabrics/Azure/protectionContainers/IaasVMContainer;iaasvmcontainerv2;netsdktestrg;netvmtestv2vm1/protectedItems/VM;iaasvmcontainerv2;netsdktestrg;netvmtestv2vm1/operationResults/00000000-0000-0000-0000-000000000000?api-version=2016-12-01",
"Azure-AsyncOperation": "https://management.azure.com/Subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/SwaggerTestRg/providers/Microsoft.RecoveryServices/vaults/NetSDKTestRsVault/backupFabrics/Azure/protectionContainers/IaasVMContainer;iaasvmcontainerv2;netsdktestrg;netvmtestv2vm1/protectedItems/VM;iaasvmcontainerv2;netsdktestrg;netvmtestv2vm1/operationsStatus/00000000-0000-0000-0000-000000000000?api-version=2016-12-01",
"Retry-After": 60
},
"body": {}
}
}
}
30 changes: 16 additions & 14 deletions ...Microsoft.RecoveryServices/stable/2016-12-01/examples/AzureIaasVm/TriggerRestore_ALR.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,22 @@
"recoveryPointId": "348916168024334",
"api-version": "2016-12-01",
"parameters": {
"recoveryPointId": "348916168024334",
"recoveryType": "AlternateLocation",
"sourceResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/netsdktestrg/providers/Microsoft.Compute/virtualMachines/netvmtestv2vm1",
"targetVirtualMachineId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/netsdktestrg2/providers/Microsoft.Compute/virtualmachines/RSMDALRVM981435",
"targetResourceGroupId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/netsdktestrg2",
"storageAccountId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testRg/providers/Microsoft.Storage/storageAccounts/testingAccount",
"virtualNetworkId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testRg/providers/Microsoft.Network/virtualNetworks/testNet",
"subnetId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testRg/providers/Microsoft.Network/virtualNetworks/testNet/subnets/default",
"region": "southeastasia",
"createNewCloudService": false,
"originalStorageAccountOption": false,
"api-version": "2016-12-01",
"encryptionDetails": {
"encryptionEnabled": false
"properties": {
"objectType": "IaasVMRestoreRequest",
"recoveryPointId": "348916168024334",
"recoveryType": "AlternateLocation",
"sourceResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/netsdktestrg/providers/Microsoft.Compute/virtualMachines/netvmtestv2vm1",
"targetVirtualMachineId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/netsdktestrg2/providers/Microsoft.Compute/virtualmachines/RSMDALRVM981435",
"targetResourceGroupId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/netsdktestrg2",
"storageAccountId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testRg/providers/Microsoft.Storage/storageAccounts/testingAccount",
"virtualNetworkId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testRg/providers/Microsoft.Network/virtualNetworks/testNet",
"subnetId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testRg/providers/Microsoft.Network/virtualNetworks/testNet/subnets/default",
"region": "southeastasia",
"createNewCloudService": false,
"originalStorageAccountOption": false,
"encryptionDetails": {
"encryptionEnabled": false
}
}
}
},
Expand Down
22 changes: 12 additions & 10 deletions ....RecoveryServices/stable/2016-12-01/examples/AzureIaasVm/TriggerRestore_RestoreDisks.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,18 @@
"recoveryPointId": "348916168024334",
"api-version": "2016-12-01",
"parameters": {
"recoveryPointId": "348916168024334",
"recoveryType": "RestoreDisks",
"sourceResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/netsdktestrg/providers/Microsoft.Compute/virtualMachines/netvmtestv2vm1",
"storageAccountId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testingRg/providers/Microsoft.Storage/storageAccounts/testAccount",
"region": "southeastasia",
"createNewCloudService": true,
"originalStorageAccountOption": false,
"api-version": "2016-12-01",
"encryptionDetails": {
"encryptionEnabled": false
"properties": {
"objectType": "IaasVMRestoreRequest",
"recoveryPointId": "348916168024334",
"recoveryType": "RestoreDisks",
"sourceResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/netsdktestrg/providers/Microsoft.Compute/virtualMachines/netvmtestv2vm1",
"storageAccountId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testingRg/providers/Microsoft.Storage/storageAccounts/testAccount",
"region": "southeastasia",
"createNewCloudService": true,
"originalStorageAccountOption": false,
"encryptionDetails": {
"encryptionEnabled": false
}
}
}
},
Expand Down
Loading