Skip to content

Commit

Permalink
Merge pull request #4 from jbuls/jbuls/ga20211001
Browse files Browse the repository at this point in the history 
Billing subscription changes for GA 2021-10-01
  • Loading branch information
@jbuls
jbuls authored Oct 27, 2021
2 parents 2325a1d + 6091b9b commit 71d2153
Show file tree
Hide file tree
Showing 19 changed files with 1,545 additions and 738 deletions.
1,139 changes: 796 additions & 343 deletions ...ion/billing/resource-manager/Microsoft.Billing/stable/2021-10-01/billingSubscription.json
View file

Large diffs are not rendered by default.

36 changes: 22 additions & 14 deletions ...ng/resource-manager/Microsoft.Billing/stable/2021-10-01/examples/BillingSubscription.json
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,25 @@
{
"parameters": {
"api-version": "2020-05-01",
"api-version": "2021-10-01",
"billingAccountName": "{billingAccountName}",
"subscriptionId": "{subscriptionId}"
"billingSubscriptionName": "418b0e9c-5dc3-4260-918f-30b90619fe07"
},
"responses": {
"200": {
"body": {
"id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/billingSubscriptions/{subscriptionId}",
"name": "{subscriptionId}",
"id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/billingSubscriptions/418b0e9c-5dc3-4260-918f-30b90619fe07",
"name": "418b0e9c-5dc3-4260-918f-30b90619fe07",
"type": "Microsoft.Billing/billingAccounts/billingSubscriptions",
"properties": {
"displayName": "My Subscription",
"subscriptionId": "6b96d3f2-9008-4a9d-912f-f87744185aa3",
"subscriptionBillingStatus": "Active",
"autoRenew": "Off",
"billingFrequency": "P1M",
"billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/2b72f936-0166-47d6-91a3-ef9f84f36664",
"billingProfileDisplayName": "Contoso operations billing profile",
"billingProfileName": "2b72f936-0166-47d6-91a3-ef9f84f36664",
"displayName": "Subscription 1",
"invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/2b72f936-0166-47d6-91a3-ef9f84f36664/invoiceSections/5c562559-e31b-4bfe-b608-f8b5b3fbd073",
"invoiceSectionDisplayName": "Contoso operations invoice section",
"invoiceSectionName": "5c562559-e31b-4bfe-b608-f8b5b3fbd073",
"lastMonthCharges": {
"currency": "USD",
"value": 5000.00
Expand All @@ -22,15 +28,17 @@
"currency": "USD",
"value": 600
},
"invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000/invoiceSections/22000000-0000-0000-0000-000000000000",
"invoiceSectionDisplayName": "Contoso operations invoiceSection",
"billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000",
"billingProfileDisplayName": "Contoso operations billing",
"costCenter": "ABC1234",
"productCategory": "UsageBased",
"productType": "Usage based",
"productTypeId": "DZH318Z0BPS6",
"purchaseDate": "2021-10-01T00:00:00Z",
"quantity": 1,
"skuId": "0001",
"skuDescription": "Microsoft Azure Plan"
"skuDescription": "Microsoft Azure Plan",
"status": "Active",
"subscriptionId": "6b96d3f2-9008-4a9d-912f-f87744185aa3"
}
}
}
}
}
}
45 changes: 45 additions & 0 deletions ...source-manager/Microsoft.Billing/stable/2021-10-01/examples/BillingSubscriptionAlias.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
{
"parameters": {
"api-version": "2021-10-01",
"billingAccountName": "{billingAccountName}",
"billingSubscriptionAliasName": "c356b7c7-7545-4686-b843-c1a49cf853fc"
},
"responses": {
"200": {
"body": {
"id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/billingSubscriptions/aliases/c356b7c7-7545-4686-b843-c1a49cf853fc",
"name": "c356b7c7-7545-4686-b843-c1a49cf853fc",
"type": "Microsoft.Billing/billingAccounts/billingSubscriptions/aliases",
"properties": {
"autoRenew": "Off",
"billingFrequency": "P1M",
"billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/2b72f936-0166-47d6-91a3-ef9f84f36664",
"billingProfileDisplayName": "Contoso operations billing profile",
"billingProfileName": "2b72f936-0166-47d6-91a3-ef9f84f36664",
"billingSubscriptionId": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/billingSubscriptions/418b0e9c-5dc3-4260-918f-30b90619fe07",
"displayName": "Subscription 1",
"invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/2b72f936-0166-47d6-91a3-ef9f84f36664/invoiceSections/5c562559-e31b-4bfe-b608-f8b5b3fbd073",
"invoiceSectionDisplayName": "Contoso operations invoice section",
"invoiceSectionName": "5c562559-e31b-4bfe-b608-f8b5b3fbd073",
"lastMonthCharges": {
"currency": "USD",
"value": 5000.00
},
"monthToDateCharges": {
"currency": "USD",
"value": 600
},
"productCategory": "UsageBased",
"productType": "Usage based",
"productTypeId": "DZH318Z0BPS6",
"purchaseDate": "2021-10-01T00:00:00Z",
"quantity": 1,
"skuId": "0001",
"skuDescription": "Microsoft Azure Plan",
"status": "Active",
"subscriptionId": "6b96d3f2-9008-4a9d-912f-f87744185aa3"
}
}
}
}
}
118 changes: 118 additions & 0 deletions ...soft.Billing/stable/2021-10-01/examples/BillingSubscriptionAliasListByBillingAccount.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
{
"parameters": {
"api-version": "2021-10-01",
"billingAccountName": "{billingAccountName}"
},
"responses": {
"200": {
"body": {
"value": [
{
"id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/billingSubscriptions/aliases/c356b7c7-7545-4686-b843-c1a49cf853fc",
"name": "c356b7c7-7545-4686-b843-c1a49cf853fc",
"type": "Microsoft.Billing/billingAccounts/billingProfiles/invoiceSections/billingSubscriptions/aliases",
"properties": {
"autoRenew": "Off",
"billingFrequency": "P1M",
"billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/2b72f936-0166-47d6-91a3-ef9f84f36664",
"billingProfileDisplayName": "Contoso operations billing profile",
"billingProfileName": "2b72f936-0166-47d6-91a3-ef9f84f36664",
"billingSubscriptionId": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/billingSubscriptions/418b0e9c-5dc3-4260-918f-30b90619fe07",
"displayName": "Subscription 1",
"invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/2b72f936-0166-47d6-91a3-ef9f84f36664/invoiceSections/5c562559-e31b-4bfe-b608-f8b5b3fbd073",
"invoiceSectionDisplayName": "Contoso operations invoice section",
"invoiceSectionName": "5c562559-e31b-4bfe-b608-f8b5b3fbd073",
"lastMonthCharges": {
"currency": "USD",
"value": 5000.00
},
"monthToDateCharges": {
"currency": "USD",
"value": 600
},
"productCategory": "UsageBased",
"productType": "Usage Based",
"productTypeId": "DZH318Z0BPS6",
"purchaseDate": "2021-10-01T00:00:00Z",
"quantity": 1,
"skuId": "0001",
"skuDescription": "Microsoft Azure Plan",
"status": "Active",
"subscriptionId": "6b96d3f2-9008-4a9d-912f-f87744185aa3"
}
},
{
"id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/billingSubscriptions/aliases/ec16a54e-e8ad-4c14-8e87-e30e75fa800e",
"name": "ec16a54e-e8ad-4c14-8e87-e30e75fa800e",
"type": "Microsoft.Billing/billingAccounts/billingProfiles/invoiceSections/billingSubscriptions/aliases",
"properties": {
"autoRenew": "Off",
"billingFrequency": "P1M",
"billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/2b72f936-0166-47d6-91a3-ef9f84f36664",
"billingProfileDisplayName": "Contoso operations billing profile",
"billingProfileName": "2b72f936-0166-47d6-91a3-ef9f84f36664",
"billingSubscriptionId": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/billingSubscriptions/9e030ae5-51ed-4e02-8e17-d51b3aa55980",
"displayName": "Subscription 2",
"invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/2b72f936-0166-47d6-91a3-ef9f84f36664/invoiceSections/5c562559-e31b-4bfe-b608-f8b5b3fbd073",
"invoiceSectionDisplayName": "Contoso operations invoice section",
"invoiceSectionName": "5c562559-e31b-4bfe-b608-f8b5b3fbd073",
"lastMonthCharges": {
"currency": "USD",
"value": 1000.00
},
"monthToDateCharges": {
"currency": "USD",
"value": 400
},
"productCategory": "UsageBased",
"productType": "Usage based",
"productTypeId": "DZH318Z0BPS6",
"purchaseDate": "2021-10-01T00:00:00Z",
"quantity": 1,
"skuId": "0001",
"skuDescription": "Microsoft Azure Plan",
"status": "Active",
"subscriptionId": "6b96d3f2-9008-4a9d-912f-6b96d3f2"
}
},
{
"id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/billingSubscriptions/aliases/2ee97fe0-efca-4960-a9af-98a30c2c497c",
"name": "2ee97fe0-efca-4960-a9af-98a30c2c497c",
"type": "Microsoft.Billing/billingAccounts/billingProfiles/invoiceSections/billingSubscriptions/aliases",
"properties": {
"autoRenew": "Off",
"billingFrequency": "P1M",
"billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/2b72f936-0166-47d6-91a3-ef9f84f36664",
"billingProfileDisplayName": "Contoso operations billing profile",
"billingProfileName": "2b72f936-0166-47d6-91a3-ef9f84f36664",
"billingSubscriptionId": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/billingSubscriptions/7f271b5e-a89e-45cc-8fa5-cd5c643f8b5e",
"displayName": "Subscription 3",
"invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/2b72f936-0166-47d6-91a3-ef9f84f36664/invoiceSections/5c562559-e31b-4bfe-b608-f8b5b3fbd0730",
"invoiceSectionDisplayName": "Contoso operations invoice section",
"invoiceSectionName": "5c562559-e31b-4bfe-b608-f8b5b3fbd073",
"lastMonthCharges": {
"currency": "USD",
"value": 6000.00
},
"monthToDateCharges": {
"currency": "USD",
"value": 900
},
"productCategory": "SeatBased",
"productType": "Microsoft 365 Business Standard",
"productTypeId": "CFQ7TTC0LDPB",
"purchaseDate": "2021-08-01T00:12:49.7261677+00:00",
"quantity": 4,
"skuId": "0001",
"skuDescription": "Microsoft 365 Business Standard",
"status": "Active",
"termDuration": "P1Y",
"termStartDate": "2021-10-01T00:00:00Z",
"termEndDate": "2022-09-30T00:00:00Z"
}
}
]
}
}
}
}
Loading

0 comments on commit 71d2153

Please sign in to comment.