Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
5742b8f
Adding Lots to Consumption RP
Sep 20, 2018
994490b
Add pricesheet download api to Microsoft.Billing
Nov 7, 2018
b822b3a
Adding missing types
Nov 7, 2018
16233c2
defining single use parameters inline
Nov 7, 2018
14fe81a
Adding missing files (unrelated to this commit but need to get rid of…
Nov 7, 2018
3bb8827
Delete consumption.json
sandeepkatumalla Nov 7, 2018
e5ddd11
Removing unnecessary files
Nov 7, 2018
e16a1a5
Merge branch 'master' of https://github.com/sandeepkatumalla/azure-re…
Nov 7, 2018
28d8d06
Delete LotsListByBillingProfile.json
sandeepkatumalla Nov 7, 2018
607fc99
Removing additional /
Nov 7, 2018
6a62632
Merge branch 'master' of https://github.com/sandeepkatumalla/azure-re…
Nov 7, 2018
eb84d6d
changing tag to pricesheet
Nov 8, 2018
03fd7f3
Update x-ms-examples key
Nov 8, 2018
c3a339b
Fixing conflict
Nov 8, 2018
0a5aa3e
fixing warning
Nov 8, 2018
e01b483
Noting it as a long running operation
Nov 8, 2018
3257ef2
removing long running operation since it doesn't support GET which is…
Nov 8, 2018
f6575e2
Feedback from ARM
Nov 8, 2018
68c62da
nit: minor spelling checks
Nov 8, 2018
2f24998
nit: fixing operationId warning
Nov 8, 2018
b8da71c
nit: fixes and examples
Nov 9, 2018
fd4787e
fixing format
Nov 9, 2018
2a1aa3f
Microsoft.Billing swagger changes for GTM
Nov 15, 2018
40ca1ee
Microsoft.Consumption swagger changes for GTM
Nov 15, 2018
63f6a23
Delete previous version from PR
sandeepkatumalla Nov 15, 2018
2d73cd5
adding back billing.json
Nov 15, 2018
6680ff6
Removing pricesheet from old version
Nov 15, 2018
293f285
Fixing example names
Nov 16, 2018
4b98cb6
ARM feedback on datetime
Nov 16, 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

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"parameters": {
"api-version": "2018-11-01-preview",
"billingAccountId": "04e9d123-ae03-5621-6c17-e70da00924ee",

This comment was marked as outdated.

"billingProfileId": "2291f7a6-e97a-4bb8-83d7-6090beb137e1"
},
"responses": {
"200": {
"body": {
"id": "/providers/Microsoft.Billing/billingAccounts/04e9d123-ae03-5621-6c17-e70da00924ee/billingProfiles/2291f7a6-e97a-4bb8-83d7-6090beb137e1/availableBalance/3f2a7a28-985c-4451-8b77-f83f47c3d2c6",
"name": "3f2a7a28-985c-4451-8b77-f83f47c3d2c6",
"type": "Microsoft.Billing/availableBalance",
"properties": {
"amount": {
"currency": "USD",
"value": 500.00
}
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"parameters": {
"api-version": "2018-11-01-preview",
"billingAccountId": "2000100"
},
"responses": {
"200": {
"body": {
"id": "/providers/Microsoft.Billing/billingAccounts/2000100",
"name": "2000100",
"type": "Microsoft.Billing/billingAccounts",
"properties": {
"displayName": "Test Account",
"company": "Test Account",
"accountType": "Organization",
"address": {
Copy link
Member

Choose a reason for hiding this comment

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

address is being returned as billingAddress in API response

"AddressLine1": "Test Address",
Copy link
Member

Choose a reason for hiding this comment

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

camelCasing everywhere

"AddressLine2": "Test Address",
"AddressLine3": "Test Address",
"City": "City",
"PostalCode": "00000",
"Region": "WA",
"Country": "US",
"PhoneNumber": "000-000-0000"
},
"country": "United States",
"agreements": [
"wwww.contoso.com/agreements"
]
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
{
"parameters": {
"api-version": "2018-11-01-preview",
"billingAccountId": "2000200",
"periodStartDate": "2018-01-01",
"periodEndDate": "2018-06-30",
"$filter": "invoicePeriodStartDate le 2018-06-01"
},
"responses": {
"200": {
"body": {
"value": [
{
"id": "providers/Microsoft.Billing/billingAccounts/2000200/billingProfile/345986/invoices/1383723",
"name": "1383723",
"type": "Microsoft.Billing/invoices",
"properties": {
"dueDate": "2018-01-16",
"invoiceDate": "2018-01-01",
"status": "Due",
"amountDue": {
"currency": "USD",
"value": 2000.00
},
"billedAmount": {
"currency": "USD",
"value": 2000.00
},
"invoicePeriodStartDate": "2018-01-01",
"invoicePeriodEndDate": "2018-01-15",
"billingProfile": "345986",
"billingProfileName": "Contoso Operations Billing",
"purchaseOrderNumber": "123456",
"documentUrls": [
{
"kind": "Invoice",
"url": "https://microsoft.com/invoice.pdf"
}
],
"payments": [
{
"date": "2018-01-14",
"paymentType": "credited",
"amount": {
"currency": "USD",
"value": 2000.00
}
}
]
}
},
{
"id": "providers/Microsoft.Billing/billingAccounts/2000200/billingProfile/345987/invoices/1383724",
Copy link
Member

Choose a reason for hiding this comment

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

Let's be consistent in whether we prefix the id with a "/". I'm seeing two conventions in this PR.

"name": "1383724",
"type": "Microsoft.Billing/invoices",
"properties": {
"dueDate": "2018-03-01",
"invoiceDate": "2018-02-01",
"status": "PastDue",
"amountDue": {
"currency": "USD",
"value": 2000.00
},
"billedAmount": {
"currency": "USD",
"value": 2000.00
},
"invoicePeriodStartDate": "2018-02-01",
"invoicePeriodEndDate": "2018-02-30",
"billingProfile": "345987",
"billingProfileName": "Contoso Operations Billing",
"purchaseOrderNumber": "123456",
"documentUrls": [
{
"kind": "VoidNote",
"url": "https://microsoft.com/voidNote.pdf"
}
],
"payments": [
{
"date": "2018-01-14",
"paymentType": "credited",
"amount": {
"currency": "USD",
"value": 2000.00
}
}
]
}
}
]
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,122 @@
{
"parameters": {
"api-version": "2018-11-01-preview",
"billingAccountId": "2000100",
"$expand": "invoiceSections, billingProfiles"
},
"responses": {
"200": {
"body": {
"id": "/providers/Microsoft.Billing/billingAccounts/2000100",
"name": "2000100",
"type": "Microsoft.Billing/billingAccounts",
"properties": {
"company": "Test Account",
"accountType": "Organization",
"address": {
"AddressLine1": "Test Address",
"AddressLine2": "Test Address",
"AddressLine3": "Test Address",
"City": "City",
"PostalCode": "00000",
"Region": "WA",
"Country": "US",
"PhoneNumber": "000-000-0000"
},
"country": "United States",
"agreements": [
"wwww.contoso.com/agreements"
],
"invoiceSections": [
{
"id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/invoiceSections/invoiceSectionId1",
"name": "invoiceSectionId1",
"type": "Microsoft.Billing/invoiceSections",
"properties": {
"displayName": "invoiceSectionName1"
}
},
{
"id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/invoiceSections/invoiceSectionId2",
"name": "invoiceSectionId2",
"type": "Microsoft.Billing/invoiceSections",
"properties": {
"displayName": "invoiceSectionName2"
}
}
],
"billingProfiles": [
{
"id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/billingProfiles/BillingProfileId1",
"name": "BillingProfileId1",
"type": "Microsoft.Billing/billingProfiles",
"properties": {
"displayName": "BillingProfileName1",
"poNumber": "ABC12345",
"billingAddress": {
"AddressLine1": "Test Address",
"AddressLine2": "Test Address",
"AddressLine3": "Test Address",
"City": "City",
"PostalCode": "00000",
"Region": "WA",
"Country": "US",
"PhoneNumber": "000-000-0000"
},
"billingContact": "ronald@contoso.com",
"emailInvoice": true,
"isClassic": false,
"invoiceDay": 5,
"currency": "USD",
"enabledAzureSKUs": [
{
"skuId": "0001",
"skuDescription": "Microsoft Azure Dev/Test"
},
{
"skuId": "0002",
"skuDescription": "Microsoft Azure Standard"
}
]
}
},
{
"id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/billingProfiles/BillingProfileId2",
"name": "BillingProfileId2",
"type": "Microsoft.Billing/billingProfiles",
"properties": {
"displayName": "BillingProfileName2",
"poNumber": "ABC12345",
"billingAddress": {
"AddressLine1": "Test Address",
"AddressLine2": "Test Address",
"AddressLine3": "Test Address",
"City": "City",
"PostalCode": "00000",
"Region": "WA",
"Country": "US",
"PhoneNumber": "000-000-0000"
},
"billingContact": "ronald@contoso.com",
"emailInvoice": true,
"isClassic": false,
"invoiceDay": 5,
"currency": "USD",
"enabledAzureSKUs": [
{
"skuId": "0001",
"skuDescription": "Microsoft Azure Dev/Test"
},
{
"skuId": "0002",
"skuDescription": "Microsoft Azure Standard"
}
]
}
}
]
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
{
"parameters": {
"api-version": "2018-11-01-preview"
},
"responses": {
"200": {
"body": {
"value": [
{
"id": "/providers/Microsoft.Billing/billingAccounts/2000100",
"name": "2000100",
"type": "Microsoft.Billing/billingAccounts",
"properties": {
"displayName": "Test Account",
"company": "Test Account1",
"accountType": "Organization",
"address": {
"AddressLine1": "Test Address",
"AddressLine2": "Test Address",
"AddressLine3": "Test Address",
"City": "City",
"PostalCode": "00000",
"Region": "WA",
"Country": "US",
"PhoneNumber": "000-000-0000"
},
"country": "United States",
"agreements": [
"wwww.contoso.com/agreements"
]
}
},
{
"id": "/providers/Microsoft.Billing/billingAccounts/2000200",
"name": "2000200",
"type": "Microsoft.Billing/billingAccounts",
"properties": {
"displayName": "Test Account",
"company": "",
"accountType": "Organization",
"address": null,
"country": "",
"agreements": [
""
]
}
},
{
"id": "/providers/Microsoft.Billing/billingAccounts/2000300",
"name": "2000100",
"type": "Microsoft.Billing/billingAccounts",
"properties": {
"displayName": "Test Account",
"company": "Test Account3",
"accountType": "Organization",
"address": {
"AddressLine1": "Test Address",
"AddressLine2": "Test Address",
"AddressLine3": "Test Address",
"City": "City",
"PostalCode": "00000",
"Region": "WA",
"Country": "US",
"PhoneNumber": "000-000-0000"
},
"country": "United States",
"agreements": [
"wwww.contoso.com/agreements"
]
}
}
]
}
}
}
}
Loading