Skip to content

Commit 71e88cb

Browse files
viananth00Kai0
viananth
authored and
00Kai0
committed
[Azure Stack] Updates to Subscriptions module (Azure#8898)
* commit dd09a40 Author: bganapa <[email protected]> Date: Tue Mar 17 17:32:10 2020 -0700 Update to camelCasing for resourceGroups commit 4212dd0 Author: bganapa <[email protected]> Date: Tue Mar 17 17:30:07 2020 -0700 Update to camelCasing for resourcegroups commit 594441b Author: Rakesh Kumar <[email protected]> Date: Tue Nov 26 14:06:28 2019 -0800 Rakku stackadmin issue (Azure#7852) * network admin module changes * remove readme.azsautogen.md from network * rename new[ModuleName] to [ModuleName]Definition for AcquiredPlan, DirectoryTenant, Offer, OfferDelegation, Plan and Subscription * fix for enum naming error in github issue Azure#7822 commit ac4e40d Author: Rakesh Kumar <[email protected]> Date: Wed Nov 20 16:47:44 2019 -0800 Subscription Admin module parameter renaming (Azure#7816) * network admin module changes * remove readme.azsautogen.md from network * rename new[ModuleName] to [ModuleName]Definition for AcquiredPlan, DirectoryTenant, Offer, OfferDelegation, Plan and Subscription commit 9e551f0 Author: bganapa <[email protected]> Date: Tue Nov 12 11:44:22 2019 -0800 Reset to Stackadmin2 (Azure#7766) * Fix example * Fix examples * Address PR comments
1 parent 241bb04 commit 71e88cb

File tree

18 files changed

+170
-53
lines changed

18 files changed

+170
-53
lines changed

‎specification/azsadmin/resource-manager/subscriptions/Microsoft.Subscriptions.Admin/preview/2015-11-01/AcquiredPlan.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@
146146
"$ref": "Subscriptions.json#/parameters/ApiVersionParameter"
147147
},
148148
{
149-
"$ref": "#/parameters/NewAcquiredPlanParameter"
149+
"$ref": "#/parameters/AcquiredPlanDefinitionParameter"
150150
}
151151
],
152152
"responses": {
@@ -268,8 +268,8 @@
268268
"type": "string",
269269
"x-ms-parameter-location": "method"
270270
},
271-
"NewAcquiredPlanParameter": {
272-
"name": "newAcquiredPlan",
271+
"AcquiredPlanDefinitionParameter": {
272+
"name": "acquiredPlanDefinition",
273273
"in": "body",
274274
"description": "The new acquired plan.",
275275
"required": true,

‎specification/azsadmin/resource-manager/subscriptions/Microsoft.Subscriptions.Admin/preview/2015-11-01/DelegatedProvider.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
"200": {
7777
"description": "OK",
7878
"schema": {
79-
"$ref": "Subscriptions.json#/definitions/Subscription"
79+
"$ref": "Subscriptions.json#/definitions/SubscriptionDefinition"
8080
}
8181
}
8282
}

‎specification/azsadmin/resource-manager/subscriptions/Microsoft.Subscriptions.Admin/preview/2015-11-01/DirectoryTenant.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@
146146
"$ref": "Subscriptions.json#/parameters/ApiVersionParameter"
147147
},
148148
{
149-
"$ref": "#/parameters/NewDirectoryTenantParameter"
149+
"$ref": "#/parameters/DirectoryTenantDefinitionParameter"
150150
}
151151
],
152152
"responses": {
@@ -220,9 +220,9 @@
220220
"in": "path",
221221
"x-ms-parameter-location": "method"
222222
},
223-
"NewDirectoryTenantParameter": {
223+
"DirectoryTenantDefinitionParameter": {
224224
"description": "New directory tenant properties.",
225-
"name": "newTenant",
225+
"name": "tenantDefinition",
226226
"required": true,
227227
"in": "body",
228228
"schema": {

‎specification/azsadmin/resource-manager/subscriptions/Microsoft.Subscriptions.Admin/preview/2015-11-01/Offer.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
}
5050
}
5151
},
52-
"/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Subscriptions.Admin/offers": {
52+
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Subscriptions.Admin/offers": {
5353
"get": {
5454
"x-ms-examples": {
5555
"Get the list of offers under a resource group.": {
@@ -85,7 +85,7 @@
8585
}
8686
}
8787
},
88-
"/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Subscriptions.Admin/offers/{offer}": {
88+
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Subscriptions.Admin/offers/{offer}": {
8989
"get": {
9090
"x-ms-examples": {
9191
"Get the specified offer.": {
@@ -145,7 +145,7 @@
145145
"$ref": "Subscriptions.json#/parameters/ApiVersionParameter"
146146
},
147147
{
148-
"$ref": "#/parameters/NewOfferParameter"
148+
"$ref": "#/parameters/OfferDefinitionParameter"
149149
}
150150
],
151151
"responses": {
@@ -198,7 +198,7 @@
198198
}
199199
}
200200
},
201-
"/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Subscriptions.Admin/offers/{offer}/metrics": {
201+
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Subscriptions.Admin/offers/{offer}/metrics": {
202202
"get": {
203203
"x-ms-examples": {
204204
"Get the offer metrics.": {
@@ -234,7 +234,7 @@
234234
}
235235
}
236236
},
237-
"/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Subscriptions.Admin/offers/{offer}/metricDefinitions": {
237+
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Subscriptions.Admin/offers/{offer}/metricDefinitions": {
238238
"get": {
239239
"x-ms-examples": {
240240
"Get the metric definitions.": {
@@ -270,7 +270,7 @@
270270
}
271271
}
272272
},
273-
"/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Subscriptions.Admin/offers/{offer}/link": {
273+
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Subscriptions.Admin/offers/{offer}/link": {
274274
"post": {
275275
"x-ms-examples": {
276276
"Links a plan to an offer.": {
@@ -309,7 +309,7 @@
309309
}
310310
}
311311
},
312-
"/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Subscriptions.Admin/offers/{offer}/unlink": {
312+
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Subscriptions.Admin/offers/{offer}/unlink": {
313313
"post": {
314314
"x-ms-examples": {
315315
"Unlink a plan from an offer.": {
@@ -508,9 +508,9 @@
508508
}
509509
},
510510
"parameters": {
511-
"NewOfferParameter": {
511+
"OfferDefinitionParameter": {
512512
"description": "New offer.",
513-
"name": "newOffer",
513+
"name": "offerDefinition",
514514
"in": "body",
515515
"required": true,
516516
"schema": {

‎specification/azsadmin/resource-manager/subscriptions/Microsoft.Subscriptions.Admin/preview/2015-11-01/OfferDelegation.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@
121121
"$ref": "Subscriptions.json#/parameters/ApiVersionParameter"
122122
},
123123
{
124-
"$ref": "#/parameters/NewOfferDelegationParameter"
124+
"$ref": "#/parameters/OfferDelegationDefinitionParameter"
125125
}
126126
],
127127
"responses": {
@@ -231,9 +231,9 @@
231231
"type": "string",
232232
"x-ms-parameter-location": "method"
233233
},
234-
"NewOfferDelegationParameter": {
234+
"OfferDelegationDefinitionParameter": {
235235
"description": "New offer delegation parameter.",
236-
"name": "newOfferDelegation",
236+
"name": "offerDelegationDefinition",
237237
"in": "body",
238238
"required": true,
239239
"schema": {

‎specification/azsadmin/resource-manager/subscriptions/Microsoft.Subscriptions.Admin/preview/2015-11-01/Plan.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
}
5050
}
5151
},
52-
"/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Subscriptions.Admin/plans": {
52+
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Subscriptions.Admin/plans": {
5353
"get": {
5454
"x-ms-examples": {
5555
"Get the list of plans under a resource group.": {
@@ -85,7 +85,7 @@
8585
}
8686
}
8787
},
88-
"/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Subscriptions.Admin/plans/{plan}": {
88+
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Subscriptions.Admin/plans/{plan}": {
8989
"get": {
9090
"x-ms-examples": {
9191
"Get the specified plan.": {
@@ -145,7 +145,7 @@
145145
"$ref": "Subscriptions.json#/parameters/ApiVersionParameter"
146146
},
147147
{
148-
"$ref": "#/parameters/NewPlanParameter"
148+
"$ref": "#/parameters/PlanDefinitionParameter"
149149
}
150150
],
151151
"responses": {
@@ -346,9 +346,9 @@
346346
}
347347
},
348348
"parameters": {
349-
"NewPlanParameter": {
349+
"PlanDefinitionParameter": {
350350
"description": "New plan.",
351-
"name": "newPlan",
351+
"name": "planDefinition",
352352
"in": "body",
353353
"required": true,
354354
"schema": {

‎specification/azsadmin/resource-manager/subscriptions/Microsoft.Subscriptions.Admin/preview/2015-11-01/Subscriptions.json‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@
238238
"x-ms-pageable": {
239239
"nextLinkName": null
240240
},
241-
"x-ms-odata": "#/definitions/Subscription"
241+
"x-ms-odata": "#/definitions/SubscriptionDefinition"
242242
}
243243
},
244244
"/subscriptions/{subscriptionId}/providers/Microsoft.Subscriptions.Admin/checkNameAvailability": {
@@ -274,7 +274,7 @@
274274
}
275275
}
276276
},
277-
"/subscriptions/{subscriptionId}/providers/Microsoft.Subscriptions.Admin/subscriptions/{subscription}": {
277+
"/subscriptions/{subscriptionId}/providers/Microsoft.Subscriptions.Admin/subscriptions/{targetSubscriptionId}": {
278278
"get": {
279279
"x-ms-examples": {
280280
"Get a specified subscription.": {
@@ -291,7 +291,7 @@
291291
"$ref": "#/parameters/SubscriptionIdParameter"
292292
},
293293
{
294-
"$ref": "#/parameters/SubscriptionParameter"
294+
"$ref": "#/parameters/TargetSubscriptionIdParameter"
295295
},
296296
{
297297
"$ref": "#/parameters/ApiVersionParameter"
@@ -301,7 +301,7 @@
301301
"200": {
302302
"description": "OK",
303303
"schema": {
304-
"$ref": "#/definitions/Subscription"
304+
"$ref": "#/definitions/SubscriptionDefinition"
305305
}
306306
}
307307
}
@@ -322,10 +322,10 @@
322322
"$ref": "#/parameters/SubscriptionIdParameter"
323323
},
324324
{
325-
"$ref": "#/parameters/SubscriptionParameter"
325+
"$ref": "#/parameters/TargetSubscriptionIdParameter"
326326
},
327327
{
328-
"$ref": "#/parameters/NewSubscriptionParameter"
328+
"$ref": "#/parameters/SubscriptionDefinitionParameter"
329329
},
330330
{
331331
"$ref": "#/parameters/ApiVersionParameter"
@@ -335,13 +335,13 @@
335335
"201": {
336336
"description": "Created",
337337
"schema": {
338-
"$ref": "#/definitions/Subscription"
338+
"$ref": "#/definitions/SubscriptionDefinition"
339339
}
340340
},
341341
"200": {
342342
"description": "OK",
343343
"schema": {
344-
"$ref": "#/definitions/Subscription"
344+
"$ref": "#/definitions/SubscriptionDefinition"
345345
}
346346
}
347347
}
@@ -362,7 +362,7 @@
362362
"$ref": "#/parameters/SubscriptionIdParameter"
363363
},
364364
{
365-
"$ref": "#/parameters/SubscriptionParameter"
365+
"$ref": "#/parameters/TargetSubscriptionIdParameter"
366366
},
367367
{
368368
"$ref": "#/parameters/ApiVersionParameter"
@@ -767,8 +767,8 @@
767767
}
768768
}
769769
},
770-
"Subscription": {
771-
"description": "List of supported operations.",
770+
"SubscriptionDefinition": {
771+
"description": "Subscription object properties.",
772772
"type": "object",
773773
"properties": {
774774
"delegatedProviderSubscriptionId": {
@@ -820,7 +820,7 @@
820820
"type": "array",
821821
"description": "Subscription definition.",
822822
"items": {
823-
"$ref": "#/definitions/Subscription"
823+
"$ref": "#/definitions/SubscriptionDefinition"
824824
}
825825
},
826826
"nextLink": {
@@ -1215,20 +1215,20 @@
12151215
"required": true,
12161216
"x-ms-parameter-location": "method"
12171217
},
1218-
"SubscriptionParameter": {
1219-
"description": "Subscription parameter.",
1220-
"name": "subscription",
1218+
"TargetSubscriptionIdParameter": {
1219+
"description": "The target subscription ID.",
1220+
"name": "targetSubscriptionId",
12211221
"in": "path",
12221222
"type": "string",
12231223
"required": true,
12241224
"x-ms-parameter-location": "method"
12251225
},
1226-
"NewSubscriptionParameter": {
1226+
"SubscriptionDefinitionParameter": {
12271227
"description": "Subscription parameter.",
1228-
"name": "newSubscription",
1228+
"name": "subscriptionDefinition",
12291229
"in": "body",
12301230
"schema": {
1231-
"$ref": "#/definitions/Subscription"
1231+
"$ref": "#/definitions/SubscriptionDefinition"
12321232
},
12331233
"required": true,
12341234
"x-ms-parameter-location": "method"

‎specification/azsadmin/resource-manager/subscriptions/Microsoft.Subscriptions.Admin/preview/2015-11-01/examples/AcquiredPlan/Create.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"api-version": "2015-11-01",
66
"targetSubscriptionId": "8158498d-27b1-4ccf-9aa1-de0f925731e6",
77
"planAcquisitionId": "718c7f7c-4868-479a-98ce-5caaa8f158c8",
8-
"newAcquiredPlan": {
8+
"acquiredPlanDefinition": {
99
"properties": {
1010
"acquisitionId": "718c7f7c-4868-479a-98ce-5caaa8f158c8",
1111
"id": "/subscriptions/8158498d-27b1-4ccf-9aa1-de0f925731e6/providers/Microsoft.Subscriptions/subscriptions/8158498d-27b1-4ccf-9aa1-de0f925731e6/acquiredPlans/718c7f7c-4868-479a-98ce-5caaa8f158c8",

‎specification/azsadmin/resource-manager/subscriptions/Microsoft.Subscriptions.Admin/preview/2015-11-01/examples/DirectoryTenant/Create.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"location": "local",
55
"api-version": "2015-11-01",
66
"tenant": "azurestackci05.onmicrosoft.in",
7-
"newTenant": "eb90516e-65d7-4bf6-8537-8322e9172832",
7+
"tenantDefinition": "eb90516e-65d7-4bf6-8537-8322e9172832",
88
"resourceGroupName": "system.local"
99
},
1010
"responses": {

‎specification/azsadmin/resource-manager/subscriptions/Microsoft.Subscriptions.Admin/preview/2015-11-01/examples/Offer/Create.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"api-version": "2015-11-01",
66
"offer": "sampleoffer1",
77
"resourceGroupName": "RG1",
8-
"newOffer": {
8+
"offerDefinition": {
99
"properties": {
1010
"name": "testOffer1",
1111
"displayName": "Test Offer",

0 commit comments

Comments
 (0)