Skip to content

Commit 0b7a9fe

Browse files
author
Samuel Anudeep
committed
Merge pull request #134 from MabOneSdk/dev1
FI from dev1 into release
2 parents 75f33a3 + 88c4264 commit 0b7a9fe

File tree

12 files changed

+258
-218
lines changed

12 files changed

+258
-218
lines changed

‎src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/Commands.AzureBackup.Test.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
</Reference>
4242
<Reference Include="Microsoft.Azure.Management.BackupServicesManagement, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
4343
<SpecificVersion>False</SpecificVersion>
44-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.BackupServices.1.0.3-preview\lib\net40\Microsoft.Azure.Management.BackupServicesManagement.dll</HintPath>
44+
<HintPath>..\Commands.AzureBackup\Resources\Microsoft.Azure.Management.BackupServicesManagement.dll</HintPath>
4545
</Reference>
4646
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
4747
<SpecificVersion>False</SpecificVersion>

‎src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/ScenarioTests/AzureBackupContainerTests.ps1‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,12 @@ $IaasVMManagedResourceName = "hydrarecordvm"
5454
$IaasVMManagedResourceGroupName = "hydrarecordvm"
5555
$VaultResourceName = "backuprn"
5656
$VaultResourceRGName = "backuprg"
57-
$RegisterTestVM = "powershellbvt"
5857

5958

6059
function Test-RegisterAzureBackupContainer
6160
{
6261
$vault = Get-AzureRMBackupVault -Name $VaultResourceName
63-
$jobId = Register-AzureRMBackupContainer -vault $vault -Name $RegisterTestVM -ServiceName $RegisterTestVM
62+
$jobId = Register-AzureRMBackupContainer -vault $vault -Name $IaasVMManagedResourceName -ServiceName $IaasVMManagedResourceGroupName
6463

6564
Assert-NotNull $jobId 'Job should not be null';
6665
}

‎src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/SessionRecords/Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupContainerTests/AzureBackupContainerScenarioTests.json‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
"en-us"
1111
],
1212
"x-ms-client-request-id": [
13-
"b6ee8175-6285-48e1-8d88-b04a52c65045-2015-08-14 10:25:36Z-PS"
13+
"36086411-570f-4a0c-b6b1-3dab5e799d22-2015-08-24 11:14:28Z-PS"
1414
],
1515
"User-Agent": [
16-
"Microsoft.Azure.Management.BackupServices.BackupVaultServicesManagementClient/0.0.0.0"
16+
"Microsoft.Azure.Management.BackupServices.BackupVaultServicesManagementClient/1.0.0.0"
1717
]
1818
},
19-
"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}",
19+
"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}",
2020
"ResponseHeaders": {
2121
"Content-Length": [
2222
"344"
@@ -31,28 +31,28 @@
3131
"no-cache"
3232
],
3333
"x-ms-request-id": [
34-
"cf75119f-1291-4957-806b-483e8181a98f"
34+
"ef33055f-ef57-402d-acb0-2c5a3df1a7ac"
3535
],
3636
"x-ms-client-request-id": [
37-
"b6ee8175-6285-48e1-8d88-b04a52c65045-2015-08-14 10:25:36Z-PS"
37+
"36086411-570f-4a0c-b6b1-3dab5e799d22-2015-08-24 11:14:28Z-PS"
3838
],
3939
"Strict-Transport-Security": [
4040
"max-age=31536000; includeSubDomains"
4141
],
4242
"x-ms-ratelimit-remaining-subscription-reads": [
43-
"14996"
43+
"14999"
4444
],
4545
"x-ms-correlation-request-id": [
46-
"cf75119f-1291-4957-806b-483e8181a98f"
46+
"ef33055f-ef57-402d-acb0-2c5a3df1a7ac"
4747
],
4848
"x-ms-routing-request-id": [
49-
"CENTRALUS:20150814T102539Z:cf75119f-1291-4957-806b-483e8181a98f"
49+
"CENTRALUS:20150824T111431Z:ef33055f-ef57-402d-acb0-2c5a3df1a7ac"
5050
],
5151
"Cache-Control": [
5252
"no-cache"
5353
],
5454
"Date": [
55-
"Fri, 14 Aug 2015 10:25:38 GMT"
55+
"Mon, 24 Aug 2015 11:14:31 GMT"
5656
],
5757
"Server": [
5858
"Microsoft-IIS/8.0"
@@ -70,16 +70,16 @@
7070
"en-us"
7171
],
7272
"x-ms-client-request-id": [
73-
"b6ee8175-6285-48e1-8d88-b04a52c65045-2015-08-14 10:25:36Z-PS"
73+
"36086411-570f-4a0c-b6b1-3dab5e799d22-2015-08-24 11:14:28Z-PS"
7474
],
7575
"User-Agent": [
76-
"Microsoft.Azure.Management.BackupServices.BackupVaultServicesManagementClient/0.0.0.0"
76+
"Microsoft.Azure.Management.BackupServices.BackupVaultServicesManagementClient/1.0.0.0"
7777
]
7878
},
79-
"ResponseBody": "{\r\n \"resourceId\": 1774108198771083879,\r\n \"properties\": {\r\n \"storageType\": \"LocallyRedundant\",\r\n \"storageTypeState\": \"Locked\"\r\n }\r\n}",
79+
"ResponseBody": "{\r\n \"resourceId\": 6476019202094164610,\r\n \"properties\": {\r\n \"storageType\": \"GeoRedundant\",\r\n \"storageTypeState\": \"Locked\"\r\n }\r\n}",
8080
"ResponseHeaders": {
8181
"Content-Length": [
82-
"110"
82+
"106"
8383
],
8484
"Content-Type": [
8585
"application/json"
@@ -91,29 +91,29 @@
9191
"no-cache"
9292
],
9393
"x-ms-request-id": [
94-
"cc0d7b18-86d0-4f2f-94dc-48e3288b1846"
94+
"560174f4-2b3a-461b-b319-bbd482816924"
9595
],
9696
"x-ms-client-request-id": [
97-
"b6ee8175-6285-48e1-8d88-b04a52c65045-2015-08-14 10:25:36Z-PS",
98-
"b6ee8175-6285-48e1-8d88-b04a52c65045-2015-08-14 10:25:36Z-PS"
97+
"36086411-570f-4a0c-b6b1-3dab5e799d22-2015-08-24 11:14:28Z-PS",
98+
"36086411-570f-4a0c-b6b1-3dab5e799d22-2015-08-24 11:14:28Z-PS"
9999
],
100100
"Strict-Transport-Security": [
101101
"max-age=31536000; includeSubDomains"
102102
],
103103
"x-ms-ratelimit-remaining-subscription-reads": [
104-
"14995"
104+
"14998"
105105
],
106106
"x-ms-correlation-request-id": [
107-
"cc0d7b18-86d0-4f2f-94dc-48e3288b1846"
107+
"560174f4-2b3a-461b-b319-bbd482816924"
108108
],
109109
"x-ms-routing-request-id": [
110-
"CENTRALUS:20150814T102540Z:cc0d7b18-86d0-4f2f-94dc-48e3288b1846"
110+
"CENTRALUS:20150824T111432Z:560174f4-2b3a-461b-b319-bbd482816924"
111111
],
112112
"Cache-Control": [
113113
"no-cache"
114114
],
115115
"Date": [
116-
"Fri, 14 Aug 2015 10:25:40 GMT"
116+
"Mon, 24 Aug 2015 11:14:32 GMT"
117117
],
118118
"Server": [
119119
"Microsoft-IIS/8.0"
@@ -122,19 +122,19 @@
122122
"StatusCode": 200
123123
},
124124
{
125-
"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'",
126-
"EncodedRequestUri": "L1N1YnNjcmlwdGlvbnMvZjUzMDNhMGItZmFlNC00Y2RiLWI0NGQtMGU0YzAzMmRkZTI2L3Jlc291cmNlR3JvdXBzL2JhY2t1cHJnL3Byb3ZpZGVycy9NaWNyb3NvZnQuQmFja3VwL0JhY2t1cFZhdWx0L2JhY2t1cHJuL2NvbnRhaW5lcnM/YXBpLXZlcnNpb249MjAxNC0wOS0wMSYkZmlsdGVyPWNvbnRhaW5lclR5cGUlMjBlcSUyMCdJYWFzVk0n",
125+
"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'",
126+
"EncodedRequestUri": "L1N1YnNjcmlwdGlvbnMvZjUzMDNhMGItZmFlNC00Y2RiLWI0NGQtMGU0YzAzMmRkZTI2L3Jlc291cmNlR3JvdXBzL2JhY2t1cHJnL3Byb3ZpZGVycy9NaWNyb3NvZnQuQmFja3VwL0JhY2t1cFZhdWx0L2JhY2t1cHJuL2NvbnRhaW5lcnM/YXBpLXZlcnNpb249MjAxNC0wOS0wMSYkZmlsdGVyPXR5cGUlMjBlcSUyMCdJYWFzVk0n",
127127
"RequestMethod": "GET",
128128
"RequestBody": "",
129129
"RequestHeaders": {
130130
"Accept-Language": [
131131
"en-us"
132132
],
133133
"x-ms-client-request-id": [
134-
"56b1a915-da7a-4109-97cd-4a546fabdbde-2015-08-14 10:25:40Z-PS"
134+
"0ae364d6-7a9e-40e4-8658-f0e06c0de7c8-2015-08-24 11:14:32Z-PS"
135135
],
136136
"User-Agent": [
137-
"Microsoft.Azure.Management.BackupServices.BackupServicesManagementClient/0.0.0.0"
137+
"Microsoft.Azure.Management.BackupServices.BackupServicesManagementClient/1.0.0.0"
138138
]
139139
},
140140
"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 @@
152152
"no-cache"
153153
],
154154
"x-ms-request-id": [
155-
"f88725ce-30e4-4405-a6f9-5eae2f9bc9d3"
155+
"a4e766c4-feff-4839-8717-22543e0d3986"
156156
],
157157
"x-ms-client-request-id": [
158-
"56b1a915-da7a-4109-97cd-4a546fabdbde-2015-08-14 10:25:40Z-PS",
159-
"56b1a915-da7a-4109-97cd-4a546fabdbde-2015-08-14 10:25:40Z-PS"
158+
"0ae364d6-7a9e-40e4-8658-f0e06c0de7c8-2015-08-24 11:14:32Z-PS",
159+
"0ae364d6-7a9e-40e4-8658-f0e06c0de7c8-2015-08-24 11:14:32Z-PS"
160160
],
161161
"Strict-Transport-Security": [
162162
"max-age=31536000; includeSubDomains"
163163
],
164164
"x-ms-ratelimit-remaining-subscription-reads": [
165-
"14996"
165+
"14999"
166166
],
167167
"x-ms-correlation-request-id": [
168-
"f88725ce-30e4-4405-a6f9-5eae2f9bc9d3"
168+
"a4e766c4-feff-4839-8717-22543e0d3986"
169169
],
170170
"x-ms-routing-request-id": [
171-
"CENTRALUS:20150814T102543Z:f88725ce-30e4-4405-a6f9-5eae2f9bc9d3"
171+
"CENTRALUS:20150824T111435Z:a4e766c4-feff-4839-8717-22543e0d3986"
172172
],
173173
"Cache-Control": [
174174
"no-cache"
175175
],
176176
"Date": [
177-
"Fri, 14 Aug 2015 10:25:43 GMT"
177+
"Mon, 24 Aug 2015 11:14:35 GMT"
178178
],
179179
"Server": [
180180
"Microsoft-IIS/8.0"
@@ -186,19 +186,19 @@
186186
"StatusCode": 200
187187
},
188188
{
189-
"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'",
190-
"EncodedRequestUri": "L1N1YnNjcmlwdGlvbnMvZjUzMDNhMGItZmFlNC00Y2RiLWI0NGQtMGU0YzAzMmRkZTI2L3Jlc291cmNlR3JvdXBzL2JhY2t1cHJnL3Byb3ZpZGVycy9NaWNyb3NvZnQuQmFja3VwL0JhY2t1cFZhdWx0L2JhY2t1cHJuL2NvbnRhaW5lcnM/YXBpLXZlcnNpb249MjAxNC0wOS0wMSYkZmlsdGVyPWNvbnRhaW5lclR5cGUlMjBlcSUyMCdJYWFzVk0nJTIwYW5kJTIwZnJpZW5kbHlOYW1lJTIwZXElMjAnaHlkcmFyZWNvcmR2bSc=",
189+
"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'",
190+
"EncodedRequestUri": "L1N1YnNjcmlwdGlvbnMvZjUzMDNhMGItZmFlNC00Y2RiLWI0NGQtMGU0YzAzMmRkZTI2L3Jlc291cmNlR3JvdXBzL2JhY2t1cHJnL3Byb3ZpZGVycy9NaWNyb3NvZnQuQmFja3VwL0JhY2t1cFZhdWx0L2JhY2t1cHJuL2NvbnRhaW5lcnM/YXBpLXZlcnNpb249MjAxNC0wOS0wMSYkZmlsdGVyPXR5cGUlMjBlcSUyMCdJYWFzVk0nJTIwYW5kJTIwZnJpZW5kbHlOYW1lJTIwZXElMjAnaHlkcmFyZWNvcmR2bSc=",
191191
"RequestMethod": "GET",
192192
"RequestBody": "",
193193
"RequestHeaders": {
194194
"Accept-Language": [
195195
"en-us"
196196
],
197197
"x-ms-client-request-id": [
198-
"fff73c43-0e6e-4137-b54f-4e1bc214edf6-2015-08-14 10:25:43Z-PS"
198+
"fd17ac5f-faf7-46a1-9eb2-660f7e7d9af4-2015-08-24 11:14:36Z-PS"
199199
],
200200
"User-Agent": [
201-
"Microsoft.Azure.Management.BackupServices.BackupServicesManagementClient/0.0.0.0"
201+
"Microsoft.Azure.Management.BackupServices.BackupServicesManagementClient/1.0.0.0"
202202
]
203203
},
204204
"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 @@
216216
"no-cache"
217217
],
218218
"x-ms-request-id": [
219-
"e5e16955-fb54-4c23-a222-baedd71224d5"
219+
"aa47c965-a832-4c87-986d-da50f79d4cd2"
220220
],
221221
"x-ms-client-request-id": [
222-
"fff73c43-0e6e-4137-b54f-4e1bc214edf6-2015-08-14 10:25:43Z-PS",
223-
"fff73c43-0e6e-4137-b54f-4e1bc214edf6-2015-08-14 10:25:43Z-PS"
222+
"fd17ac5f-faf7-46a1-9eb2-660f7e7d9af4-2015-08-24 11:14:36Z-PS",
223+
"fd17ac5f-faf7-46a1-9eb2-660f7e7d9af4-2015-08-24 11:14:36Z-PS"
224224
],
225225
"Strict-Transport-Security": [
226226
"max-age=31536000; includeSubDomains"
227227
],
228228
"x-ms-ratelimit-remaining-subscription-reads": [
229-
"14995"
229+
"14998"
230230
],
231231
"x-ms-correlation-request-id": [
232-
"e5e16955-fb54-4c23-a222-baedd71224d5"
232+
"aa47c965-a832-4c87-986d-da50f79d4cd2"
233233
],
234234
"x-ms-routing-request-id": [
235-
"CENTRALUS:20150814T102544Z:e5e16955-fb54-4c23-a222-baedd71224d5"
235+
"CENTRALUS:20150824T111436Z:aa47c965-a832-4c87-986d-da50f79d4cd2"
236236
],
237237
"Cache-Control": [
238238
"no-cache"
239239
],
240240
"Date": [
241-
"Fri, 14 Aug 2015 10:25:44 GMT"
241+
"Mon, 24 Aug 2015 11:14:36 GMT"
242242
],
243243
"Server": [
244244
"Microsoft-IIS/8.0"

0 commit comments

Comments
 (0)