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

[Ready to MERGE] Swagger for Tenant Properties API #5038

Merged
merged 13 commits into from
Feb 22, 2019
Merged

[Ready to MERGE] Swagger for Tenant Properties API #5038

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
5d3784a
added swagger for Tenant Properties
Jan 15, 2019
38018ad
Fixed camel casing in billing.json file
Jan 15, 2019
c81e213
Update billing.json
Jan 15, 2019
33d848a
changes in DiscoverTenants contracts
Jan 15, 2019
5c877c2
billing.Json trim blank space
Jan 15, 2019
c736ede
Update billing.json
Jan 15, 2019
7a96d09
removal of plural name
Jan 15, 2019
eab3b0f
Updating the route
Jan 17, 2019
b6137f4
Moved Swagger for Discover Tenants from billing to consumption
Jan 18, 2019
53fb8f8
Change in Namespace followed by one additional parameter "billingAcco…
Jan 23, 2019
b405815
Change of method name from discoverTenants to tanants.
Jan 24, 2019
42f98d2
changes ion response type
Jan 24, 2019
0d55ad6
added name after Id. Code review implementation
Jan 25, 2019
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
Prev Previous commit
Next Next commit
Change of method name from discoverTenants to tanants. 
Change of method name from discoverTenants to tanants.
  • Loading branch information
Santosh Sinha committed Jan 24, 2019
commit b4058158e72d1f4d1f12d312dfc1136731381151
69 changes: 54 additions & 15 deletions ...ion/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/consumption.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2702,20 +2702,20 @@
}
}
},
"/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/billingProfiles/{billingProfileId}/providers/Microsoft.Consumption/discoverTenants": {
"/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/billingProfiles/{billingProfileId}/providers/Microsoft.Consumption/tenants": {
"get": {
"tags": [
"discoverTenants"
"Tenants"
],
"x-ms-examples": {
"TenantPropertiesGet": {
"$ref": "./examples/DiscoverTenantsGet.json"
"$ref": "./examples/TenantsGet.json"
}
},
"operationId": "DiscoverTenants_Get",
"operationId": "Tenants_Get",
"description": "Gets a Tenant Properties.",
"parameters": [
{
{
"name": "billingAccountId",
"in": "path",
"description": "Billing Account Id.",
Expand All @@ -2737,7 +2737,7 @@
"200": {
"description": "OK. The request has succeeded.",
"schema": {
"$ref": "#/definitions/DiscoverTenant"
"$ref": "#/definitions/TenantListResult"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changes in tenant response as per ARM recommendations.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also changes in route from "discoverTenants" to "tenants" now.

}
},
"default": {
Expand Down Expand Up @@ -3135,8 +3135,24 @@
}
}
},
"DiscoverTenant": {
"description": "A Tenant properties Resource",
"Tenant": {
"description": "An tenant detail resource.",
"type": "object",
"allOf": [
{
"$ref": "#/definitions/Resource"
}
],
"properties": {
"properties": {
"x-ms-client-flatten": true,
"$ref": "#/definitions/TenantProperties",
"title": "Usage detail properties"
}
}
},
"TenantProperties": {
"description": "The properties of the tenants.",
"properties": {
"billingProfileName": {
"description": "The Billing Profile name.",
Expand All @@ -3152,9 +3168,32 @@
"description": "The TenantId.",
"type": "string",
"readOnly": true
},
"billingAccountName": {
"description": "The Billing Account Name.",
"type": "string",
"readOnly": true
}
}
},
},
"TenantListResult": {
"description": "A Tenant properties Resource",
"properties": {
"value": {
"description": "The list of tenant details.",
"type": "array",
"readOnly": true,
"items": {
"$ref": "#/definitions/Tenant"
}
},
"nextLink": {
"description": "The link (url) to the next page of results.",
"type": "string",
"readOnly": true
}
}
},
"MarketplacesListResult": {
"description": "Result of listing marketplaces. It contains a list of available marketplaces in reverse chronological order by billing period.",
"type": "object",
Expand Down Expand Up @@ -4262,19 +4301,19 @@
"$ref": "#/definitions/ManagementGroupAggregatedCostResult"
}
},
"includedSubscriptions": {
"includedSubscriptions": {
"description": "List of subscription Guids included in the calculation of aggregated cost",
"type": "array",
"type": "array",
"items": {
"type": "string"
}
}
},
"excludedSubscriptions": {
"excludedSubscriptions": {
"description": "List of subscription Guids excluded from the calculation of aggregated cost",
"type": "array",
"type": "array",
"items": {
"type": "string"
}
}
}
}
},
Expand Down
5 changes: 3 additions & 2 deletions ...18-10-01/examples/DiscoverTenantsGet.json → ...table/2018-10-01/examples/TenantsGet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,15 @@
"parameters": {
"api-version": "2019-01-01",
"billingProfileId": "dd21e577-ec81-45ec-b08a-622213737978",
"billingAccountId": "0d49b9e9-dfe7-536e-ede4-bae1d63adbb7"
"billingAccountId": "0d49b9e9-dfe7-536e-ede4-bae1d63adbb7"
},
"responses": {
"200": {
"body": {
"billingProfileName": "PayByCheck01",
"billingAccountName": "Create Customer",
"tenantId": "251d3d06-c6e0-487b-bd5e-5c2e4c23d51a"
"tenantId": "251d3d06-c6e0-487b-bd5e-5c2e4c23d51a",
"BillingAccountId": "0d49b9e9-dfe7-536e-ede4-bae1d63adbb7"
}
}
}
Expand Down