diff --git a/ChangeLog.md b/ChangeLog.md
index 9e97c0149675..8c38cdefb168 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,3 +1,5 @@
+## 2015.09.03 version 0.9.8
+
## 2015.08.17 version 0.9.7
* Azure Profile cmdlets
* New-AzureProfile
diff --git a/setup/azurecmdfiles.wxi b/setup/azurecmdfiles.wxi
index 1343534e150d..1dbfaa5bc76a 100644
--- a/setup/azurecmdfiles.wxi
+++ b/setup/azurecmdfiles.wxi
@@ -578,6 +578,15 @@
+
+
+
+
+
+
+
+
+
@@ -623,6 +632,9 @@
+
+
+
@@ -1187,6 +1199,15 @@
+
+
+
+
+
+
+
+
+
@@ -1223,6 +1244,9 @@
+
+
+
@@ -1326,6 +1350,15 @@
+
+
+
+
+
+
+
+
+
@@ -1353,6 +1386,9 @@
+
+
+
@@ -1421,6 +1457,15 @@
+
+
+
+
+
+
+
+
+
@@ -1469,6 +1514,9 @@
+
+
+
@@ -2026,6 +2074,9 @@
+
+
+
@@ -3227,6 +3278,15 @@
+
+
+
+
+
+
+
+
+
@@ -3344,6 +3404,9 @@
+
+
+
@@ -4682,6 +4745,15 @@
+
+
+
+
+
+
+
+
+
@@ -4733,6 +4805,9 @@
+
+
+
@@ -4919,6 +4994,9 @@
+
+
+
@@ -4934,6 +5012,7 @@
+
@@ -5110,6 +5189,9 @@
+
+
+
@@ -5122,6 +5204,7 @@
+
@@ -5155,6 +5238,9 @@
+
+
+
@@ -5164,6 +5250,7 @@
+
@@ -5186,6 +5273,9 @@
+
+
+
@@ -5202,6 +5292,7 @@
+
@@ -5383,6 +5474,7 @@
+
@@ -5774,6 +5866,9 @@
+
+
+
@@ -5813,6 +5908,7 @@
+
@@ -6233,6 +6329,9 @@
+
+
+
@@ -6250,6 +6349,7 @@
+
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/Commands.AzureBackup.Test.csproj b/src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/Commands.AzureBackup.Test.csproj
index 3088c89b2dcd..f0fdd55696d6 100644
--- a/src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/Commands.AzureBackup.Test.csproj
+++ b/src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/Commands.AzureBackup.Test.csproj
@@ -40,8 +40,7 @@
..\..\..\packages\Microsoft.Azure.Common.Authentication.1.1.3-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll
- False
- ..\..\..\packages\Microsoft.Azure.Management.BackupServices.1.0.3-preview\lib\net40\Microsoft.Azure.Management.BackupServicesManagement.dll
+ ..\..\..\packages\Microsoft.Azure.Management.BackupServices.1.0.4-preview\lib\net40\Microsoft.Azure.Management.BackupServicesManagement.dll
False
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/ScenarioTests/AzureBackupContainerTests.ps1 b/src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/ScenarioTests/AzureBackupContainerTests.ps1
index 75e3b265546e..b8cc114d0723 100644
--- a/src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/ScenarioTests/AzureBackupContainerTests.ps1
+++ b/src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/ScenarioTests/AzureBackupContainerTests.ps1
@@ -54,13 +54,12 @@ $IaasVMManagedResourceName = "hydrarecordvm"
$IaasVMManagedResourceGroupName = "hydrarecordvm"
$VaultResourceName = "backuprn"
$VaultResourceRGName = "backuprg"
-$RegisterTestVM = "powershellbvt"
function Test-RegisterAzureBackupContainer
{
$vault = Get-AzureRMBackupVault -Name $VaultResourceName
- $jobId = Register-AzureRMBackupContainer -vault $vault -Name $RegisterTestVM -ServiceName $RegisterTestVM
+ $jobId = Register-AzureRMBackupContainer -vault $vault -Name $IaasVMManagedResourceName -ServiceName $IaasVMManagedResourceGroupName
Assert-NotNull $jobId 'Job should not be null';
}
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/SessionRecords/Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupContainerTests/AzureBackupContainerScenarioTests.json b/src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/SessionRecords/Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupContainerTests/AzureBackupContainerScenarioTests.json
index 411e120318d9..8f59c920de1a 100644
--- a/src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/SessionRecords/Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupContainerTests/AzureBackupContainerScenarioTests.json
+++ b/src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/SessionRecords/Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupContainerTests/AzureBackupContainerScenarioTests.json
@@ -10,13 +10,13 @@
"en-us"
],
"x-ms-client-request-id": [
- "b6ee8175-6285-48e1-8d88-b04a52c65045-2015-08-14 10:25:36Z-PS"
+ "36086411-570f-4a0c-b6b1-3dab5e799d22-2015-08-24 11:14:28Z-PS"
],
"User-Agent": [
- "Microsoft.Azure.Management.BackupServices.BackupVaultServicesManagementClient/0.0.0.0"
+ "Microsoft.Azure.Management.BackupServices.BackupVaultServicesManagementClient/1.0.0.0"
]
},
- "ResponseBody": "{\r\n \"location\": \"southeastasia\",\r\n \"name\": \"backuprn\",\r\n \"etag\": \"fef5d39d-ff91-43f7-9127-3b9a171a9f0c\",\r\n \"tags\": {},\r\n \"properties\": {\r\n \"sku\": {\r\n \"name\": \"standard\"\r\n },\r\n \"provisioningState\": \"Succeeded\"\r\n },\r\n \"id\": \"/subscriptions/f5303a0b-fae4-4cdb-b44d-0e4c032dde26/resourceGroups/backuprg/providers/Microsoft.Backup/BackupVault/backuprn\",\r\n \"type\": \"Microsoft.Backup/BackupVault\"\r\n}",
+ "ResponseBody": "{\r\n \"location\": \"southeastasia\",\r\n \"name\": \"backuprn\",\r\n \"etag\": \"bbe62c5f-f8f3-4927-9b53-ac4befce53b0\",\r\n \"tags\": {},\r\n \"properties\": {\r\n \"sku\": {\r\n \"name\": \"standard\"\r\n },\r\n \"provisioningState\": \"Succeeded\"\r\n },\r\n \"id\": \"/subscriptions/f5303a0b-fae4-4cdb-b44d-0e4c032dde26/resourceGroups/backuprg/providers/Microsoft.Backup/BackupVault/backuprn\",\r\n \"type\": \"Microsoft.Backup/BackupVault\"\r\n}",
"ResponseHeaders": {
"Content-Length": [
"344"
@@ -31,28 +31,28 @@
"no-cache"
],
"x-ms-request-id": [
- "cf75119f-1291-4957-806b-483e8181a98f"
+ "ef33055f-ef57-402d-acb0-2c5a3df1a7ac"
],
"x-ms-client-request-id": [
- "b6ee8175-6285-48e1-8d88-b04a52c65045-2015-08-14 10:25:36Z-PS"
+ "36086411-570f-4a0c-b6b1-3dab5e799d22-2015-08-24 11:14:28Z-PS"
],
"Strict-Transport-Security": [
"max-age=31536000; includeSubDomains"
],
"x-ms-ratelimit-remaining-subscription-reads": [
- "14996"
+ "14999"
],
"x-ms-correlation-request-id": [
- "cf75119f-1291-4957-806b-483e8181a98f"
+ "ef33055f-ef57-402d-acb0-2c5a3df1a7ac"
],
"x-ms-routing-request-id": [
- "CENTRALUS:20150814T102539Z:cf75119f-1291-4957-806b-483e8181a98f"
+ "CENTRALUS:20150824T111431Z:ef33055f-ef57-402d-acb0-2c5a3df1a7ac"
],
"Cache-Control": [
"no-cache"
],
"Date": [
- "Fri, 14 Aug 2015 10:25:38 GMT"
+ "Mon, 24 Aug 2015 11:14:31 GMT"
],
"Server": [
"Microsoft-IIS/8.0"
@@ -70,16 +70,16 @@
"en-us"
],
"x-ms-client-request-id": [
- "b6ee8175-6285-48e1-8d88-b04a52c65045-2015-08-14 10:25:36Z-PS"
+ "36086411-570f-4a0c-b6b1-3dab5e799d22-2015-08-24 11:14:28Z-PS"
],
"User-Agent": [
- "Microsoft.Azure.Management.BackupServices.BackupVaultServicesManagementClient/0.0.0.0"
+ "Microsoft.Azure.Management.BackupServices.BackupVaultServicesManagementClient/1.0.0.0"
]
},
- "ResponseBody": "{\r\n \"resourceId\": 1774108198771083879,\r\n \"properties\": {\r\n \"storageType\": \"LocallyRedundant\",\r\n \"storageTypeState\": \"Locked\"\r\n }\r\n}",
+ "ResponseBody": "{\r\n \"resourceId\": 6476019202094164610,\r\n \"properties\": {\r\n \"storageType\": \"GeoRedundant\",\r\n \"storageTypeState\": \"Locked\"\r\n }\r\n}",
"ResponseHeaders": {
"Content-Length": [
- "110"
+ "106"
],
"Content-Type": [
"application/json"
@@ -91,29 +91,29 @@
"no-cache"
],
"x-ms-request-id": [
- "cc0d7b18-86d0-4f2f-94dc-48e3288b1846"
+ "560174f4-2b3a-461b-b319-bbd482816924"
],
"x-ms-client-request-id": [
- "b6ee8175-6285-48e1-8d88-b04a52c65045-2015-08-14 10:25:36Z-PS",
- "b6ee8175-6285-48e1-8d88-b04a52c65045-2015-08-14 10:25:36Z-PS"
+ "36086411-570f-4a0c-b6b1-3dab5e799d22-2015-08-24 11:14:28Z-PS",
+ "36086411-570f-4a0c-b6b1-3dab5e799d22-2015-08-24 11:14:28Z-PS"
],
"Strict-Transport-Security": [
"max-age=31536000; includeSubDomains"
],
"x-ms-ratelimit-remaining-subscription-reads": [
- "14995"
+ "14998"
],
"x-ms-correlation-request-id": [
- "cc0d7b18-86d0-4f2f-94dc-48e3288b1846"
+ "560174f4-2b3a-461b-b319-bbd482816924"
],
"x-ms-routing-request-id": [
- "CENTRALUS:20150814T102540Z:cc0d7b18-86d0-4f2f-94dc-48e3288b1846"
+ "CENTRALUS:20150824T111432Z:560174f4-2b3a-461b-b319-bbd482816924"
],
"Cache-Control": [
"no-cache"
],
"Date": [
- "Fri, 14 Aug 2015 10:25:40 GMT"
+ "Mon, 24 Aug 2015 11:14:32 GMT"
],
"Server": [
"Microsoft-IIS/8.0"
@@ -122,8 +122,8 @@
"StatusCode": 200
},
{
- "RequestUri": "/Subscriptions/f5303a0b-fae4-4cdb-b44d-0e4c032dde26/resourceGroups/backuprg/providers/Microsoft.Backup/BackupVault/backuprn/containers?api-version=2014-09-01&$filter=containerType%20eq%20'IaasVM'",
- "EncodedRequestUri": "L1N1YnNjcmlwdGlvbnMvZjUzMDNhMGItZmFlNC00Y2RiLWI0NGQtMGU0YzAzMmRkZTI2L3Jlc291cmNlR3JvdXBzL2JhY2t1cHJnL3Byb3ZpZGVycy9NaWNyb3NvZnQuQmFja3VwL0JhY2t1cFZhdWx0L2JhY2t1cHJuL2NvbnRhaW5lcnM/YXBpLXZlcnNpb249MjAxNC0wOS0wMSYkZmlsdGVyPWNvbnRhaW5lclR5cGUlMjBlcSUyMCdJYWFzVk0n",
+ "RequestUri": "/Subscriptions/f5303a0b-fae4-4cdb-b44d-0e4c032dde26/resourceGroups/backuprg/providers/Microsoft.Backup/BackupVault/backuprn/containers?api-version=2014-09-01&$filter=type%20eq%20'IaasVM'",
+ "EncodedRequestUri": "L1N1YnNjcmlwdGlvbnMvZjUzMDNhMGItZmFlNC00Y2RiLWI0NGQtMGU0YzAzMmRkZTI2L3Jlc291cmNlR3JvdXBzL2JhY2t1cHJnL3Byb3ZpZGVycy9NaWNyb3NvZnQuQmFja3VwL0JhY2t1cFZhdWx0L2JhY2t1cHJuL2NvbnRhaW5lcnM/YXBpLXZlcnNpb249MjAxNC0wOS0wMSYkZmlsdGVyPXR5cGUlMjBlcSUyMCdJYWFzVk0n",
"RequestMethod": "GET",
"RequestBody": "",
"RequestHeaders": {
@@ -131,10 +131,10 @@
"en-us"
],
"x-ms-client-request-id": [
- "56b1a915-da7a-4109-97cd-4a546fabdbde-2015-08-14 10:25:40Z-PS"
+ "0ae364d6-7a9e-40e4-8658-f0e06c0de7c8-2015-08-24 11:14:32Z-PS"
],
"User-Agent": [
- "Microsoft.Azure.Management.BackupServices.BackupServicesManagementClient/0.0.0.0"
+ "Microsoft.Azure.Management.BackupServices.BackupServicesManagementClient/1.0.0.0"
]
},
"ResponseBody": "{\r\n \"value\": [\r\n {\r\n \"properties\": {\r\n \"friendlyName\": \"hydrarecordvm\",\r\n \"status\": \"Registered\",\r\n \"healthStatus\": \"Healthy\",\r\n \"containerType\": \"IaasVM\",\r\n \"parentContainerId\": \"/subscriptions/f5303a0b-fae4-4cdb-b44d-0e4c032dde26/resourceGroups/backuprg/providers/Microsoft.Backup/BackupVault/backuprn/containers/hydrarecordvm\"\r\n },\r\n \"id\": \"/subscriptions/f5303a0b-fae4-4cdb-b44d-0e4c032dde26/resourceGroups/backuprg/providers/Microsoft.Backup/BackupVault/backuprn/containers/iaasvmcontainer;hydrarecordvm;hydrarecordvm\",\r\n \"name\": \"iaasvmcontainer;hydrarecordvm;hydrarecordvm\",\r\n \"type\": \"Microsoft.Backup/BackupVault/containers\"\r\n }\r\n ],\r\n \"nextLink\": null\r\n}",
@@ -152,29 +152,29 @@
"no-cache"
],
"x-ms-request-id": [
- "f88725ce-30e4-4405-a6f9-5eae2f9bc9d3"
+ "a4e766c4-feff-4839-8717-22543e0d3986"
],
"x-ms-client-request-id": [
- "56b1a915-da7a-4109-97cd-4a546fabdbde-2015-08-14 10:25:40Z-PS",
- "56b1a915-da7a-4109-97cd-4a546fabdbde-2015-08-14 10:25:40Z-PS"
+ "0ae364d6-7a9e-40e4-8658-f0e06c0de7c8-2015-08-24 11:14:32Z-PS",
+ "0ae364d6-7a9e-40e4-8658-f0e06c0de7c8-2015-08-24 11:14:32Z-PS"
],
"Strict-Transport-Security": [
"max-age=31536000; includeSubDomains"
],
"x-ms-ratelimit-remaining-subscription-reads": [
- "14996"
+ "14999"
],
"x-ms-correlation-request-id": [
- "f88725ce-30e4-4405-a6f9-5eae2f9bc9d3"
+ "a4e766c4-feff-4839-8717-22543e0d3986"
],
"x-ms-routing-request-id": [
- "CENTRALUS:20150814T102543Z:f88725ce-30e4-4405-a6f9-5eae2f9bc9d3"
+ "CENTRALUS:20150824T111435Z:a4e766c4-feff-4839-8717-22543e0d3986"
],
"Cache-Control": [
"no-cache"
],
"Date": [
- "Fri, 14 Aug 2015 10:25:43 GMT"
+ "Mon, 24 Aug 2015 11:14:35 GMT"
],
"Server": [
"Microsoft-IIS/8.0"
@@ -186,8 +186,8 @@
"StatusCode": 200
},
{
- "RequestUri": "/Subscriptions/f5303a0b-fae4-4cdb-b44d-0e4c032dde26/resourceGroups/backuprg/providers/Microsoft.Backup/BackupVault/backuprn/containers?api-version=2014-09-01&$filter=containerType%20eq%20'IaasVM'%20and%20friendlyName%20eq%20'hydrarecordvm'",
- "EncodedRequestUri": "L1N1YnNjcmlwdGlvbnMvZjUzMDNhMGItZmFlNC00Y2RiLWI0NGQtMGU0YzAzMmRkZTI2L3Jlc291cmNlR3JvdXBzL2JhY2t1cHJnL3Byb3ZpZGVycy9NaWNyb3NvZnQuQmFja3VwL0JhY2t1cFZhdWx0L2JhY2t1cHJuL2NvbnRhaW5lcnM/YXBpLXZlcnNpb249MjAxNC0wOS0wMSYkZmlsdGVyPWNvbnRhaW5lclR5cGUlMjBlcSUyMCdJYWFzVk0nJTIwYW5kJTIwZnJpZW5kbHlOYW1lJTIwZXElMjAnaHlkcmFyZWNvcmR2bSc=",
+ "RequestUri": "/Subscriptions/f5303a0b-fae4-4cdb-b44d-0e4c032dde26/resourceGroups/backuprg/providers/Microsoft.Backup/BackupVault/backuprn/containers?api-version=2014-09-01&$filter=type%20eq%20'IaasVM'%20and%20friendlyName%20eq%20'hydrarecordvm'",
+ "EncodedRequestUri": "L1N1YnNjcmlwdGlvbnMvZjUzMDNhMGItZmFlNC00Y2RiLWI0NGQtMGU0YzAzMmRkZTI2L3Jlc291cmNlR3JvdXBzL2JhY2t1cHJnL3Byb3ZpZGVycy9NaWNyb3NvZnQuQmFja3VwL0JhY2t1cFZhdWx0L2JhY2t1cHJuL2NvbnRhaW5lcnM/YXBpLXZlcnNpb249MjAxNC0wOS0wMSYkZmlsdGVyPXR5cGUlMjBlcSUyMCdJYWFzVk0nJTIwYW5kJTIwZnJpZW5kbHlOYW1lJTIwZXElMjAnaHlkcmFyZWNvcmR2bSc=",
"RequestMethod": "GET",
"RequestBody": "",
"RequestHeaders": {
@@ -195,10 +195,10 @@
"en-us"
],
"x-ms-client-request-id": [
- "fff73c43-0e6e-4137-b54f-4e1bc214edf6-2015-08-14 10:25:43Z-PS"
+ "fd17ac5f-faf7-46a1-9eb2-660f7e7d9af4-2015-08-24 11:14:36Z-PS"
],
"User-Agent": [
- "Microsoft.Azure.Management.BackupServices.BackupServicesManagementClient/0.0.0.0"
+ "Microsoft.Azure.Management.BackupServices.BackupServicesManagementClient/1.0.0.0"
]
},
"ResponseBody": "{\r\n \"value\": [\r\n {\r\n \"properties\": {\r\n \"friendlyName\": \"hydrarecordvm\",\r\n \"status\": \"Registered\",\r\n \"healthStatus\": \"Healthy\",\r\n \"containerType\": \"IaasVM\",\r\n \"parentContainerId\": \"/subscriptions/f5303a0b-fae4-4cdb-b44d-0e4c032dde26/resourceGroups/backuprg/providers/Microsoft.Backup/BackupVault/backuprn/containers/hydrarecordvm\"\r\n },\r\n \"id\": \"/subscriptions/f5303a0b-fae4-4cdb-b44d-0e4c032dde26/resourceGroups/backuprg/providers/Microsoft.Backup/BackupVault/backuprn/containers/iaasvmcontainer;hydrarecordvm;hydrarecordvm\",\r\n \"name\": \"iaasvmcontainer;hydrarecordvm;hydrarecordvm\",\r\n \"type\": \"Microsoft.Backup/BackupVault/containers\"\r\n }\r\n ],\r\n \"nextLink\": null\r\n}",
@@ -216,29 +216,29 @@
"no-cache"
],
"x-ms-request-id": [
- "e5e16955-fb54-4c23-a222-baedd71224d5"
+ "aa47c965-a832-4c87-986d-da50f79d4cd2"
],
"x-ms-client-request-id": [
- "fff73c43-0e6e-4137-b54f-4e1bc214edf6-2015-08-14 10:25:43Z-PS",
- "fff73c43-0e6e-4137-b54f-4e1bc214edf6-2015-08-14 10:25:43Z-PS"
+ "fd17ac5f-faf7-46a1-9eb2-660f7e7d9af4-2015-08-24 11:14:36Z-PS",
+ "fd17ac5f-faf7-46a1-9eb2-660f7e7d9af4-2015-08-24 11:14:36Z-PS"
],
"Strict-Transport-Security": [
"max-age=31536000; includeSubDomains"
],
"x-ms-ratelimit-remaining-subscription-reads": [
- "14995"
+ "14998"
],
"x-ms-correlation-request-id": [
- "e5e16955-fb54-4c23-a222-baedd71224d5"
+ "aa47c965-a832-4c87-986d-da50f79d4cd2"
],
"x-ms-routing-request-id": [
- "CENTRALUS:20150814T102544Z:e5e16955-fb54-4c23-a222-baedd71224d5"
+ "CENTRALUS:20150824T111436Z:aa47c965-a832-4c87-986d-da50f79d4cd2"
],
"Cache-Control": [
"no-cache"
],
"Date": [
- "Fri, 14 Aug 2015 10:25:44 GMT"
+ "Mon, 24 Aug 2015 11:14:36 GMT"
],
"Server": [
"Microsoft-IIS/8.0"
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/SessionRecords/Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupContainerTests/AzureBackupRegisterContainerScenarioTests.json b/src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/SessionRecords/Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupContainerTests/AzureBackupRegisterContainerScenarioTests.json
index 7cc891273d27..8d769a6f217d 100644
--- a/src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/SessionRecords/Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupContainerTests/AzureBackupRegisterContainerScenarioTests.json
+++ b/src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/SessionRecords/Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupContainerTests/AzureBackupRegisterContainerScenarioTests.json
@@ -10,16 +10,16 @@
"en-us"
],
"x-ms-client-request-id": [
- "6e091fde-9338-4f63-b81c-12565d6486f4-2015-08-18 15:40:22Z-PS"
+ "0b564194-6328-4a17-aa8c-719de153d988-2015-08-24 11:25:05Z-PS"
],
"User-Agent": [
- "Microsoft.Azure.Management.BackupServices.BackupVaultServicesManagementClient/0.0.0.0"
+ "Microsoft.Azure.Management.BackupServices.BackupVaultServicesManagementClient/1.0.0.0"
]
},
- "ResponseBody": "{\r\n \"value\": [\r\n {\r\n \"id\": \"/subscriptions/f5303a0b-fae4-4cdb-b44d-0e4c032dde26/resourceGroups/backuprg/providers/Microsoft.Backup/BackupVault/backuprn\",\r\n \"name\": \"backuprn\",\r\n \"type\": \"Microsoft.Backup/BackupVault\",\r\n \"location\": \"southeastasia\",\r\n \"tags\": {}\r\n },\r\n {\r\n \"id\": \"/subscriptions/f5303a0b-fae4-4cdb-b44d-0e4c032dde26/resourceGroups/backuprg/providers/Microsoft.Backup/BackupVault/backuprn1\",\r\n \"name\": \"backuprn1\",\r\n \"type\": \"Microsoft.Backup/BackupVault\",\r\n \"location\": \"westus\",\r\n \"tags\": {}\r\n }\r\n ]\r\n}",
+ "ResponseBody": "{\r\n \"value\": [\r\n {\r\n \"id\": \"/subscriptions/f5303a0b-fae4-4cdb-b44d-0e4c032dde26/resourceGroups/backuprg/providers/Microsoft.Backup/BackupVault/backuprn\",\r\n \"name\": \"backuprn\",\r\n \"type\": \"Microsoft.Backup/BackupVault\",\r\n \"location\": \"southeastasia\",\r\n \"tags\": {}\r\n }\r\n ]\r\n}",
"ResponseHeaders": {
"Content-Length": [
- "458"
+ "237"
],
"Content-Type": [
"application/json; charset=utf-8"
@@ -31,16 +31,16 @@
"no-cache"
],
"x-ms-ratelimit-remaining-subscription-reads": [
- "14997"
+ "14999"
],
"x-ms-request-id": [
- "82213eae-32b6-407e-98f1-1907fc2f47a0"
+ "cff6fdf6-25c4-496d-a9e3-b9760455ccf0"
],
"x-ms-correlation-request-id": [
- "82213eae-32b6-407e-98f1-1907fc2f47a0"
+ "cff6fdf6-25c4-496d-a9e3-b9760455ccf0"
],
"x-ms-routing-request-id": [
- "CENTRALUS:20150818T154023Z:82213eae-32b6-407e-98f1-1907fc2f47a0"
+ "CENTRALUS:20150824T112507Z:cff6fdf6-25c4-496d-a9e3-b9760455ccf0"
],
"Strict-Transport-Security": [
"max-age=31536000; includeSubDomains"
@@ -49,7 +49,7 @@
"no-cache"
],
"Date": [
- "Tue, 18 Aug 2015 15:40:23 GMT"
+ "Mon, 24 Aug 2015 11:25:06 GMT"
]
},
"StatusCode": 200
@@ -64,13 +64,13 @@
"en-us"
],
"x-ms-client-request-id": [
- "6e091fde-9338-4f63-b81c-12565d6486f4-2015-08-18 15:40:22Z-PS"
+ "0b564194-6328-4a17-aa8c-719de153d988-2015-08-24 11:25:05Z-PS"
],
"User-Agent": [
- "Microsoft.Azure.Management.BackupServices.BackupVaultServicesManagementClient/0.0.0.0"
+ "Microsoft.Azure.Management.BackupServices.BackupVaultServicesManagementClient/1.0.0.0"
]
},
- "ResponseBody": "{\r\n \"resourceId\": 3420983535961922368,\r\n \"properties\": {\r\n \"storageType\": \"GeoRedundant\",\r\n \"storageTypeState\": \"Locked\"\r\n }\r\n}",
+ "ResponseBody": "{\r\n \"resourceId\": 6476019202094164610,\r\n \"properties\": {\r\n \"storageType\": \"GeoRedundant\",\r\n \"storageTypeState\": \"Locked\"\r\n }\r\n}",
"ResponseHeaders": {
"Content-Length": [
"106"
@@ -85,29 +85,29 @@
"no-cache"
],
"x-ms-request-id": [
- "de793bd2-316c-41e1-8c4c-9c279ed82e85"
+ "4503ceed-b420-4738-927f-a806a68c0fae"
],
"x-ms-client-request-id": [
- "6e091fde-9338-4f63-b81c-12565d6486f4-2015-08-18 15:40:22Z-PS",
- "6e091fde-9338-4f63-b81c-12565d6486f4-2015-08-18 15:40:22Z-PS"
+ "0b564194-6328-4a17-aa8c-719de153d988-2015-08-24 11:25:05Z-PS",
+ "0b564194-6328-4a17-aa8c-719de153d988-2015-08-24 11:25:05Z-PS"
],
"Strict-Transport-Security": [
"max-age=31536000; includeSubDomains"
],
"x-ms-ratelimit-remaining-subscription-reads": [
- "14996"
+ "14998"
],
"x-ms-correlation-request-id": [
- "de793bd2-316c-41e1-8c4c-9c279ed82e85"
+ "4503ceed-b420-4738-927f-a806a68c0fae"
],
"x-ms-routing-request-id": [
- "CENTRALUS:20150818T154033Z:de793bd2-316c-41e1-8c4c-9c279ed82e85"
+ "CENTRALUS:20150824T112509Z:4503ceed-b420-4738-927f-a806a68c0fae"
],
"Cache-Control": [
"no-cache"
],
"Date": [
- "Tue, 18 Aug 2015 15:40:33 GMT"
+ "Mon, 24 Aug 2015 11:25:09 GMT"
],
"Server": [
"Microsoft-IIS/8.0"
@@ -116,8 +116,8 @@
"StatusCode": 200
},
{
- "RequestUri": "/Subscriptions/f5303a0b-fae4-4cdb-b44d-0e4c032dde26/resourceGroups/backuprg/providers/Microsoft.Backup/BackupVault/backuprn/containers?api-version=2014-09-01&$filter=containerType%20eq%20'IaasVM'%20and%20friendlyName%20eq%20'powershellbvt'%20and%20status%20eq%20'NotRegistered'",
- "EncodedRequestUri": "L1N1YnNjcmlwdGlvbnMvZjUzMDNhMGItZmFlNC00Y2RiLWI0NGQtMGU0YzAzMmRkZTI2L3Jlc291cmNlR3JvdXBzL2JhY2t1cHJnL3Byb3ZpZGVycy9NaWNyb3NvZnQuQmFja3VwL0JhY2t1cFZhdWx0L2JhY2t1cHJuL2NvbnRhaW5lcnM/YXBpLXZlcnNpb249MjAxNC0wOS0wMSYkZmlsdGVyPWNvbnRhaW5lclR5cGUlMjBlcSUyMCdJYWFzVk0nJTIwYW5kJTIwZnJpZW5kbHlOYW1lJTIwZXElMjAncG93ZXJzaGVsbGJ2dCclMjBhbmQlMjBzdGF0dXMlMjBlcSUyMCdOb3RSZWdpc3RlcmVkJw==",
+ "RequestUri": "/Subscriptions/f5303a0b-fae4-4cdb-b44d-0e4c032dde26/resourceGroups/backuprg/providers/Microsoft.Backup/BackupVault/backuprn/containers?api-version=2014-09-01&$filter=type%20eq%20'IaasVM'%20and%20friendlyName%20eq%20'hydrarecordvm'%20and%20status%20eq%20'NotRegistered'",
+ "EncodedRequestUri": "L1N1YnNjcmlwdGlvbnMvZjUzMDNhMGItZmFlNC00Y2RiLWI0NGQtMGU0YzAzMmRkZTI2L3Jlc291cmNlR3JvdXBzL2JhY2t1cHJnL3Byb3ZpZGVycy9NaWNyb3NvZnQuQmFja3VwL0JhY2t1cFZhdWx0L2JhY2t1cHJuL2NvbnRhaW5lcnM/YXBpLXZlcnNpb249MjAxNC0wOS0wMSYkZmlsdGVyPXR5cGUlMjBlcSUyMCdJYWFzVk0nJTIwYW5kJTIwZnJpZW5kbHlOYW1lJTIwZXElMjAnaHlkcmFyZWNvcmR2bSclMjBhbmQlMjBzdGF0dXMlMjBlcSUyMCdOb3RSZWdpc3RlcmVkJw==",
"RequestMethod": "GET",
"RequestBody": "",
"RequestHeaders": {
@@ -125,13 +125,13 @@
"en-us"
],
"x-ms-client-request-id": [
- "ebc2e8e9-92ea-4c9e-8bd9-c1f2eee14183-2015-08-18 15:40:33Z-PS"
+ "ce6d85f1-e475-4bc4-97d1-4640f7a987e2-2015-08-24 11:25:09Z-PS"
],
"User-Agent": [
- "Microsoft.Azure.Management.BackupServices.BackupServicesManagementClient/0.0.0.0"
+ "Microsoft.Azure.Management.BackupServices.BackupServicesManagementClient/1.0.0.0"
]
},
- "ResponseBody": "{\r\n \"value\": [\r\n {\r\n \"properties\": {\r\n \"friendlyName\": \"powershellbvt\",\r\n \"status\": \"NotRegistered\",\r\n \"healthStatus\": \"Healthy\",\r\n \"containerType\": \"IaasVM\",\r\n \"parentContainerId\": \"/subscriptions/f5303a0b-fae4-4cdb-b44d-0e4c032dde26/resourceGroups/backuprg/providers/Microsoft.Backup/BackupVault/backuprn/containers/powershellbvt\"\r\n },\r\n \"id\": \"/subscriptions/f5303a0b-fae4-4cdb-b44d-0e4c032dde26/resourceGroups/backuprg/providers/Microsoft.Backup/BackupVault/backuprn/containers/iaasvmcontainer;powershellbvt;powershellbvt\",\r\n \"name\": \"iaasvmcontainer;powershellbvt;powershellbvt\",\r\n \"type\": \"Microsoft.Backup/BackupVault/containers\"\r\n }\r\n ],\r\n \"nextLink\": null\r\n}",
+ "ResponseBody": "{\r\n \"value\": [\r\n {\r\n \"properties\": {\r\n \"friendlyName\": \"hydrarecordvm\",\r\n \"status\": \"NotRegistered\",\r\n \"healthStatus\": \"Healthy\",\r\n \"containerType\": \"IaasVM\",\r\n \"parentContainerId\": \"/subscriptions/f5303a0b-fae4-4cdb-b44d-0e4c032dde26/resourceGroups/backuprg/providers/Microsoft.Backup/BackupVault/backuprn/containers/hydrarecordvm\"\r\n },\r\n \"id\": \"/subscriptions/f5303a0b-fae4-4cdb-b44d-0e4c032dde26/resourceGroups/backuprg/providers/Microsoft.Backup/BackupVault/backuprn/containers/iaasvmcontainer;hydrarecordvm;hydrarecordvm\",\r\n \"name\": \"iaasvmcontainer;hydrarecordvm;hydrarecordvm\",\r\n \"type\": \"Microsoft.Backup/BackupVault/containers\"\r\n }\r\n ],\r\n \"nextLink\": null\r\n}",
"ResponseHeaders": {
"Content-Length": [
"609"
@@ -146,29 +146,29 @@
"no-cache"
],
"x-ms-request-id": [
- "5c0187c9-f3d8-4a00-9cc2-fb2c2092753b"
+ "460a48bd-cf32-40e5-84fe-6f160054bf90"
],
"x-ms-client-request-id": [
- "ebc2e8e9-92ea-4c9e-8bd9-c1f2eee14183-2015-08-18 15:40:33Z-PS",
- "ebc2e8e9-92ea-4c9e-8bd9-c1f2eee14183-2015-08-18 15:40:33Z-PS"
+ "ce6d85f1-e475-4bc4-97d1-4640f7a987e2-2015-08-24 11:25:09Z-PS",
+ "ce6d85f1-e475-4bc4-97d1-4640f7a987e2-2015-08-24 11:25:09Z-PS"
],
"Strict-Transport-Security": [
"max-age=31536000; includeSubDomains"
],
"x-ms-ratelimit-remaining-subscription-reads": [
- "14997"
+ "14999"
],
"x-ms-correlation-request-id": [
- "5c0187c9-f3d8-4a00-9cc2-fb2c2092753b"
+ "460a48bd-cf32-40e5-84fe-6f160054bf90"
],
"x-ms-routing-request-id": [
- "CENTRALUS:20150818T154036Z:5c0187c9-f3d8-4a00-9cc2-fb2c2092753b"
+ "CENTRALUS:20150824T112512Z:460a48bd-cf32-40e5-84fe-6f160054bf90"
],
"Cache-Control": [
"no-cache"
],
"Date": [
- "Tue, 18 Aug 2015 15:40:36 GMT"
+ "Mon, 24 Aug 2015 11:25:12 GMT"
],
"Server": [
"Microsoft-IIS/8.0"
@@ -180,8 +180,8 @@
"StatusCode": 200
},
{
- "RequestUri": "/Subscriptions/f5303a0b-fae4-4cdb-b44d-0e4c032dde26/resourceGroups/backuprg/providers/Microsoft.Backup/BackupVault/backuprn/registeredContainers/iaasvmcontainer%3Bpowershellbvt%3Bpowershellbvt?api-version=2014-09-01",
- "EncodedRequestUri": "L1N1YnNjcmlwdGlvbnMvZjUzMDNhMGItZmFlNC00Y2RiLWI0NGQtMGU0YzAzMmRkZTI2L3Jlc291cmNlR3JvdXBzL2JhY2t1cHJnL3Byb3ZpZGVycy9NaWNyb3NvZnQuQmFja3VwL0JhY2t1cFZhdWx0L2JhY2t1cHJuL3JlZ2lzdGVyZWRDb250YWluZXJzL2lhYXN2bWNvbnRhaW5lciUzQnBvd2Vyc2hlbGxidnQlM0Jwb3dlcnNoZWxsYnZ0P2FwaS12ZXJzaW9uPTIwMTQtMDktMDE=",
+ "RequestUri": "/Subscriptions/f5303a0b-fae4-4cdb-b44d-0e4c032dde26/resourceGroups/backuprg/providers/Microsoft.Backup/BackupVault/backuprn/registeredContainers/iaasvmcontainer%3Bhydrarecordvm%3Bhydrarecordvm?api-version=2014-09-01",
+ "EncodedRequestUri": "L1N1YnNjcmlwdGlvbnMvZjUzMDNhMGItZmFlNC00Y2RiLWI0NGQtMGU0YzAzMmRkZTI2L3Jlc291cmNlR3JvdXBzL2JhY2t1cHJnL3Byb3ZpZGVycy9NaWNyb3NvZnQuQmFja3VwL0JhY2t1cFZhdWx0L2JhY2t1cHJuL3JlZ2lzdGVyZWRDb250YWluZXJzL2lhYXN2bWNvbnRhaW5lciUzQmh5ZHJhcmVjb3Jkdm0lM0JoeWRyYXJlY29yZHZtP2FwaS12ZXJzaW9uPTIwMTQtMDktMDE=",
"RequestMethod": "PUT",
"RequestBody": "",
"RequestHeaders": {
@@ -189,16 +189,16 @@
"en-us"
],
"x-ms-client-request-id": [
- "ebc2e8e9-92ea-4c9e-8bd9-c1f2eee14183-2015-08-18 15:40:33Z-PS"
+ "ce6d85f1-e475-4bc4-97d1-4640f7a987e2-2015-08-24 11:25:09Z-PS"
],
"x-ms-version": [
"2013-03-01"
],
"User-Agent": [
- "Microsoft.Azure.Management.BackupServices.BackupServicesManagementClient/0.0.0.0"
+ "Microsoft.Azure.Management.BackupServices.BackupServicesManagementClient/1.0.0.0"
]
},
- "ResponseBody": "\"8fe78e98-472c-4f34-889f-504c16c7c6a9\"",
+ "ResponseBody": "\"fba7c4ab-d6e2-4f32-b2ca-aef55703fbe7\"",
"ResponseHeaders": {
"Content-Length": [
"38"
@@ -213,29 +213,29 @@
"no-cache"
],
"x-ms-request-id": [
- "ddf87ac3-99d2-4ab1-af09-20a581bfb084"
+ "e63b35e3-796d-4902-983f-9c36eda26651"
],
"x-ms-client-request-id": [
- "ebc2e8e9-92ea-4c9e-8bd9-c1f2eee14183-2015-08-18 15:40:33Z-PS",
- "ebc2e8e9-92ea-4c9e-8bd9-c1f2eee14183-2015-08-18 15:40:33Z-PS"
+ "ce6d85f1-e475-4bc4-97d1-4640f7a987e2-2015-08-24 11:25:09Z-PS",
+ "ce6d85f1-e475-4bc4-97d1-4640f7a987e2-2015-08-24 11:25:09Z-PS"
],
"Strict-Transport-Security": [
"max-age=31536000; includeSubDomains"
],
"x-ms-ratelimit-remaining-subscription-writes": [
- "1199"
+ "999998"
],
"x-ms-correlation-request-id": [
- "ddf87ac3-99d2-4ab1-af09-20a581bfb084"
+ "e63b35e3-796d-4902-983f-9c36eda26651"
],
"x-ms-routing-request-id": [
- "CENTRALUS:20150818T154038Z:ddf87ac3-99d2-4ab1-af09-20a581bfb084"
+ "CENTRALUS:20150824T112513Z:e63b35e3-796d-4902-983f-9c36eda26651"
],
"Cache-Control": [
"no-cache"
],
"Date": [
- "Tue, 18 Aug 2015 15:40:38 GMT"
+ "Mon, 24 Aug 2015 11:25:13 GMT"
],
"Server": [
"Microsoft-IIS/8.0"
@@ -247,8 +247,8 @@
"StatusCode": 202
},
{
- "RequestUri": "/subscriptions/f5303a0b-fae4-4cdb-b44d-0e4c032dde26/resourceGroups/backuprg/providers/Microsoft.Backup/BackupVault/backuprn/operationResults/8fe78e98-472c-4f34-889f-504c16c7c6a9?api-version=2014-09-01",
- "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvZjUzMDNhMGItZmFlNC00Y2RiLWI0NGQtMGU0YzAzMmRkZTI2L3Jlc291cmNlR3JvdXBzL2JhY2t1cHJnL3Byb3ZpZGVycy9NaWNyb3NvZnQuQmFja3VwL0JhY2t1cFZhdWx0L2JhY2t1cHJuL29wZXJhdGlvblJlc3VsdHMvOGZlNzhlOTgtNDcyYy00ZjM0LTg4OWYtNTA0YzE2YzdjNmE5P2FwaS12ZXJzaW9uPTIwMTQtMDktMDE=",
+ "RequestUri": "/subscriptions/f5303a0b-fae4-4cdb-b44d-0e4c032dde26/resourceGroups/backuprg/providers/Microsoft.Backup/BackupVault/backuprn/operationResults/fba7c4ab-d6e2-4f32-b2ca-aef55703fbe7?api-version=2014-09-01",
+ "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvZjUzMDNhMGItZmFlNC00Y2RiLWI0NGQtMGU0YzAzMmRkZTI2L3Jlc291cmNlR3JvdXBzL2JhY2t1cHJnL3Byb3ZpZGVycy9NaWNyb3NvZnQuQmFja3VwL0JhY2t1cFZhdWx0L2JhY2t1cHJuL29wZXJhdGlvblJlc3VsdHMvZmJhN2M0YWItZDZlMi00ZjMyLWIyY2EtYWVmNTU3MDNmYmU3P2FwaS12ZXJzaW9uPTIwMTQtMDktMDE=",
"RequestMethod": "GET",
"RequestBody": "",
"RequestHeaders": {
@@ -256,13 +256,13 @@
"en-us"
],
"x-ms-client-request-id": [
- "ebc2e8e9-92ea-4c9e-8bd9-c1f2eee14183-2015-08-18 15:40:33Z-PS"
+ "ce6d85f1-e475-4bc4-97d1-4640f7a987e2-2015-08-24 11:25:09Z-PS"
],
"User-Agent": [
- "Microsoft.Azure.Management.BackupServices.BackupServicesManagementClient/0.0.0.0"
+ "Microsoft.Azure.Management.BackupServices.BackupServicesManagementClient/1.0.0.0"
]
},
- "ResponseBody": "{\r\n \"status\": \"InProgress\",\r\n \"error\": {\r\n \"code\": \"\",\r\n \"message\": \"\"\r\n },\r\n \"jobList\": [\r\n \"2df287f4-5ba0-4530-b7bd-f78c34bace8a\"\r\n ]\r\n}",
+ "ResponseBody": "{\r\n \"status\": \"InProgress\",\r\n \"error\": {\r\n \"code\": \"\",\r\n \"message\": \"\"\r\n },\r\n \"jobList\": [\r\n \"065302f5-8700-41d7-848c-db7bf575496f\"\r\n ]\r\n}",
"ResponseHeaders": {
"Content-Length": [
"107"
@@ -277,29 +277,29 @@
"no-cache"
],
"x-ms-request-id": [
- "6f678bec-a5b8-49c0-885d-a820d913b40e"
+ "bcff8db2-3edf-4d3d-9ec3-f62927076c13"
],
"x-ms-client-request-id": [
- "ebc2e8e9-92ea-4c9e-8bd9-c1f2eee14183-2015-08-18 15:40:33Z-PS",
- "ebc2e8e9-92ea-4c9e-8bd9-c1f2eee14183-2015-08-18 15:40:33Z-PS"
+ "ce6d85f1-e475-4bc4-97d1-4640f7a987e2-2015-08-24 11:25:09Z-PS",
+ "ce6d85f1-e475-4bc4-97d1-4640f7a987e2-2015-08-24 11:25:09Z-PS"
],
"Strict-Transport-Security": [
"max-age=31536000; includeSubDomains"
],
"x-ms-ratelimit-remaining-subscription-reads": [
- "14996"
+ "14998"
],
"x-ms-correlation-request-id": [
- "6f678bec-a5b8-49c0-885d-a820d913b40e"
+ "bcff8db2-3edf-4d3d-9ec3-f62927076c13"
],
"x-ms-routing-request-id": [
- "CENTRALUS:20150818T154039Z:6f678bec-a5b8-49c0-885d-a820d913b40e"
+ "CENTRALUS:20150824T112514Z:bcff8db2-3edf-4d3d-9ec3-f62927076c13"
],
"Cache-Control": [
"no-cache"
],
"Date": [
- "Tue, 18 Aug 2015 15:40:39 GMT"
+ "Mon, 24 Aug 2015 11:25:14 GMT"
],
"Server": [
"Microsoft-IIS/8.0"
@@ -311,8 +311,8 @@
"StatusCode": 200
},
{
- "RequestUri": "/subscriptions/f5303a0b-fae4-4cdb-b44d-0e4c032dde26/resourceGroups/backuprg/providers/Microsoft.Backup/BackupVault/backuprn/jobs/2df287f4-5ba0-4530-b7bd-f78c34bace8a?api-version=2014-09-01",
- "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvZjUzMDNhMGItZmFlNC00Y2RiLWI0NGQtMGU0YzAzMmRkZTI2L3Jlc291cmNlR3JvdXBzL2JhY2t1cHJnL3Byb3ZpZGVycy9NaWNyb3NvZnQuQmFja3VwL0JhY2t1cFZhdWx0L2JhY2t1cHJuL2pvYnMvMmRmMjg3ZjQtNWJhMC00NTMwLWI3YmQtZjc4YzM0YmFjZThhP2FwaS12ZXJzaW9uPTIwMTQtMDktMDE=",
+ "RequestUri": "/subscriptions/f5303a0b-fae4-4cdb-b44d-0e4c032dde26/resourceGroups/backuprg/providers/Microsoft.Backup/BackupVault/backuprn/jobs/065302f5-8700-41d7-848c-db7bf575496f?api-version=2014-09-01",
+ "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvZjUzMDNhMGItZmFlNC00Y2RiLWI0NGQtMGU0YzAzMmRkZTI2L3Jlc291cmNlR3JvdXBzL2JhY2t1cHJnL3Byb3ZpZGVycy9NaWNyb3NvZnQuQmFja3VwL0JhY2t1cFZhdWx0L2JhY2t1cHJuL2pvYnMvMDY1MzAyZjUtODcwMC00MWQ3LTg0OGMtZGI3YmY1NzU0OTZmP2FwaS12ZXJzaW9uPTIwMTQtMDktMDE=",
"RequestMethod": "GET",
"RequestBody": "",
"RequestHeaders": {
@@ -320,16 +320,16 @@
"en-us"
],
"x-ms-client-request-id": [
- "ebc2e8e9-92ea-4c9e-8bd9-c1f2eee14183-2015-08-18 15:40:33Z-PS"
+ "ce6d85f1-e475-4bc4-97d1-4640f7a987e2-2015-08-24 11:25:09Z-PS"
],
"User-Agent": [
- "Microsoft.Azure.Management.BackupServices.BackupServicesManagementClient/0.0.0.0"
+ "Microsoft.Azure.Management.BackupServices.BackupServicesManagementClient/1.0.0.0"
]
},
- "ResponseBody": "{\r\n \"properties\": {\r\n \"tasksList\": [],\r\n \"propertyBag\": {\r\n \"VM Name\": \"powershellbvt\",\r\n \"Cloud Service\": \"powershellbvt\"\r\n },\r\n \"progressPercentage\": null,\r\n \"dynamicErrorMessage\": null,\r\n \"workloadType\": \"IaasVM\",\r\n \"operation\": \"Register\",\r\n \"status\": \"InProgress\",\r\n \"startTimestamp\": \"2015-08-18T15:40:36.3766125Z\",\r\n \"endTimestamp\": \"2001-01-01T00:00:00Z\",\r\n \"duration\": \"00:00:02.8034889\",\r\n \"entityFriendlyName\": \"powershellbvt\",\r\n \"actionsInfo\": null,\r\n \"errorDetails\": null\r\n },\r\n \"id\": \"/subscriptions/f5303a0b-fae4-4cdb-b44d-0e4c032dde26/resourceGroups/backuprg/providers/Microsoft.Backup/BackupVault/backuprn/jobs/2df287f4-5ba0-4530-b7bd-f78c34bace8a\",\r\n \"name\": \"2df287f4-5ba0-4530-b7bd-f78c34bace8a\",\r\n \"type\": \"Microsoft.Backup/BackupVault/jobs\"\r\n}",
+ "ResponseBody": "{\r\n \"properties\": {\r\n \"tasksList\": [],\r\n \"propertyBag\": {\r\n \"VM Name\": \"hydrarecordvm\",\r\n \"Cloud Service\": \"hydrarecordvm\"\r\n },\r\n \"progressPercentage\": null,\r\n \"dynamicErrorMessage\": null,\r\n \"workloadType\": \"IaasVM\",\r\n \"operation\": \"Register\",\r\n \"status\": \"InProgress\",\r\n \"startTimestamp\": \"2015-08-24T11:25:13.5885186Z\",\r\n \"endTimestamp\": \"2001-01-01T00:00:00Z\",\r\n \"duration\": \"00:00:01.7311888\",\r\n \"entityFriendlyName\": \"hydrarecordvm\",\r\n \"actionsInfo\": null,\r\n \"errorDetails\": null\r\n },\r\n \"id\": \"/subscriptions/f5303a0b-fae4-4cdb-b44d-0e4c032dde26/resourceGroups/backuprg/providers/Microsoft.Backup/BackupVault/backuprn/jobs/065302f5-8700-41d7-848c-db7bf575496f\",\r\n \"name\": \"065302f5-8700-41d7-848c-db7bf575496f\",\r\n \"type\": \"Microsoft.Backup/BackupVault/jobs\"\r\n}",
"ResponseHeaders": {
"Content-Length": [
- "677"
+ "681"
],
"Content-Type": [
"application/json"
@@ -341,29 +341,29 @@
"no-cache"
],
"x-ms-request-id": [
- "5569d853-28fe-4006-8a64-8880c5005433"
+ "24b49ff0-d366-4b0a-b199-15bb6fb1905a"
],
"x-ms-client-request-id": [
- "ebc2e8e9-92ea-4c9e-8bd9-c1f2eee14183-2015-08-18 15:40:33Z-PS",
- "ebc2e8e9-92ea-4c9e-8bd9-c1f2eee14183-2015-08-18 15:40:33Z-PS"
+ "ce6d85f1-e475-4bc4-97d1-4640f7a987e2-2015-08-24 11:25:09Z-PS",
+ "ce6d85f1-e475-4bc4-97d1-4640f7a987e2-2015-08-24 11:25:09Z-PS"
],
"Strict-Transport-Security": [
"max-age=31536000; includeSubDomains"
],
"x-ms-ratelimit-remaining-subscription-reads": [
- "14995"
+ "14997"
],
"x-ms-correlation-request-id": [
- "5569d853-28fe-4006-8a64-8880c5005433"
+ "24b49ff0-d366-4b0a-b199-15bb6fb1905a"
],
"x-ms-routing-request-id": [
- "CENTRALUS:20150818T154040Z:5569d853-28fe-4006-8a64-8880c5005433"
+ "CENTRALUS:20150824T112515Z:24b49ff0-d366-4b0a-b199-15bb6fb1905a"
],
"Cache-Control": [
"no-cache"
],
"Date": [
- "Tue, 18 Aug 2015 15:40:39 GMT"
+ "Mon, 24 Aug 2015 11:25:14 GMT"
],
"Server": [
"Microsoft-IIS/8.0"
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/SessionRecords/Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupContainerTests/AzureBackupUnregisterContainerScenarioTests.json b/src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/SessionRecords/Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupContainerTests/AzureBackupUnregisterContainerScenarioTests.json
index 1224f18479e4..ae40b6f82111 100644
--- a/src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/SessionRecords/Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupContainerTests/AzureBackupUnregisterContainerScenarioTests.json
+++ b/src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/SessionRecords/Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupContainerTests/AzureBackupUnregisterContainerScenarioTests.json
@@ -10,16 +10,16 @@
"en-us"
],
"x-ms-client-request-id": [
- "6c250745-4225-438b-89da-eea604d94145-2015-08-14 11:07:31Z-PS"
+ "f789315e-ee4c-41f6-b039-b10eba85d1d1-2015-08-24 11:17:53Z-PS"
],
"User-Agent": [
- "Microsoft.Azure.Management.BackupServices.BackupVaultServicesManagementClient/0.0.0.0"
+ "Microsoft.Azure.Management.BackupServices.BackupVaultServicesManagementClient/1.0.0.0"
]
},
- "ResponseBody": "{\r\n \"value\": [\r\n {\r\n \"id\": \"/subscriptions/f5303a0b-fae4-4cdb-b44d-0e4c032dde26/resourceGroups/backuprg/providers/Microsoft.Backup/BackupVault/backuprn\",\r\n \"name\": \"backuprn\",\r\n \"type\": \"Microsoft.Backup/BackupVault\",\r\n \"location\": \"southeastasia\",\r\n \"tags\": {}\r\n },\r\n {\r\n \"id\": \"/subscriptions/f5303a0b-fae4-4cdb-b44d-0e4c032dde26/resourceGroups/hydrarecording/providers/Microsoft.Backup/BackupVault/hydrarecordingrn\",\r\n \"name\": \"hydrarecordingrn\",\r\n \"type\": \"Microsoft.Backup/BackupVault\",\r\n \"location\": \"westus\",\r\n \"tags\": {}\r\n },\r\n {\r\n \"id\": \"/subscriptions/f5303a0b-fae4-4cdb-b44d-0e4c032dde26/resourceGroups/pragrawa-rg/providers/Microsoft.Backup/BackupVault/pragrawa-rg01\",\r\n \"name\": \"pragrawa-rg01\",\r\n \"type\": \"Microsoft.Backup/BackupVault\",\r\n \"location\": \"westus\",\r\n \"tags\": {}\r\n }\r\n ]\r\n}",
+ "ResponseBody": "{\r\n \"value\": [\r\n {\r\n \"id\": \"/subscriptions/f5303a0b-fae4-4cdb-b44d-0e4c032dde26/resourceGroups/backuprg/providers/Microsoft.Backup/BackupVault/backuprn\",\r\n \"name\": \"backuprn\",\r\n \"type\": \"Microsoft.Backup/BackupVault\",\r\n \"location\": \"southeastasia\",\r\n \"tags\": {}\r\n }\r\n ]\r\n}",
"ResponseHeaders": {
"Content-Length": [
- "710"
+ "237"
],
"Content-Type": [
"application/json; charset=utf-8"
@@ -31,16 +31,16 @@
"no-cache"
],
"x-ms-ratelimit-remaining-subscription-reads": [
- "14993"
+ "14999"
],
"x-ms-request-id": [
- "7b4de7bb-3574-414c-aae9-c32bb5270182"
+ "a9f3ef9b-6d96-42d5-8e81-1bcc49e70a0d"
],
"x-ms-correlation-request-id": [
- "7b4de7bb-3574-414c-aae9-c32bb5270182"
+ "a9f3ef9b-6d96-42d5-8e81-1bcc49e70a0d"
],
"x-ms-routing-request-id": [
- "CENTRALUS:20150814T110732Z:7b4de7bb-3574-414c-aae9-c32bb5270182"
+ "CENTRALUS:20150824T111755Z:a9f3ef9b-6d96-42d5-8e81-1bcc49e70a0d"
],
"Strict-Transport-Security": [
"max-age=31536000; includeSubDomains"
@@ -49,7 +49,7 @@
"no-cache"
],
"Date": [
- "Fri, 14 Aug 2015 11:07:31 GMT"
+ "Mon, 24 Aug 2015 11:17:54 GMT"
]
},
"StatusCode": 200
@@ -64,16 +64,16 @@
"en-us"
],
"x-ms-client-request-id": [
- "6c250745-4225-438b-89da-eea604d94145-2015-08-14 11:07:31Z-PS"
+ "f789315e-ee4c-41f6-b039-b10eba85d1d1-2015-08-24 11:17:53Z-PS"
],
"User-Agent": [
- "Microsoft.Azure.Management.BackupServices.BackupVaultServicesManagementClient/0.0.0.0"
+ "Microsoft.Azure.Management.BackupServices.BackupVaultServicesManagementClient/1.0.0.0"
]
},
- "ResponseBody": "{\r\n \"resourceId\": 1774108198771083879,\r\n \"properties\": {\r\n \"storageType\": \"LocallyRedundant\",\r\n \"storageTypeState\": \"Locked\"\r\n }\r\n}",
+ "ResponseBody": "{\r\n \"resourceId\": 6476019202094164610,\r\n \"properties\": {\r\n \"storageType\": \"GeoRedundant\",\r\n \"storageTypeState\": \"Locked\"\r\n }\r\n}",
"ResponseHeaders": {
"Content-Length": [
- "110"
+ "106"
],
"Content-Type": [
"application/json"
@@ -85,29 +85,29 @@
"no-cache"
],
"x-ms-request-id": [
- "ecaf0dbd-787b-4a9d-97c3-a33a5a7379ea"
+ "de1bdb9f-c8d6-4850-879d-5411551f6b66"
],
"x-ms-client-request-id": [
- "6c250745-4225-438b-89da-eea604d94145-2015-08-14 11:07:31Z-PS",
- "6c250745-4225-438b-89da-eea604d94145-2015-08-14 11:07:31Z-PS"
+ "f789315e-ee4c-41f6-b039-b10eba85d1d1-2015-08-24 11:17:53Z-PS",
+ "f789315e-ee4c-41f6-b039-b10eba85d1d1-2015-08-24 11:17:53Z-PS"
],
"Strict-Transport-Security": [
"max-age=31536000; includeSubDomains"
],
"x-ms-ratelimit-remaining-subscription-reads": [
- "14992"
+ "14998"
],
"x-ms-correlation-request-id": [
- "ecaf0dbd-787b-4a9d-97c3-a33a5a7379ea"
+ "de1bdb9f-c8d6-4850-879d-5411551f6b66"
],
"x-ms-routing-request-id": [
- "CENTRALUS:20150814T110743Z:ecaf0dbd-787b-4a9d-97c3-a33a5a7379ea"
+ "CENTRALUS:20150824T111757Z:de1bdb9f-c8d6-4850-879d-5411551f6b66"
],
"Cache-Control": [
"no-cache"
],
"Date": [
- "Fri, 14 Aug 2015 11:07:43 GMT"
+ "Mon, 24 Aug 2015 11:17:57 GMT"
],
"Server": [
"Microsoft-IIS/8.0"
@@ -116,8 +116,8 @@
"StatusCode": 200
},
{
- "RequestUri": "/Subscriptions/f5303a0b-fae4-4cdb-b44d-0e4c032dde26/resourceGroups/backuprg/providers/Microsoft.Backup/BackupVault/backuprn/containers?api-version=2014-09-01&$filter=containerType%20eq%20'IaasVM'%20and%20friendlyName%20eq%20'hydrarecordvm'",
- "EncodedRequestUri": "L1N1YnNjcmlwdGlvbnMvZjUzMDNhMGItZmFlNC00Y2RiLWI0NGQtMGU0YzAzMmRkZTI2L3Jlc291cmNlR3JvdXBzL2JhY2t1cHJnL3Byb3ZpZGVycy9NaWNyb3NvZnQuQmFja3VwL0JhY2t1cFZhdWx0L2JhY2t1cHJuL2NvbnRhaW5lcnM/YXBpLXZlcnNpb249MjAxNC0wOS0wMSYkZmlsdGVyPWNvbnRhaW5lclR5cGUlMjBlcSUyMCdJYWFzVk0nJTIwYW5kJTIwZnJpZW5kbHlOYW1lJTIwZXElMjAnaHlkcmFyZWNvcmR2bSc=",
+ "RequestUri": "/Subscriptions/f5303a0b-fae4-4cdb-b44d-0e4c032dde26/resourceGroups/backuprg/providers/Microsoft.Backup/BackupVault/backuprn/containers?api-version=2014-09-01&$filter=type%20eq%20'IaasVM'%20and%20friendlyName%20eq%20'hydrarecordvm'",
+ "EncodedRequestUri": "L1N1YnNjcmlwdGlvbnMvZjUzMDNhMGItZmFlNC00Y2RiLWI0NGQtMGU0YzAzMmRkZTI2L3Jlc291cmNlR3JvdXBzL2JhY2t1cHJnL3Byb3ZpZGVycy9NaWNyb3NvZnQuQmFja3VwL0JhY2t1cFZhdWx0L2JhY2t1cHJuL2NvbnRhaW5lcnM/YXBpLXZlcnNpb249MjAxNC0wOS0wMSYkZmlsdGVyPXR5cGUlMjBlcSUyMCdJYWFzVk0nJTIwYW5kJTIwZnJpZW5kbHlOYW1lJTIwZXElMjAnaHlkcmFyZWNvcmR2bSc=",
"RequestMethod": "GET",
"RequestBody": "",
"RequestHeaders": {
@@ -125,10 +125,10 @@
"en-us"
],
"x-ms-client-request-id": [
- "b9f77ba4-d5ce-4d54-a761-eeb4c9d2659d-2015-08-14 11:07:43Z-PS"
+ "5a5bbcb5-4c64-4689-a931-876ed94f5e6d-2015-08-24 11:17:57Z-PS"
],
"User-Agent": [
- "Microsoft.Azure.Management.BackupServices.BackupServicesManagementClient/0.0.0.0"
+ "Microsoft.Azure.Management.BackupServices.BackupServicesManagementClient/1.0.0.0"
]
},
"ResponseBody": "{\r\n \"value\": [\r\n {\r\n \"properties\": {\r\n \"friendlyName\": \"hydrarecordvm\",\r\n \"status\": \"Registered\",\r\n \"healthStatus\": \"Healthy\",\r\n \"containerType\": \"IaasVM\",\r\n \"parentContainerId\": \"/subscriptions/f5303a0b-fae4-4cdb-b44d-0e4c032dde26/resourceGroups/backuprg/providers/Microsoft.Backup/BackupVault/backuprn/containers/hydrarecordvm\"\r\n },\r\n \"id\": \"/subscriptions/f5303a0b-fae4-4cdb-b44d-0e4c032dde26/resourceGroups/backuprg/providers/Microsoft.Backup/BackupVault/backuprn/containers/iaasvmcontainer;hydrarecordvm;hydrarecordvm\",\r\n \"name\": \"iaasvmcontainer;hydrarecordvm;hydrarecordvm\",\r\n \"type\": \"Microsoft.Backup/BackupVault/containers\"\r\n }\r\n ],\r\n \"nextLink\": null\r\n}",
@@ -146,29 +146,29 @@
"no-cache"
],
"x-ms-request-id": [
- "bd731385-07df-4cb9-a3d9-5b46c4e6095d"
+ "bd6380f3-37fa-4714-b73c-0f0f033d2783"
],
"x-ms-client-request-id": [
- "b9f77ba4-d5ce-4d54-a761-eeb4c9d2659d-2015-08-14 11:07:43Z-PS",
- "b9f77ba4-d5ce-4d54-a761-eeb4c9d2659d-2015-08-14 11:07:43Z-PS"
+ "5a5bbcb5-4c64-4689-a931-876ed94f5e6d-2015-08-24 11:17:57Z-PS",
+ "5a5bbcb5-4c64-4689-a931-876ed94f5e6d-2015-08-24 11:17:57Z-PS"
],
"Strict-Transport-Security": [
"max-age=31536000; includeSubDomains"
],
"x-ms-ratelimit-remaining-subscription-reads": [
- "14983"
+ "14999"
],
"x-ms-correlation-request-id": [
- "bd731385-07df-4cb9-a3d9-5b46c4e6095d"
+ "bd6380f3-37fa-4714-b73c-0f0f033d2783"
],
"x-ms-routing-request-id": [
- "CENTRALUS:20150814T110746Z:bd731385-07df-4cb9-a3d9-5b46c4e6095d"
+ "CENTRALUS:20150824T111800Z:bd6380f3-37fa-4714-b73c-0f0f033d2783"
],
"Cache-Control": [
"no-cache"
],
"Date": [
- "Fri, 14 Aug 2015 11:07:45 GMT"
+ "Mon, 24 Aug 2015 11:18:00 GMT"
],
"Server": [
"Microsoft-IIS/8.0"
@@ -189,13 +189,13 @@
"en-us"
],
"x-ms-client-request-id": [
- "13d99ef1-f619-4217-b0af-709dd2f65ab4-2015-08-14 11:07:46Z-PS"
+ "cfb8a2b4-2e84-464c-9e60-1d056e6f7d36-2015-08-24 11:18:00Z-PS"
],
"User-Agent": [
- "Microsoft.Azure.Management.BackupServices.BackupServicesManagementClient/0.0.0.0"
+ "Microsoft.Azure.Management.BackupServices.BackupServicesManagementClient/1.0.0.0"
]
},
- "ResponseBody": "\"957ed0ce-e696-4dad-ac6b-efface1b4e7c\"",
+ "ResponseBody": "\"85bc9c9b-ba94-474d-a5bf-a191afe58f53\"",
"ResponseHeaders": {
"Content-Length": [
"38"
@@ -210,29 +210,29 @@
"no-cache"
],
"x-ms-request-id": [
- "891112b4-4467-4309-b256-7c0eb0409dac"
+ "30abba00-f4b3-4b16-9e12-20924b4a4950"
],
"x-ms-client-request-id": [
- "13d99ef1-f619-4217-b0af-709dd2f65ab4-2015-08-14 11:07:46Z-PS",
- "13d99ef1-f619-4217-b0af-709dd2f65ab4-2015-08-14 11:07:46Z-PS"
+ "cfb8a2b4-2e84-464c-9e60-1d056e6f7d36-2015-08-24 11:18:00Z-PS",
+ "cfb8a2b4-2e84-464c-9e60-1d056e6f7d36-2015-08-24 11:18:00Z-PS"
],
"Strict-Transport-Security": [
"max-age=31536000; includeSubDomains"
],
"x-ms-ratelimit-remaining-subscription-writes": [
- "999994"
+ "999999"
],
"x-ms-correlation-request-id": [
- "891112b4-4467-4309-b256-7c0eb0409dac"
+ "30abba00-f4b3-4b16-9e12-20924b4a4950"
],
"x-ms-routing-request-id": [
- "CENTRALUS:20150814T110747Z:891112b4-4467-4309-b256-7c0eb0409dac"
+ "CENTRALUS:20150824T111801Z:30abba00-f4b3-4b16-9e12-20924b4a4950"
],
"Cache-Control": [
"no-cache"
],
"Date": [
- "Fri, 14 Aug 2015 11:07:46 GMT"
+ "Mon, 24 Aug 2015 11:18:01 GMT"
],
"Server": [
"Microsoft-IIS/8.0"
@@ -244,8 +244,8 @@
"StatusCode": 202
},
{
- "RequestUri": "/subscriptions/f5303a0b-fae4-4cdb-b44d-0e4c032dde26/resourceGroups/backuprg/providers/Microsoft.Backup/BackupVault/backuprn/operationResults/957ed0ce-e696-4dad-ac6b-efface1b4e7c?api-version=2014-09-01",
- "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvZjUzMDNhMGItZmFlNC00Y2RiLWI0NGQtMGU0YzAzMmRkZTI2L3Jlc291cmNlR3JvdXBzL2JhY2t1cHJnL3Byb3ZpZGVycy9NaWNyb3NvZnQuQmFja3VwL0JhY2t1cFZhdWx0L2JhY2t1cHJuL29wZXJhdGlvblJlc3VsdHMvOTU3ZWQwY2UtZTY5Ni00ZGFkLWFjNmItZWZmYWNlMWI0ZTdjP2FwaS12ZXJzaW9uPTIwMTQtMDktMDE=",
+ "RequestUri": "/subscriptions/f5303a0b-fae4-4cdb-b44d-0e4c032dde26/resourceGroups/backuprg/providers/Microsoft.Backup/BackupVault/backuprn/operationResults/85bc9c9b-ba94-474d-a5bf-a191afe58f53?api-version=2014-09-01",
+ "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvZjUzMDNhMGItZmFlNC00Y2RiLWI0NGQtMGU0YzAzMmRkZTI2L3Jlc291cmNlR3JvdXBzL2JhY2t1cHJnL3Byb3ZpZGVycy9NaWNyb3NvZnQuQmFja3VwL0JhY2t1cFZhdWx0L2JhY2t1cHJuL29wZXJhdGlvblJlc3VsdHMvODViYzljOWItYmE5NC00NzRkLWE1YmYtYTE5MWFmZTU4ZjUzP2FwaS12ZXJzaW9uPTIwMTQtMDktMDE=",
"RequestMethod": "GET",
"RequestBody": "",
"RequestHeaders": {
@@ -253,16 +253,16 @@
"en-us"
],
"x-ms-client-request-id": [
- "13d99ef1-f619-4217-b0af-709dd2f65ab4-2015-08-14 11:07:46Z-PS"
+ "cfb8a2b4-2e84-464c-9e60-1d056e6f7d36-2015-08-24 11:18:00Z-PS"
],
"User-Agent": [
- "Microsoft.Azure.Management.BackupServices.BackupServicesManagementClient/0.0.0.0"
+ "Microsoft.Azure.Management.BackupServices.BackupServicesManagementClient/1.0.0.0"
]
},
- "ResponseBody": "{\r\n \"status\": \"Failed\",\r\n \"error\": {\r\n \"code\": \"BMSUserErrorContainerHasDatasources\",\r\n \"message\": \"Failed to unregister a registered item. This item contains protected child items. Please stop protection and then delete the protected child items before attempting to unregister the parent item.\"\r\n },\r\n \"jobList\": [\r\n \"15ba1ed4-4d41-478f-aca7-63eaef3435fe\"\r\n ]\r\n}",
+ "ResponseBody": "{\r\n \"status\": \"InProgress\",\r\n \"error\": {\r\n \"code\": \"\",\r\n \"message\": \"\"\r\n },\r\n \"jobList\": [\r\n \"8bd0c467-995d-4d78-bfbd-47e3a9b8e5e5\"\r\n ]\r\n}",
"ResponseHeaders": {
"Content-Length": [
- "333"
+ "107"
],
"Content-Type": [
"application/json"
@@ -274,29 +274,29 @@
"no-cache"
],
"x-ms-request-id": [
- "4aefa749-f224-4cd5-b002-739c5995d37c"
+ "9e8e346a-17bc-4462-b5d0-8926d6da4755"
],
"x-ms-client-request-id": [
- "13d99ef1-f619-4217-b0af-709dd2f65ab4-2015-08-14 11:07:46Z-PS",
- "13d99ef1-f619-4217-b0af-709dd2f65ab4-2015-08-14 11:07:46Z-PS"
+ "cfb8a2b4-2e84-464c-9e60-1d056e6f7d36-2015-08-24 11:18:00Z-PS",
+ "cfb8a2b4-2e84-464c-9e60-1d056e6f7d36-2015-08-24 11:18:00Z-PS"
],
"Strict-Transport-Security": [
"max-age=31536000; includeSubDomains"
],
"x-ms-ratelimit-remaining-subscription-reads": [
- "14982"
+ "14998"
],
"x-ms-correlation-request-id": [
- "4aefa749-f224-4cd5-b002-739c5995d37c"
+ "9e8e346a-17bc-4462-b5d0-8926d6da4755"
],
"x-ms-routing-request-id": [
- "CENTRALUS:20150814T110748Z:4aefa749-f224-4cd5-b002-739c5995d37c"
+ "CENTRALUS:20150824T111802Z:9e8e346a-17bc-4462-b5d0-8926d6da4755"
],
"Cache-Control": [
"no-cache"
],
"Date": [
- "Fri, 14 Aug 2015 11:07:47 GMT"
+ "Mon, 24 Aug 2015 11:18:01 GMT"
],
"Server": [
"Microsoft-IIS/8.0"
@@ -308,8 +308,8 @@
"StatusCode": 200
},
{
- "RequestUri": "/subscriptions/f5303a0b-fae4-4cdb-b44d-0e4c032dde26/resourceGroups/backuprg/providers/Microsoft.Backup/BackupVault/backuprn/jobs/15ba1ed4-4d41-478f-aca7-63eaef3435fe?api-version=2014-09-01",
- "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvZjUzMDNhMGItZmFlNC00Y2RiLWI0NGQtMGU0YzAzMmRkZTI2L3Jlc291cmNlR3JvdXBzL2JhY2t1cHJnL3Byb3ZpZGVycy9NaWNyb3NvZnQuQmFja3VwL0JhY2t1cFZhdWx0L2JhY2t1cHJuL2pvYnMvMTViYTFlZDQtNGQ0MS00NzhmLWFjYTctNjNlYWVmMzQzNWZlP2FwaS12ZXJzaW9uPTIwMTQtMDktMDE=",
+ "RequestUri": "/subscriptions/f5303a0b-fae4-4cdb-b44d-0e4c032dde26/resourceGroups/backuprg/providers/Microsoft.Backup/BackupVault/backuprn/jobs/8bd0c467-995d-4d78-bfbd-47e3a9b8e5e5?api-version=2014-09-01",
+ "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvZjUzMDNhMGItZmFlNC00Y2RiLWI0NGQtMGU0YzAzMmRkZTI2L3Jlc291cmNlR3JvdXBzL2JhY2t1cHJnL3Byb3ZpZGVycy9NaWNyb3NvZnQuQmFja3VwL0JhY2t1cFZhdWx0L2JhY2t1cHJuL2pvYnMvOGJkMGM0NjctOTk1ZC00ZDc4LWJmYmQtNDdlM2E5YjhlNWU1P2FwaS12ZXJzaW9uPTIwMTQtMDktMDE=",
"RequestMethod": "GET",
"RequestBody": "",
"RequestHeaders": {
@@ -317,16 +317,16 @@
"en-us"
],
"x-ms-client-request-id": [
- "13d99ef1-f619-4217-b0af-709dd2f65ab4-2015-08-14 11:07:46Z-PS"
+ "cfb8a2b4-2e84-464c-9e60-1d056e6f7d36-2015-08-24 11:18:00Z-PS"
],
"User-Agent": [
- "Microsoft.Azure.Management.BackupServices.BackupServicesManagementClient/0.0.0.0"
+ "Microsoft.Azure.Management.BackupServices.BackupServicesManagementClient/1.0.0.0"
]
},
- "ResponseBody": "{\r\n \"properties\": {\r\n \"tasksList\": [],\r\n \"propertyBag\": {\r\n \"VM Name\": \"hydrarecordvm\",\r\n \"Cloud Service\": \"hydrarecordvm\"\r\n },\r\n \"progressPercentage\": null,\r\n \"dynamicErrorMessage\": null,\r\n \"workloadType\": \"IaasVM\",\r\n \"operation\": \"UnRegister\",\r\n \"status\": \"Failed\",\r\n \"startTimestamp\": \"2015-08-14T11:07:47.5082523Z\",\r\n \"endTimestamp\": \"2015-08-14T11:07:47.5082523Z\",\r\n \"duration\": \"00:00:00\",\r\n \"entityFriendlyName\": \"hydrarecordvm\",\r\n \"actionsInfo\": null,\r\n \"errorDetails\": [\r\n {\r\n \"errorCode\": 134607755,\r\n \"errorTitle\": \"\",\r\n \"errorString\": \"Failed to unregister a registered item.\",\r\n \"recommendations\": [\r\n \"This item contains protected child items. Please stop protection and then delete the protected child items before attempting to unregister the parent item.\"\r\n ]\r\n }\r\n ]\r\n },\r\n \"id\": \"/subscriptions/f5303a0b-fae4-4cdb-b44d-0e4c032dde26/resourceGroups/backuprg/providers/Microsoft.Backup/BackupVault/backuprn/jobs/15ba1ed4-4d41-478f-aca7-63eaef3435fe\",\r\n \"name\": \"15ba1ed4-4d41-478f-aca7-63eaef3435fe\",\r\n \"type\": \"Microsoft.Backup/BackupVault/jobs\"\r\n}",
+ "ResponseBody": "{\r\n \"properties\": {\r\n \"tasksList\": [],\r\n \"propertyBag\": {\r\n \"VM Name\": \"hydrarecordvm\",\r\n \"Cloud Service\": \"hydrarecordvm\"\r\n },\r\n \"progressPercentage\": null,\r\n \"dynamicErrorMessage\": null,\r\n \"workloadType\": \"IaasVM\",\r\n \"operation\": \"UnRegister\",\r\n \"status\": \"InProgress\",\r\n \"startTimestamp\": \"2015-08-24T11:18:01.4252877Z\",\r\n \"endTimestamp\": \"2001-01-01T00:00:00Z\",\r\n \"duration\": \"00:00:01.9029908\",\r\n \"entityFriendlyName\": \"hydrarecordvm\",\r\n \"actionsInfo\": null,\r\n \"errorDetails\": null\r\n },\r\n \"id\": \"/subscriptions/f5303a0b-fae4-4cdb-b44d-0e4c032dde26/resourceGroups/backuprg/providers/Microsoft.Backup/BackupVault/backuprn/jobs/8bd0c467-995d-4d78-bfbd-47e3a9b8e5e5\",\r\n \"name\": \"8bd0c467-995d-4d78-bfbd-47e3a9b8e5e5\",\r\n \"type\": \"Microsoft.Backup/BackupVault/jobs\"\r\n}",
"ResponseHeaders": {
"Content-Length": [
- "946"
+ "683"
],
"Content-Type": [
"application/json"
@@ -338,29 +338,29 @@
"no-cache"
],
"x-ms-request-id": [
- "0b84a442-b6b5-413f-bb5d-e0508aa17b94"
+ "d75f2a52-ad01-4fb2-b33d-1fd04f44602a"
],
"x-ms-client-request-id": [
- "13d99ef1-f619-4217-b0af-709dd2f65ab4-2015-08-14 11:07:46Z-PS",
- "13d99ef1-f619-4217-b0af-709dd2f65ab4-2015-08-14 11:07:46Z-PS"
+ "cfb8a2b4-2e84-464c-9e60-1d056e6f7d36-2015-08-24 11:18:00Z-PS",
+ "cfb8a2b4-2e84-464c-9e60-1d056e6f7d36-2015-08-24 11:18:00Z-PS"
],
"Strict-Transport-Security": [
"max-age=31536000; includeSubDomains"
],
"x-ms-ratelimit-remaining-subscription-reads": [
- "14981"
+ "14997"
],
"x-ms-correlation-request-id": [
- "0b84a442-b6b5-413f-bb5d-e0508aa17b94"
+ "d75f2a52-ad01-4fb2-b33d-1fd04f44602a"
],
"x-ms-routing-request-id": [
- "CENTRALUS:20150814T110748Z:0b84a442-b6b5-413f-bb5d-e0508aa17b94"
+ "CENTRALUS:20150824T111803Z:d75f2a52-ad01-4fb2-b33d-1fd04f44602a"
],
"Cache-Control": [
"no-cache"
],
"Date": [
- "Fri, 14 Aug 2015 11:07:48 GMT"
+ "Mon, 24 Aug 2015 11:18:03 GMT"
],
"Server": [
"Microsoft-IIS/8.0"
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/packages.config b/src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/packages.config
index 347d88dceca1..f3c649040ddb 100644
--- a/src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/packages.config
+++ b/src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/packages.config
@@ -4,7 +4,7 @@
-
+
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/AzureBackupClientAdapter/VaultAdapter.cs b/src/ResourceManager/AzureBackup/Commands.AzureBackup/AzureBackupClientAdapter/VaultAdapter.cs
index 6c4d36b51dab..7867512414d2 100644
--- a/src/ResourceManager/AzureBackup/Commands.AzureBackup/AzureBackupClientAdapter/VaultAdapter.cs
+++ b/src/ResourceManager/AzureBackup/Commands.AzureBackup/AzureBackupClientAdapter/VaultAdapter.cs
@@ -117,9 +117,12 @@ public IEnumerable GetVaultsInResourceGroup(string resourceGro
///
///
///
- public void DeleteVault(string resourceGroupName, string vaultName)
+ public bool DeleteVault(string resourceGroupName, string vaultName)
{
- AzureBackupVaultClient.Vault.DeleteAsync(resourceGroupName, vaultName, GetCustomRequestHeaders(), CmdletCancellationToken).Wait();
+ AzureBackupVaultGetResponse response = AzureBackupVaultClient.Vault.DeleteAsync(resourceGroupName, vaultName, GetCustomRequestHeaders(), CmdletCancellationToken).Result;
+
+ // OneSDK will return only either OK or NoContent
+ return response.StatusCode == System.Net.HttpStatusCode.OK;
}
public VaultCredUploadCertResponse UploadCertificate(string resourceGroupName, string resourceName, string certName, VaultCredUploadCertRequest request)
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/AzureBackupCmdletHelpMessage.cs b/src/ResourceManager/AzureBackup/Commands.AzureBackup/AzureBackupCmdletHelpMessage.cs
index 46d975b9255b..ac217acd4b19 100644
--- a/src/ResourceManager/AzureBackup/Commands.AzureBackup/AzureBackupCmdletHelpMessage.cs
+++ b/src/ResourceManager/AzureBackup/Commands.AzureBackup/AzureBackupCmdletHelpMessage.cs
@@ -93,5 +93,7 @@ internal static class AzureBackupCmdletHelpMessage
public const string WeekNumber = "List of Week Numbers of the month";
public const string MonthsOfYear = "List of Months of the year";
public const string Retention = "Retention duration value";
+
+ public const string PolicyObject = "Policy object for enabling protection";
}
}
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Container/RegisterAzureRMBackupContainer.cs b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Container/RegisterAzureRMBackupContainer.cs
index aac86a2f5ebd..58f9b5e80f11 100644
--- a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Container/RegisterAzureRMBackupContainer.cs
+++ b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Container/RegisterAzureRMBackupContainer.cs
@@ -33,7 +33,7 @@ namespace Microsoft.Azure.Commands.AzureBackup.Cmdlets
///
/// Get list of containers
///
- [Cmdlet(VerbsLifecycle.Register, "AzureRMBackupContainer", DefaultParameterSetName = V1VMParameterSet), OutputType(typeof(AzureRMBackupJob))]
+ [Cmdlet(VerbsLifecycle.Register, "AzureRMBackupContainer"), OutputType(typeof(AzureRMBackupJob))]
public class RegisterAzureRMBackupContainer : AzureBackupVaultCmdletBase
{
internal const string V1VMParameterSet = "V1VM";
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Item/Disable-AzureRMBackupProtection .cs b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Item/Disable-AzureRMBackupProtection .cs
index ef40407e65df..af9f3f04e048 100644
--- a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Item/Disable-AzureRMBackupProtection .cs
+++ b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Item/Disable-AzureRMBackupProtection .cs
@@ -40,12 +40,6 @@ public SwitchParameter RemoveRecoveryPoints
}
private bool DeleteBackupData;
- [Parameter(Position = 2, Mandatory = false, HelpMessage = AzureBackupCmdletHelpMessage.Reason)]
- public string Reason { get; set; }
-
- [Parameter(Position = 3, Mandatory = false, HelpMessage = AzureBackupCmdletHelpMessage.Comments)]
- public string Comments { get; set; }
-
public override void ExecuteCmdlet()
{
ExecutionBlock(() =>
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Item/Enable-AzureRMBackupProtection .cs b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Item/Enable-AzureRMBackupProtection .cs
index 1c7a6f518c05..1f52a7b7e487 100644
--- a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Item/Enable-AzureRMBackupProtection .cs
+++ b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Item/Enable-AzureRMBackupProtection .cs
@@ -32,7 +32,7 @@ namespace Microsoft.Azure.Commands.AzureBackup.Cmdlets
[Cmdlet(VerbsLifecycle.Enable, "AzureRMBackupProtection"), OutputType(typeof(AzureRMBackupJob))]
public class EnableAzureRMBackupProtection : AzureRMBackupItemCmdletBase
{
- [Parameter(Mandatory = true, HelpMessage = AzureBackupCmdletHelpMessage.PolicyName)]
+ [Parameter(Mandatory = true, HelpMessage = AzureBackupCmdletHelpMessage.PolicyObject)]
[ValidateNotNullOrEmpty]
public AzureRMBackupProtectionPolicy Policy { get; set; }
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/ProtectionPolicy/RemoveAzureRMBackupProtectionPolicy.cs b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/ProtectionPolicy/RemoveAzureRMBackupProtectionPolicy.cs
index e161d8a4680a..aeb1338a6d9b 100644
--- a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/ProtectionPolicy/RemoveAzureRMBackupProtectionPolicy.cs
+++ b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/ProtectionPolicy/RemoveAzureRMBackupProtectionPolicy.cs
@@ -45,7 +45,7 @@ public override void ExecuteCmdlet()
}
else
{
- var exception = new ArgumentException(string.Format(Resources.PolicyNotFound, policyInfo.Name));
+ var exception = new ArgumentException(string.Format(Resources.PolicyNotFound, ProtectionPolicy.Name));
throw exception;
}
});
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Vault/RemoveAzureRMBackupVault.cs b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Vault/RemoveAzureRMBackupVault.cs
index 24fd5cbda339..b0a64c1f1a0f 100644
--- a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Vault/RemoveAzureRMBackupVault.cs
+++ b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Vault/RemoveAzureRMBackupVault.cs
@@ -12,6 +12,8 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
+using Microsoft.Azure.Commands.AzureBackup.Properties;
+using System;
using System.Management.Automation;
namespace Microsoft.Azure.Commands.AzureBackup.Cmdlets
@@ -28,7 +30,10 @@ public override void ExecuteCmdlet()
{
base.ExecuteCmdlet();
- AzureBackupClient.DeleteVault(Vault.ResourceGroupName, Vault.Name);
+ if (!AzureBackupClient.DeleteVault(Vault.ResourceGroupName, Vault.Name))
+ {
+ throw new Exception(Resources.ResourceNotFoundMessage);
+ }
});
}
}
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Commands.AzureBackup.csproj b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Commands.AzureBackup.csproj
index 786c156e036e..aede1c1e2b9f 100644
--- a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Commands.AzureBackup.csproj
+++ b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Commands.AzureBackup.csproj
@@ -57,8 +57,7 @@
..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll
- False
- ..\..\..\packages\Microsoft.Azure.Management.BackupServices.1.0.3-preview\lib\net40\Microsoft.Azure.Management.BackupServicesManagement.dll
+ ..\..\..\packages\Microsoft.Azure.Management.BackupServices.1.0.4-preview\lib\net40\Microsoft.Azure.Management.BackupServicesManagement.dll
False
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Helpers/VaultHelpers.cs b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Helpers/VaultHelpers.cs
index 2bb8d3805a01..4d51fb5458ad 100644
--- a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Helpers/VaultHelpers.cs
+++ b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Helpers/VaultHelpers.cs
@@ -13,6 +13,9 @@
// ----------------------------------------------------------------------------------
using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
using ClientModel = Microsoft.Azure.Management.BackupServices.Models;
using CmdletModel = Microsoft.Azure.Commands.AzureBackup.Models;
@@ -50,5 +53,78 @@ public static string GetResourceGroup(string vaultId)
string[] tokens = vaultId.Split(new[] { '/' }, StringSplitOptions.RemoveEmptyEntries);
return tokens[3];
}
+
+ // NOTE: Commenting code which will be used in a later sprint, but not right now.
+
+ ///
+ /// Extension to convert enumerable Hashtable into a dictionary
+ ///
+ ///
+ ///
+ // public static Dictionary ConvertToDictionary(this Hashtable[] tags)
+ // {
+ // return tags == null
+ // ? null
+ // : tags
+ // .CoalesceEnumerable()
+ // .Select(hashTable => hashTable.OfType()
+ // .ToDictionary(kvp => kvp.Key.ToString(), kvp => kvp.Value))
+ // .Where(tagDictionary => tagDictionary.ContainsKey("Name"))
+ // .Select(tagDictionary => Tuple
+ // .Create(
+ // tagDictionary["Name"].ToString(),
+ // tagDictionary.ContainsKey("Value") ? tagDictionary["Value"].ToString() : string.Empty))
+ // .Distinct(kvp => kvp.Item1)
+ // .ToDictionary(kvp => kvp.Item1, kvp => kvp.Item2);
+ // }
+
+ ///
+ /// Extension to coalesce enumerable
+ ///
+ /// Enumerable type
+ /// Enumerable
+ ///
+ // public static IEnumerable CoalesceEnumerable(this IEnumerable source)
+ // {
+ // return source ?? Enumerable.Empty();
+ // }
+
+ ///
+ /// Extension to remove duplicates from enumerable based on a provided key selector
+ ///
+ /// Enumerable type
+ /// Type of key
+ /// Input enumerable to remove duplicates from
+ /// Lambda to select key
+ ///
+ // public static IEnumerable Distinct(this IEnumerable source, Func keySelector)
+ // {
+ // var set = new Dictionary(EqualityComparer.Default);
+ // foreach (TSource element in source)
+ // {
+ // TSource value;
+ // var key = keySelector(element);
+ // if (!set.TryGetValue(key, out value))
+ // {
+ // yield return element;
+ // }
+ // else
+ // {
+ // set[key] = value;
+ // }
+ // }
+ // }
+
+ ///
+ /// Extension to convert dictionary to hashtable enumerable
+ ///
+ ///
+ ///
+ // public static Hashtable[] GetTagsHashtables(this IDictionary tags)
+ // {
+ // return tags == null
+ // ? null
+ // : tags.Select(kvp => new Hashtable { { "Name", kvp.Key }, { "Value", kvp.Value } }).ToArray();
+ // }
}
}
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Microsoft.Azure.Commands.AzureBackup.format.ps1xml b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Microsoft.Azure.Commands.AzureBackup.format.ps1xml
index 2e9d28348932..d61c12629259 100644
--- a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Microsoft.Azure.Commands.AzureBackup.format.ps1xml
+++ b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Microsoft.Azure.Commands.AzureBackup.format.ps1xml
@@ -12,6 +12,10 @@
18
+
+
+ 18
+
18
@@ -27,6 +31,9 @@
Name
+
+ ResourceGroupName
+
Region
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Models/AzurePSBackupVault.cs b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Models/AzurePSBackupVault.cs
index a86ec7bc4aeb..d57047ba15ee 100644
--- a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Models/AzurePSBackupVault.cs
+++ b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Models/AzurePSBackupVault.cs
@@ -30,7 +30,8 @@ public class AzureRMBackupVault
public string Region { get; set; }
- // public Hashtable[] Tags { get; protected set; }
+ // TODO: Add support for tags
+ //public Hashtable[] Tags { get; set; }
public string Storage { get; set; }
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Properties/Resources.resx b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Properties/Resources.resx
index 28203c10b30d..b6bca7072396 100644
--- a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Properties/Resources.resx
+++ b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Properties/Resources.resx
@@ -148,10 +148,12 @@ Please contact Microsoft for further assistant.
Cmdlet called for ResourceGroupName: {0}, ResourceName: {1}, Location: {2}
- For daily backup schedule, protection policy cannot have DaysOfWeek param in backup schedule
+ For a daily backup schedule, using the DaysOfWeek parameter is not allowed
+ Scrubbed
- For weekly backup schedule, DaysOfWeek in backup schedule is mandatory and cannot be empty
+ For a weekly backup schedule, using the DaysOfWeek parameter is mandatory
+ Scrubbed
AzureBackupVault.Name
@@ -190,22 +192,26 @@ Please contact Microsoft for further assistant.
Creating backup vault with ResourceGroupName: {0}, ResourceName: {1}
- Only one AzureBackupDailyRetentionPolicy in RetentionPolicies is allowed
+ Only one daily retention policy is allowed for a Protection Policy
+ Scrubbed
- For AzureBackupDailyRetentionPolicy , valid values of retention are {0} to {1}
+ The daily retention value should be between {0} and {1}
+ Scrubbed
- For Daily Schedule, AzureBackupDailyRetentionPolicy in RetentionPolicies param is mandatory
+ For a daily backup schedule, setting a daily retention policy is mandatory
+ Scrubbed
- Days of the month in Monthly/Yearly retention is not allowed for weekly backup Schedules
+ Using the DaysOfMonth parameter in retention policies is not allowed when weekly backup schedules are used
+ Scrubbed
- DaysofTheWeek list in Weekly retention schedule must be same of backup schedule DaysOfTheWeek
+ The DaysOfWeek specified in a weekly retention schedule should be same as of DaysOfWeek value specified in the backup schedule
- DaysOfTheWeek of retention schedule must be same of backup schedule DaysOfTheWeek
+ The DaysOfWeek specified in a weekly retention schedule should be same as of DaysOfWeek value specified in the backup schedule
Desired Container is not found. Returning with isDiscoveryNeed = true
@@ -256,28 +262,36 @@ Please contact Microsoft for further assistant.
Making client call
- For AzureBackupMonthlyRetentionPolicy and RetentionFormat in Days, DaysOfMonth param is mandatory and can not be empty
+ For a monthly retention policy specified in days, using the DaysOfMonth parameter is mandatory
+ Scrubbed
- For AzureBackupMonthlyRetentionPolicy and RetentionFormat in Weeks, DaysOfMonth param is not allowed.
+ For a monthly retention policy specified in weeks, using the DaysOfMonth parameter is not allowed
+ Scrubbed
- For AzureBackupMonthlyRetentionPolicy and RetentionFormat in Weeks, DaysOfWeek param is mandatory and can not be empty
+ For a monthly retention policy specified in weeks, using the DaysOfWeek parameter is mandatory
+ Scrubbed
- For AzureBackupMonthlyRetentionPolicy and RetentionFormat in Days, DaysOfWeek or WeekNumber params are not allowed
+ For a monthly retention policy specified in days, using the DaysOfWeek and WeekNumber parameters is not allowed
+ Scrubbed
- Only one AzureBackupMonthlyRetentionPolicy in RetentionPolicies is allowed
+ Only one monthly retention policy is allowed for a Protection Policy
+ Scrubbed
- For AzureBackupMonthlyRetentionPolicy , valid values of retention are {0} to {1}
+ The monthly retention value should be between {0} and {1}
+ Scrubbed
- For AzureBackupMonthlyRetentionPolicy and RetentionFormat in Weeks, WeekNumber param is mandatory and can not be empty
+ For a monthly retention policy specified in weeks, using the WeekNumber parameter is mandatory
+ Scrubbed
- Days of the week list in Monthly/Yearly retention schedule should be subset of Day of week list in Backup Schedule
+ The DaysOfWeek specified for monthly and yearly retention policies should be a subset of the DaysOfWeek value specified in the backup schedule
+ Scrubbed
No recovery point exist with Id := {0}
@@ -295,13 +309,16 @@ Please contact Microsoft for further assistant.
OperationStatus : {0}
- A protection policy with the specified name already exists.
+ A protection policy with the specified name already exists
+ Scrubbed
- For DaysOfWeek, weekly switch param is required
+ The DaysOfWeek parameter should be used in conjunction with the –Weekly switch parameter
+ Scrubbed
Protection Policy {0} not found
+ Scrubbed
ParameterSetName = {0}
@@ -320,9 +337,11 @@ Please contact Microsoft for further assistant.
The protection policy name should contain alphanumeric characters and cannot start with a number
+ Scrubbed
The protection policy name must contain between 3 and 150 characters
+ Scrubbed
Please make sure you have pass right set of parameters
@@ -419,45 +438,59 @@ Please contact Microsoft for further assistant.
Received WebException, Response: {0}, Status: {1}
- For AzureBackupWeeklyRetentionPolicy , DaysOfWeek param is mandatory and can not be empty
+ For a weekly retention policy, using the DaysOfWeek parameter is mandatory
+ Scrubbed
- Only one AzureBackupWeeklyRetentionPolicy in RetentionPolicies is allowed
+ Only one weekly retention policy is allowed for a Protection Policy
+ Scrubbed
- For AzureBackupWeeklyRetentionPolicy , valid values of retention are {0} to {1}
+ The weekly retention value should be between {0} and {1}
+ Scrubbed
- For Weekly Schedule, AzureBackupWeeklyRetentionPolicy in RetentionPolicies param is mandatory
+ For a weekly backup schedule, setting a weekly retention policy is mandatory
+ Scrubbed
- For weekly scheduletype , ScheduleRunDays param is mandatory and can not be empty.
+ For a weekly backup schedule, using the DaysOfWeek parameter is mandatory
+ Scrubbed
- For Weekly Schedule, AzureBackupDailyRetentionPolicy in RetentionPolicies param is not allowed
+ For a weekly backup schedule, setting a daily retention policy is not allowed
+ Scrubbed
- For AzureBackupYearlyRetentionPolicy and RetentionFormat in Weeks, DaysOfMonth param is not allowed
+ For a yearly retention policy specified in days, using the MonthsOfYear and DaysOfMonth parameters is not allowed
+ Scrubbed
- For AzureBackupYearlyRetentionPolicy and RetentionFormat in Days, DaysOfMonth param is mandatory and can not be empty
+ For a yearly retention policy specified in days, using the MonthsOfYear and DaysOfMonth parameters is mandatory
+ Scrubbed
- For AzureBackupYearlyRetentionPolicy and RetentionFormat in Weeks, DaysOfWeek param is mandatory and can not be empty
+ For a yearly retention policy specified in weeks, using the DaysOfWeek and WeekNumber parameters is mandatory
+ Scrubbed
- For AzureBackupYearlyRetentionPolicy and RetentionFormat in Days, DaysOfWeek or WeekNumber params are not allowed
+ For a yearly retention policy specified in days, using the DaysOfWeek and WeekNumber parameters is not allowed
+ Scrubbed
- Only one AzureBackupYearlyRetentionPolicy in RetentionPolicies is allowed
+ Only one yearly retention policy is allowed for a Protection Policy
+ Scrubbed
- For AzureBackupYearlyRetentionPolicy and RetentionFormat in days, MonthsOfYear param is mandatory and can not be empty
+ For a yearly retention policy specified in days, using the MonthsOfYear and DaysOfMonth parameters is mandatory
+ Scrubbed
- For AzureBackupYearlyRetentionPolicy , valid values of retention are {0} to {1}
+ Yearly retention value should be between {0} and {1}
+ Scrubbed
- For AzureBackupYearlyRetentionPolicy and RetentionFormat in Weeks, WeekNumber param is mandatory and can not be empty
+ For a yearly retention policy specified in weeks, using the DaysOfWeek and WeekNumber parameters is mandatory
+ Scrubbed
\ No newline at end of file
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/packages.config b/src/ResourceManager/AzureBackup/Commands.AzureBackup/packages.config
index 2d0042531dd2..4f83b6260f45 100644
--- a/src/ResourceManager/AzureBackup/Commands.AzureBackup/packages.config
+++ b/src/ResourceManager/AzureBackup/Commands.AzureBackup/packages.config
@@ -4,7 +4,7 @@
-
+
diff --git a/src/ResourceManager/Compute/Commands.Compute.Test/Commands.Compute.Test.csproj b/src/ResourceManager/Compute/Commands.Compute.Test/Commands.Compute.Test.csproj
index 4711bb4a4f4e..6af5f9948b38 100644
--- a/src/ResourceManager/Compute/Commands.Compute.Test/Commands.Compute.Test.csproj
+++ b/src/ResourceManager/Compute/Commands.Compute.Test/Commands.Compute.Test.csproj
@@ -290,6 +290,9 @@
Always
+
+ Always
+
Always
diff --git a/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/AvailabilitySetTests.ps1 b/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/AvailabilitySetTests.ps1
index a20507f4bb0b..2d0c14f0b11c 100644
--- a/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/AvailabilitySetTests.ps1
+++ b/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/AvailabilitySetTests.ps1
@@ -24,7 +24,7 @@ function Test-AvailabilitySet
try
{
# Common
- $loc = 'West US';
+ $loc = Get-ComputeVMLocation;
New-AzureResourceGroup -Name $rgname -Location $loc -Force;
$asetName = 'avs' + $rgname;
diff --git a/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/ComputeCloudExceptionTests.ps1 b/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/ComputeCloudExceptionTests.ps1
index 31b516ff82cf..5352c62ac105 100644
--- a/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/ComputeCloudExceptionTests.ps1
+++ b/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/ComputeCloudExceptionTests.ps1
@@ -20,7 +20,7 @@ function Run-ComputeCloudExceptionTests
try
{
# Common
- $loc = 'West US';
+ $loc = Get-ComputeVMLocation;
New-AzureResourceGroup -Name $rgname -Location $loc -Force;
$compare = "Resource*NotFound*OperationID : `'*`'";
diff --git a/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/ComputeTestCommon.ps1 b/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/ComputeTestCommon.ps1
index 7b129e658606..8c5a35612f8d 100644
--- a/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/ComputeTestCommon.ps1
+++ b/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/ComputeTestCommon.ps1
@@ -394,3 +394,75 @@ function Get-SasUri
return $uri;
}
+
+# Get a Location according to resource provider.
+function Get-ResourceProviderLocation
+{
+ param ([string] $name, [string] $default = "westus", [bool] $canonical = $true)
+
+ $loc = Get-AzureLocation | where { $_.Name.Equals($name) };
+
+ if ($loc -eq $null)
+ {
+ throw 'There is no available locations with given parameters';
+ }
+
+ if ($loc.LocationsString.ToLowerInvariant().Replace(" ", "").Contains($default.ToLowerInvariant().Replace(" ","")))
+ {
+ return $default;
+ }
+
+ if ($canonical)
+ {
+ return $loc.Locations[0].ToLowerInvariant().Replace(" ", "");
+ }
+ else
+ {
+ return $loc.Locations[0];
+ }
+}
+
+function Get-ComputeVMLocation
+{
+ Get-ResourceProviderLocation "Microsoft.Compute/virtualMachines";
+}
+
+function Get-ComputeAvailabilitySetLocation
+{
+ Get-ResourceProviderLocation "Microsoft.Compute/availabilitySets";
+}
+
+function Get-ComputeVMExtensionLocation
+{
+ Get-ResourceProviderLocation "Microsoft.Compute/virtualMachines/extensions";
+}
+
+function Get-ComputeVMDiagnosticSettingLocation
+{
+ Get-ResourceProviderLocation "Microsoft.Compute/virtualMachines/diagnosticSettings";
+}
+
+function Get-ComputeVMMetricDefinitionLocation
+{
+ Get-ResourceProviderLocation "Microsoft.Compute/virtualMachines/metricDefinitions";
+}
+
+function Get-ComputeOperationLocation
+{
+ Get-ResourceProviderLocation "Microsoft.Compute/locations/operations";
+}
+
+function Get-ComputeVMSizeLocation
+{
+ Get-ResourceProviderLocation "Microsoft.Compute/locations/vmSizes";
+}
+
+function Get-ComputeUsageLocation
+{
+ Get-ResourceProviderLocation "Microsoft.Compute/locations/usages";
+}
+
+function Get-ComputePublisherLocation
+{
+ Get-ResourceProviderLocation "Microsoft.Compute/locations/publishers";
+}
diff --git a/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineExtensionTests.ps1 b/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineExtensionTests.ps1
index 1aead9ca56a7..4ba5a65405fe 100644
--- a/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineExtensionTests.ps1
+++ b/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineExtensionTests.ps1
@@ -24,7 +24,7 @@ function Test-VirtualMachineExtension
try
{
# Common
- $loc = 'westus';
+ $loc = Get-ComputeVMLocation;
New-AzureResourceGroup -Name $rgname -Location $loc -Force;
# VM Profile & Hardware
@@ -163,7 +163,7 @@ function Test-VirtualMachineExtensionUsingHashTable
try
{
# Common
- $loc = 'westus';
+ $loc = Get-ComputeVMLocation;
New-AzureResourceGroup -Name $rgname -Location $loc -Force;
# VM Profile & Hardware
@@ -325,7 +325,7 @@ function Test-VirtualMachineCustomScriptExtension
try
{
# Common
- $loc = 'westus';
+ $loc = Get-ComputeVMLocation;
New-AzureResourceGroup -Name $rgname -Location $loc -Force;
# VM Profile & Hardware
@@ -494,7 +494,7 @@ function Test-VirtualMachineCustomScriptExtensionFileUri
try
{
# Common
- $loc = 'westus';
+ $loc = Get-ComputeVMLocation;
New-AzureResourceGroup -Name $rgname -Location $loc -Force;
# VM Profile & Hardware
@@ -652,7 +652,7 @@ function Test-VirtualMachineAccessExtension
try
{
# Common
- $loc = 'westus';
+ $loc = Get-ComputeVMLocation;
New-AzureResourceGroup -Name $rgname -Location $loc -Force;
# VM Profile & Hardware
diff --git a/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineNetworkInterfaceTests.ps1 b/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineNetworkInterfaceTests.ps1
index 346db4d72d3d..0916cb826df0 100644
--- a/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineNetworkInterfaceTests.ps1
+++ b/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineNetworkInterfaceTests.ps1
@@ -24,7 +24,7 @@ function Test-SingleNetworkInterface
try
{
# Common
- $loc = 'westus';
+ $loc = Get-ComputeVMLocation;
New-AzureResourceGroup -Name $rgname -Location $loc -Force;
# VM Profile & Hardware
@@ -146,7 +146,7 @@ function Test-SingleNetworkInterfaceDnsSettings
try
{
# Common
- $loc = 'westus';
+ $loc = Get-ComputeVMLocation;
New-AzureResourceGroup -Name $rgname -Location $loc -Force;
# VM Profile & Hardware
@@ -252,7 +252,7 @@ function Test-MultipleNetworkInterface
try
{
# Common
- $loc = 'westus';
+ $loc = Get-ComputeVMLocation;
New-AzureResourceGroup -Name $rgname -Location $loc -Force;
# VM Profile & Hardware
@@ -366,7 +366,7 @@ function Test-AddNetworkInterface
try
{
# Common
- $loc = 'westus';
+ $loc = Get-ComputeVMLocation;
New-AzureResourceGroup -Name $rgname -Location $loc -Force;
# VM Profile & Hardware
diff --git a/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineTests.cs b/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineTests.cs
index 0ff55d7a4fa4..66cd56174f04 100644
--- a/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineTests.cs
+++ b/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineTests.cs
@@ -75,6 +75,13 @@ public void TestVirtualMachineDataDisk()
ComputeTestController.NewInstance.RunPsTest("Test-VirtualMachineDataDisk");
}
+ [Fact]
+ [Trait(Category.AcceptanceType, Category.CheckIn)]
+ public void TestVirtualMachineDataDiskNegative()
+ {
+ ComputeTestController.NewInstance.RunPsTest("Test-VirtualMachineDataDiskNegative");
+ }
+
[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TestVirtualMachinePIRv2()
diff --git a/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineTests.ps1 b/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineTests.ps1
index 36de6b3bdb25..d3d5c5838d47 100644
--- a/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineTests.ps1
+++ b/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineTests.ps1
@@ -24,7 +24,7 @@ function Test-VirtualMachine
try
{
# Common
- $loc = 'westus';
+ $loc = Get-ComputeVMLocation;
New-AzureResourceGroup -Name $rgname -Location $loc -Force;
# VM Profile & Hardware
@@ -243,7 +243,7 @@ function Test-VirtualMachineImageList
try
{
- $locStr = 'westus';
+ $locStr = Get-ComputeVMLocation;
# List Tests
$foundAnyImage = $false;
@@ -397,7 +397,7 @@ function Test-VirtualMachineSizeAndUsage
try
{
# Common
- $loc = 'westus';
+ $loc = Get-ComputeVMLocation;
New-AzureResourceGroup -Name $rgname -Location $loc -Force;
# Availability Set
@@ -571,7 +571,7 @@ function Test-VirtualMachinePIRv2
try
{
# Common
- $loc = 'westus';
+ $loc = Get-ComputeVMLocation;
New-AzureResourceGroup -Name $rgname -Location $loc -Force;
# VM Profile & Hardware
@@ -680,7 +680,7 @@ function Test-VirtualMachineCapture
try
{
# Common
- $loc = 'westus';
+ $loc = Get-ComputeVMLocation;
New-AzureResourceGroup -Name $rgname -Location $loc -Force;
# VM Profile & Hardware
@@ -786,11 +786,210 @@ function Test-VirtualMachineCapture
}
}
+function Test-VirtualMachineDataDisk
+{
+ # Setup
+ $rgname = Get-ComputeTestResourceName
+
+ try
+ {
+ # Common
+ $loc = Get-ComputeVMLocation;
+ New-AzureResourceGroup -Name $rgname -Location $loc -Force;
+
+ # VM Profile & Hardware
+ $vmsize = 'Standard_A4';
+ $vmname = 'vm' + $rgname;
+ $p = New-AzureVMConfig -VMName $vmname -VMSize $vmsize;
+ Assert-AreEqual $p.HardwareProfile.VirtualMachineSize $vmsize;
+
+ # NRP
+ $subnet = New-AzureVirtualNetworkSubnetConfig -Name ('subnet' + $rgname) -AddressPrefix "10.0.0.0/24";
+ $vnet = New-AzureVirtualNetwork -Force -Name ('vnet' + $rgname) -ResourceGroupName $rgname -Location $loc -AddressPrefix "10.0.0.0/16" -DnsServer "10.1.1.1" -Subnet $subnet;
+ $vnet = Get-AzureVirtualNetwork -Name ('vnet' + $rgname) -ResourceGroupName $rgname;
+ $subnetId = $vnet.Subnets[0].Id;
+ $pubip = New-AzurePublicIpAddress -Force -Name ('pubip' + $rgname) -ResourceGroupName $rgname -Location $loc -AllocationMethod Dynamic -DomainNameLabel ('pubip' + $rgname);
+ $pubip = Get-AzurePublicIpAddress -Name ('pubip' + $rgname) -ResourceGroupName $rgname;
+ $pubipId = $pubip.Id;
+ $nic = New-AzureNetworkInterface -Force -Name ('nic' + $rgname) -ResourceGroupName $rgname -Location $loc -SubnetId $subnetId -PublicIpAddressId $pubip.Id;
+ $nic = Get-AzureNetworkInterface -Name ('nic' + $rgname) -ResourceGroupName $rgname;
+ $nicId = $nic.Id;
+
+ $p = Add-AzureVMNetworkInterface -VM $p -Id $nicId;
+ Assert-AreEqual $p.NetworkProfile.NetworkInterfaces.Count 1;
+ Assert-AreEqual $p.NetworkProfile.NetworkInterfaces[0].ReferenceUri $nicId;
+
+ # Adding the same Nic but not set it Primary
+ $p = Add-AzureVMNetworkInterface -VM $p -Id $nicId -Primary;
+ Assert-AreEqual $p.NetworkProfile.NetworkInterfaces.Count 1;
+ Assert-AreEqual $p.NetworkProfile.NetworkInterfaces[0].ReferenceUri $nicId;
+ Assert-AreEqual $p.NetworkProfile.NetworkInterfaces[0].Primary $true;
+
+ # Storage Account (SA)
+ $stoname = 'sto' + $rgname;
+ $stotype = 'Standard_GRS';
+ New-AzureStorageAccount -ResourceGroupName $rgname -Name $stoname -Location $loc -Type $stotype;
+ $stoaccount = Get-AzureStorageAccount -ResourceGroupName $rgname -Name $stoname;
+
+ $osDiskName = 'osDisk';
+ $osDiskCaching = 'ReadWrite';
+ $osDiskVhdUri = "https://$stoname.blob.core.windows.net/test/os.vhd";
+ $dataDiskVhdUri1 = "https://$stoname.blob.core.windows.net/test/data1.vhd";
+ $dataDiskVhdUri2 = "https://$stoname.blob.core.windows.net/test/data2.vhd";
+ $dataDiskVhdUri3 = "https://$stoname.blob.core.windows.net/test/data3.vhd";
+ $dataDiskName1 = 'testDataDisk1';
+ $dataDiskName2 = 'testDataDisk2';
+ $dataDiskName3 = 'testDataDisk3';
+
+ $p = Set-AzureVMOSDisk -VM $p -Name $osDiskName -VhdUri $osDiskVhdUri -Caching $osDiskCaching -CreateOption FromImage;
+
+ $p = Add-AzureVMDataDisk -VM $p -Name $dataDiskName1 -Caching 'ReadOnly' -DiskSizeInGB 5 -Lun 1 -VhdUri $dataDiskVhdUri1 -CreateOption Empty;
+ $p = Add-AzureVMDataDisk -VM $p -Name $dataDiskName2 -Caching 'ReadOnly' -DiskSizeInGB 11 -Lun 2 -VhdUri $dataDiskVhdUri2 -CreateOption Empty;
+ $p = Add-AzureVMDataDisk -VM $p -Name $dataDiskName3 -Caching 'ReadOnly' -DiskSizeInGB 12 -Lun 3 -VhdUri $dataDiskVhdUri3 -CreateOption Empty;
+ $p = Remove-AzureVMDataDisk -VM $p -Name $dataDiskName3;
+
+ $p = Set-AzureVMDataDisk -VM $p -Name $dataDiskName1 -DiskSizeInGB 10;
+ Assert-ThrowsContains { Set-AzureVMDataDisk -VM $p -Name $dataDiskName3 -Caching 'ReadWrite'; } "not currently assigned for this VM";
+
+ Assert-AreEqual $p.StorageProfile.OSDisk.Caching $osDiskCaching;
+ Assert-AreEqual $p.StorageProfile.OSDisk.Name $osDiskName;
+ Assert-AreEqual $p.StorageProfile.OSDisk.VirtualHardDisk.Uri $osDiskVhdUri;
+
+ Assert-AreEqual $p.StorageProfile.DataDisks.Count 2;
+ Assert-AreEqual $p.StorageProfile.DataDisks[0].Name $dataDiskName1;
+ Assert-AreEqual $p.StorageProfile.DataDisks[0].Caching 'ReadOnly';
+ Assert-AreEqual $p.StorageProfile.DataDisks[0].DiskSizeGB 10;
+ Assert-AreEqual $p.StorageProfile.DataDisks[0].Lun 1;
+ Assert-AreEqual $p.StorageProfile.DataDisks[0].VirtualHardDisk.Uri $dataDiskVhdUri1;
+ Assert-AreEqual $p.StorageProfile.DataDisks[0].CreateOption 'Empty';
+
+ Assert-AreEqual $p.StorageProfile.DataDisks[1].Name $dataDiskName2;
+ Assert-AreEqual $p.StorageProfile.DataDisks[1].Caching 'ReadOnly';
+ Assert-AreEqual $p.StorageProfile.DataDisks[1].DiskSizeGB 11;
+ Assert-AreEqual $p.StorageProfile.DataDisks[1].Lun 2;
+ Assert-AreEqual $p.StorageProfile.DataDisks[1].VirtualHardDisk.Uri $dataDiskVhdUri2;
+ Assert-AreEqual $p.StorageProfile.DataDisks[1].CreateOption 'Empty';
+
+ # OS & Image
+ $user = "Foo12";
+ $password = 'BaR@123' + $rgname;
+ $securePassword = ConvertTo-SecureString $password -AsPlainText -Force;
+ $cred = New-Object System.Management.Automation.PSCredential ($user, $securePassword);
+ $computerName = 'test';
+ $vhdContainer = "https://$stoname.blob.core.windows.net/test";
+
+ $p = Set-AzureVMOperatingSystem -VM $p -Windows -ComputerName $computerName -Credential $cred;
+
+ $imgRef = Get-DefaultCRPImage -loc $loc;
+ $p = ($imgRef | Set-AzureVMSourceImage -VM $p);
+
+ Assert-AreEqual $p.OSProfile.AdminUsername $user;
+ Assert-AreEqual $p.OSProfile.ComputerName $computerName;
+ Assert-AreEqual $p.OSProfile.AdminPassword $password;
+
+ Assert-AreEqual $p.StorageProfile.ImageReference.Offer $imgRef.Offer;
+ Assert-AreEqual $p.StorageProfile.ImageReference.Publisher $imgRef.PublisherName;
+ Assert-AreEqual $p.StorageProfile.ImageReference.Sku $imgRef.Skus;
+ Assert-AreEqual $p.StorageProfile.ImageReference.Version $imgRef.Version;
+
+ # Virtual Machine
+ # TODO: Still need to do retry for New-AzureVM for SA, even it's returned in Get-.
+ New-AzureVM -ResourceGroupName $rgname -Location $loc -VM $p;
+
+ # Get VM
+ $vm1 = Get-AzureVM -Name $vmname -ResourceGroupName $rgname;
+
+ Assert-AreEqual $vm1.Name $vmname;
+ Assert-AreEqual $vm1.NetworkProfile.NetworkInterfaces.Count 1;
+ Assert-AreEqual $vm1.NetworkProfile.NetworkInterfaces[0].ReferenceUri $nicId;
+
+ Assert-AreEqual $vm1.StorageProfile.ImageReference.Offer $imgRef.Offer;
+ Assert-AreEqual $vm1.StorageProfile.ImageReference.Publisher $imgRef.PublisherName;
+ Assert-AreEqual $vm1.StorageProfile.ImageReference.Sku $imgRef.Skus;
+ Assert-AreEqual $vm1.StorageProfile.ImageReference.Version $imgRef.Version;
+
+ Assert-AreEqual $vm1.StorageProfile.DataDisks.Count 2;
+ Assert-AreEqual $vm1.StorageProfile.DataDisks[0].Name $dataDiskName1;
+ Assert-AreEqual $vm1.StorageProfile.DataDisks[0].Caching 'ReadOnly';
+ Assert-AreEqual $vm1.StorageProfile.DataDisks[0].DiskSizeGB 10;
+ Assert-AreEqual $vm1.StorageProfile.DataDisks[0].Lun 1;
+ Assert-AreEqual $vm1.StorageProfile.DataDisks[0].VirtualHardDisk.Uri $dataDiskVhdUri1;
+ Assert-AreEqual $vm1.StorageProfile.DataDisks[0].CreateOption 'Empty';
+
+ Assert-AreEqual $vm1.StorageProfile.DataDisks[1].Name $dataDiskName2;
+ Assert-AreEqual $vm1.StorageProfile.DataDisks[1].Caching 'ReadOnly';
+ Assert-AreEqual $vm1.StorageProfile.DataDisks[1].DiskSizeGB 11;
+ Assert-AreEqual $vm1.StorageProfile.DataDisks[1].Lun 2;
+ Assert-AreEqual $vm1.StorageProfile.DataDisks[1].VirtualHardDisk.Uri $dataDiskVhdUri2;
+ Assert-AreEqual $vm1.StorageProfile.DataDisks[1].CreateOption 'Empty';
+
+ Assert-AreEqual $vm1.OSProfile.AdminUsername $user;
+ Assert-AreEqual $vm1.OSProfile.ComputerName $computerName;
+ Assert-AreEqual $vm1.HardwareProfile.VirtualMachineSize $vmsize;
+
+ $vm1 = Set-AzureVMDataDisk -VM $vm1 -Caching 'ReadWrite' -Lun 1;
+ $vm1 = Set-AzureVMDataDisk -VM $vm1 -Name $dataDiskName2 -Caching 'ReadWrite';
+ $vm1 = Add-AzureVMDataDisk -VM $vm1 -Name $dataDiskName3 -Caching 'ReadOnly' -DiskSizeInGB 12 -Lun 3 -VhdUri $dataDiskVhdUri3 -CreateOption Empty;
+
+ # Update
+ Update-AzureVM -ResourceGroupName $rgname -VM $vm1;
+
+ $vm2 = Get-AzureVM -Name $vmname -ResourceGroupName $rgname;
+ Assert-AreEqual $vm2.NetworkProfile.NetworkInterfaces.Count 1;
+ Assert-AreEqual $vm2.NetworkProfile.NetworkInterfaces[0].ReferenceUri $nicId;
+
+ Assert-AreEqual $vm2.StorageProfile.ImageReference.Offer $imgRef.Offer;
+ Assert-AreEqual $vm2.StorageProfile.ImageReference.Publisher $imgRef.PublisherName;
+ Assert-AreEqual $vm2.StorageProfile.ImageReference.Sku $imgRef.Skus;
+ Assert-AreEqual $vm2.StorageProfile.ImageReference.Version $imgRef.Version;
+
+ Assert-AreEqual $vm2.StorageProfile.DataDisks.Count 3;
+ Assert-AreEqual $vm2.StorageProfile.DataDisks[0].Name $dataDiskName1;
+ Assert-AreEqual $vm2.StorageProfile.DataDisks[0].Caching 'ReadWrite';
+ Assert-AreEqual $vm2.StorageProfile.DataDisks[0].DiskSizeGB 10;
+ Assert-AreEqual $vm2.StorageProfile.DataDisks[0].Lun 1;
+ Assert-AreEqual $vm2.StorageProfile.DataDisks[0].VirtualHardDisk.Uri $dataDiskVhdUri1;
+ Assert-AreEqual $vm2.StorageProfile.DataDisks[0].CreateOption 'Empty';
+
+ Assert-AreEqual $vm2.StorageProfile.DataDisks[1].Name $dataDiskName2;
+ Assert-AreEqual $vm2.StorageProfile.DataDisks[1].Caching 'ReadWrite';
+ Assert-AreEqual $vm2.StorageProfile.DataDisks[1].DiskSizeGB 11;
+ Assert-AreEqual $vm2.StorageProfile.DataDisks[1].Lun 2;
+ Assert-AreEqual $vm2.StorageProfile.DataDisks[1].VirtualHardDisk.Uri $dataDiskVhdUri2;
+ Assert-AreEqual $vm2.StorageProfile.DataDisks[1].CreateOption 'Empty';
+
+ Assert-AreEqual $vm2.StorageProfile.DataDisks[2].Name $dataDiskName3;
+ Assert-AreEqual $vm2.StorageProfile.DataDisks[2].Caching 'ReadOnly';
+ Assert-AreEqual $vm2.StorageProfile.DataDisks[2].DiskSizeGB 12;
+ Assert-AreEqual $vm2.StorageProfile.DataDisks[2].Lun 3;
+ Assert-AreEqual $vm2.StorageProfile.DataDisks[2].VirtualHardDisk.Uri $dataDiskVhdUri3;
+ Assert-AreEqual $vm2.StorageProfile.DataDisks[2].CreateOption 'Empty';
+
+ Assert-AreEqual $vm2.OSProfile.AdminUsername $user;
+ Assert-AreEqual $vm2.OSProfile.ComputerName $computerName;
+ Assert-AreEqual $vm2.HardwareProfile.VirtualMachineSize $vmsize;
+ Assert-NotNull $vm2.Location;
+
+ $vms = Get-AzureVM -ResourceGroupName $rgname;
+ Assert-AreNotEqual $vms $null;
+
+ # Remove All VMs
+ Get-AzureVM -ResourceGroupName $rgname | Remove-AzureVM -ResourceGroupName $rgname -Force;
+ $vms = Get-AzureVM -ResourceGroupName $rgname;
+ Assert-AreEqual $vms $null;
+ }
+ finally
+ {
+ # Cleanup
+ Clean-ResourceGroup $rgname
+ }
+}
+
<#
.SYNOPSIS
-Test Virtual Machines Data Disks
+Test Virtual Machines Data Disks Negative
#>
-function Test-VirtualMachineDataDisk
+function Test-VirtualMachineDataDiskNegative
{
# Setup
$rgname = Get-ComputeTestResourceName
@@ -798,7 +997,7 @@ function Test-VirtualMachineDataDisk
try
{
# Common
- $loc = 'westus';
+ $loc = Get-ComputeVMLocation;
New-AzureResourceGroup -Name $rgname -Location $loc -Force;
# VM Profile & Hardware
@@ -865,7 +1064,6 @@ function Test-VirtualMachineDataDisk
}
}
-
<#
.SYNOPSIS
Test Virtual Machines Plan
@@ -878,7 +1076,7 @@ function Test-VirtualMachinePlan
try
{
# Common
- $loc = 'westus';
+ $loc = Get-ComputeVMLocation;
New-AzureResourceGroup -Name $rgname -Location $loc -Force;
# VM Profile & Hardware
@@ -961,7 +1159,7 @@ function Test-VirtualMachinePlan2
try
{
# Common
- $loc = Get-ComputeDefaultLocation;
+ $loc = Get-ComputeVMLocation;
New-AzureResourceGroup -Name $rgname -Location $loc -Force;
@@ -1041,7 +1239,7 @@ function Test-VirtualMachineTags
try
{
# Common
- $loc = 'westus';
+ $loc = Get-ComputeVMLocation;
New-AzureResourceGroup -Name $rgname -Location $loc -Force;
# VM Profile & Hardware
@@ -1119,7 +1317,7 @@ function Test-VirtualMachineWithVMAgentAutoUpdate
try
{
# Common
- $loc = 'westus';
+ $loc = Get-ComputeVMLocation;
New-AzureResourceGroup -Name $rgname -Location $loc -Force;
# VM Profile & Hardware
@@ -1223,7 +1421,7 @@ function Test-LinuxVirtualMachine
try
{
# Common
- $loc = 'westus';
+ $loc = Get-ComputeVMLocation;
New-AzureResourceGroup -Name $rgname -Location $loc -Force;
# VM Profile & Hardware
@@ -1317,7 +1515,7 @@ function Test-LinuxVirtualMachine
# Test Image Cmdlet Output Format
function Test-VMImageCmdletOutputFormat
{
- $locStr = Get-ComputeDefaultLocation;
+ $locStr = Get-ComputeVMLocation;
$imgRef = Get-DefaultCRPImage -loc $locStr;
$publisher = $imgRef.PublisherName;
$offer = $imgRef.Offer;
@@ -1353,68 +1551,6 @@ function Test-GetVMSizeFromAllLocations
}
}
-<#
-.SYNOPSIS
-Test Virtual Machine List with Paging
-#>
-function Test-VirtualMachineListWithPaging
-{
- # Setup
- $rgname = Get-ComputeTestResourceName
-
- try
- {
- # Common
- $loc = Get-ComputeDefaultLocation;
- New-AzureResourceGroup -Name $rgname -Location $loc -Force;
-
- $numberOfInstances = 51;
- $vmSize = 'Standard_A0';
-
- $templateFile = ".\Templates\azuredeploy.json";
- $paramFile = ".\Templates\azuredeploy-parameters-51vms.json";
- $paramContent =
-@"
-{
- "newStorageAccountName": {
- "value": "${rgname}sto"
- },
- "adminUsername": {
- "value": "Foo12"
- },
- "adminPassword": {
- "value": "BaR@123${rgname}"
- },
- "numberOfInstances": {
- "value": $numberOfInstances
- },
- "location": {
- "value": "$loc"
- },
- "vmSize": {
- "value": "$vmSize"
- }
-}
-"@;
-
- Set-Content -Path $paramFile -Value $paramContent -Force -Verbose;
-
- New-AzureResourceGroupDeployment -Name "${rgname}dp" -ResourceGroupName $rgname -TemplateFile $templateFile -TemplateParameterFile $paramFile;
-
- $vms = Get-AzureVM -ResourceGroupName $rgname;
- Assert-True { $vms.Count -eq $numberOfInstances };
-
- $vms = Get-AzureVM;
- Assert-True { $vms.Count -ge $numberOfInstances };
- }
- finally
- {
- # Cleanup
- Clean-ResourceGroup $rgname
- }
-}
-
-
<