Skip to content

Billing RP Swagger changes for Indirect commerce channel #10102

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

Merged
merged 7 commits into from
Jul 21, 2020
Merged

Billing RP Swagger changes for Indirect commerce channel #10102

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
19e79e1
Changes for indirect commerce channel
ramkd12 Jul 12, 2020
bd384f5
Fix json syntax error
ramkd12 Jul 12, 2020
e2aba04
LINT failures
ramkd12 Jul 12, 2020
5695f4c
TargetCloud type fix
ramkd12 Jul 12, 2020
77b456d
Correcting the syntax of the json file
ramkd12 Jul 13, 2020
2537da9
Fixing the prettier and lint errors
ramkd12 Jul 14, 2020
0b47ad4
Reverting Agreement related changes
ramkd12 Jul 20, 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
98 changes: 98 additions & 0 deletions ...cation/billing/resource-manager/Microsoft.Billing/preview/2019-10-01-preview/billing.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6542,6 +6542,21 @@
"description": "Billing address.",
"$ref": "#/definitions/AddressDetails"
},
"billingRelationshipType": {
"description": "Identifies which services and purchases are paid by a billing profile.",
"type": "string",
"enum": [
"Direct",
"IndirectCustomer",
"IndirectPartner",
"CSPPartner"
],
"readOnly": true,
"x-ms-enum": {
"name": "BillingRelationshipType",
"modelAsString": true
}
},
"invoiceEmailOptIn": {
"description": "Flag controlling whether the invoices for the billing profile are sent through email.",
"type": "boolean"
Expand All @@ -6563,6 +6578,11 @@
"$ref": "#/definitions/AzurePlan"
}
},
"indirectRelationshipInfo": {
"description": "Identifies the billing profile that is linked to another billing profile in indirect purchase motion.",
"readOnly": true,
"$ref": "#/definitions/IndirectRelationshipInfo"
},
"invoiceSections": {
"description": "The invoice sections associated to the billing profile.",
"type": "array",
Expand Down Expand Up @@ -6609,6 +6629,14 @@
"name": "SpendingLimit",
"modelAsString": true
}
},
"targetClouds": {
"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.",
"type": "array",
"readOnly": true,
"items": {
"$ref": "#/definitions/TargetCloud"
}
}
}
},
Expand Down Expand Up @@ -6657,6 +6685,23 @@
}
}
},
"IndirectRelationshipInfo": {
"description": "The billing profile details of the partner of the customer for an indirect motion.",
"properties": {
"billingAccountName": {
"description": "The billing account name of the partner or the customer for an indirect motion.",
"type": "string"
},
"billingProfileName": {
"description": "The billing profile name of the partner or the customer for an indirect motion.",
"type": "string"
},
"displayName": {
"description": "The display name of the partner or customer for an indirect motion.",
"type": "string"
}
}
},
"InvoiceSectionCreationRequest": {
"description": "The properties of the invoice section.",
"properties": {
Expand Down Expand Up @@ -6706,6 +6751,24 @@
"displayName": {
"description": "The name of the invoice section.",
"type": "string"
},
"state": {
"description": "Identifies the state of an invoice section.",
"type": "string",
"enum": [
"Active",
"Restricted"
],
"readOnly": true,
"x-ms-enum": {
"name": "InvoiceSectionState",
"modelAsString": true
}
},
"targetCloud": {
"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.",
"$ref": "#/definitions/TargetCloud",
"readOnly": true
}
}
},
Expand Down Expand Up @@ -7541,6 +7604,19 @@
}
}
},
"TargetCloud": {
"type": "string",
"description": "Possible cloud environments.",
"enum": [
"USGov",
"USNat",
"USSec"
],
"x-ms-enum": {
"name": "targetCloud",
"modelAsString": true
}
},
"TransactionListResult": {
"description": "The list of transactions.",
"properties": {
Expand Down Expand Up @@ -8271,6 +8347,11 @@
"type": "string",
"readOnly": true
},
"billingProfileInfo": {
"description": "The billing profile details of the agreement for an indirect motion.",
"readOnly": true,
"$ref": "#/definitions/BillingProfileInfo"
},
"category": {
"type": "string",
"description": "The category of the agreement signed by a customer.",
Expand Down Expand Up @@ -8325,6 +8406,23 @@
}
}
},
"BillingProfileInfo": {
"description": "The billing profile details of the agreement for an indirect motion.",
"properties": {
"billingProfileId": {
"description": "The billing profile id partner or the customer for an indirect motion.",
"type": "string"
},
"billingProfileDisplayName": {
"description": "The billing profile name of the partner or the customer for an indirect motion.",
"type": "string"
},
"indirectRelationshipOrganizationName": {
"description": "The display name of the partner or customer for an indirect motion.",
"type": "string"
}
}
},
"ValidateTransferListResponse": {
"description": "Result of transfer validation.",
"properties": {
Expand Down
30 changes: 30 additions & 0 deletions ...Microsoft.Billing/preview/2019-10-01-preview/examples/AgreementsListByBillingAccount.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,36 @@
],
"status": "PendingSignature"
}
},
{
"id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/agreements/Agreement3",
"name": "Agreement3",
"type": "Microsoft.Billing/billingAccounts/agreements",
"properties": {
"agreementLink": "https://agreementuri3.com",
"billingProfileInfo": {
"billingProfileId": "33000000-0000-0000-0000-000000000001",
"billingProfileDisplayName": "Contoso Inc.",
"indirectRelationshipOrganizationName": "Partner Inc."
},
"category": "FedGovIndirect",
"acceptanceMode": "Offline",
"effectiveDate": "2018-12-05T00:00:00Z",
"expirationDate": "2019-12-05T00:00:00Z",
"participants": [
{
"status": "Accepted",
"statusDate": "2018-11-01T00:00:00Z",
"email": "[email protected]"
},
{
"status": "Declined",
"statusDate": "2018-11-02T00:00:00Z",
"email": "[email protected]"
}
],
"status": "Published"
}
}
]
}
Expand Down
13 changes: 11 additions & 2 deletions ...nager/Microsoft.Billing/preview/2019-10-01-preview/examples/BillingAccountWithExpand.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
"region": "WA",
"country": "US"
},
"billingRelationshipType": "Direct",
"currency": "USD",
"enabledAzurePlans": [
{
Expand All @@ -70,7 +71,8 @@
"name": "invoiceSectionId1",
"type": "Microsoft.Billing/billingAccounts/billingProfiles/invoiceSections",
"properties": {
"displayName": "invoiceSectionName1"
"displayName": "invoiceSectionName1",
"state": "Active"
}
}
]
Expand All @@ -94,6 +96,7 @@
"region": "WA",
"country": "US"
},
"billingRelationshipType": "IndirectCustomer",
"currency": "USD",
"enabledAzurePlans": [
{
Expand All @@ -105,6 +108,11 @@
"skuDescription": "Microsoft Azure Standard"
}
],
"indirectRelationshipInfo": {
"billingAccountName": "30000000-0000-0000-0000-000000000001_00000000-0000-0000-0000-000000000000",
"billingProfileName": "33000000-0000-0000-0000-000000000001",
"displayName": "Partner1"
},
"invoiceDay": 5,
"invoiceEmailOptIn": true,
"poNumber": "ABC12345",
Expand All @@ -116,7 +124,8 @@
"name": "invoiceSectionId2",
"type": "Microsoft.Billing/billingAccounts/billingProfiles/invoiceSections",
"properties": {
"displayName": "invoiceSectionName2"
"displayName": "invoiceSectionName2",
"state": "Active"
}
}
]
Expand Down
45 changes: 38 additions & 7 deletions .../Microsoft.Billing/preview/2019-10-01-preview/examples/BillingAccountsListWithExpand.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
"region": "WA",
"country": "US"
},
"billingRelationshipType": "Direct",
"currency": "USD",
"enabledAzurePlans": [
{
Expand All @@ -71,15 +72,17 @@
"name": "invoiceSectionId1",
"type": "Microsoft.Billing/billingAccounts/billingProfiles/invoiceSections",
"properties": {
"displayName": "invoiceSectionName1"
"displayName": "invoiceSectionName1",
"state": "Active"
}
},
{
"id": "/providers/Microsoft.Billing/billingAccounts/00000000-0000-0000-0000-000000000000_00000000-0000-0000-0000-000000000000/billingProfiles/11000000-0000-0000-0000-000000000000/invoiceSections/invoiceSectionId2",
"name": "invoiceSectionId2",
"type": "Microsoft.Billing/billingAccounts/billingProfiles/invoiceSections",
"properties": {
"displayName": "invoiceSectionName2"
"displayName": "invoiceSectionName2",
"state": "Active"
}
}
]
Expand All @@ -103,6 +106,7 @@
"region": "WA",
"country": "US"
},
"billingRelationshipType": "CSPPartner",
"currency": "USD",
"enabledAzurePlans": [
{
Expand All @@ -125,7 +129,8 @@
"name": "invoiceSectionId11",
"type": "Microsoft.Billing/billingAccounts/billingProfiles/invoiceSections",
"properties": {
"displayName": "invoiceSectionName11"
"displayName": "invoiceSectionName11",
"state": "Active"
}
}
]
Expand Down Expand Up @@ -164,6 +169,7 @@
"region": "WA",
"country": "US"
},
"billingRelationshipType": "IndirectPartner",
"currency": "USD",
"enabledAzurePlans": [
{
Expand All @@ -175,27 +181,40 @@
"skuDescription": "Microsoft Azure Standard"
}
],
"indirectRelationshipInfo": {
"billingAccountName": "20000000-0000-0000-0000-000000000001_00000000-0000-0000-0000-000000000000",
"billingProfileName": "22000000-0000-0000-0000-000000000001",
"displayName": "Customer1"
},
"invoiceDay": 5,
"invoiceEmailOptIn": true,
"poNumber": "ABC12345",
"status": "Warned",
"statusReasonCode": "PastDue",
"spendingLimit": "On",
"targetClouds": [
"USNat",
"USSec"
],
"invoiceSections": [
{
"id": "/providers/Microsoft.Billing/billingAccounts/10000000-0000-0000-0000-000000000001_00000000-0000-0000-0000-000000000000/billingProfiles/11000000-0000-0000-0000-000000000004/invoiceSections/invoiceSectionId3",
"name": "invoiceSectionId3",
"type": "Microsoft.Billing/billingAccounts/billingProfiles/invoiceSections",
"properties": {
"displayName": "invoiceSectionName3"
"displayName": "invoiceSectionName3",
"state": "Restricted",
"targetCloud": "USNat"
}
},
{
"id": "/providers/Microsoft.Billing/billingAccounts/10000000-0000-0000-0000-000000000001_00000000-0000-0000-0000-000000000000/billingProfiles/11000000-0000-0000-0000-000000000004/invoiceSections/invoiceSectionId4",
"name": "invoiceSectionId4",
"type": "Microsoft.Billing/billingAccounts/billingProfiles/invoiceSections",
"properties": {
"displayName": "invoiceSectionName4"
"displayName": "invoiceSectionName4",
"state": "Restricted",
"targetCloud": "USSec"
}
}
]
Expand All @@ -219,6 +238,7 @@
"region": "WA",
"country": "US"
},
"billingRelationshipType": "IndirectCustomer",
"currency": "USD",
"enabledAzurePlans": [
{
Expand All @@ -230,27 +250,38 @@
"skuDescription": "Microsoft Azure Standard"
}
],
"indirectRelationshipInfo": {
"billingAccountName": "30000000-0000-0000-0000-000000000001_00000000-0000-0000-0000-000000000000",
"billingProfileName": "33000000-0000-0000-0000-000000000001",
"displayName": "Partner1"
},
"invoiceDay": 5,
"invoiceEmailOptIn": true,
"poNumber": "ABC12345",
"status": "Warned",
"statusReasonCode": "PastDue",
"spendingLimit": "On",
"targetClouds": [
"USSec"
],
"invoiceSections": [
{
"id": "/providers/Microsoft.Billing/billingAccounts/10000000-0000-0000-0000-000000000001_00000000-0000-0000-0000-000000000000/billingProfiles/11000000-0000-0000-0000-000000000005/invoiceSections/invoiceSectionId5",
"name": "invoiceSectionId5",
"type": "Microsoft.Billing/billingAccounts/billingProfiles/invoiceSections",
"properties": {
"displayName": "invoiceSectionName5"
"displayName": "invoiceSectionName5",
"state": "Active"
}
},
{
"id": "/providers/Microsoft.Billing/billingAccounts/10000000-0000-0000-0000-000000000001_00000000-0000-0000-0000-000000000000/billingProfiles/11000000-0000-0000-0000-000000000005/invoiceSections/invoiceSectionId6",
"name": "invoiceSectionId6",
"type": "Microsoft.Billing/billingAccounts/billingProfiles/invoiceSections",
"properties": {
"displayName": "invoiceSectionName6"
"displayName": "invoiceSectionName6",
"state": "Restricted",
"targetCloud": "USSec"
}
}
]
Expand Down
1 change: 1 addition & 0 deletions ...esource-manager/Microsoft.Billing/preview/2019-10-01-preview/examples/BillingProfile.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
"region": "WA",
"country": "US"
},
"billingRelationshipType": "Direct",
"currency": "USD",
"enabledAzurePlans": [
{
Expand Down
Loading