Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Azure Stack] Updates to Subscriptions module #8898

Merged
merged 4 commits into from
Apr 16, 2020
Merged

[Azure Stack] Updates to Subscriptions module #8898

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e9df406
commit dd09a40a97fdfd2b215498a6643ce21c9a2dbd38
viananth Mar 31, 2020
4e2c506
Fix example
viananth Mar 31, 2020
6a0a975
Fix examples
viananth Mar 31, 2020
df6fb6f
Address PR comments
viananth Apr 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ...-manager/subscriptions/Microsoft.Subscriptions.Admin/preview/2015-11-01/AcquiredPlan.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@
"$ref": "Subscriptions.json#/parameters/ApiVersionParameter"
},
{
"$ref": "#/parameters/NewAcquiredPlanParameter"
"$ref": "#/parameters/AcquiredPlanDefinitionParameter"
}
],
"responses": {
Expand Down Expand Up @@ -268,8 +268,8 @@
"type": "string",
"x-ms-parameter-location": "method"
},
"NewAcquiredPlanParameter": {
"name": "newAcquiredPlan",
"AcquiredPlanDefinitionParameter": {
"name": "acquiredPlanDefinition",
"in": "body",
"description": "The new acquired plan.",
"required": true,
Expand Down
2 changes: 1 addition & 1 deletion ...ger/subscriptions/Microsoft.Subscriptions.Admin/preview/2015-11-01/DelegatedProvider.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
"200": {
"description": "OK",
"schema": {
"$ref": "Subscriptions.json#/definitions/Subscription"
"$ref": "Subscriptions.json#/definitions/SubscriptionDefinition"
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions ...nager/subscriptions/Microsoft.Subscriptions.Admin/preview/2015-11-01/DirectoryTenant.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@
"$ref": "Subscriptions.json#/parameters/ApiVersionParameter"
},
{
"$ref": "#/parameters/NewDirectoryTenantParameter"
"$ref": "#/parameters/DirectoryTenantDefinitionParameter"
}
],
"responses": {
Expand Down Expand Up @@ -220,9 +220,9 @@
"in": "path",
"x-ms-parameter-location": "method"
},
"NewDirectoryTenantParameter": {
"DirectoryTenantDefinitionParameter": {
"description": "New directory tenant properties.",
"name": "newTenant",
"name": "tenantDefinition",
"required": true,
"in": "body",
"schema": {
Expand Down
18 changes: 9 additions & 9 deletions ...esource-manager/subscriptions/Microsoft.Subscriptions.Admin/preview/2015-11-01/Offer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
}
}
},
"/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Subscriptions.Admin/offers": {
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Subscriptions.Admin/offers": {
"get": {
"x-ms-examples": {
"Get the list of offers under a resource group.": {
Expand Down Expand Up @@ -85,7 +85,7 @@
}
}
},
"/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Subscriptions.Admin/offers/{offer}": {
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Subscriptions.Admin/offers/{offer}": {
"get": {
"x-ms-examples": {
"Get the specified offer.": {
Expand Down Expand Up @@ -145,7 +145,7 @@
"$ref": "Subscriptions.json#/parameters/ApiVersionParameter"
},
{
"$ref": "#/parameters/NewOfferParameter"
"$ref": "#/parameters/OfferDefinitionParameter"
}
],
"responses": {
Expand Down Expand Up @@ -198,7 +198,7 @@
}
}
},
"/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Subscriptions.Admin/offers/{offer}/metrics": {
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Subscriptions.Admin/offers/{offer}/metrics": {
"get": {
"x-ms-examples": {
"Get the offer metrics.": {
Expand Down Expand Up @@ -234,7 +234,7 @@
}
}
},
"/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Subscriptions.Admin/offers/{offer}/metricDefinitions": {
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Subscriptions.Admin/offers/{offer}/metricDefinitions": {
"get": {
"x-ms-examples": {
"Get the metric definitions.": {
Expand Down Expand Up @@ -270,7 +270,7 @@
}
}
},
"/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Subscriptions.Admin/offers/{offer}/link": {
viananth marked this conversation as resolved.
Show resolved Hide resolved
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Subscriptions.Admin/offers/{offer}/link": {
"post": {
"x-ms-examples": {
"Links a plan to an offer.": {
Expand Down Expand Up @@ -309,7 +309,7 @@
}
}
},
"/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Subscriptions.Admin/offers/{offer}/unlink": {
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Subscriptions.Admin/offers/{offer}/unlink": {
"post": {
"x-ms-examples": {
"Unlink a plan from an offer.": {
Expand Down Expand Up @@ -508,9 +508,9 @@
}
},
"parameters": {
"NewOfferParameter": {
"OfferDefinitionParameter": {
"description": "New offer.",
"name": "newOffer",
"name": "offerDefinition",
"in": "body",
"required": true,
"schema": {
Expand Down
6 changes: 3 additions & 3 deletions ...nager/subscriptions/Microsoft.Subscriptions.Admin/preview/2015-11-01/OfferDelegation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@
"$ref": "Subscriptions.json#/parameters/ApiVersionParameter"
},
{
"$ref": "#/parameters/NewOfferDelegationParameter"
"$ref": "#/parameters/OfferDelegationDefinitionParameter"
}
],
"responses": {
Expand Down Expand Up @@ -231,9 +231,9 @@
"type": "string",
"x-ms-parameter-location": "method"
},
"NewOfferDelegationParameter": {
"OfferDelegationDefinitionParameter": {
"description": "New offer delegation parameter.",
"name": "newOfferDelegation",
"name": "offerDelegationDefinition",
"in": "body",
"required": true,
"schema": {
Expand Down
10 changes: 5 additions & 5 deletions ...resource-manager/subscriptions/Microsoft.Subscriptions.Admin/preview/2015-11-01/Plan.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
}
}
},
"/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Subscriptions.Admin/plans": {
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Subscriptions.Admin/plans": {
"get": {
"x-ms-examples": {
"Get the list of plans under a resource group.": {
Expand Down Expand Up @@ -85,7 +85,7 @@
}
}
},
"/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Subscriptions.Admin/plans/{plan}": {
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Subscriptions.Admin/plans/{plan}": {
"get": {
"x-ms-examples": {
"Get the specified plan.": {
Expand Down Expand Up @@ -145,7 +145,7 @@
"$ref": "Subscriptions.json#/parameters/ApiVersionParameter"
},
{
"$ref": "#/parameters/NewPlanParameter"
"$ref": "#/parameters/PlanDefinitionParameter"
}
],
"responses": {
Expand Down Expand Up @@ -346,9 +346,9 @@
}
},
"parameters": {
"NewPlanParameter": {
"PlanDefinitionParameter": {
"description": "New plan.",
"name": "newPlan",
"name": "planDefinition",
"in": "body",
"required": true,
"schema": {
Expand Down
36 changes: 18 additions & 18 deletions ...manager/subscriptions/Microsoft.Subscriptions.Admin/preview/2015-11-01/Subscriptions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@
"x-ms-pageable": {
"nextLinkName": null
},
"x-ms-odata": "#/definitions/Subscription"
"x-ms-odata": "#/definitions/SubscriptionDefinition"
}
},
"/subscriptions/{subscriptionId}/providers/Microsoft.Subscriptions.Admin/checkNameAvailability": {
Expand Down Expand Up @@ -274,7 +274,7 @@
}
}
},
"/subscriptions/{subscriptionId}/providers/Microsoft.Subscriptions.Admin/subscriptions/{subscription}": {
"/subscriptions/{subscriptionId}/providers/Microsoft.Subscriptions.Admin/subscriptions/{targetSubscriptionId}": {
"get": {
"x-ms-examples": {
"Get a specified subscription.": {
Expand All @@ -291,7 +291,7 @@
"$ref": "#/parameters/SubscriptionIdParameter"
},
{
"$ref": "#/parameters/SubscriptionParameter"
"$ref": "#/parameters/TargetSubscriptionIdParameter"
},
{
"$ref": "#/parameters/ApiVersionParameter"
Expand All @@ -301,7 +301,7 @@
"200": {
"description": "OK",
"schema": {
"$ref": "#/definitions/Subscription"
"$ref": "#/definitions/SubscriptionDefinition"
}
}
}
Expand All @@ -322,10 +322,10 @@
"$ref": "#/parameters/SubscriptionIdParameter"
},
{
"$ref": "#/parameters/SubscriptionParameter"
"$ref": "#/parameters/TargetSubscriptionIdParameter"
},
{
"$ref": "#/parameters/NewSubscriptionParameter"
"$ref": "#/parameters/SubscriptionDefinitionParameter"
},
{
"$ref": "#/parameters/ApiVersionParameter"
Expand All @@ -335,13 +335,13 @@
"201": {
"description": "Created",
"schema": {
"$ref": "#/definitions/Subscription"
"$ref": "#/definitions/SubscriptionDefinition"
}
},
"200": {
"description": "OK",
"schema": {
"$ref": "#/definitions/Subscription"
"$ref": "#/definitions/SubscriptionDefinition"
}
}
}
Expand All @@ -362,7 +362,7 @@
"$ref": "#/parameters/SubscriptionIdParameter"
},
{
"$ref": "#/parameters/SubscriptionParameter"
"$ref": "#/parameters/TargetSubscriptionIdParameter"
},
{
"$ref": "#/parameters/ApiVersionParameter"
Expand Down Expand Up @@ -767,8 +767,8 @@
}
}
},
"Subscription": {
"description": "List of supported operations.",
"SubscriptionDefinition": {
"description": "Subscription object properties.",
"type": "object",
"properties": {
"delegatedProviderSubscriptionId": {
Expand Down Expand Up @@ -820,7 +820,7 @@
"type": "array",
"description": "Subscription definition.",
"items": {
"$ref": "#/definitions/Subscription"
"$ref": "#/definitions/SubscriptionDefinition"
}
},
"nextLink": {
Expand Down Expand Up @@ -1215,20 +1215,20 @@
"required": true,
"x-ms-parameter-location": "method"
},
"SubscriptionParameter": {
"description": "Subscription parameter.",
"name": "subscription",
"TargetSubscriptionIdParameter": {
"description": "The target subscription ID.",
"name": "targetSubscriptionId",
"in": "path",
"type": "string",
"required": true,
"x-ms-parameter-location": "method"
},
"NewSubscriptionParameter": {
"SubscriptionDefinitionParameter": {
"description": "Subscription parameter.",
"name": "newSubscription",
"name": "subscriptionDefinition",
"in": "body",
"schema": {
"$ref": "#/definitions/Subscription"
"$ref": "#/definitions/SubscriptionDefinition"
},
"required": true,
"x-ms-parameter-location": "method"
Expand Down
2 changes: 1 addition & 1 deletion ...ptions/Microsoft.Subscriptions.Admin/preview/2015-11-01/examples/AcquiredPlan/Create.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"api-version": "2015-11-01",
"targetSubscriptionId": "8158498d-27b1-4ccf-9aa1-de0f925731e6",
"planAcquisitionId": "718c7f7c-4868-479a-98ce-5caaa8f158c8",
"newAcquiredPlan": {
"acquiredPlanDefinition": {
"properties": {
"acquisitionId": "718c7f7c-4868-479a-98ce-5caaa8f158c8",
"id": "/subscriptions/8158498d-27b1-4ccf-9aa1-de0f925731e6/providers/Microsoft.Subscriptions/subscriptions/8158498d-27b1-4ccf-9aa1-de0f925731e6/acquiredPlans/718c7f7c-4868-479a-98ce-5caaa8f158c8",
Expand Down
2 changes: 1 addition & 1 deletion ...ons/Microsoft.Subscriptions.Admin/preview/2015-11-01/examples/DirectoryTenant/Create.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"location": "local",
"api-version": "2015-11-01",
"tenant": "azurestackci05.onmicrosoft.in",
"newTenant": "eb90516e-65d7-4bf6-8537-8322e9172832",
"tenantDefinition": "eb90516e-65d7-4bf6-8537-8322e9172832",
"resourceGroupName": "system.local"
},
"responses": {
Expand Down
2 changes: 1 addition & 1 deletion ...subscriptions/Microsoft.Subscriptions.Admin/preview/2015-11-01/examples/Offer/Create.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"api-version": "2015-11-01",
"offer": "sampleoffer1",
"resourceGroupName": "RG1",
"newOffer": {
"offerDefinition": {
"properties": {
"name": "testOffer1",
"displayName": "Test Offer",
Expand Down
2 changes: 1 addition & 1 deletion ...ons/Microsoft.Subscriptions.Admin/preview/2015-11-01/examples/OfferDelegation/Create.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"resourceGroupName": "cnur9852subscrrg374",
"offer": "cnur9852tenantoffer374",
"offerDelegationName": "testOfferDelegation",
"newOfferDelegation": "newDelegationName"
"offerDelegationDefinition": "newDelegationName"
},
"responses": {
"200": {
Expand Down
2 changes: 1 addition & 1 deletion .../subscriptions/Microsoft.Subscriptions.Admin/preview/2015-11-01/examples/Plan/Create.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"api-version": "2015-11-01",
"resourceGroupName": "plans",
"plan": "testplan",
"newPlan": {
"planDefinition": {
"properties": {
"description": "test plan",
"displayName": "testplans",
Expand Down
2 changes: 1 addition & 1 deletion ...ft.Subscriptions.Admin/preview/2015-11-01/examples/Subscriptions/CheckIdentityHealth.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"body": {
"reportStartTimeUtc": "2017-08-01T00:00:00.00Z",
"reportEndTimeUtc": "2017-08-01T00:00:00.00Z",
"status": "",
"status": "Unknown",
"directoryTenants": [
{
"tenantId": "",
Expand Down
3 changes: 2 additions & 1 deletion ...tions/Microsoft.Subscriptions.Admin/preview/2015-11-01/examples/Subscriptions/Create.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
{
"parameters": {
"subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23",
"targetSubscriptionId": "c79389af-4480-48cc-8fa2-ee8ced8e843d",
"location": "local",
"api-version": "2015-11-01",
"subscription": "test",
"newSubscription": {
"subscriptionDefinition": {
"properties": {
"delegatedProviderSubscriptionId": "d16dfcf0-44cc-4498-9937-08b94159d27b",
"displayName": "Test Subscription",
Expand Down
1 change: 1 addition & 0 deletions ...tions/Microsoft.Subscriptions.Admin/preview/2015-11-01/examples/Subscriptions/Delete.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"parameters": {
"targetSubscriptionId": "c79389af-4480-48cc-8fa2-ee8ced8e843d",
"subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23",
"location": "local",
"api-version": "2015-11-01",
Expand Down
1 change: 1 addition & 0 deletions ...riptions/Microsoft.Subscriptions.Admin/preview/2015-11-01/examples/Subscriptions/Get.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"parameters": {
"subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23",
"targetSubscriptionId": "c79389af-4480-48cc-8fa2-ee8ced8e843d",
bganapa marked this conversation as resolved.
Show resolved Hide resolved
"location": "local",
"api-version": "2015-11-01",
"subscription": "test"
Expand Down
Loading