Skip to content

Commit

Permalink
Merge pull request Azure#34 from deathly809/mgmerge
Browse files Browse the repository at this point in the history 
Cherry pick recent changes from AzureStack branch
  • Loading branch information
@deathly809
deathly809 authored Apr 24, 2018
2 parents 4b38f11 + 1d35db7 commit 608f98b
Show file tree
Hide file tree
Showing 33 changed files with 2,826 additions and 376 deletions.
2 changes: 1 addition & 1 deletion ...tions.Admin/Generated.PowerShell.Commands/SwaggerPathCommands/Get-AzsSubscriptionPlan.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ function Get-AzsSubscriptionPlan {
$TaskResult = $SubscriptionsAdminClient.AcquiredPlans.ListWithHttpMessagesAsync($TargetSubscriptionId)
} elseif ('Get' -eq $PsCmdlet.ParameterSetName -or 'ResourceId' -eq $PsCmdlet.ParameterSetName) {
Write-Verbose -Message 'Performing operation GetWithHttpMessagesAsync on $SubscriptionsAdminClient.'
$TaskResult = $SubscriptionsAdminClient.AcquiredPlans.GetWithHttpMessagesAsync($TargetSubscriptionId.ToString(), $PlanAcquisitionId.ToString())
$TaskResult = $SubscriptionsAdminClient.AcquiredPlans.GetWithHttpMessagesAsync($TargetSubscriptionId.ToString(), $AcquisitionId.ToString())
} else {
Write-Verbose -Message 'Failed to map parameter set to operation method.'
throw 'Module failed to find operation to execute.'
Expand Down
1 change: 0 additions & 1 deletion src/StackAdmin/Azs.Subscriptions.Admin/Tests/Azs.Subscriptions.Admin.Tests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@
<None Include="packages.config">
<SubType>Designer</SubType>
</None>
<None Include="SessionRecords\SubscriptionsAdminClient\TestCreateUpdateThenDeleteDirectoryTenant.json" />
<None Include="SessionRecords\SubscriptionsAdminClient\TestCreateUpdateThenDeleteOffer.json" />
<None Include="SessionRecords\SubscriptionsAdminClient\TestCreateUpdateThenDeletePlan.json" />
<None Include="SessionRecords\SubscriptionsAdminClient\TestGetAcquiredPlan.json" />
Expand Down
72 changes: 72 additions & 0 deletions ...scriptions.Admin/Tests/SessionRecords/SubscriptionsAdminClient/CheckNameAvailability.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
{
"Entries": [
{
"RequestUri": "/subscriptions/3c2a4c80-e594-46eb-b923-98fd98d50155/providers/Microsoft.Subscriptions.Admin/checkNameAvailability?api-version=2015-11-01",
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvM2MyYTRjODAtZTU5NC00NmViLWI5MjMtOThmZDk4ZDUwMTU1L3Byb3ZpZGVycy9NaWNyb3NvZnQuU3Vic2NyaXB0aW9ucy5BZG1pbi9jaGVja05hbWVBdmFpbGFiaWxpdHk/YXBpLXZlcnNpb249MjAxNS0xMS0wMQ==",
"RequestMethod": "POST",
"RequestBody": "{\r\n \"name\": \"Test Sub\",\r\n \"resourceType\": \"Microsoft.Subscriptions.Admin/plans\"\r\n}",
"RequestHeaders": {
"Content-Type": [
"application/json; charset=utf-8"
],
"Content-Length": [
"84"
],
"x-ms-client-request-id": [
"08af24be-5458-4c13-a749-62efc5f0fdfa"
],
"accept-language": [
"en-US"
],
"User-Agent": [
"FxVersion/4.6.26201.01",
"Microsoft.AzureStack.Management.Subscriptions.Admin.SubscriptionsAdminClient/0.1.0.0"
]
},
"ResponseBody": "{\r\n \"nameAvailable\": true\r\n}",
"ResponseHeaders": {
"Content-Length": [
"22"
],
"Content-Type": [
"application/json; charset=utf-8"
],
"Expires": [
"-1"
],
"Cache-Control": [
"no-cache"
],
"Date": [
"Tue, 10 Apr 2018 18:08:20 GMT"
],
"Pragma": [
"no-cache"
],
"x-ms-ratelimit-remaining-subscription-writes": [
"1168"
],
"x-ms-request-id": [
"5fb38da7-d427-4d24-90f6-27d943a532f8"
],
"x-ms-correlation-request-id": [
"5fb38da7-d427-4d24-90f6-27d943a532f8"
],
"x-ms-routing-request-id": [
"REDMOND:20180410T180820Z:5fb38da7-d427-4d24-90f6-27d943a532f8"
],
"Strict-Transport-Security": [
"max-age=31536000; includeSubDomains"
],
"X-Content-Type-Options": [
"nosniff"
]
},
"StatusCode": 200
}
],
"Names": {},
"Variables": {
"SubscriptionId": "3c2a4c80-e594-46eb-b923-98fd98d50155"
}
}
301 changes: 301 additions & 0 deletions ...Admin/Tests/SessionRecords/SubscriptionsAdminClient/TestCreateThenDeleteAcquiredPlan.json
View file

Large diffs are not rendered by default.

92 changes: 46 additions & 46 deletions ....Admin/Tests/SessionRecords/SubscriptionsAdminClient/TestCreateUpdateThenDeleteOffer.json
View file

Large diffs are not rendered by default.

106 changes: 53 additions & 53 deletions ...s.Admin/Tests/SessionRecords/SubscriptionsAdminClient/TestCreateUpdateThenDeletePlan.json
View file

Large diffs are not rendered by default.

182 changes: 182 additions & 0 deletions ...ubscriptions.Admin/Tests/SessionRecords/SubscriptionsAdminClient/TestGetAcquiredPlan.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,182 @@
{
"Entries": [
{
"RequestUri": "/subscriptions/ca831431-dac2-4466-a538-59fa3f882f68/providers/Microsoft.Subscriptions.Admin/subscriptions?api-version=2015-11-01",
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvY2E4MzE0MzEtZGFjMi00NDY2LWE1MzgtNTlmYTNmODgyZjY4L3Byb3ZpZGVycy9NaWNyb3NvZnQuU3Vic2NyaXB0aW9ucy5BZG1pbi9zdWJzY3JpcHRpb25zP2FwaS12ZXJzaW9uPTIwMTUtMTEtMDE=",
"RequestMethod": "GET",
"RequestBody": "",
"RequestHeaders": {
"x-ms-client-request-id": [
"b19323bc-6df8-441b-b017-21e01717a83b"
],
"accept-language": [
"en-US"
],
"User-Agent": [
"FxVersion/4.6.26328.01",
"Microsoft.AzureStack.Management.Subscriptions.Admin.SubscriptionsAdminClient/0.1.0.0"
]
},
"ResponseBody": "{\r\n \"value\": [\r\n {\r\n \"id\": \"/subscriptions/ca831431-dac2-4466-a538-59fa3f882f68/providers/Microsoft.Subscriptions.Admin/subscriptions/43bb01c9-820e-4e91-8949-ce6327842e16\",\r\n \"subscriptionId\": \"43bb01c9-820e-4e91-8949-ce6327842e16\",\r\n \"delegatedProviderSubscriptionId\": \"ca831431-dac2-4466-a538-59fa3f882f68\",\r\n \"displayName\": \"subdel\",\r\n \"owner\": \"[email protected]\",\r\n \"tenantId\": \"d669642b-89ec-466e-af2c-2ceab9fef685\",\r\n \"routingResourceManagerType\": \"Default\",\r\n \"offerId\": \"/subscriptions/ca831431-dac2-4466-a538-59fa3f882f68/resourceGroups/rg/providers/Microsoft.Subscriptions.Admin/offers/offersub\",\r\n \"state\": \"Enabled\"\r\n },\r\n {\r\n \"id\": \"/subscriptions/ca831431-dac2-4466-a538-59fa3f882f68/providers/Microsoft.Subscriptions.Admin/subscriptions/e667edb1-5cff-4a12-b989-f973444fa0cd\",\r\n \"subscriptionId\": \"e667edb1-5cff-4a12-b989-f973444fa0cd\",\r\n \"delegatedProviderSubscriptionId\": \"ca831431-dac2-4466-a538-59fa3f882f68\",\r\n \"displayName\": \"sub1\",\r\n \"owner\": \"[email protected]\",\r\n \"tenantId\": \"d669642b-89ec-466e-af2c-2ceab9fef685\",\r\n \"routingResourceManagerType\": \"Default\",\r\n \"offerId\": \"/subscriptions/ca831431-dac2-4466-a538-59fa3f882f68/resourceGroups/rg/providers/Microsoft.Subscriptions.Admin/offers/offer1\",\r\n \"state\": \"Enabled\"\r\n }\r\n ]\r\n}",
"ResponseHeaders": {
"Content-Length": [
"1209"
],
"Content-Type": [
"application/json; charset=utf-8"
],
"Expires": [
"-1"
],
"Cache-Control": [
"no-cache"
],
"Date": [
"Mon, 23 Apr 2018 18:06:57 GMT"
],
"Pragma": [
"no-cache"
],
"x-ms-ratelimit-remaining-subscription-reads": [
"14973"
],
"x-ms-request-id": [
"5c7f4f23-41db-435a-bcf0-dedcf4e39017"
],
"x-ms-correlation-request-id": [
"5c7f4f23-41db-435a-bcf0-dedcf4e39017"
],
"x-ms-routing-request-id": [
"LOCAL:20180423T180657Z:5c7f4f23-41db-435a-bcf0-dedcf4e39017"
],
"Strict-Transport-Security": [
"max-age=31536000; includeSubDomains"
],
"X-Content-Type-Options": [
"nosniff"
]
},
"StatusCode": 200
},
{
"RequestUri": "/subscriptions/ca831431-dac2-4466-a538-59fa3f882f68/providers/Microsoft.Subscriptions.Admin/subscriptions/ca831431-dac2-4466-a538-59fa3f882f68/acquiredPlans?api-version=2015-11-01",
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvY2E4MzE0MzEtZGFjMi00NDY2LWE1MzgtNTlmYTNmODgyZjY4L3Byb3ZpZGVycy9NaWNyb3NvZnQuU3Vic2NyaXB0aW9ucy5BZG1pbi9zdWJzY3JpcHRpb25zL2NhODMxNDMxLWRhYzItNDQ2Ni1hNTM4LTU5ZmEzZjg4MmY2OC9hY3F1aXJlZFBsYW5zP2FwaS12ZXJzaW9uPTIwMTUtMTEtMDE=",
"RequestMethod": "GET",
"RequestBody": "",
"RequestHeaders": {
"x-ms-client-request-id": [
"f7604214-514d-41b0-a328-b5ae3f90c388"
],
"accept-language": [
"en-US"
],
"User-Agent": [
"FxVersion/4.6.26328.01",
"Microsoft.AzureStack.Management.Subscriptions.Admin.SubscriptionsAdminClient/0.1.0.0"
]
},
"ResponseBody": "{\r\n \"value\": [\r\n {\r\n \"id\": \"/subscriptions/ca831431-dac2-4466-a538-59fa3f882f68/providers/Microsoft.Subscriptions/subscriptions/ca831431-dac2-4466-a538-59fa3f882f68/acquiredPlans/3311c4cf-a77b-459d-bdcf-dcbe8bd22fa1\",\r\n \"acquisitionId\": \"3311c4cf-a77b-459d-bdcf-dcbe8bd22fa1\",\r\n \"planId\": \"/subscriptions/ca831431-dac2-4466-a538-59fa3f882f68/providers/Microsoft.Subscriptions/plans/plan1\",\r\n \"provisioningState\": \"Succeeded\",\r\n \"acquisitionTime\": \"2018-04-24T01:06:32.7133333Z\"\r\n }\r\n ]\r\n}",
"ResponseHeaders": {
"Content-Length": [
"453"
],
"Content-Type": [
"application/json; charset=utf-8"
],
"Expires": [
"-1"
],
"Cache-Control": [
"no-cache"
],
"Date": [
"Mon, 23 Apr 2018 18:06:59 GMT"
],
"Pragma": [
"no-cache"
],
"x-ms-ratelimit-remaining-subscription-reads": [
"14972"
],
"x-ms-request-id": [
"decf2a2a-1fe7-4159-9a3f-2dc6e386113a"
],
"x-ms-correlation-request-id": [
"decf2a2a-1fe7-4159-9a3f-2dc6e386113a"
],
"x-ms-routing-request-id": [
"LOCAL:20180423T180659Z:decf2a2a-1fe7-4159-9a3f-2dc6e386113a"
],
"Strict-Transport-Security": [
"max-age=31536000; includeSubDomains"
],
"X-Content-Type-Options": [
"nosniff"
]
},
"StatusCode": 200
},
{
"RequestUri": "/subscriptions/ca831431-dac2-4466-a538-59fa3f882f68/providers/Microsoft.Subscriptions.Admin/subscriptions/ca831431-dac2-4466-a538-59fa3f882f68/acquiredPlans/3311c4cf-a77b-459d-bdcf-dcbe8bd22fa1?api-version=2015-11-01",
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvY2E4MzE0MzEtZGFjMi00NDY2LWE1MzgtNTlmYTNmODgyZjY4L3Byb3ZpZGVycy9NaWNyb3NvZnQuU3Vic2NyaXB0aW9ucy5BZG1pbi9zdWJzY3JpcHRpb25zL2NhODMxNDMxLWRhYzItNDQ2Ni1hNTM4LTU5ZmEzZjg4MmY2OC9hY3F1aXJlZFBsYW5zLzMzMTFjNGNmLWE3N2ItNDU5ZC1iZGNmLWRjYmU4YmQyMmZhMT9hcGktdmVyc2lvbj0yMDE1LTExLTAx",
"RequestMethod": "GET",
"RequestBody": "",
"RequestHeaders": {
"x-ms-client-request-id": [
"be4cffd2-63f4-47a9-a71a-fef23c1fc872"
],
"accept-language": [
"en-US"
],
"User-Agent": [
"FxVersion/4.6.26328.01",
"Microsoft.AzureStack.Management.Subscriptions.Admin.SubscriptionsAdminClient/0.1.0.0"
]
},
"ResponseBody": "{\r\n \"id\": \"/subscriptions/ca831431-dac2-4466-a538-59fa3f882f68/providers/Microsoft.Subscriptions/subscriptions/ca831431-dac2-4466-a538-59fa3f882f68/acquiredPlans/3311c4cf-a77b-459d-bdcf-dcbe8bd22fa1\",\r\n \"acquisitionId\": \"3311c4cf-a77b-459d-bdcf-dcbe8bd22fa1\",\r\n \"planId\": \"/subscriptions/ca831431-dac2-4466-a538-59fa3f882f68/providers/Microsoft.Subscriptions/plans/plan1\",\r\n \"provisioningState\": \"Succeeded\",\r\n \"acquisitionTime\": \"2018-04-24T01:06:32.7133333Z\"\r\n}",
"ResponseHeaders": {
"Content-Length": [
"441"
],
"Content-Type": [
"application/json; charset=utf-8"
],
"Expires": [
"-1"
],
"Cache-Control": [
"no-cache"
],
"Date": [
"Mon, 23 Apr 2018 18:07:02 GMT"
],
"Pragma": [
"no-cache"
],
"x-ms-ratelimit-remaining-subscription-reads": [
"14971"
],
"x-ms-request-id": [
"a7b06e8e-fdc1-4296-9cde-b27097102af1"
],
"x-ms-correlation-request-id": [
"a7b06e8e-fdc1-4296-9cde-b27097102af1"
],
"x-ms-routing-request-id": [
"LOCAL:20180423T180702Z:a7b06e8e-fdc1-4296-9cde-b27097102af1"
],
"Strict-Transport-Security": [
"max-age=31536000; includeSubDomains"
],
"X-Content-Type-Options": [
"nosniff"
]
},
"StatusCode": 200
}
],
"Names": {},
"Variables": {
"SubscriptionId": "ca831431-dac2-4466-a538-59fa3f882f68"
}
}
Loading

0 comments on commit 608f98b

Please sign in to comment.