Skip to content

Commit 608f98b

Browse files
deathly809deathly809
authored
Merge pull request Azure#34 from deathly809/mgmerge
Cherry pick recent changes from AzureStack branch
2 parents 4b38f11 + 1d35db7 commit 608f98b

33 files changed

+2826
-376
lines changed

‎src/StackAdmin/Azs.Subscriptions.Admin/Module/Azs.Subscriptions.Admin/Generated.PowerShell.Commands/SwaggerPathCommands/Get-AzsSubscriptionPlan.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ function Get-AzsSubscriptionPlan {
107107
$TaskResult = $SubscriptionsAdminClient.AcquiredPlans.ListWithHttpMessagesAsync($TargetSubscriptionId)
108108
} elseif ('Get' -eq $PsCmdlet.ParameterSetName -or 'ResourceId' -eq $PsCmdlet.ParameterSetName) {
109109
Write-Verbose -Message 'Performing operation GetWithHttpMessagesAsync on $SubscriptionsAdminClient.'
110-
$TaskResult = $SubscriptionsAdminClient.AcquiredPlans.GetWithHttpMessagesAsync($TargetSubscriptionId.ToString(), $PlanAcquisitionId.ToString())
110+
$TaskResult = $SubscriptionsAdminClient.AcquiredPlans.GetWithHttpMessagesAsync($TargetSubscriptionId.ToString(), $AcquisitionId.ToString())
111111
} else {
112112
Write-Verbose -Message 'Failed to map parameter set to operation method.'
113113
throw 'Module failed to find operation to execute.'

‎src/StackAdmin/Azs.Subscriptions.Admin/Tests/Azs.Subscriptions.Admin.Tests.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@
6262
<None Include="packages.config">
6363
<SubType>Designer</SubType>
6464
</None>
65-
<None Include="SessionRecords\SubscriptionsAdminClient\TestCreateUpdateThenDeleteDirectoryTenant.json" />
6665
<None Include="SessionRecords\SubscriptionsAdminClient\TestCreateUpdateThenDeleteOffer.json" />
6766
<None Include="SessionRecords\SubscriptionsAdminClient\TestCreateUpdateThenDeletePlan.json" />
6867
<None Include="SessionRecords\SubscriptionsAdminClient\TestGetAcquiredPlan.json" />

‎src/StackAdmin/Azs.Subscriptions.Admin/Tests/SessionRecords/SubscriptionsAdminClient/CheckNameAvailability.json

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
{
2+
"Entries": [
3+
{
4+
"RequestUri": "/subscriptions/3c2a4c80-e594-46eb-b923-98fd98d50155/providers/Microsoft.Subscriptions.Admin/checkNameAvailability?api-version=2015-11-01",
5+
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvM2MyYTRjODAtZTU5NC00NmViLWI5MjMtOThmZDk4ZDUwMTU1L3Byb3ZpZGVycy9NaWNyb3NvZnQuU3Vic2NyaXB0aW9ucy5BZG1pbi9jaGVja05hbWVBdmFpbGFiaWxpdHk/YXBpLXZlcnNpb249MjAxNS0xMS0wMQ==",
6+
"RequestMethod": "POST",
7+
"RequestBody": "{\r\n \"name\": \"Test Sub\",\r\n \"resourceType\": \"Microsoft.Subscriptions.Admin/plans\"\r\n}",
8+
"RequestHeaders": {
9+
"Content-Type": [
10+
"application/json; charset=utf-8"
11+
],
12+
"Content-Length": [
13+
"84"
14+
],
15+
"x-ms-client-request-id": [
16+
"08af24be-5458-4c13-a749-62efc5f0fdfa"
17+
],
18+
"accept-language": [
19+
"en-US"
20+
],
21+
"User-Agent": [
22+
"FxVersion/4.6.26201.01",
23+
"Microsoft.AzureStack.Management.Subscriptions.Admin.SubscriptionsAdminClient/0.1.0.0"
24+
]
25+
},
26+
"ResponseBody": "{\r\n \"nameAvailable\": true\r\n}",
27+
"ResponseHeaders": {
28+
"Content-Length": [
29+
"22"
30+
],
31+
"Content-Type": [
32+
"application/json; charset=utf-8"
33+
],
34+
"Expires": [
35+
"-1"
36+
],
37+
"Cache-Control": [
38+
"no-cache"
39+
],
40+
"Date": [
41+
"Tue, 10 Apr 2018 18:08:20 GMT"
42+
],
43+
"Pragma": [
44+
"no-cache"
45+
],
46+
"x-ms-ratelimit-remaining-subscription-writes": [
47+
"1168"
48+
],
49+
"x-ms-request-id": [
50+
"5fb38da7-d427-4d24-90f6-27d943a532f8"
51+
],
52+
"x-ms-correlation-request-id": [
53+
"5fb38da7-d427-4d24-90f6-27d943a532f8"
54+
],
55+
"x-ms-routing-request-id": [
56+
"REDMOND:20180410T180820Z:5fb38da7-d427-4d24-90f6-27d943a532f8"
57+
],
58+
"Strict-Transport-Security": [
59+
"max-age=31536000; includeSubDomains"
60+
],
61+
"X-Content-Type-Options": [
62+
"nosniff"
63+
]
64+
},
65+
"StatusCode": 200
66+
}
67+
],
68+
"Names": {},
69+
"Variables": {
70+
"SubscriptionId": "3c2a4c80-e594-46eb-b923-98fd98d50155"
71+
}
72+
}

‎src/StackAdmin/Azs.Subscriptions.Admin/Tests/SessionRecords/SubscriptionsAdminClient/TestCreateThenDeleteAcquiredPlan.json

Lines changed: 301 additions & 0 deletions
Large diffs are not rendered by default.

‎src/StackAdmin/Azs.Subscriptions.Admin/Tests/SessionRecords/SubscriptionsAdminClient/TestCreateUpdateThenDeleteOffer.json

Lines changed: 46 additions & 46 deletions
Large diffs are not rendered by default.

‎src/StackAdmin/Azs.Subscriptions.Admin/Tests/SessionRecords/SubscriptionsAdminClient/TestCreateUpdateThenDeletePlan.json

Lines changed: 53 additions & 53 deletions
Large diffs are not rendered by default.

‎src/StackAdmin/Azs.Subscriptions.Admin/Tests/SessionRecords/SubscriptionsAdminClient/TestGetAcquiredPlan.json

Lines changed: 182 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,182 @@
1+
{
2+
"Entries": [
3+
{
4+
"RequestUri": "/subscriptions/ca831431-dac2-4466-a538-59fa3f882f68/providers/Microsoft.Subscriptions.Admin/subscriptions?api-version=2015-11-01",
5+
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvY2E4MzE0MzEtZGFjMi00NDY2LWE1MzgtNTlmYTNmODgyZjY4L3Byb3ZpZGVycy9NaWNyb3NvZnQuU3Vic2NyaXB0aW9ucy5BZG1pbi9zdWJzY3JpcHRpb25zP2FwaS12ZXJzaW9uPTIwMTUtMTEtMDE=",
6+
"RequestMethod": "GET",
7+
"RequestBody": "",
8+
"RequestHeaders": {
9+
"x-ms-client-request-id": [
10+
"b19323bc-6df8-441b-b017-21e01717a83b"
11+
],
12+
"accept-language": [
13+
"en-US"
14+
],
15+
"User-Agent": [
16+
"FxVersion/4.6.26328.01",
17+
"Microsoft.AzureStack.Management.Subscriptions.Admin.SubscriptionsAdminClient/0.1.0.0"
18+
]
19+
},
20+
"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}",
21+
"ResponseHeaders": {
22+
"Content-Length": [
23+
"1209"
24+
],
25+
"Content-Type": [
26+
"application/json; charset=utf-8"
27+
],
28+
"Expires": [
29+
"-1"
30+
],
31+
"Cache-Control": [
32+
"no-cache"
33+
],
34+
"Date": [
35+
"Mon, 23 Apr 2018 18:06:57 GMT"
36+
],
37+
"Pragma": [
38+
"no-cache"
39+
],
40+
"x-ms-ratelimit-remaining-subscription-reads": [
41+
"14973"
42+
],
43+
"x-ms-request-id": [
44+
"5c7f4f23-41db-435a-bcf0-dedcf4e39017"
45+
],
46+
"x-ms-correlation-request-id": [
47+
"5c7f4f23-41db-435a-bcf0-dedcf4e39017"
48+
],
49+
"x-ms-routing-request-id": [
50+
"LOCAL:20180423T180657Z:5c7f4f23-41db-435a-bcf0-dedcf4e39017"
51+
],
52+
"Strict-Transport-Security": [
53+
"max-age=31536000; includeSubDomains"
54+
],
55+
"X-Content-Type-Options": [
56+
"nosniff"
57+
]
58+
},
59+
"StatusCode": 200
60+
},
61+
{
62+
"RequestUri": "/subscriptions/ca831431-dac2-4466-a538-59fa3f882f68/providers/Microsoft.Subscriptions.Admin/subscriptions/ca831431-dac2-4466-a538-59fa3f882f68/acquiredPlans?api-version=2015-11-01",
63+
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvY2E4MzE0MzEtZGFjMi00NDY2LWE1MzgtNTlmYTNmODgyZjY4L3Byb3ZpZGVycy9NaWNyb3NvZnQuU3Vic2NyaXB0aW9ucy5BZG1pbi9zdWJzY3JpcHRpb25zL2NhODMxNDMxLWRhYzItNDQ2Ni1hNTM4LTU5ZmEzZjg4MmY2OC9hY3F1aXJlZFBsYW5zP2FwaS12ZXJzaW9uPTIwMTUtMTEtMDE=",
64+
"RequestMethod": "GET",
65+
"RequestBody": "",
66+
"RequestHeaders": {
67+
"x-ms-client-request-id": [
68+
"f7604214-514d-41b0-a328-b5ae3f90c388"
69+
],
70+
"accept-language": [
71+
"en-US"
72+
],
73+
"User-Agent": [
74+
"FxVersion/4.6.26328.01",
75+
"Microsoft.AzureStack.Management.Subscriptions.Admin.SubscriptionsAdminClient/0.1.0.0"
76+
]
77+
},
78+
"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}",
79+
"ResponseHeaders": {
80+
"Content-Length": [
81+
"453"
82+
],
83+
"Content-Type": [
84+
"application/json; charset=utf-8"
85+
],
86+
"Expires": [
87+
"-1"
88+
],
89+
"Cache-Control": [
90+
"no-cache"
91+
],
92+
"Date": [
93+
"Mon, 23 Apr 2018 18:06:59 GMT"
94+
],
95+
"Pragma": [
96+
"no-cache"
97+
],
98+
"x-ms-ratelimit-remaining-subscription-reads": [
99+
"14972"
100+
],
101+
"x-ms-request-id": [
102+
"decf2a2a-1fe7-4159-9a3f-2dc6e386113a"
103+
],
104+
"x-ms-correlation-request-id": [
105+
"decf2a2a-1fe7-4159-9a3f-2dc6e386113a"
106+
],
107+
"x-ms-routing-request-id": [
108+
"LOCAL:20180423T180659Z:decf2a2a-1fe7-4159-9a3f-2dc6e386113a"
109+
],
110+
"Strict-Transport-Security": [
111+
"max-age=31536000; includeSubDomains"
112+
],
113+
"X-Content-Type-Options": [
114+
"nosniff"
115+
]
116+
},
117+
"StatusCode": 200
118+
},
119+
{
120+
"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",
121+
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvY2E4MzE0MzEtZGFjMi00NDY2LWE1MzgtNTlmYTNmODgyZjY4L3Byb3ZpZGVycy9NaWNyb3NvZnQuU3Vic2NyaXB0aW9ucy5BZG1pbi9zdWJzY3JpcHRpb25zL2NhODMxNDMxLWRhYzItNDQ2Ni1hNTM4LTU5ZmEzZjg4MmY2OC9hY3F1aXJlZFBsYW5zLzMzMTFjNGNmLWE3N2ItNDU5ZC1iZGNmLWRjYmU4YmQyMmZhMT9hcGktdmVyc2lvbj0yMDE1LTExLTAx",
122+
"RequestMethod": "GET",
123+
"RequestBody": "",
124+
"RequestHeaders": {
125+
"x-ms-client-request-id": [
126+
"be4cffd2-63f4-47a9-a71a-fef23c1fc872"
127+
],
128+
"accept-language": [
129+
"en-US"
130+
],
131+
"User-Agent": [
132+
"FxVersion/4.6.26328.01",
133+
"Microsoft.AzureStack.Management.Subscriptions.Admin.SubscriptionsAdminClient/0.1.0.0"
134+
]
135+
},
136+
"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}",
137+
"ResponseHeaders": {
138+
"Content-Length": [
139+
"441"
140+
],
141+
"Content-Type": [
142+
"application/json; charset=utf-8"
143+
],
144+
"Expires": [
145+
"-1"
146+
],
147+
"Cache-Control": [
148+
"no-cache"
149+
],
150+
"Date": [
151+
"Mon, 23 Apr 2018 18:07:02 GMT"
152+
],
153+
"Pragma": [
154+
"no-cache"
155+
],
156+
"x-ms-ratelimit-remaining-subscription-reads": [
157+
"14971"
158+
],
159+
"x-ms-request-id": [
160+
"a7b06e8e-fdc1-4296-9cde-b27097102af1"
161+
],
162+
"x-ms-correlation-request-id": [
163+
"a7b06e8e-fdc1-4296-9cde-b27097102af1"
164+
],
165+
"x-ms-routing-request-id": [
166+
"LOCAL:20180423T180702Z:a7b06e8e-fdc1-4296-9cde-b27097102af1"
167+
],
168+
"Strict-Transport-Security": [
169+
"max-age=31536000; includeSubDomains"
170+
],
171+
"X-Content-Type-Options": [
172+
"nosniff"
173+
]
174+
},
175+
"StatusCode": 200
176+
}
177+
],
178+
"Names": {},
179+
"Variables": {
180+
"SubscriptionId": "ca831431-dac2-4466-a538-59fa3f882f68"
181+
}
182+
}

0 commit comments

Comments
 (0)