Skip to content

Commit

Permalink
Merge pull request AzureRT#76 from Azure/dev
Browse files Browse the repository at this point in the history 
.
  • Loading branch information
@huangpf
huangpf committed Aug 25, 2015
2 parents 2bef23a + ba9f811 commit bc42ba2
Show file tree
Hide file tree
Showing 104 changed files with 48,314 additions and 41,145 deletions.
3 changes: 1 addition & 2 deletions src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/Commands.AzureBackup.Test.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,7 @@
<HintPath>..\..\..\packages\Microsoft.Azure.Common.Authentication.1.1.3-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.Management.BackupServicesManagement, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\Microsoft.Azure.Management.BackupServices.1.0.3-preview\lib\net40\Microsoft.Azure.Management.BackupServicesManagement.dll</HintPath>
<HintPath>..\..\..\packages\Microsoft.Azure.Management.BackupServices.1.0.4-preview\lib\net40\Microsoft.Azure.Management.BackupServicesManagement.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
Expand Down
3 changes: 1 addition & 2 deletions ...Manager/AzureBackup/Commands.AzureBackup.Test/ScenarioTests/AzureBackupContainerTests.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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';
}
Expand Down
84 changes: 42 additions & 42 deletions ...ackup.Test.ScenarioTests.AzureBackupContainerTests/AzureBackupContainerScenarioTests.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand All @@ -122,19 +122,19 @@
"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": {
"Accept-Language": [
"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}",
Expand All @@ -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"
Expand All @@ -186,19 +186,19 @@
"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": {
"Accept-Language": [
"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}",
Expand All @@ -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"
Expand Down
Loading

0 comments on commit bc42ba2

Please sign in to comment.