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

Added new api versions for PriceSheet and UsageDetail #3187

Merged
merged 2 commits into from
Jun 11, 2018
Merged

Added new api versions for PriceSheet and UsageDetail #3187

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f5512a
Added new api versions for PriceSheet and UsageDetail
kc786 Jun 6, 2018
900a527
consolidating the operation groups based on code review.
kc786 Jun 6, 2018
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
1,166 changes: 1,164 additions & 2 deletions ...ion/consumption/resource-manager/Microsoft.Consumption/stable/2018-05-31/consumption.json
View file
Open in desktop

Large diffs are not rendered by default.

34 changes: 34 additions & 0 deletions ...umption/resource-manager/Microsoft.Consumption/stable/2018-05-31/examples/PriceSheet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"parameters":
{
"api-version": "2018-05-31",
"subscriptionId": "00000000-0000-0000-0000-000000000000"
},
"responses":
{
"200":
{
"body":
{
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Consumption/pricesheets/default",
"name": "default",
"type": "Microsoft.Consumption/pricesheets",
"properties":
{
"nextLink": "https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/microsoft.consumption/pricesheets/default?api-version=2018-01-31&$skiptoken=AQAAAA%3D%3D",
"pricesheets": [
{
"billingPeriodId": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/201702",
"meterId": "00000000-0000-0000-0000-000000000000",
"unitOfMeasure": "100 Hours",
"includedQuantity": 100,
"partNumber": "XX-11110",
"unitPrice": 0.00328,
"currencyCode": "EUR",
"offerId":"OfferId 1"
}]
}
}
}
}
}
45 changes: 45 additions & 0 deletions ...n/resource-manager/Microsoft.Consumption/stable/2018-05-31/examples/PriceSheetExpand.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
{
"parameters":
{
"api-version": "2018-05-31",
"subscriptionId": "00000000-0000-0000-0000-000000000000",
"billingPeriodName": "201801",
"$expand": "meterDetails"
},
"responses":
{
"200":
{
"body":
{
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/pricesheets/default",
"name": "default",
"type": "Microsoft.Consumption/pricesheets",
"properties":
{
"nextLink": "https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/microsoft.consumption/pricesheets/default?api-version=2018-01-31&$skiptoken=AQAAAA%3D%3D&$expand=properties/pricesheets/meterDetails",
"pricesheets": [
{
"billingPeriodId": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/201702",
"meterId": "00000000-0000-0000-0000-000000000000",
"unitOfMeasure": "100 Hours",
"includedQuantity": 100,
"partNumber": "XX-11110",
"unitPrice": 0.00328,
"currencyCode": "EUR",
"offerId":"OfferId 1",
"meterDetails":
{
"meterName": "Data Transfer Out (GB)",
"meterCategory": "Networking",
"unit": "GB",
"meterLocation": "Zone 2",
"totalIncludedQuantity": 0,
"pretaxStandardRate": 0.138
}
}]
}
}
}
}
}
35 changes: 35 additions & 0 deletions ...-manager/Microsoft.Consumption/stable/2018-05-31/examples/PriceSheetForBillingPeriod.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"parameters":
{
"api-version": "2018-05-31",
"subscriptionId": "00000000-0000-0000-0000-000000000000",
"billingPeriodName": "201801"
},
"responses":
{
"200":
{
"body":
{
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/pricesheets/default",
"name": "default",
"type": "Microsoft.Consumption/pricesheets",
"properties":
{
"nextLink": "https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/201702/providers/microsoft.consumption/pricesheets/default?api-version=2018-01-31",
"pricesheets": [
{
"billingPeriodId": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/201702",
"meterId": "00000000-0000-0000-0000-000000000000",
"unitOfMeasure": "100 Hours",
"includedQuantity": 100,
"partNumber": "XX-11110",
"unitPrice": 0.00328,
"currencyCode": "EUR",
"offerId":"OfferId 1"
}]
}
}
}
}
}
62 changes: 62 additions & 0 deletions ...resource-manager/Microsoft.Consumption/stable/2018-05-31/examples/UsageDetailsExpand.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
{
"parameters": {
"api-version": "2018-05-31",
"subscriptionId": "00000000-0000-0000-0000-000000000000",
"billingPeriodName": "201702",
"$expand": "meterDetails,additionalProperties",
"$filter": "properties/usageEnd ge '2018-01-14' AND properties/usageEnd le '2018-02-14' AND tags eq 'dev:tools'",
"$top": 1
},
"responses": {
"200": {
"body": {
"value": [
{
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/usageDetails/usageDetailsId1",
"name": "usageDetailsId1",
"type": "Microsoft.Consumption/usageDetails",
"tags": {
"env": "newcrp",
"dev": "tools"
},
"properties": {
"billingPeriodId": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/201702",
"invoiceId": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/invoices/201703-123456789",
"usageStart": "2017-02-13T00:00:00Z",
"usageEnd": "2017-02-13T23:59:59Z",
"instanceName": "shared1",
"instanceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/Default-Web-eastasia/providers/Microsoft.Web/sites/shared1",
"instanceLocation": "eastasia",
"currency": "USD",
"usageQuantity": 0.00328,
"billableQuantity": 0.00328,
"pretaxCost": 0.67,
"isEstimated": false,
"meterId": "00000000-0000-0000-0000-000000000000",
"meterDetails": {
"meterName": "Data Transfer Out (GB)",
"meterCategory": "Networking",
"unit": "GB",
"meterLocation": "Zone 2",
"totalIncludedQuantity": 0,
"pretaxStandardRate": 0.138
},
"subscriptionGuid": "00000000-0000-0000-0000-000000000000",
"subscriptionName": "Dummy subscription",
"accountName": "My account name",
"departmentName": "My department name",
"product": "My product name",
"consumedService": "My consumed service",
"costCenter": "Cost center 1",
"partNumber":"Part Number 1",
"resourceGuid":"00000000-0000-0000-0000-000000000000",
"offerId":"Offer Id 1",
"chargesBilledSeparately":true,
"additionalProperties": "{\"MyType\":\"\",\"ServiceType\":\"\",\"VMName\":\"\",\"UsageType\":\"MyUsage\"}"
}
}
]
}
}
}
}
42 changes: 42 additions & 0 deletions ...n/resource-manager/Microsoft.Consumption/stable/2018-05-31/examples/UsageDetailsList.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
{
"parameters": {
"api-version": "2018-05-31",
"subscriptionId": "00000000-0000-0000-0000-000000000000"
},
"responses": {
"200": {
"body": {
"value": [
{
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Consumption/usageDetails/usageDetailsId1",
"name": "usageDetailsId1",
"type": "Microsoft.Consumption/usageDetails",
"tags": {
"env": "newcrp",
"dev": "tools"
},
"properties": {
"billingPeriodId": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/201702",
"invoiceId": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/invoices/201703-123456789",
"usageStart": "2017-02-13T00:00:00Z",
"usageEnd": "2017-02-13T23:59:59Z",
"instanceName": "shared1",
"instanceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/Default-Web-eastasia/providers/Microsoft.Web/sites/shared1",
"instanceLocation": "eastasia",
"currency": "USD",
"usageQuantity": 0.00328,
"billableQuantity": 0.00328,
"pretaxCost": 0.67,
"isEstimated": false,
"meterId": "00000000-0000-0000-0000-000000000000",
"partNumber":"Part Number 1",
"resourceGuid":"00000000-0000-0000-0000-000000000000",
"offerId":"Offer Id 1",
"chargesBilledSeparately":true
}
}
]
}
}
}
}
44 changes: 44 additions & 0 deletions ...er/Microsoft.Consumption/stable/2018-05-31/examples/UsageDetailsListByBillingAccount.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
{
"parameters": {
"api-version": "2018-05-31",
"billingAccountId": "1234"
},
"responses": {
"200": {
"body": {
"value": [
{
"id":
"/providers/Microsoft.Billing/BillingAccounts/1234/providers/Microsoft.Consumption/usageDetails/usageDetailsId1",
"name": "usageDetailsId1",
"type": "Microsoft.Consumption/usageDetails",
"tags": {
"env": "newcrp",
"dev": "tools"
},
"properties": {
"billingPeriodId":
"/providers/Microsoft.Billing/BillingAccounts/1234/providers/Microsoft.Billing/billingPeriods/201702",
"invoiceId": "/providers/Microsoft.Billing/BillingAccounts/1234/providers/Microsoft.Billing/invoices/201703-123456789",
"usageStart": "2017-02-13T00:00:00Z",
"usageEnd": "2017-02-13T23:59:59Z",
"instanceName": "shared1",
"instanceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/Default-Web-eastasia/providers/Microsoft.Web/sites/shared1",
"instanceLocation": "eastasia",
"currency": "USD",
"usageQuantity": 0.00328,
"billableQuantity": 0.00328,
"pretaxCost": 0.67,
"isEstimated": false,
"meterId": "00000000-0000-0000-0000-000000000000",
"partNumber":"Part Number 1",
"resourceGuid":"00000000-0000-0000-0000-000000000000",
"offerId":"Offer Id 1",
"chargesBilledSeparately":true
}
}
]
}
}
}
}
44 changes: 44 additions & 0 deletions ...anager/Microsoft.Consumption/stable/2018-05-31/examples/UsageDetailsListByDepartment.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
{
"parameters": {
"api-version": "2018-05-31",
"departmentId": "1234"
},
"responses": {
"200": {
"body": {
"value": [
{
"id":
"/providers/Microsoft.Billing/Departments/1234/providers/Microsoft.Consumption/usageDetails/usageDetailsId1",
"name": "usageDetailsId1",
"type": "Microsoft.Consumption/usageDetails",
"tags": {
"env": "newcrp",
"dev": "tools"
},
"properties": {
"billingPeriodId":
"/providers/Microsoft.Billing/Departments/1234/providers/Microsoft.Billing/billingPeriods/201702",
"invoiceId": "/providers/Microsoft.Billing/Departments/1234/providers/Microsoft.Billing/invoices/201703-123456789",
"usageStart": "2017-02-13T00:00:00Z",
"usageEnd": "2017-02-13T23:59:59Z",
"instanceName": "shared1",
"instanceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/Default-Web-eastasia/providers/Microsoft.Web/sites/shared1",
"instanceLocation": "eastasia",
"currency": "USD",
"usageQuantity": 0.00328,
"billableQuantity": 0.00328,
"pretaxCost": 0.67,
"isEstimated": false,
"meterId": "00000000-0000-0000-0000-000000000000",
"partNumber":"Part Number 1",
"resourceGuid":"00000000-0000-0000-0000-000000000000",
"offerId":"Offer Id 1",
"chargesBilledSeparately":true
}
}
]
}
}
}
}
44 changes: 44 additions & 0 deletions ...Microsoft.Consumption/stable/2018-05-31/examples/UsageDetailsListByEnrollmentAccount.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
{
"parameters": {
"api-version": "2018-05-31",
"enrollmentAccountId": "1234"
},
"responses": {
"200": {
"body": {
"value": [
{
"id":
"/providers/Microsoft.Billing/EnrollmentAccounts/1234/providers/Microsoft.Consumption/usageDetails/usageDetailsId1",
"name": "usageDetailsId1",
"type": "Microsoft.Consumption/usageDetails",
"tags": {
"env": "newcrp",
"dev": "tools"
},
"properties": {
"billingPeriodId":
"/providers/Microsoft.Billing/EnrollmentAccounts/1234/providers/Microsoft.Billing/billingPeriods/201702",
"invoiceId": "/providers/Microsoft.Billing/EnrollmentAccounts/1234/providers/Microsoft.Billing/invoices/201703-123456789",
"usageStart": "2017-02-13T00:00:00Z",
"usageEnd": "2017-02-13T23:59:59Z",
"instanceName": "shared1",
"instanceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/Default-Web-eastasia/providers/Microsoft.Web/sites/shared1",
"instanceLocation": "eastasia",
"currency": "USD",
"usageQuantity": 0.00328,
"billableQuantity": 0.00328,
"pretaxCost": 0.67,
"isEstimated": false,
"meterId": "00000000-0000-0000-0000-000000000000",
"partNumber":"Part Number 1",
"resourceGuid":"00000000-0000-0000-0000-000000000000",
"offerId":"Offer Id 1",
"chargesBilledSeparately":true
}
}
]
}
}
}
}
Loading