Skip to content

Commit 67a91ee

Browse files
ramkd12ramkd12
authored
Billing RP Swagger changes for Indirect commerce channel (#10102)
* Changes for indirect commerce channel * Fix json syntax error * LINT failures * TargetCloud type fix * Correcting the syntax of the json file * Fixing the prettier and lint errors * Reverting Agreement related changes
1 parent ac0629c commit 67a91ee

18 files changed

+305
-21
lines changed

‎specification/billing/resource-manager/Microsoft.Billing/preview/2019-10-01-preview/billing.json‎

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6542,6 +6542,21 @@
65426542
"description": "Billing address.",
65436543
"$ref": "#/definitions/AddressDetails"
65446544
},
6545+
"billingRelationshipType": {
6546+
"description": "Identifies which services and purchases are paid by a billing profile.",
6547+
"type": "string",
6548+
"enum": [
6549+
"Direct",
6550+
"IndirectCustomer",
6551+
"IndirectPartner",
6552+
"CSPPartner"
6553+
],
6554+
"readOnly": true,
6555+
"x-ms-enum": {
6556+
"name": "BillingRelationshipType",
6557+
"modelAsString": true
6558+
}
6559+
},
65456560
"invoiceEmailOptIn": {
65466561
"description": "Flag controlling whether the invoices for the billing profile are sent through email.",
65476562
"type": "boolean"
@@ -6563,6 +6578,11 @@
65636578
"$ref": "#/definitions/AzurePlan"
65646579
}
65656580
},
6581+
"indirectRelationshipInfo": {
6582+
"description": "Identifies the billing profile that is linked to another billing profile in indirect purchase motion.",
6583+
"readOnly": true,
6584+
"$ref": "#/definitions/IndirectRelationshipInfo"
6585+
},
65666586
"invoiceSections": {
65676587
"description": "The invoice sections associated to the billing profile.",
65686588
"type": "array",
@@ -6609,6 +6629,14 @@
66096629
"name": "SpendingLimit",
66106630
"modelAsString": true
66116631
}
6632+
},
6633+
"targetClouds": {
6634+
"description": "Identifies the cloud environments that are associated with a billing profile. This is a system managed optional field and gets updated as the billing profile gets associated with accounts in various clouds.",
6635+
"type": "array",
6636+
"readOnly": true,
6637+
"items": {
6638+
"$ref": "#/definitions/TargetCloud"
6639+
}
66126640
}
66136641
}
66146642
},
@@ -6657,6 +6685,23 @@
66576685
}
66586686
}
66596687
},
6688+
"IndirectRelationshipInfo": {
6689+
"description": "The billing profile details of the partner of the customer for an indirect motion.",
6690+
"properties": {
6691+
"billingAccountName": {
6692+
"description": "The billing account name of the partner or the customer for an indirect motion.",
6693+
"type": "string"
6694+
},
6695+
"billingProfileName": {
6696+
"description": "The billing profile name of the partner or the customer for an indirect motion.",
6697+
"type": "string"
6698+
},
6699+
"displayName": {
6700+
"description": "The display name of the partner or customer for an indirect motion.",
6701+
"type": "string"
6702+
}
6703+
}
6704+
},
66606705
"InvoiceSectionCreationRequest": {
66616706
"description": "The properties of the invoice section.",
66626707
"properties": {
@@ -6706,6 +6751,24 @@
67066751
"displayName": {
67076752
"description": "The name of the invoice section.",
67086753
"type": "string"
6754+
},
6755+
"state": {
6756+
"description": "Identifies the state of an invoice section.",
6757+
"type": "string",
6758+
"enum": [
6759+
"Active",
6760+
"Restricted"
6761+
],
6762+
"readOnly": true,
6763+
"x-ms-enum": {
6764+
"name": "InvoiceSectionState",
6765+
"modelAsString": true
6766+
}
6767+
},
6768+
"targetCloud": {
6769+
"description": "Identifies the cloud environments that are associated with an invoice section. This is a system managed optional field and gets updated as the invoice section gets associated with accounts in various clouds.",
6770+
"$ref": "#/definitions/TargetCloud",
6771+
"readOnly": true
67096772
}
67106773
}
67116774
},
@@ -7541,6 +7604,19 @@
75417604
}
75427605
}
75437606
},
7607+
"TargetCloud": {
7608+
"type": "string",
7609+
"description": "Possible cloud environments.",
7610+
"enum": [
7611+
"USGov",
7612+
"USNat",
7613+
"USSec"
7614+
],
7615+
"x-ms-enum": {
7616+
"name": "targetCloud",
7617+
"modelAsString": true
7618+
}
7619+
},
75447620
"TransactionListResult": {
75457621
"description": "The list of transactions.",
75467622
"properties": {

‎specification/billing/resource-manager/Microsoft.Billing/preview/2019-10-01-preview/examples/BillingAccountWithExpand.json‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
"region": "WA",
4848
"country": "US"
4949
},
50+
"billingRelationshipType": "Direct",
5051
"currency": "USD",
5152
"enabledAzurePlans": [
5253
{
@@ -70,7 +71,8 @@
7071
"name": "invoiceSectionId1",
7172
"type": "Microsoft.Billing/billingAccounts/billingProfiles/invoiceSections",
7273
"properties": {
73-
"displayName": "invoiceSectionName1"
74+
"displayName": "invoiceSectionName1",
75+
"state": "Active"
7476
}
7577
}
7678
]
@@ -94,6 +96,7 @@
9496
"region": "WA",
9597
"country": "US"
9698
},
99+
"billingRelationshipType": "IndirectCustomer",
97100
"currency": "USD",
98101
"enabledAzurePlans": [
99102
{
@@ -105,6 +108,11 @@
105108
"skuDescription": "Microsoft Azure Standard"
106109
}
107110
],
111+
"indirectRelationshipInfo": {
112+
"billingAccountName": "30000000-0000-0000-0000-000000000001_00000000-0000-0000-0000-000000000000",
113+
"billingProfileName": "33000000-0000-0000-0000-000000000001",
114+
"displayName": "Partner1"
115+
},
108116
"invoiceDay": 5,
109117
"invoiceEmailOptIn": true,
110118
"poNumber": "ABC12345",
@@ -116,7 +124,8 @@
116124
"name": "invoiceSectionId2",
117125
"type": "Microsoft.Billing/billingAccounts/billingProfiles/invoiceSections",
118126
"properties": {
119-
"displayName": "invoiceSectionName2"
127+
"displayName": "invoiceSectionName2",
128+
"state": "Active"
120129
}
121130
}
122131
]

‎specification/billing/resource-manager/Microsoft.Billing/preview/2019-10-01-preview/examples/BillingAccountsListWithExpand.json‎

Lines changed: 38 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
"region": "WA",
4949
"country": "US"
5050
},
51+
"billingRelationshipType": "Direct",
5152
"currency": "USD",
5253
"enabledAzurePlans": [
5354
{
@@ -71,15 +72,17 @@
7172
"name": "invoiceSectionId1",
7273
"type": "Microsoft.Billing/billingAccounts/billingProfiles/invoiceSections",
7374
"properties": {
74-
"displayName": "invoiceSectionName1"
75+
"displayName": "invoiceSectionName1",
76+
"state": "Active"
7577
}
7678
},
7779
{
7880
"id": "/providers/Microsoft.Billing/billingAccounts/00000000-0000-0000-0000-000000000000_00000000-0000-0000-0000-000000000000/billingProfiles/11000000-0000-0000-0000-000000000000/invoiceSections/invoiceSectionId2",
7981
"name": "invoiceSectionId2",
8082
"type": "Microsoft.Billing/billingAccounts/billingProfiles/invoiceSections",
8183
"properties": {
82-
"displayName": "invoiceSectionName2"
84+
"displayName": "invoiceSectionName2",
85+
"state": "Active"
8386
}
8487
}
8588
]
@@ -103,6 +106,7 @@
103106
"region": "WA",
104107
"country": "US"
105108
},
109+
"billingRelationshipType": "CSPPartner",
106110
"currency": "USD",
107111
"enabledAzurePlans": [
108112
{
@@ -125,7 +129,8 @@
125129
"name": "invoiceSectionId11",
126130
"type": "Microsoft.Billing/billingAccounts/billingProfiles/invoiceSections",
127131
"properties": {
128-
"displayName": "invoiceSectionName11"
132+
"displayName": "invoiceSectionName11",
133+
"state": "Active"
129134
}
130135
}
131136
]
@@ -164,6 +169,7 @@
164169
"region": "WA",
165170
"country": "US"
166171
},
172+
"billingRelationshipType": "IndirectPartner",
167173
"currency": "USD",
168174
"enabledAzurePlans": [
169175
{
@@ -175,27 +181,40 @@
175181
"skuDescription": "Microsoft Azure Standard"
176182
}
177183
],
184+
"indirectRelationshipInfo": {
185+
"billingAccountName": "20000000-0000-0000-0000-000000000001_00000000-0000-0000-0000-000000000000",
186+
"billingProfileName": "22000000-0000-0000-0000-000000000001",
187+
"displayName": "Customer1"
188+
},
178189
"invoiceDay": 5,
179190
"invoiceEmailOptIn": true,
180191
"poNumber": "ABC12345",
181192
"status": "Warned",
182193
"statusReasonCode": "PastDue",
183194
"spendingLimit": "On",
195+
"targetClouds": [
196+
"USNat",
197+
"USSec"
198+
],
184199
"invoiceSections": [
185200
{
186201
"id": "/providers/Microsoft.Billing/billingAccounts/10000000-0000-0000-0000-000000000001_00000000-0000-0000-0000-000000000000/billingProfiles/11000000-0000-0000-0000-000000000004/invoiceSections/invoiceSectionId3",
187202
"name": "invoiceSectionId3",
188203
"type": "Microsoft.Billing/billingAccounts/billingProfiles/invoiceSections",
189204
"properties": {
190-
"displayName": "invoiceSectionName3"
205+
"displayName": "invoiceSectionName3",
206+
"state": "Restricted",
207+
"targetCloud": "USNat"
191208
}
192209
},
193210
{
194211
"id": "/providers/Microsoft.Billing/billingAccounts/10000000-0000-0000-0000-000000000001_00000000-0000-0000-0000-000000000000/billingProfiles/11000000-0000-0000-0000-000000000004/invoiceSections/invoiceSectionId4",
195212
"name": "invoiceSectionId4",
196213
"type": "Microsoft.Billing/billingAccounts/billingProfiles/invoiceSections",
197214
"properties": {
198-
"displayName": "invoiceSectionName4"
215+
"displayName": "invoiceSectionName4",
216+
"state": "Restricted",
217+
"targetCloud": "USSec"
199218
}
200219
}
201220
]
@@ -219,6 +238,7 @@
219238
"region": "WA",
220239
"country": "US"
221240
},
241+
"billingRelationshipType": "IndirectCustomer",
222242
"currency": "USD",
223243
"enabledAzurePlans": [
224244
{
@@ -230,27 +250,38 @@
230250
"skuDescription": "Microsoft Azure Standard"
231251
}
232252
],
253+
"indirectRelationshipInfo": {
254+
"billingAccountName": "30000000-0000-0000-0000-000000000001_00000000-0000-0000-0000-000000000000",
255+
"billingProfileName": "33000000-0000-0000-0000-000000000001",
256+
"displayName": "Partner1"
257+
},
233258
"invoiceDay": 5,
234259
"invoiceEmailOptIn": true,
235260
"poNumber": "ABC12345",
236261
"status": "Warned",
237262
"statusReasonCode": "PastDue",
238263
"spendingLimit": "On",
264+
"targetClouds": [
265+
"USSec"
266+
],
239267
"invoiceSections": [
240268
{
241269
"id": "/providers/Microsoft.Billing/billingAccounts/10000000-0000-0000-0000-000000000001_00000000-0000-0000-0000-000000000000/billingProfiles/11000000-0000-0000-0000-000000000005/invoiceSections/invoiceSectionId5",
242270
"name": "invoiceSectionId5",
243271
"type": "Microsoft.Billing/billingAccounts/billingProfiles/invoiceSections",
244272
"properties": {
245-
"displayName": "invoiceSectionName5"
273+
"displayName": "invoiceSectionName5",
274+
"state": "Active"
246275
}
247276
},
248277
{
249278
"id": "/providers/Microsoft.Billing/billingAccounts/10000000-0000-0000-0000-000000000001_00000000-0000-0000-0000-000000000000/billingProfiles/11000000-0000-0000-0000-000000000005/invoiceSections/invoiceSectionId6",
250279
"name": "invoiceSectionId6",
251280
"type": "Microsoft.Billing/billingAccounts/billingProfiles/invoiceSections",
252281
"properties": {
253-
"displayName": "invoiceSectionName6"
282+
"displayName": "invoiceSectionName6",
283+
"state": "Restricted",
284+
"targetCloud": "USSec"
254285
}
255286
}
256287
]

‎specification/billing/resource-manager/Microsoft.Billing/preview/2019-10-01-preview/examples/BillingProfile.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
"region": "WA",
2525
"country": "US"
2626
},
27+
"billingRelationshipType": "Direct",
2728
"currency": "USD",
2829
"enabledAzurePlans": [
2930
{

‎specification/billing/resource-manager/Microsoft.Billing/preview/2019-10-01-preview/examples/BillingProfileWithExpand.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
"region": "WA",
2525
"country": "US"
2626
},
27+
"billingRelationshipType": "Direct",
2728
"currency": "USD",
2829
"enabledAzurePlans": [
2930
{
@@ -47,7 +48,8 @@
4748
"name": "invoiceSectionId1",
4849
"type": "Microsoft.Billing/billingAccounts/billingProfiles/invoiceSections",
4950
"properties": {
50-
"displayName": "invoiceSectionName1"
51+
"displayName": "invoiceSectionName1",
52+
"state": "Active"
5153
}
5254
}
5355
]

‎specification/billing/resource-manager/Microsoft.Billing/preview/2019-10-01-preview/examples/BillingProfilesListByBillingAccount.json‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
"region": "WA",
2626
"country": "US"
2727
},
28+
"billingRelationshipType": "Direct",
2829
"currency": "USD",
2930
"enabledAzurePlans": [
3031
{
@@ -62,6 +63,7 @@
6263
"region": "WA",
6364
"country": "US"
6465
},
66+
"billingRelationshipType": "IndirectCustomer",
6567
"currency": "USD",
6668
"enabledAzurePlans": [
6769
{
@@ -73,11 +75,17 @@
7375
"skuDescription": "Microsoft Azure Standard"
7476
}
7577
],
78+
"indirectRelationshipInfo": {
79+
"billingAccountName": "30000000-0000-0000-0000-000000000001_00000000-0000-0000-0000-000000000000",
80+
"billingProfileName": "33000000-0000-0000-0000-000000000001",
81+
"displayName": "Partner1"
82+
},
7683
"invoiceDay": 5,
7784
"invoiceEmailOptIn": true,
7885
"poNumber": "ABC12345",
7986
"status": "Active",
80-
"spendingLimit": "Off"
87+
"spendingLimit": "Off",
88+
"targetClouds": []
8189
}
8290
}
8391
]

0 commit comments

Comments
 (0)