diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/billing.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/billing.json index e9c47f7b2ec5..247a92f8071b 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/billing.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/billing.json @@ -113,9 +113,6 @@ }, "BillingAccountWithExpand": { "$ref": "./examples/BillingAccountWithExpand.json" - }, - "BillingAccountsListWithExpandForEnrollmentDetails": { - "$ref": "./examples/BillingAccountsListWithExpandForEnrollmentDetails.json" } }, "operationId": "BillingAccounts_Get", @@ -421,19 +418,6 @@ "$ref": "#/definitions/InvoiceSectionListResult" } }, - "202": { - "description": "Accepted. InvoiceSection creation is in progress.", - "headers": { - "Location": { - "description": "GET this URL to retrieve the status of the asynchronous operation.", - "type": "string" - }, - "Retry-After": { - "description": "The amount of delay to use while the status of the operation is checked. The value is expressed in seconds.", - "type": "string" - } - } - }, "default": { "description": "Error response describing why the operation failed.", "schema": { @@ -541,19 +525,6 @@ "$ref": "#/definitions/InvoiceSectionListResult" } }, - "202": { - "description": "Accepted. InvoiceSection creation is in progress.", - "headers": { - "Location": { - "description": "GET this URL to retrieve the status of the asynchronous operation.", - "type": "string" - }, - "Retry-After": { - "description": "The amount of delay to use while the status of the operation is checked. The value is expressed in seconds.", - "type": "string" - } - } - }, "default": { "description": "Error response describing why the operation failed.", "schema": { @@ -1623,7 +1594,7 @@ "tags": [ "Transactions" ], - "operationId": "TransactionsByBillingProfile", + "operationId": "TransactionsByBillingProfile_List", "description": "Lists the transactions by billingProfileName for given start date and end date.", "externalDocs": { "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" @@ -1684,6 +1655,72 @@ } } }, + "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionName}/transactions": { + "get": { + "tags": [ + "Transactions" + ], + "operationId": "TransactionsByInvoiceSection_List", + "description": "Lists the transactions by invoiceSectionName for given start date and end date.", + "externalDocs": { + "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" + }, + "x-ms-examples": { + "TransactionsListByInvoiceSection": { + "$ref": "./examples/TransactionsListByInvoiceSection.json" + }, + "ReservationTransactionsListByInvoiceSection": { + "$ref": "./examples/ReservationTransactionsListByInvoiceSection.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/billingAccountNameParameter" + }, + { + "$ref": "#/parameters/invoiceSectionNameParameter" + }, + { + "$ref": "#/parameters/apiVersionParameter" + }, + { + "name": "startDate", + "in": "query", + "description": "Start date", + "required": true, + "type": "string" + }, + { + "name": "endDate", + "in": "query", + "description": "End date", + "required": true, + "type": "string" + }, + { + "name": "$filter", + "description": "May be used to filter by transaction kind. The filter supports 'eq', 'lt', 'gt', 'le', 'ge', and 'and'. It does not currently support 'ne', 'or', or 'not'. Tag filter is a key value pair string where key and value is separated by a colon (:).", + "in": "query", + "required": false, + "type": "string" + } + ], + "responses": { + "200": { + "description": "OK. The request has succeeded.", + "schema": { + "$ref": "#/definitions/TransactionsListResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + } + }, "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/policies/default": { "get": { "tags": [ diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/AcceptTransfer.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/AcceptTransfer.json index 8fec35b42f70..290109371d8d 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/AcceptTransfer.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/AcceptTransfer.json @@ -21,21 +21,13 @@ "responses": { "200": { "body": { - "id": "/providers/Microsoft.Billing/transfers/transferName", - "type": "Microsoft.Billing/transfers", - "name": "transferName", "properties": { - "creationTime": "10/10/2018 9:40:01 PM", - "expirationTime": "11/5/2018 4:47:08 AM", - "allowedSubscriptionType": [ - "DevTestAzureSubscription", - "StandardAzureSubscription", - "AzureReservation" - ], + "creationTime": "2018-10-10T17:32:28Z", + "expirationTime": "2018-11-05T17:32:28Z", "transferStatus": "InProgress", "recipientEmailId": "user@contoso.com", "initiatorEmailId": "user@contoso.com", - "lastModifiedTime": "10/10/2018 9:45:01 PM", + "lastModifiedTime": "2018-10-10T17:32:28Z", "detailedTransferStatus": [ { "productType": "AzureSubscription", diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/AddRoleAssignmentToBillingAccount.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/AddRoleAssignmentToBillingAccount.json index 437619bf02b3..b73b6776d36b 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/AddRoleAssignmentToBillingAccount.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/AddRoleAssignmentToBillingAccount.json @@ -4,7 +4,7 @@ "billingAccountName": "{billingAccountName}", "parameters": { "principalId": "6fd330f6-7d26-4aff-b9cf-7bd699f965b9", - "billingRoleDefinitionId": "10000000-aaaa-bbbb-cccc-100000000000" + "billingRoleDefinitionName": "10000000-aaaa-bbbb-cccc-100000000000" } }, "responses":{ @@ -20,7 +20,6 @@ "createdByPrincipalId": "", "name": "10000000-aaaa-bbbb-cccc-100000000000_6fd330f6-7d26-4aff-b9cf-7bd699f965b9", "principalId": "6fd330f6-7d26-4aff-b9cf-7bd699f965b9", - "roleDefinitionId": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/providers/Microsoft.Billing/billingRoleDefinitions/10000000-aaaa-bbbb-cccc-100000000000", "scope": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671" }, "type": "Microsoft.Billing/billingRoleAssignments" @@ -34,7 +33,6 @@ "createdByPrincipalId": "46b831ec-42b2-4f1a-8b54-3fd5ff9d6aa1", "name": "10000000-aaaa-bbbb-cccc-100000000000_b1839933-b3ac-42ca-8112-d29c43f3ab47", "principalId": "b1839933-b3ac-42ca-8112-d29c43f3ab47", - "roleDefinitionId": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/providers/Microsoft.Billing/billingRoleDefinitions/10000000-aaaa-bbbb-cccc-100000000000", "scope": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671" }, "type": "Microsoft.Billing/billingRoleAssignments" @@ -48,7 +46,6 @@ "createdByPrincipalId": "b1839933-b3ac-42ca-8112-d29c43f3ab47", "name": "10000000-aaaa-bbbb-cccc-100000000002_129db794-64a5-44e0-9838-002780478959", "principalId": "129db794-64a5-44e0-9838-002780478959", - "roleDefinitionId": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/providers/Microsoft.Billing/billingRoleDefinitions/10000000-aaaa-bbbb-cccc-100000000002", "scope": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671" }, "type": "Microsoft.Billing/billingRoleAssignments" @@ -62,7 +59,6 @@ "createdByPrincipalId": "b1839933-b3ac-42ca-8112-d29c43f3ab47", "name": "10000000-aaaa-bbbb-cccc-100000000001_d7b03fbc-ecd9-49b8-8e38-285b75eaa8f7", "principalId": "d7b03fbc-ecd9-49b8-8e38-285b75eaa8f7", - "roleDefinitionId": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/providers/Microsoft.Billing/billingRoleDefinitions/10000000-aaaa-bbbb-cccc-100000000001", "scope": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671" }, "type": "Microsoft.Billing/billingRoleAssignments" @@ -76,7 +72,6 @@ "createdByPrincipalId": "b1839933-b3ac-42ca-8112-d29c43f3ab47", "name": "10000000-aaaa-bbbb-cccc-100000000000_c4f54fd2-d920-4c49-9b4d-9f09387b881c", "principalId": "c4f54fd2-d920-4c49-9b4d-9f09387b881c", - "roleDefinitionId": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/providers/Microsoft.Billing/billingRoleDefinitions/10000000-aaaa-bbbb-cccc-100000000000", "scope": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671" }, "type": "Microsoft.Billing/billingRoleAssignments" diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/AddRoleAssignmentToBillingProfile.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/AddRoleAssignmentToBillingProfile.json index 1fb192798e07..53a19d4e1080 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/AddRoleAssignmentToBillingProfile.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/AddRoleAssignmentToBillingProfile.json @@ -5,7 +5,7 @@ "billingProfileName": "{billingProfileName}", "parameters": { "principalId": "6fd330f6-7d26-4aff-b9cf-7bd699f965b9", - "billingRoleDefinitionId": "10000000-aaaa-bbbb-cccc-100000000000" + "billingRoleDefinitionName": "10000000-aaaa-bbbb-cccc-100000000000" } }, "responses": { @@ -21,7 +21,6 @@ "createdByPrincipalId": "", "name": "10000000-aaaa-bbbb-cccc-100000000000_6fd330f6-7d26-4aff-b9cf-7bd699f965b9", "principalId": "6fd330f6-7d26-4aff-b9cf-7bd699f965b9", - "roleDefinitionId": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/billingProfiles/123/providers/Microsoft.Billing/billingRoleDefinitions/10000000-aaaa-bbbb-cccc-100000000000", "scope": "/providers/Microsoft.Billing/billingAccounts/billingProfiles/123/ee4241f3-de74-5631-3e6b-5df2c3d66671" }, "type": "Microsoft.Billing/billingRoleAssignments" diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/AddRoleAssignmentToInvoiceSection.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/AddRoleAssignmentToInvoiceSection.json index fd4b65e1dc18..c3e4cedd6ec6 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/AddRoleAssignmentToInvoiceSection.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/AddRoleAssignmentToInvoiceSection.json @@ -5,7 +5,7 @@ "invoiceSectionName": "{invoiceSectionName}", "parameters": { "principalId": "6fd330f6-7d26-4aff-b9cf-7bd699f965b9", - "billingRoleDefinitionId": "10000000-aaaa-bbbb-cccc-100000000000" + "billingRoleDefinitionName": "10000000-aaaa-bbbb-cccc-100000000000" } }, "responses": { @@ -21,7 +21,6 @@ "createdByPrincipalId": "", "name": "10000000-aaaa-bbbb-cccc-100000000000_6fd330f6-7d26-4aff-b9cf-7bd699f965b9", "principalId": "6fd330f6-7d26-4aff-b9cf-7bd699f965b9", - "roleDefinitionId": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/invoiceSections/123/providers/Microsoft.Billing/billingRoleDefinitions/10000000-aaaa-bbbb-cccc-100000000000", "scope": "/providers/Microsoft.Billing/billingAccounts/invoiceSections/123/ee4241f3-de74-5631-3e6b-5df2c3d66671" }, "type": "Microsoft.Billing/billingRoleAssignments" diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/AvailableBalanceByBillingProfile.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/AvailableBalanceByBillingProfile.json index 809def48253d..2171d5f1eb4e 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/AvailableBalanceByBillingProfile.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/AvailableBalanceByBillingProfile.json @@ -1,8 +1,8 @@ { "parameters": { "api-version": "2018-11-01-preview", - "billingAccountId": "04e9d123-ae03-5621-6c17-e70da00924ee", - "billingProfileId": "2291f7a6-e97a-4bb8-83d7-6090beb137e1" + "billingAccountName": "04e9d123-ae03-5621-6c17-e70da00924ee", + "billingProfileName": "2291f7a6-e97a-4bb8-83d7-6090beb137e1" }, "responses": { "200": { diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccount.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccount.json index 9bdc53c75756..fb1fa9f87d27 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccount.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccount.json @@ -1,7 +1,7 @@ { "parameters": { "api-version": "2018-11-01-preview", - "billingAccountId": "2000100" + "billingAccountName": "2000100" }, "responses": { "200": { @@ -14,19 +14,15 @@ "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" + "addressLine1": "Test Address", + "addressLine2": "Test Address", + "addressLine3": "Test Address", + "city": "City", + "postalCode": "00000", + "region": "WA", + "country": "US" }, - "country": "United States", - "agreements": [ - "wwww.contoso.com/agreements" - ] + "country": "United States" } } } diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountInvoicesList.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountInvoicesList.json index cff7acfe64b3..6539b00edd67 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountInvoicesList.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountInvoicesList.json @@ -1,7 +1,7 @@ { "parameters": { "api-version": "2018-11-01-preview", - "billingAccountId": "2000200", + "billingAccountName": "2000200", "periodStartDate": "2018-01-01", "periodEndDate": "2018-06-30", "$filter": "invoicePeriodStartDate le 2018-06-01" @@ -15,8 +15,8 @@ "name": "1383723", "type": "Microsoft.Billing/invoices", "properties": { - "dueDate": "2018-01-16", - "invoiceDate": "2018-01-01", + "dueDate": "2018-01-16T17:32:28Z", + "invoiceDate": "2018-01-01T17:32:28Z", "status": "Due", "amountDue": { "currency": "USD", @@ -26,8 +26,8 @@ "currency": "USD", "value": 2000.00 }, - "invoicePeriodStartDate": "2018-01-01", - "invoicePeriodEndDate": "2018-01-15", + "invoicePeriodStartDate": "2018-01-01T17:32:28Z", + "invoicePeriodEndDate": "2018-01-15T17:32:28Z", "billingProfile": "345986", "billingProfileName": "Contoso Operations Billing", "purchaseOrderNumber": "123456", @@ -39,7 +39,7 @@ ], "payments": [ { - "date": "2018-01-14", + "date": "2018-01-14T17:32:28Z", "paymentType": "credited", "amount": { "currency": "USD", @@ -54,8 +54,8 @@ "name": "1383724", "type": "Microsoft.Billing/invoices", "properties": { - "dueDate": "2018-03-01", - "invoiceDate": "2018-02-01", + "dueDate": "2018-03-01T17:32:28Z", + "invoiceDate": "2018-02-01T17:32:28Z", "status": "PastDue", "amountDue": { "currency": "USD", @@ -65,8 +65,8 @@ "currency": "USD", "value": 2000.00 }, - "invoicePeriodStartDate": "2018-02-01", - "invoicePeriodEndDate": "2018-02-30", + "invoicePeriodStartDate": "2018-02-01T17:32:28Z", + "invoicePeriodEndDate": "2018-02-30T17:32:28Z", "billingProfile": "345987", "billingProfileName": "Contoso Operations Billing", "purchaseOrderNumber": "123456", @@ -78,7 +78,7 @@ ], "payments": [ { - "date": "2018-01-14", + "date": "2018-01-14T17:32:28Z", "paymentType": "credited", "amount": { "currency": "USD", diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountRoleAssignment.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountRoleAssignment.json index 41d0b66ebf0c..43f06a328078 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountRoleAssignment.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountRoleAssignment.json @@ -2,7 +2,7 @@ "parameters": { "api-version": "2018-08-01-preview", "billingAccountName": "2000100", - "billingRoleAssignmentId": "{billingRoleAssignmentId}" + "billingRoleAssignmentName": "{billingRoleAssignmentId}" }, "responses": { "200": { @@ -15,7 +15,6 @@ "createdByPrincipalId": "", "name": "10000000-aaaa-bbbb-cccc-100000000000_6fd330f6-7d26-4aff-b9cf-7bd699f965b9", "principalId": "6fd330f6-7d26-4aff-b9cf-7bd699f965b9", - "roleDefinitionId": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/providers/Microsoft.Billing/billingRoleDefinitions/10000000-aaaa-bbbb-cccc-100000000000", "scope": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671" }, "type": "Microsoft.Billing/billingRoleAssignments" diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountRoleAssignmentDelete.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountRoleAssignmentDelete.json index 875c7f7f42ac..f082c8b3cb71 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountRoleAssignmentDelete.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountRoleAssignmentDelete.json @@ -2,7 +2,7 @@ "parameters": { "api-version": "2018-08-01-preview", "billingAccountName": "2000100", - "roleAssignmentId":"10000000-aaaa-bbbb-cccc-100000000000_6fd330f6-7d26-4aff-b9cf-7bd699f965b9" + "billingRoleAssignmentName":"10000000-aaaa-bbbb-cccc-100000000000_6fd330f6-7d26-4aff-b9cf-7bd699f965b9" }, "responses": { "200": { @@ -16,7 +16,6 @@ "createdByPrincipalId": "", "name": "10000000-aaaa-bbbb-cccc-100000000000_6fd330f6-7d26-4aff-b9cf-7bd699f965b9", "principalId": "6fd330f6-7d26-4aff-b9cf-7bd699f965b9", - "roleDefinitionId": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/providers/Microsoft.Billing/billingRoleDefinitions/10000000-aaaa-bbbb-cccc-100000000000", "scope": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671" } } diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountRoleAssignmentList.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountRoleAssignmentList.json index dbfd0ad8ce01..bcabd5d600d1 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountRoleAssignmentList.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountRoleAssignmentList.json @@ -16,7 +16,6 @@ "createdByPrincipalId": "", "name": "10000000-aaaa-bbbb-cccc-100000000000_6fd330f6-7d26-4aff-b9cf-7bd699f965b9", "principalId": "6fd330f6-7d26-4aff-b9cf-7bd699f965b9", - "roleDefinitionId": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/providers/Microsoft.Billing/billingRoleDefinitions/10000000-aaaa-bbbb-cccc-100000000000", "scope": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671" }, "type": "Microsoft.Billing/billingRoleAssignments" @@ -30,7 +29,6 @@ "createdByPrincipalId": "46b831ec-42b2-4f1a-8b54-3fd5ff9d6aa1", "name": "10000000-aaaa-bbbb-cccc-100000000000_b1839933-b3ac-42ca-8112-d29c43f3ab47", "principalId": "b1839933-b3ac-42ca-8112-d29c43f3ab47", - "roleDefinitionId": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/providers/Microsoft.Billing/billingRoleDefinitions/10000000-aaaa-bbbb-cccc-100000000000", "scope": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671" }, "type": "Microsoft.Billing/billingRoleAssignments" diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountRoleDefinition.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountRoleDefinition.json index 8b7ac76e5ab0..1d2624c3eeb8 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountRoleDefinition.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountRoleDefinition.json @@ -2,7 +2,7 @@ "parameters": { "api-version": "2018-08-01-preview", "billingAccountName": "2000100", - "billingRoleDefinitionId": "{billingRoleDefinitionId}" + "billingRoleDefinitionName": "{billingRoleDefinitionId}" }, "responses": { "200": { diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountWithExpand.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountWithExpand.json index 994384e92fdc..0adf021e55f8 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountWithExpand.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountWithExpand.json @@ -1,7 +1,7 @@ { "parameters": { "api-version": "2018-11-01-preview", - "billingAccountId": "2000100", + "billingAccountName": "2000100", "$expand": "invoiceSections, billingProfiles" }, "responses": { @@ -14,22 +14,18 @@ "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" + "addressLine1": "Test Address", + "addressLine2": "Test Address", + "addressLine3": "Test Address", + "city": "City", + "postalCode": "00000", + "region": "WA", + "country": "US" }, "country": "United States", - "agreements": [ - "wwww.contoso.com/agreements" - ], "invoiceSections": [ { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/invoiceSections/invoiceSectionId1", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/invoiceSectionId1", "name": "invoiceSectionId1", "type": "Microsoft.Billing/invoiceSections", "properties": { @@ -37,7 +33,7 @@ } }, { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/invoiceSections/invoiceSectionId2", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/invoiceSectionId2", "name": "invoiceSectionId2", "type": "Microsoft.Billing/invoiceSections", "properties": { @@ -47,26 +43,22 @@ ], "billingProfiles": [ { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/billingProfiles/BillingProfileId1", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/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" + "addressLine1": "Test Address", + "addressLine2": "Test Address", + "addressLine3": "Test Address", + "city": "City", + "postalCode": "00000", + "region": "WA", + "country": "US" }, - "billingContact": "ronald@contoso.com", - "emailInvoice": true, "isClassic": false, - "invoiceDay": 5, "currency": "USD", "enabledAzureSKUs": [ { @@ -81,26 +73,22 @@ } }, { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/billingProfiles/BillingProfileId2", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/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" + "addressLine1": "Test Address", + "addressLine2": "Test Address", + "addressLine3": "Test Address", + "city": "City", + "postalCode": "00000", + "region": "WA", + "country": "US" }, - "billingContact": "ronald@contoso.com", - "emailInvoice": true, "isClassic": false, - "invoiceDay": 5, "currency": "USD", "enabledAzureSKUs": [ { diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountsList.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountsList.json index 825c436ad0b4..bae82490ef61 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountsList.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountsList.json @@ -15,19 +15,15 @@ "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" + "addressLine1": "Test Address", + "addressLine2": "Test Address", + "addressLine3": "Test Address", + "city": "City", + "postalCode": "00000", + "region": "WA", + "country": "US" }, - "country": "United States", - "agreements": [ - "wwww.contoso.com/agreements" - ] + "country": "United States" } }, { @@ -39,10 +35,7 @@ "company": "", "accountType": "Organization", "address": null, - "country": "", - "agreements": [ - "" - ] + "country": "" } }, { @@ -54,19 +47,15 @@ "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" + "addressLine1": "Test Address", + "addressLine2": "Test Address", + "addressLine3": "Test Address", + "city": "City", + "postalCode": "00000", + "region": "WA", + "country": "US" }, - "country": "United States", - "agreements": [ - "wwww.contoso.com/agreements" - ] + "country": "United States" } } ] diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountsListWithCreateInvoiceSectionPermission.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountsListWithCreateInvoiceSectionPermission.json index 8d3b56bce05b..0d35ea598444 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountsListWithCreateInvoiceSectionPermission.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountsListWithCreateInvoiceSectionPermission.json @@ -15,19 +15,15 @@ "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" + "addressLine1": "Test Address", + "addressLine2": "Test Address", + "addressLine3": "Test Address", + "city": "City", + "postalCode": "00000", + "region": "WA", + "country": "US" }, - "country": "United States", - "agreements": [ - "wwww.contoso.com/agreements" - ] + "country": "United States" } }, { @@ -39,10 +35,7 @@ "company": "", "accountType": "Organization", "address": null, - "country": "", - "agreements": [ - "" - ] + "country": "" } } ] diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountsListWithExpand.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountsListWithExpand.json index 7d9c3c7b1313..f9d6a55df412 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountsListWithExpand.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountsListWithExpand.json @@ -16,22 +16,18 @@ "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" + "addressLine1": "Test Address", + "addressLine2": "Test Address", + "addressLine3": "Test Address", + "city": "City", + "postalCode": "00000", + "region": "WA", + "country": "US" }, "country": "United States", - "agreements": [ - "wwww.contoso.com/agreements" - ], "invoiceSections": [ { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/invoiceSections/invoiceSectionId1", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/invoiceSectionId1", "name": "invoiceSectionId1", "type": "Microsoft.Billing/invoiceSections", "properties": { @@ -39,7 +35,7 @@ } }, { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/invoiceSections/invoiceSectionId2", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/invoiceSectionId2", "name": "invoiceSectionId2", "type": "Microsoft.Billing/invoiceSections", "properties": { @@ -49,26 +45,22 @@ ], "billingProfiles": [ { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/billingProfiles/BillingProfileId1", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/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" + "addressLine1": "Test Address", + "addressLine2": "Test Address", + "addressLine3": "Test Address", + "city": "City", + "postalCode": "00000", + "region": "WA", + "country": "US" }, - "billingContact": "ronald@contoso.com", - "emailInvoice": true, "isClassic": false, - "invoiceDay": "5th of the month", "currency": "USD", "enabledAzureSKUs": [ { @@ -83,26 +75,22 @@ } }, { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/billingProfiles/BillingProfileId2", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/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" + "addressLine1": "Test Address", + "addressLine2": "Test Address", + "addressLine3": "Test Address", + "city": "City", + "postalCode": "00000", + "region": "WA", + "country": "US" }, - "billingContact": "ronald@contoso.com", - "emailInvoice": true, "isClassic": false, - "invoiceDay": "5th of the month", "currency": "USD", "enabledAzureSKUs": [ { @@ -129,12 +117,9 @@ "accountType": "Organization", "address": null, "country": "", - "agreements": [ - "" - ], "invoiceSections": [ { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/invoiceSections/invoiceSectionId3", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/invoiceSectionId3", "name": "invoiceSectionId3", "type": "Microsoft.Billing/invoiceSections", "properties": { @@ -142,7 +127,7 @@ } }, { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/invoiceSections/invoiceSectionId4", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/invoiceSectionId4", "name": "invoiceSectionId4", "type": "Microsoft.Billing/invoiceSections", "properties": { @@ -152,26 +137,22 @@ ], "billingProfiles": [ { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/billingProfiles/BillingProfileId3", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/BillingProfileId3", "name": "BillingProfileId3", "type": "Microsoft.Billing/billingProfiles", "properties": { "displayName": "BillingProfileName3", "poNumber": "ABC12345", "billingAddress": { - "AddressLine1": "Test Address", - "AddressLine2": "Test Address", - "AddressLine3": "Test Address", - "City": "City", - "PostalCode": "00000", - "Region": "WA", - "Country": "US", - "PhoneNumber": "000-000-0000" + "addressLine1": "Test Address", + "addressLine2": "Test Address", + "addressLine3": "Test Address", + "city": "City", + "postalCode": "00000", + "region": "WA", + "country": "US" }, - "billingContact": "ronald@contoso.com", - "emailInvoice": true, "isClassic": false, - "invoiceDay": "5th of the month", "currency": "USD", "enabledAzureSKUs": [ { @@ -186,26 +167,22 @@ } }, { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/billingProfiles/BillingProfileId4", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/BillingProfileId4", "name": "BillingProfileId4", "type": "Microsoft.Billing/billingProfiles", "properties": { "displayName": "BillingProfileName4", "poNumber": "ABC12345", "billingAddress": { - "AddressLine1": "Test Address", - "AddressLine2": "Test Address", - "AddressLine3": "Test Address", - "City": "City", - "PostalCode": "00000", - "Region": "WA", - "Country": "US", - "PhoneNumber": "000-000-0000" + "addressLine1": "Test Address", + "addressLine2": "Test Address", + "addressLine3": "Test Address", + "city": "City", + "postalCode": "00000", + "region": "WA", + "country": "US" }, - "billingContact": "ronald@contoso.com", - "emailInvoice": true, "isClassic": false, - "invoiceDay": "5th of the month", "currency": "USD", "enabledAzureSKUs": [ { diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountsListWithExpandForEnrollmentDetails.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountsListWithExpandForEnrollmentDetails.json index 633fea9f1de3..d9dd5035680f 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountsListWithExpandForEnrollmentDetails.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountsListWithExpandForEnrollmentDetails.json @@ -1,109 +1,109 @@ { - "parameters": { - "api-version": "2018-11-01-preview", - "$expand": "properties/enrollmentDetails, properties/departments, properties/enrollmentAccounts" - }, - "responses": { - "200": { - "body": { - "id": "/providers/Microsoft.Billing/billingAccounts/7645820", - "name": "7645820", - "type": "Microsoft.Billing/billingAccounts", - "properties": { - "company": "XYZ Services Group, LLC.", - "accountType": "Enrollment", - "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" - ], - "enrollmentDetails": { - "startDate": "2018-05-01", - "endDate": "2019-05-31", - "currency": "USD", - "channel": "EaDirect", - "language": "en", - "countryCode": "US", - "status": "Active", - "billingCycle": "Monthly", - "policies": { - "accountOwnerViewCharges": true, - "departmentAdminViewCharges": true, - "marketplacesEnabled": true, - "reservedInstancesEnabled": true - } - }, - "departments": [ - { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/departments/departmentId1", - "name": "departmentId1", - "type": "Microsoft.Billing/departments", - "properties": { - "departmentName": "departmentName1", - "costCenter": "C1", - "status": "Active" - } - }, - { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/departments/departmentId2", - "name": "departmentId2", - "type": "Microsoft.Billing/departments", - "properties": { - "departmentName": "departmentName2", - "costCenter": "C4", - "status": "Active" - } - } - ], - "enrollmentAccounts": [ - { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/enrollmentAccounts/accountId0", - "name": "accountId0", - "type": "Microsoft.Billing/enrollmentAccounts", - "properties": { - "accountName": "AccountName0", - "costCenter": "C0", - "status": "Active", - "startDate": "2018-05-01", - "endDate": "2019-05-31" - } - }, - { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/enrollmentAccounts/accountId1", - "name": "accountId1", - "type": "Microsoft.Billing/enrollmentAccounts", - "properties": { - "accountName": "AccountName1", - "costCenter": "C4", - "status": "Active", - "startDate": "2018-05-01", - "endDate": "2019-05-31" - } - }, - { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/enrollmentAccounts/accountId2", - "name": "accountId2", - "type": "Microsoft.Billing/enrollmentAccounts", - "properties": { - "accountName": "AccountName2", - "costCenter": "C4", - "status": "Active", - "startDate": "2018-05-01", - "endDate": "2019-05-31" - } - } - ] - } - } - } - } + "parameters": { + "api-version": "2018-11-01-preview", + "$expand": "properties/enrollmentDetails, properties/departments, properties/enrollmentAccounts" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/providers/Microsoft.Billing/billingAccounts/7645820", + "name": "7645820", + "type": "Microsoft.Billing/billingAccounts", + "properties": { + "company": "XYZ Services Group, LLC.", + "accountType": "Enrollment", + "address": { + "addressLine1": "Test Address", + "addressLine2": "Test Address", + "addressLine3": "Test Address", + "city": "City", + "postalCode": "00000", + "region": "WA", + "country": "US" + }, + "country": "United States", + "enrollmentDetails": { + "startDate": "2018-05-01T17:32:28Z", + "endDate": "2019-05-31T17:32:28Z", + "currency": "USD", + "channel": "EaDirect", + "language": "en", + "countryCode": "US", + "status": "Active", + "billingCycle": "Monthly", + "policies": { + "accountOwnerViewCharges": true, + "departmentAdminViewCharges": true, + "marketplacesEnabled": true, + "reservedInstancesEnabled": true + } + }, + "departments": [ + { + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/departments/departmentId1", + "name": "departmentId1", + "type": "Microsoft.Billing/departments", + "properties": { + "departmentName": "departmentName1", + "costCenter": "C1", + "status": "Active" + } + }, + { + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/departments/departmentId2", + "name": "departmentId2", + "type": "Microsoft.Billing/departments", + "properties": { + "departmentName": "departmentName2", + "costCenter": "C4", + "status": "Active" + } + } + ], + "enrollmentAccounts": [ + { + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/enrollmentAccounts/accountId0", + "name": "accountId0", + "type": "Microsoft.Billing/enrollmentAccounts", + "properties": { + "accountName": "AccountName0", + "costCenter": "C0", + "status": "Active", + "startDate": "2018-05-01T17:32:28Z", + "endDate": "2019-05-31T17:32:28Z" + } + }, + { + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/enrollmentAccounts/accountId1", + "name": "accountId1", + "type": "Microsoft.Billing/enrollmentAccounts", + "properties": { + "accountName": "AccountName1", + "costCenter": "C4", + "status": "Active", + "startDate": "2018-05-01T17:32:28Z", + "endDate": "2019-05-31T17:32:28Z" + } + }, + { + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/enrollmentAccounts/accountId2", + "name": "accountId2", + "type": "Microsoft.Billing/enrollmentAccounts", + "properties": { + "accountName": "AccountName2", + "costCenter": "C4", + "status": "Active", + "startDate": "2018-05-01T17:32:28Z", + "endDate": "2019-05-31T17:32:28Z" + } + } + ] + } + } + ] + } + } + } } \ No newline at end of file diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingProfile.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingProfile.json index 1010d0135018..1588313db77f 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingProfile.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingProfile.json @@ -1,30 +1,29 @@ { "parameters": { "api-version": "2018-11-01-preview", - "billingAccountId": "2000100", - "billingProfileId": "BillingProfileId1" + "billingAccountName": "2000100", + "billingProfileName": "BillingProfileId1" }, "responses": { "200": { "body": { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/billingProfiles/BillingProfileId1", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/BillingProfileId1", "name": "BillingProfileId1", "type": "Microsoft.Billing/billingProfiles", "properties": { "displayName": "BillingProfileName1", "poNumber": "ABC12345", - "address": { - "AddressLine1": "Test Address", - "AddressLine2": "Test Address", - "AddressLine3": "Test Address", - "City": "City", - "PostalCode": "00000", - "Region": "WA", - "Country": "US" + "billingAddress": { + "addressLine1": "Test Address", + "addressLine2": "Test Address", + "addressLine3": "Test Address", + "city": "City", + "postalCode": "00000", + "region": "WA", + "country": "US" }, "invoiceEmailOptIn": true, "isClassic": false, - "invoiceDay": 5, "currency": "USD", "enabledAzureSKUs": [ { diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingProfileRoleAssignment.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingProfileRoleAssignment.json index 3f36ea45103d..6a250ade8e6a 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingProfileRoleAssignment.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingProfileRoleAssignment.json @@ -3,7 +3,7 @@ "api-version": "2018-08-01-preview", "billingAccountName": "2000100", "billingProfileName": "123", - "billingRoleAssignmentId": "{billingRoleAssignmentId}" + "billingRoleAssignmentName": "{billingRoleAssignmentId}" }, "responses": { "200": { @@ -16,7 +16,6 @@ "createdByPrincipalId": "46b831ec-42b2-4f1a-8b54-3fd5ff9d6aa1", "name": "10000000-aaaa-bbbb-cccc-100000000000_b1839933-b3ac-42ca-8112-d29c43f3ab47", "principalId": "b1839933-b3ac-42ca-8112-d29c43f3ab47", - "roleDefinitionId": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/billingProfiles/123/providers/Microsoft.Billing/billingRoleDefinitions/10000000-aaaa-bbbb-cccc-100000000000", "scope": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/billingProfiles/123" }, "type": "Microsoft.Billing/billingRoleAssignments" diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingProfileRoleAssignmentDelete.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingProfileRoleAssignmentDelete.json index 2be444f40398..56e71ff672cb 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingProfileRoleAssignmentDelete.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingProfileRoleAssignmentDelete.json @@ -3,7 +3,7 @@ "api-version": "2018-08-01-preview", "billingAccountName": "2000100", "billingProfileName": "123", - "billingRoleAssignmentId": "10000000-aaaa-bbbb-cccc-100000000000_b1839933-b3ac-42ca-8112-d29c43f3ab47" + "billingRoleAssignmentName": "10000000-aaaa-bbbb-cccc-100000000000_b1839933-b3ac-42ca-8112-d29c43f3ab47" }, "responses": { "200": { @@ -16,7 +16,6 @@ "createdByPrincipalId": "46b831ec-42b2-4f1a-8b54-3fd5ff9d6aa1", "name": "10000000-aaaa-bbbb-cccc-100000000000_b1839933-b3ac-42ca-8112-d29c43f3ab47", "principalId": "b1839933-b3ac-42ca-8112-d29c43f3ab47", - "roleDefinitionId": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/billingProfiles/123/providers/Microsoft.Billing/billingRoleDefinitions/10000000-aaaa-bbbb-cccc-100000000000", "scope": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/billingProfiles/123" }, "type": "Microsoft.Billing/billingRoleAssignments" diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingProfileRoleAssignmentList.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingProfileRoleAssignmentList.json index 9711f85d3993..0490007c7637 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingProfileRoleAssignmentList.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingProfileRoleAssignmentList.json @@ -17,7 +17,6 @@ "createdByPrincipalId": "", "name": "10000000-aaaa-bbbb-cccc-100000000000_6fd330f6-7d26-4aff-b9cf-7bd699f965b9", "principalId": "6fd330f6-7d26-4aff-b9cf-7bd699f965b9", - "roleDefinitionId": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/billingProfile/123/providers/Microsoft.Billing/billingRoleDefinitions/10000000-aaaa-bbbb-cccc-100000000000", "scope": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/billingProfile/123" }, "type": "Microsoft.Billing/billingRoleAssignments" @@ -31,7 +30,6 @@ "createdByPrincipalId": "46b831ec-42b2-4f1a-8b54-3fd5ff9d6aa1", "name": "10000000-aaaa-bbbb-cccc-100000000000_b1839933-b3ac-42ca-8112-d29c43f3ab47", "principalId": "b1839933-b3ac-42ca-8112-d29c43f3ab47", - "roleDefinitionId": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/billingProfile/123/providers/Microsoft.Billing/billingRoleDefinitions/10000000-aaaa-bbbb-cccc-100000000000", "scope": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/billingProfile/123" }, "type": "Microsoft.Billing/billingRoleAssignments" @@ -45,7 +43,6 @@ "createdByPrincipalId": "b1839933-b3ac-42ca-8112-d29c43f3ab47", "name": "10000000-aaaa-bbbb-cccc-100000000002_129db794-64a5-44e0-9838-002780478959", "principalId": "129db794-64a5-44e0-9838-002780478959", - "roleDefinitionId": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/billingProfile/123/providers/Microsoft.Billing/billingRoleDefinitions/10000000-aaaa-bbbb-cccc-100000000002", "scope": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/billingProfile/123" }, "type": "Microsoft.Billing/billingRoleAssignments" @@ -59,7 +56,6 @@ "createdByPrincipalId": "b1839933-b3ac-42ca-8112-d29c43f3ab47", "name": "10000000-aaaa-bbbb-cccc-100000000001_d7b03fbc-ecd9-49b8-8e38-285b75eaa8f7", "principalId": "d7b03fbc-ecd9-49b8-8e38-285b75eaa8f7", - "roleDefinitionId": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/billingProfile/123/providers/Microsoft.Billing/billingRoleDefinitions/10000000-aaaa-bbbb-cccc-100000000001", "scope": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/billingProfile/123" }, "type": "Microsoft.Billing/billingRoleAssignments" @@ -73,7 +69,6 @@ "createdByPrincipalId": "b1839933-b3ac-42ca-8112-d29c43f3ab47", "name": "10000000-aaaa-bbbb-cccc-100000000000_c4f54fd2-d920-4c49-9b4d-9f09387b881c", "principalId": "c4f54fd2-d920-4c49-9b4d-9f09387b881c", - "roleDefinitionId": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/billingProfile/123/providers/Microsoft.Billing/billingRoleDefinitions/10000000-aaaa-bbbb-cccc-100000000000", "scope": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/billingProfile/123" }, "type": "Microsoft.Billing/billingRoleAssignments" diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingProfileRoleDefinition.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingProfileRoleDefinition.json index acdf8f6bc1a3..633e68d7ce69 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingProfileRoleDefinition.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingProfileRoleDefinition.json @@ -3,7 +3,7 @@ "api-version": "2018-08-01-preview", "billingAccountName": "2000100", "billingProfileName": "123", - "billingRoleDefinitionId": "10000000-aaaa-bbbb-cccc-100000000000" + "billingRoleDefinitionName": "10000000-aaaa-bbbb-cccc-100000000000" }, "responses": { "200": { diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingProfilesListByBillingAccountName.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingProfilesListByBillingAccountName.json index 12f79f969079..abe68032e5a2 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingProfilesListByBillingAccountName.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingProfilesListByBillingAccountName.json @@ -1,31 +1,30 @@ { "parameters": { "api-version": "2018-11-01-preview", - "billingAccountId": "{billingAccountId}" + "billingAccountName": "{billingAccountName}" }, "responses": { "200": { "body": { "value": [ { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/billingProfiles/BillingProfileId1", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/BillingProfileId1", "name": "BillingProfileId1", "type": "Microsoft.Billing/billingProfiles", "properties": { "displayName": "BillingProfileName1", "poNumber": "ABC12345", - "address": { - "AddressLine1": "Test Address", - "AddressLine2": "Test Address", - "AddressLine3": "Test Address", - "City": "City", - "PostalCode": "00000", - "Region": "WA", - "Country": "US" + "billingAddress": { + "addressLine1": "Test Address", + "addressLine2": "Test Address", + "addressLine3": "Test Address", + "city": "City", + "postalCode": "00000", + "region": "WA", + "country": "US" }, "invoiceEmailOptIn": true, "isClassic": false, - "invoiceDay": 5, "currency": "USD", "enabledAzureSKUs": [ { @@ -40,25 +39,23 @@ } }, { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/billingProfiles/BillingProfileName2", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/BillingProfileName2", "name": "BillingProfileName2", "type": "Microsoft.Billing/billingProfiles", "properties": { "displayName": "BillingProfileName2", "poNumber": "ABC12345", "billingAddress": { - "CompanyName": "Contoso", - "AttentionTo": "Test Address", - "AddressLine1": "Test Address1", - "AddressLine2": "Test Address2", - "City": "City", - "ZipCode": "00000", - "State": "WA", - "Country": "USA" + "addressLine1": "Test Address", + "addressLine2": "Test Address", + "addressLine3": "Test Address", + "city": "City", + "postalCode": "00000", + "region": "WA", + "country": "US" }, "invoiceEmailOptIn": true, "isClassic": false, - "invoiceDay": 5, "currency": "USD", "enabledAzureSKUs": [ { diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingProperty.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingProperty.json index 2e14b1ae6e3d..c37e1dda02ee 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingProperty.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingProperty.json @@ -1,30 +1,22 @@ { - "parameters": { - "api-version": "2018-11-01", - "subscriptionId": "300de4e3-b973-4d69-8b57-da07971b4280" - }, - "responses": { - "200": { - "body": { - "value": { - "id": "/subscriptions/300de4e3-b973-4d69-8b57-da07971b4280/providers/Microsoft.Billing/billingProperty", - "name": "300de4e3-b973-4d69-8b57-da07971b4280", - "type": "Microsoft.Billing/BillingProperty", - "properties": { - "productId": "providers/Microsoft.Billing/billingAccounts/ec4e5646-246e-47db-936e-34b91bf3e7d4/invoiceSections/c8c5a313-35d3-44fd-a41b-3629b71a3d1a/products/56bab771-3a48-45c9-a675-3e70fbd82874", - "productName": "AssetSummaryDescription", - "billingTenantId": "97d90bbc-69ce-4e8b-bf18-a2d439079d15", - "billingAccountId": "providers/Microsoft.Billing/billingAccounts/ec4e5646-246e-47db-936e-34b91bf3e7d4", - "billingAccountName": "My Account", - "invoiceSectionId": "providers/Microsoft.Billing/billingAccounts/ec4e5646-246e-47db-936e-34b91bf3e7d4/invoiceSections/c8c5a313-35d3-44fd-a41b-3629b71a3d1a", - "invoiceSectionName": "Contoso operations invoice section", - "billingProfileId": "providers/Microsoft.Billing/billingAccounts/ec4e5646-246e-47db-936e-34b91bf3e7d4/billingProfiles/b1f996ea-d439-4e63-a8c6-2f9c86c7eafb", - "billingProfileName": "Contoso operations billing", - "skuId": "0001", - "skuDescription": "Microsoft Azure Standard" - } - } - } + "parameters": { + "api-version": "2018-11-01", + "subscriptionId": "300de4e3-b973-4d69-8b57-da07971b4280" + }, + "responses": { + "200": { + "body": { + "productId": "providers/Microsoft.Billing/billingAccounts/ec4e5646-246e-47db-936e-34b91bf3e7d4/invoiceSections/c8c5a313-35d3-44fd-a41b-3629b71a3d1a/products/56bab771-3a48-45c9-a675-3e70fbd82874", + "billingTenantId": "97d90bbc-69ce-4e8b-bf18-a2d439079d15", + "billingAccountId": "providers/Microsoft.Billing/billingAccounts/ec4e5646-246e-47db-936e-34b91bf3e7d4", + "billingAccountName": "My Account", + "invoiceSectionId": "providers/Microsoft.Billing/billingAccounts/ec4e5646-246e-47db-936e-34b91bf3e7d4/invoiceSections/c8c5a313-35d3-44fd-a41b-3629b71a3d1a", + "invoiceSectionName": "Contoso operations invoice section", + "billingProfileId": "providers/Microsoft.Billing/billingAccounts/ec4e5646-246e-47db-936e-34b91bf3e7d4/billingProfiles/b1f996ea-d439-4e63-a8c6-2f9c86c7eafb", + "billingProfileName": "Contoso operations billing", + "skuId": "0001", + "skuDescription": "Microsoft Azure Standard" } } - } \ No newline at end of file + } +} \ No newline at end of file diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingSubscription.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingSubscription.json index 222d449a33f5..048ba48b068a 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingSubscription.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingSubscription.json @@ -1,41 +1,39 @@ { "parameters": { "api-version": "2018-11-01-preview", - "billingAccountId": "1234", - "invoiceSectionId": "12345", - "billingSubscriptionId": "billinSubscriptionId1", + "billingAccountName": "1234", + "invoiceSectionName": "12345", + "billingSubscriptionName": "billinSubscriptionId1", "$expand": "billingProfile" }, "responses": { "200": { "body": { - "value": { - "id": "/providers/Microsoft.Billing/BillingAccounts/1234/invoiceSections/12345/billingSubscriptions/billinSubscriptionId1", - "name": "billinSubscriptionId1", - "type": "Microsoft.Billing/billingSubscriptions", - "properties": { - "displayName": "AIP Dev", - "subscriptonId": "6b96d3f2-9008-4a9d-912f-f87744185aa3", - "subscriptionBillingStatus": "Active", - "monthToDateCharges": { - "currency": "USD", - "value": 1000.00 - }, - "lastMonthCharges": { - "currency": "USD", - "value": 5000.00 - }, - "enrollmentAccountContext": { - "costCenter": "Cost center A", - "startDate": "Date", - "endDate": "Date", - "enrollmentAccountId": "providers/Microsoft.Billing/billingAccount/100/enrollmentAccounts/12345" - }, - "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/billingProfiles/BillingProfileId3", - "billingProfileName": "BillingProfileId3", - "skuId": "0001", - "skuDescription": "Microsoft Azure Dev/Test" - } + "id": "/providers/Microsoft.Billing/BillingAccounts/1234/invoiceSections/12345/billingSubscriptions/billinSubscriptionId1", + "name": "billinSubscriptionId1", + "type": "Microsoft.Billing/billingSubscriptions", + "properties": { + "displayName": "AIP Dev", + "subscriptionId": "6b96d3f2-9008-4a9d-912f-f87744185aa3", + "subscriptionBillingStatus": "Active", + "monthToDateCharges": { + "currency": "USD", + "value": 1000.00 + }, + "lastMonthCharges": { + "currency": "USD", + "value": 5000.00 + }, + "enrollmentAccountContext": { + "costCenter": "Cost center A", + "startDate": "2018-05-01T17:32:28Z", + "endDate": "2018-05-01T17:32:28Z", + "enrollmentAccountName": "providers/Microsoft.Billing/billingAccount/100/enrollmentAccounts/12345" + }, + "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/BillingProfileId3", + "billingProfileName": "BillingProfileId3", + "skuId": "0001", + "skuDescription": "Microsoft Azure Dev/Test" } } } diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingSubscriptionsListByBillingAccount.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingSubscriptionsListByBillingAccount.json index ff9b2c696cc1..a42f6e093fea 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingSubscriptionsListByBillingAccount.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingSubscriptionsListByBillingAccount.json @@ -1,7 +1,7 @@ { "parameters": { "api-version": "2018-11-01-preview", - "billingAccountId": "1234", + "billingAccountName": "1234", "$expand": "billingProfile" }, "responses": { @@ -26,11 +26,11 @@ }, "enrollmentAccountContext": { "costCenter": "Cost center A", - "startDate": "Date", - "endDate": "Date", - "enrollmentAccountId": "providers/Microsoft.Billing/billingAccount/100/enrollmentAccounts/12345" + "startDate": "2018-05-01T17:32:28Z", + "endDate": "2018-05-01T17:32:28Z", + "enrollmentAccountName": "providers/Microsoft.Billing/billingAccount/100/enrollmentAccounts/12345" }, - "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/billingProfiles/BillingProfileId1", + "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/BillingProfileId1", "billingProfileName": "BillingProfileId1", "skuId": "0001", "skuDescription": "Microsoft Azure Dev/Test" @@ -54,11 +54,11 @@ }, "enrollmentAccountContext": { "costCenter": "Cost center A", - "startDate": "Date", - "endDate": "Date", - "enrollmentAccountId": "providers/Microsoft.Billing/billingAccount/100/enrollmentAccounts/12345" + "startDate": "2018-05-01T17:32:28Z", + "endDate": "2018-05-01T17:32:28Z", + "enrollmentAccountName": "providers/Microsoft.Billing/billingAccount/100/enrollmentAccounts/12345" }, - "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/billingProfiles/BillingProfileId2", + "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/BillingProfileId2", "billingProfileName": "BillingProfileId2", "skuId": "0001", "skuDescription": "Microsoft Azure Dev/Test" @@ -82,11 +82,11 @@ }, "enrollmentAccountContext": { "costCenter": "Cost center A", - "startDate": "Date", - "endDate": "Date", - "enrollmentAccountId": "providers/Microsoft.Billing/billingAccount/100/enrollmentAccounts/12345" + "startDate": "2018-05-01T17:32:28Z", + "endDate": "2018-05-01T17:32:28Z", + "enrollmentAccountName": "providers/Microsoft.Billing/billingAccount/100/enrollmentAccounts/12345" }, - "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/billingProfiles/BillingProfileId3", + "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/BillingProfileId3", "billingProfileName": "BillingProfileId3", "skuId": "0001", "skuDescription": "Microsoft Azure Dev/Test" diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingSubscriptionsListByBillingProfile.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingSubscriptionsListByBillingProfile.json index c13f6e93acc8..64db962cbe55 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingSubscriptionsListByBillingProfile.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingSubscriptionsListByBillingProfile.json @@ -1,8 +1,8 @@ { "parameters": { "api-version": "2018-11-01-preview", - "billingAccountId": "{billingAccountId}", - "billingProfileId": "{BillingProfileId}", + "billingAccountName": "{billingAccountName}", + "billingProfileName": "{BillingProfileId}", "$expand": "billingProfile" }, "responses": { @@ -10,7 +10,7 @@ "body": { "value": [ { - "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountId}/invoiceSections/12345/billingSubscriptions/billinSubscriptionId1", + "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/invoiceSections/12345/billingSubscriptions/billinSubscriptionId1", "name": "billinSubscriptionId1", "type": "Microsoft.Billing/billingSubscriptions", "properties": { @@ -27,18 +27,18 @@ }, "enrollmentAccountContext": { "costCenter": "Cost center A", - "startDate": "Date", - "endDate": "Date", - "enrollmentAccountId": "providers/Microsoft.Billing/billingAccount/100/enrollmentAccounts/12345" + "startDate": "2018-05-01T17:32:28Z", + "endDate": "2018-05-01T17:32:28Z", + "enrollmentAccountName": "providers/Microsoft.Billing/billingAccount/100/enrollmentAccounts/12345" }, - "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/billingProfiles/{BillingProfileId}", + "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{BillingProfileId}", "billingProfileName": "{BillingProfileId}", "skuId": "0001", "skuDescription": "Microsoft Azure Dev/Test" } }, { - "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountId}/invoiceSections/12345/billingSubscriptions/billinSubscriptionId2", + "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/invoiceSections/12345/billingSubscriptions/billinSubscriptionId2", "name": "billinSubscriptionId2", "type": "Microsoft.Billing/billingSubscriptions", "properties": { @@ -55,18 +55,18 @@ }, "enrollmentAccountContext": { "costCenter": "Cost center A", - "startDate": "Date", - "endDate": "Date", - "enrollmentAccountId": "providers/Microsoft.Billing/billingAccount/100/enrollmentAccounts/12345" + "startDate": "2018-05-01T17:32:28Z", + "endDate": "2018-05-01T17:32:28Z", + "enrollmentAccountName": "providers/Microsoft.Billing/billingAccount/100/enrollmentAccounts/12345" }, - "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/billingProfiles/{BillingProfileId}", + "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{BillingProfileId}", "billingProfileName": "{BillingProfileId}", "skuId": "0001", "skuDescription": "Microsoft Azure Dev/Test" } }, { - "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountId}/invoiceSections/12345/billingSubscriptions/billinSubscriptionId3", + "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/invoiceSections/12345/billingSubscriptions/billinSubscriptionId3", "name": "billinSubscriptionId3", "type": "Microsoft.Billing/billingSubscriptions", "properties": { @@ -83,11 +83,11 @@ }, "enrollmentAccountContext": { "costCenter": "Cost center A", - "startDate": "Date", - "endDate": "Date", - "enrollmentAccountId": "providers/Microsoft.Billing/billingAccount/100/enrollmentAccounts/12345" + "startDate": "2018-05-01T17:32:28Z", + "endDate": "2018-05-01T17:32:28Z", + "enrollmentAccountName": "providers/Microsoft.Billing/billingAccount/100/enrollmentAccounts/12345" }, - "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/billingProfiles/{BillingProfileId}", + "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{BillingProfileId}", "billingProfileName": "{BillingProfileId}", "skuId": "0001", "skuDescription": "Microsoft Azure Dev/Test" diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingSubscriptionsListByInvoiceSection.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingSubscriptionsListByInvoiceSection.json index 9558d3755dae..75905239f422 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingSubscriptionsListByInvoiceSection.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingSubscriptionsListByInvoiceSection.json @@ -1,8 +1,8 @@ { "parameters": { "api-version": "2018-11-01-preview", - "billingAccountId": "1234", - "invoiceSectionId": "12345", + "billingAccountName": "1234", + "invoiceSectionName": "12345", "$expand": "billingProfile" }, "responses": { @@ -27,11 +27,11 @@ }, "enrollmentAccountContext": { "costCenter": "Cost center A", - "startDate": "Date", - "endDate": "Date", - "enrollmentAccountId": "providers/Microsoft.Billing/billingAccount/100/enrollmentAccounts/12345" + "startDate": "2018-05-01T17:32:28Z", + "endDate": "2018-05-01T17:32:28Z", + "enrollmentAccountName": "providers/Microsoft.Billing/billingAccount/100/enrollmentAccounts/12345" }, - "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/billingProfiles/BillingProfileId1", + "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/BillingProfileId1", "billingProfileName": "BillingProfileId1", "skuId": "0001", "skuDescription": "Microsoft Azure Dev/Test" @@ -55,11 +55,11 @@ }, "enrollmentAccountContext": { "costCenter": "Cost center A", - "startDate": "Date", - "endDate": "Date", - "enrollmentAccountId": "providers/Microsoft.Billing/billingAccount/100/enrollmentAccounts/12345" + "startDate": "2018-05-01T17:32:28Z", + "endDate": "2018-05-01T17:32:28Z", + "enrollmentAccountName": "providers/Microsoft.Billing/billingAccount/100/enrollmentAccounts/12345" }, - "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/billingProfiles/BillingProfileId2", + "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/BillingProfileId2", "billingProfileName": "BillingProfileId2", "skuId": "0001", "skuDescription": "Microsoft Azure Dev/Test" @@ -83,11 +83,11 @@ }, "enrollmentAccountContext": { "costCenter": "Cost center A", - "startDate": "Date", - "endDate": "Date", - "enrollmentAccountId": "providers/Microsoft.Billing/billingAccount/100/enrollmentAccounts/12345" + "startDate": "2018-05-01T17:32:28Z", + "endDate": "2018-05-01T17:32:28Z", + "enrollmentAccountName": "providers/Microsoft.Billing/billingAccount/100/enrollmentAccounts/12345" }, - "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/billingProfiles/BillingProfileId3", + "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/BillingProfileId3", "billingProfileName": "BillingProfileId3", "skuId": "0001", "skuDescription": "Microsoft Azure Dev/Test" diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/CancelTransfer.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/CancelTransfer.json index 02d5505aa037..60e09fbf9941 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/CancelTransfer.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/CancelTransfer.json @@ -9,19 +9,16 @@ "responses": { "200": { "body": { - "id": "/providers/Microsoft.Billing/billingAccounts/billingAccountName/invoiceSections/invoiceSectionName/transfers/transferName", - "type": "Microsoft.Billing/transfers", - "name": "transferName", "properties": { - "creationTime": "10/10/2018 9:40:01 PM", - "expirationTime": "11/5/2018 4:47:08 AM", + "creationTime": "2018-10-10T17:32:28Z", + "expirationTime": "2018-11-05T17:32:28Z", "invoiceSectionId": "invoiceSectionId", - "billingAccountId": "billingAccountId", + "billingAccountId": "billingAccountName", "transferStatus": "Pending", "recipientEmailId": "user@contoso.com", "initiatorEmailId": "user@contoso.com", "canceledBy": "user@contoso.com", - "lastModifiedTime": "10/10/2018 9:45:01 PM" + "lastModifiedTime": "2018-10-10T17:32:28Z" } } } diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/CreateInvoiceSection.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/CreateInvoiceSection.json index b8fd0db3dcaa..9cf8ebb91252 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/CreateInvoiceSection.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/CreateInvoiceSection.json @@ -1,25 +1,54 @@ { "parameters": { "api-version": "2018-11-01-preview", - "billingAccountId": "{billingAccountId}", + "billingAccountName": "{billingAccountName}", "parameters": { - "request": { - "displayName": "invoiceSectionName1", - "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/billingProfiles/BillingProfileId1" - } + "displayName": "invoiceSectionName1", + "billingProfiles": [ + { + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/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" + }, + "isClassic": false, + "currency": "USD", + "enabledAzureSKUs": [ + { + "skuId": "0001", + "skuDescription": "Microsoft Azure Dev/Test" + }, + { + "skuId": "0002", + "skuDescription": "Microsoft Azure Standard" + } + ] + } + } + ] } }, "responses": { "202": { "headers": { - "Location": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/invoiceSections/operationResults/ed2975a8-8f77-43bb-a717-ace54326b14b?api-version=2018-07-31", + "Location": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/operationResults/ed2975a8-8f77-43bb-a717-ace54326b14b?api-version=2018-07-31", "Retry-After": "60", - "Azure-AsyncOperation": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/invoiceSections/operationStatus/ed2975a8-8f77-43bb-a717-ace54326b14b?api-version=2018-07-31" + "Azure-AsyncOperation": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/operationStatus/ed2975a8-8f77-43bb-a717-ace54326b14b?api-version=2018-07-31" } }, - "201": { + "200": { "body": { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/invoiceSections/invoiceSectionId1", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/invoiceSectionId1", "name": "invoiceSectionId1", "type": "Microsoft.Billing/invoiceSections", "properties": { diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/DeclineTransfer.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/DeclineTransfer.json index efb693221b97..16b13bc4ae9d 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/DeclineTransfer.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/DeclineTransfer.json @@ -7,21 +7,13 @@ "responses": { "200": { "body": { - "id": "/providers/Microsoft.Billing/transfers/transferName", - "type": "Microsoft.Billing/transfers", - "name": "transferName", "properties": { - "creationTime": "10/10/2018 9:40:01 PM", - "expirationTime": "11/5/2018 4:47:08 AM", - "allowedSubscriptionType": [ - "DevTestAzureSubscription", - "StandardAzureSubscription", - "AzureReservation" - ], + "creationTime": "2018-10-10T17:32:28Z", + "expirationTime": "2018-11-05T17:32:28Z", "transferStatus": "Declined", "recipientEmailId": "user@contoso.com", "initiatorEmailId": "user@contoso.com", - "lastModifiedTime": "10/10/2018 9:45:01 PM" + "lastModifiedTime": "2018-10-10T17:32:28Z" } } } diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/Department.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/Department.json index 62653d7ae850..ae9d6941bd70 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/Department.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/Department.json @@ -1,13 +1,13 @@ { "parameters": { "api-version": "2018-11-01-preview", - "billingAccountId": "{billingAccountId}", - "departmentId": "{departmentId1}" + "billingAccountName": "{billingAccountName}", + "departmentName": "{departmentId1}" }, "responses": { "200": { "body": { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/departments/departmentId1", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/departments/departmentId1", "name": "departmentId1", "type": "Microsoft.Billing/departments", "properties": { diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/DepartmentWithExpand.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/DepartmentWithExpand.json index 4a77b8836ed2..b197be83d360 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/DepartmentWithExpand.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/DepartmentWithExpand.json @@ -1,14 +1,14 @@ -{ +{ "parameters": { "api-version": "2018-11-01-preview", - "billingAccountId": "{billingAccountId}", - "departmentId": "{departmentId}", - "$expand": "properties/enrollmentAccounts" + "billingAccountName": "{billingAccountName}", + "departmentName": "{departmentId}", + "$expand": "properties/enrollmentAccounts" }, "responses": { "200": { "body": { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/departments/departmentId1", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/departments/departmentId1", "name": "departmentId1", "type": "Microsoft.Billing/departments", "properties": { @@ -17,27 +17,27 @@ "status": "Active", "enrollmentAccounts": [ { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/enrollmentAccounts/accountId0", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/enrollmentAccounts/accountId0", "name": "accountId0", "type": "Microsoft.Billing/enrollmentAccounts", "properties": { "accountName": "AccountName0", "costCenter": "C0", "status": "Active", - "startDate": "2018-05-01", - "endDate": "2019-05-31" + "startDate": "2018-05-01T17:32:28Z", + "endDate": "2019-05-31T17:32:28Z" } }, { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/enrollmentAccounts/accountId1", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/enrollmentAccounts/accountId1", "name": "accountId1", "type": "Microsoft.Billing/enrollmentAccounts", "properties": { "accountName": "AccountName1", "costCenter": "C4", "status": "Active", - "startDate": "2018-05-01", - "endDate": "2019-05-31" + "startDate": "2018-05-01T17:32:28Z", + "endDate": "2019-05-31T17:32:28Z" } } ] diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/DepartmentsListByBillingAccountName.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/DepartmentsListByBillingAccountName.json index 874ed1d0872f..52fa47d7f206 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/DepartmentsListByBillingAccountName.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/DepartmentsListByBillingAccountName.json @@ -1,7 +1,7 @@ { "parameters": { "api-version": "2018-11-01-preview", - "billingAccountId": "{billingAccountId}" + "billingAccountName": "{billingAccountName}" }, "responses": { "200": { @@ -9,7 +9,7 @@ "nextLink": "Link to next page", "value": [ { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/departments/departmentId1", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/departments/departmentId1", "name": "departmentId1", "type": "Microsoft.Billing/departments", "properties": { @@ -19,7 +19,7 @@ } }, { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/departments/departmentId2", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/departments/departmentId2", "name": "departmentId2", "type": "Microsoft.Billing/departments", "properties": { diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/DepartmentsListByBillingAccountNameWithExpand.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/DepartmentsListByBillingAccountNameWithExpand.json index 1702033ebb2e..ae3e59fcbff7 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/DepartmentsListByBillingAccountNameWithExpand.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/DepartmentsListByBillingAccountNameWithExpand.json @@ -1,8 +1,8 @@ { "parameters": { "api-version": "2018-11-01-preview", - "billingAccountId": "{billingAccountId}", - "$expand": "properties/enrollmentAccounts" + "billingAccountName": "{billingAccountName}", + "$expand": "properties/enrollmentAccounts" }, "responses": { "200": { @@ -10,7 +10,7 @@ "nextLink": "Link to next page", "value": [ { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/departments/departmentId1", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/departments/departmentId1", "name": "departmentId1", "type": "Microsoft.Billing/departments", "properties": { @@ -19,34 +19,34 @@ "status": "Active", "enrollmentAccounts": [ { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/enrollmentAccounts/accountId0", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/enrollmentAccounts/accountId0", "name": "accountId0", "type": "Microsoft.Billing/enrollmentAccounts", "properties": { "accountName": "AccountName0", "costCenter": "C0", "status": "Active", - "startDate": "2018-05-01", - "endDate": "2019-05-31" + "startDate": "2018-05-01T17:32:28Z", + "endDate": "2019-05-31T17:32:28Z" } }, { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/enrollmentAccounts/accountId1", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/enrollmentAccounts/accountId1", "name": "accountId1", "type": "Microsoft.Billing/enrollmentAccounts", "properties": { "accountName": "AccountName1", "costCenter": "C4", "status": "Active", - "startDate": "2018-05-01", - "endDate": "2019-05-31" + "startDate": "2018-05-01T17:32:28Z", + "endDate": "2019-05-31T17:32:28Z" } } ] } }, { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/departments/departmentId2", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/departments/departmentId2", "name": "departmentId2", "type": "Microsoft.Billing/departments", "properties": { @@ -55,27 +55,27 @@ "status": "Active", "enrollmentAccounts": [ { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/enrollmentAccounts/accountId2", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/enrollmentAccounts/accountId2", "name": "accountId2", "type": "Microsoft.Billing/enrollmentAccounts", "properties": { "accountName": "AccountName2", "costCenter": "C4", "status": "Active", - "startDate": "2018-05-01", - "endDate": "2019-05-31" + "startDate": "2018-05-01T17:32:28Z", + "endDate": "2019-05-31T17:32:28Z" } }, { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/enrollmentAccounts/accountId5", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/enrollmentAccounts/accountId5", "name": "accountId5", "type": "Microsoft.Billing/enrollmentAccounts", "properties": { "accountName": "AccountName5", "costCenter": "C4", "status": "Active", - "startDate": "2018-05-01", - "endDate": "2019-05-31" + "startDate": "2018-05-01T17:32:28Z", + "endDate": "2019-05-31T17:32:28Z" } } ] diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/EnrollmentAccount.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/EnrollmentAccount.json index 2bb112feea9a..1cef16310673 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/EnrollmentAccount.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/EnrollmentAccount.json @@ -1,21 +1,21 @@ { "parameters": { "api-version": "2018-11-01-preview", - "billingAccountId": "{billingAccountId}", - "enrollmentAccountId": "{enrollmentAccountId}" + "billingAccountName": "{billingAccountName}", + "enrollmentAccountName": "{enrollmentAccountName}" }, "responses": { "200": { "body": { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/enrollmentAccounts/accountId0", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/enrollmentAccounts/accountId0", "name": "accountId0", "type": "Microsoft.Billing/enrollmentAccounts", "properties": { "accountName": "AccountName0", "costCenter": "C0", "status": "Active", - "startDate": "2018-05-01", - "endDate": "2019-05-31" + "startDate": "2018-05-01T17:32:28Z", + "endDate": "2019-05-31T17:32:28Z" } } } diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/EnrollmentAccountWithExpand.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/EnrollmentAccountWithExpand.json index 69a8dde490b3..d8ee2bdc49ac 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/EnrollmentAccountWithExpand.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/EnrollmentAccountWithExpand.json @@ -1,24 +1,24 @@ { "parameters": { "api-version": "2018-11-01-preview", - "billingAccountId": "{billingAccountId}", - "enrollmentAccountId": "{enrollmentAccountId}", + "billingAccountName": "{billingAccountName}", + "enrollmentAccountName": "{enrollmentAccountName}", "$expand": "properties/department" }, "responses": { "200": { "body": { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/enrollmentAccounts/accountId0", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/enrollmentAccounts/accountId0", "name": "accountId0", "type": "Microsoft.Billing/enrollmentAccounts", "properties": { "accountName": "AccountName0", "costCenter": "C0", "status": "Active", - "startDate": "2018-05-01", - "endDate": "2019-05-31", + "startDate": "2018-05-01T17:32:28Z", + "endDate": "2019-05-31T17:32:28Z", "department": { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/departments/departmentId1", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/departments/departmentId1", "name": "departmentId1", "type": "Microsoft.Billing/departments", "properties": { diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/EnrollmentAccountsListByBillingAccountName.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/EnrollmentAccountsListByBillingAccountName.json index 994aa2459ac8..8401e62ce39a 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/EnrollmentAccountsListByBillingAccountName.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/EnrollmentAccountsListByBillingAccountName.json @@ -1,7 +1,7 @@ { "parameters": { "api-version": "2018-11-01-preview", - "billingAccountId": "{billingAccountId}" + "billingAccountName": "{billingAccountName}" }, "responses": { "200": { @@ -9,39 +9,39 @@ "nextLink": "Link to next page", "value": [ { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/enrollmentAccounts/accountId0", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/enrollmentAccounts/accountId0", "name": "accountId0", "type": "Microsoft.Billing/enrollmentAccounts", "properties": { "accountName": "AccountName0", "costCenter": "C0", "status": "Active", - "startDate": "2018-05-01", - "endDate": "2019-05-31" + "startDate": "2018-05-01T17:32:28Z", + "endDate": "2019-05-31T17:32:28Z" } }, { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/enrollmentAccounts/accountId1", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/enrollmentAccounts/accountId1", "name": "accountId1", "type": "Microsoft.Billing/enrollmentAccounts", "properties": { "accountName": "AccountName1", "costCenter": "C4", "status": "Active", - "startDate": "2018-05-01", - "endDate": "2019-05-31" + "startDate": "2018-05-01T17:32:28Z", + "endDate": "2019-05-31T17:32:28Z" } }, { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/enrollmentAccounts/accountId2", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/enrollmentAccounts/accountId2", "name": "accountId2", "type": "Microsoft.Billing/enrollmentAccounts", "properties": { "accountName": "AccountName2", "costCenter": "C4", "status": "Active", - "startDate": "2018-05-01", - "endDate": "2019-05-31" + "startDate": "2018-05-01T17:32:28Z", + "endDate": "2019-05-31T17:32:28Z" } } ] diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/EnrollmentAccountsListByBillingAccountNameWithExpand.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/EnrollmentAccountsListByBillingAccountNameWithExpand.json index a282f7e89dee..76477d815c6b 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/EnrollmentAccountsListByBillingAccountNameWithExpand.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/EnrollmentAccountsListByBillingAccountNameWithExpand.json @@ -1,7 +1,7 @@ { "parameters": { "api-version": "2018-11-01-preview", - "billingAccountId": "{billingAccountId}", + "billingAccountName": "{billingAccountName}", "$expand": "properties/department" }, "responses": { @@ -10,17 +10,17 @@ "nextLink": "Link to next page", "value": [ { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/enrollmentAccounts/accountId0", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/enrollmentAccounts/accountId0", "name": "accountId0", "type": "Microsoft.Billing/enrollmentAccounts", "properties": { "accountName": "AccountName0", "costCenter": "C0", "status": "Active", - "startDate": "2018-05-01", - "endDate": "2019-05-31", + "startDate": "2018-05-01T17:32:28Z", + "endDate": "2019-05-31T17:32:28Z", "department": { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/departments/departmentId1", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/departments/departmentId1", "name": "departmentId1", "type": "Microsoft.Billing/departments", "properties": { @@ -32,29 +32,29 @@ } }, { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/enrollmentAccounts/accountId1", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/enrollmentAccounts/accountId1", "name": "accountId1", "type": "Microsoft.Billing/enrollmentAccounts", "properties": { "accountName": "AccountName1", "costCenter": "C4", "status": "Active", - "startDate": "2018-05-01", - "endDate": "2019-05-31" + "startDate": "2018-05-01T17:32:28Z", + "endDate": "2019-05-31T17:32:28Z" } }, { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/enrollmentAccounts/accountId2", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/enrollmentAccounts/accountId2", "name": "accountId2", "type": "Microsoft.Billing/enrollmentAccounts", "properties": { "accountName": "AccountName2", "costCenter": "C4", "status": "Active", - "startDate": "2018-05-01", - "endDate": "2019-05-31", + "startDate": "2018-05-01T17:32:28Z", + "endDate": "2019-05-31T17:32:28Z", "department": { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/departments/departmentId1", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/departments/departmentId1", "name": "departmentId1", "type": "Microsoft.Billing/departments", "properties": { diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/GetRecipientTransfer.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/GetRecipientTransfer.json index 679c09ac6bd7..9c6ec50284bd 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/GetRecipientTransfer.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/GetRecipientTransfer.json @@ -7,21 +7,13 @@ "responses": { "200": { "body": { - "id": "/providers/Microsoft.Billing/transfers/transferName", - "type": "Microsoft.Billing/transfers", - "name": "transferName", "properties": { - "creationTime": "10/10/2018 9:40:01 PM", - "expirationTime": "11/5/2018 4:47:08 AM", - "allowedSubscriptionType": [ - "DevTestAzureSubscription", - "StandardAzureSubscription", - "AzureReservation" - ], + "creationTime": "2018-10-10T17:32:28Z", + "expirationTime": "2018-11-05T17:32:28Z", "transferStatus": "InProgress", "recipientEmailId": "user@contoso.com", "initiatorEmailId": "user@contoso.com", - "lastModifiedTime": "10/10/2018 9:45:01 PM", + "lastModifiedTime": "2018-10-10T17:32:28Z", "detailedTransferStatus": [ { "productType": "AzureSubscription", diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/GetTransfer.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/GetTransfer.json index 84013eff6500..748f82827a51 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/GetTransfer.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/GetTransfer.json @@ -9,18 +9,15 @@ "responses": { "200": { "body": { - "id": "/providers/Microsoft.Billing/billingAccounts/billingAccountName/invoiceSections/invoiceSectionName/transfers/transferName", - "type": "Microsoft.Billing/transfers", - "name": "transferName", "properties": { - "creationTime": "10/10/2018 9:40:01 PM", - "expirationTime": "11/5/2018 4:47:08 AM", + "creationTime": "2018-10-10T17:32:28Z", + "expirationTime": "2018-11-05T17:32:28Z", "invoiceSectionId": "invoiceSectionId", - "billingAccountId": "billingAccountId", + "billingAccountId": "billingAccountName", "transferStatus": "InProgress", "recipientEmailId": "user@contoso.com", "initiatorEmailId": "user@contoso.com", - "lastModifiedTime": "10/10/2018 9:45:01 PM", + "lastModifiedTime": "2018-10-10T17:32:28Z", "detailedTransferStatus": [ { "productType": "AzureSubscription", diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InitiateTransfer.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InitiateTransfer.json index 3f1fbc4ed1fc..749fc758ec1b 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InitiateTransfer.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InitiateTransfer.json @@ -5,7 +5,7 @@ "invoiceSectionName": "invoiceSectionName", "body": { "properties": { - "billingProfileId": "billingProfileId", + "billingProfileName": "billingProfileName", "recipientEmailId": "user@contoso.com" } @@ -15,18 +15,15 @@ "responses": { "200": { "body": { - "id": "/providers/Microsoft.Billing/billingAccounts/billingAccountName/invoiceSections/invoiceSectionName/transfers/transferName", - "type": "Microsoft.Billing/transfers", - "name": "transferName", "properties": { - "creationTime": "10/10/2018 9:40:01 PM", - "expirationTime": "11/5/2018 4:47:08 AM", + "creationTime": "2018-10-10T17:32:28Z", + "expirationTime": "2018-11-05T17:32:28Z", "invoiceSectionId": "invoiceSectionId", - "billingAccountId": "billingAccountId", + "billingAccountId": "billingAccountName", "transferStatus": "Pending", "recipientEmailId": "user@contoso.com", "initiatorEmailId": "user@contoso.com", - "lastModifiedTime": "10/10/2018 9:40:01 PM" + "lastModifiedTime": "2018-10-10T17:32:28Z" } } } diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/Invoice.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/Invoice.json index 0e2cc27891a3..5be090ec4ec5 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/Invoice.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/Invoice.json @@ -1,8 +1,8 @@ { "parameters": { "api-version": "2018-11-01-preview", - "billingAccountId": "2000200", - "billingProfileId": "345986", + "billingAccountName": "2000200", + "billingProfileName": "345986", "invoiceName": "1383723" }, "responses": { @@ -12,8 +12,8 @@ "name": "1383723", "type": "Microsoft.Billing/invoices", "properties": { - "dueDate": "2018-01-16", - "invoiceDate": "2018-01-01", + "dueDate": "2018-01-16T17:32:28Z", + "invoiceDate": "2018-01-01T17:32:28Z", "status": "Due", "amountDue": { "currency": "USD", @@ -23,9 +23,8 @@ "currency": "USD", "value": 2000.00 }, - "invoicePeriodStartDate": "2018-01-01", - "invoicePeriodEndDate": "2018-01-15", - "billingProfile": "345986", + "invoicePeriodStartDate": "2018-01-01T17:32:28Z", + "invoicePeriodEndDate": "2018-01-15T17:32:28Z", "billingProfileName": "Contoso Operations Billing", "purchaseOrderNumber": "123456", "documentUrls": [ @@ -44,7 +43,7 @@ ], "payments": [ { - "date": "2018-01-14", + "date": "2018-01-14T17:32:28Z", "paymentType": "credited", "amount": { "currency": "USD", diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSection.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSection.json index 0ae93c0fb01c..b98850157ef0 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSection.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSection.json @@ -1,13 +1,13 @@ { "parameters": { "api-version": "2018-11-01-preview", - "billingAccountId": "{billingAccountId}", - "invoiceSectionId": "{invoiceSectionId}" + "billingAccountName": "{billingAccountName}", + "invoiceSectionName": "12345" }, "responses": { "200": { "body": { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/invoiceSections/{invoiceSectionId}", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionId}", "name": "{invoiceSectionId}", "type": "Microsoft.Billing/invoiceSections", "properties": { diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionRoleAssignment.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionRoleAssignment.json index 4485d3390560..ab51f9e9e9d6 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionRoleAssignment.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionRoleAssignment.json @@ -3,7 +3,7 @@ "api-version": "2018-08-01-preview", "billingAccountName": "2000100", "invoiceSectionName": "123", - "billingRoleAssignmentId": "{billingRoleAssignmentId}" + "billingRoleAssignmentName": "{billingRoleAssignmentId}" }, "responses": { "200": { @@ -16,7 +16,6 @@ "createdByPrincipalId": "", "name": "10000000-aaaa-bbbb-cccc-100000000000_6fd330f6-7d26-4aff-b9cf-7bd699f965b9", "principalId": "6fd330f6-7d26-4aff-b9cf-7bd699f965b9", - "roleDefinitionId": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/invoiceSections/123/providers/Microsoft.Billing/billingRoleDefinitions/10000000-aaaa-bbbb-cccc-100000000000", "scope": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/invoiceSections/123" }, "type": "Microsoft.Billing/billingRoleAssignments" diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionRoleAssignmentDelete.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionRoleAssignmentDelete.json index 4485d3390560..ab51f9e9e9d6 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionRoleAssignmentDelete.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionRoleAssignmentDelete.json @@ -3,7 +3,7 @@ "api-version": "2018-08-01-preview", "billingAccountName": "2000100", "invoiceSectionName": "123", - "billingRoleAssignmentId": "{billingRoleAssignmentId}" + "billingRoleAssignmentName": "{billingRoleAssignmentId}" }, "responses": { "200": { @@ -16,7 +16,6 @@ "createdByPrincipalId": "", "name": "10000000-aaaa-bbbb-cccc-100000000000_6fd330f6-7d26-4aff-b9cf-7bd699f965b9", "principalId": "6fd330f6-7d26-4aff-b9cf-7bd699f965b9", - "roleDefinitionId": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/invoiceSections/123/providers/Microsoft.Billing/billingRoleDefinitions/10000000-aaaa-bbbb-cccc-100000000000", "scope": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/invoiceSections/123" }, "type": "Microsoft.Billing/billingRoleAssignments" diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionRoleAssignmentList.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionRoleAssignmentList.json index c466899ab787..6bf91df5b8ae 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionRoleAssignmentList.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionRoleAssignmentList.json @@ -17,7 +17,6 @@ "createdByPrincipalId": "", "name": "10000000-aaaa-bbbb-cccc-100000000000_6fd330f6-7d26-4aff-b9cf-7bd699f965b9", "principalId": "6fd330f6-7d26-4aff-b9cf-7bd699f965b9", - "roleDefinitionId": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/invoiceSections/123/providers/Microsoft.Billing/billingRoleDefinitions/10000000-aaaa-bbbb-cccc-100000000000", "scope": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/invoiceSections/123" }, "type": "Microsoft.Billing/billingRoleAssignments" @@ -31,7 +30,6 @@ "createdByPrincipalId": "46b831ec-42b2-4f1a-8b54-3fd5ff9d6aa1", "name": "10000000-aaaa-bbbb-cccc-100000000000_b1839933-b3ac-42ca-8112-d29c43f3ab47", "principalId": "b1839933-b3ac-42ca-8112-d29c43f3ab47", - "roleDefinitionId": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/invoiceSections/123/providers/Microsoft.Billing/billingRoleDefinitions/10000000-aaaa-bbbb-cccc-100000000000", "scope": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/invoiceSections/123" }, "type": "Microsoft.Billing/billingRoleAssignments" @@ -45,7 +43,6 @@ "createdByPrincipalId": "b1839933-b3ac-42ca-8112-d29c43f3ab47", "name": "10000000-aaaa-bbbb-cccc-100000000002_129db794-64a5-44e0-9838-002780478959", "principalId": "129db794-64a5-44e0-9838-002780478959", - "roleDefinitionId": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/invoiceSections/123/providers/Microsoft.Billing/billingRoleDefinitions/10000000-aaaa-bbbb-cccc-100000000002", "scope": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/invoiceSections/123" }, "type": "Microsoft.Billing/billingRoleAssignments" @@ -59,7 +56,6 @@ "createdByPrincipalId": "b1839933-b3ac-42ca-8112-d29c43f3ab47", "name": "10000000-aaaa-bbbb-cccc-100000000001_d7b03fbc-ecd9-49b8-8e38-285b75eaa8f7", "principalId": "d7b03fbc-ecd9-49b8-8e38-285b75eaa8f7", - "roleDefinitionId": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/invoiceSections/123/providers/Microsoft.Billing/billingRoleDefinitions/10000000-aaaa-bbbb-cccc-100000000001", "scope": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/invoiceSections/123" }, "type": "Microsoft.Billing/billingRoleAssignments" @@ -73,7 +69,6 @@ "createdByPrincipalId": "b1839933-b3ac-42ca-8112-d29c43f3ab47", "name": "10000000-aaaa-bbbb-cccc-100000000000_c4f54fd2-d920-4c49-9b4d-9f09387b881c", "principalId": "c4f54fd2-d920-4c49-9b4d-9f09387b881c", - "roleDefinitionId": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/invoiceSections/123/providers/Microsoft.Billing/billingRoleDefinitions/10000000-aaaa-bbbb-cccc-100000000000", "scope": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/invoiceSections/123" }, "type": "Microsoft.Billing/billingRoleAssignments" diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionRoleDefinition.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionRoleDefinition.json index d8aa0847ba60..01744614bb81 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionRoleDefinition.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionRoleDefinition.json @@ -3,7 +3,7 @@ "api-version": "2018-08-01-preview", "billingAccountName": "2000100", "invoiceSectionName": "123", - "billingRoleDefinitionId": "{billingRoleDefinitionId}" + "billingRoleDefinitionName": "{billingRoleDefinitionId}" }, "responses": { "200": { diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionWithExpand.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionWithExpand.json index c99b2dcd5f67..996fa1fd7e51 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionWithExpand.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionWithExpand.json @@ -1,39 +1,36 @@ { "parameters": { "api-version": "2018-11-01-preview", - "invoiceSectionId": "{invoiceSectionId}", + "billingAccountName": "2000200", + "invoiceSectionName": "{invoiceSectionName}", "$expand": "billingProfiles" }, "responses": { "200": { "body": { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/invoiceSections/{invoiceSectionId}", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionId}", "name": "{invoiceSectionId}", "type": "Microsoft.Billing/invoiceSections", "properties": { "displayName": "invoiceSectionName1", "billingProfiles": [ { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/billingProfiles/BillingProfileId1", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/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": "USA", - "PhoneNumber": "000-000-0000" + "addressLine1": "Test Address", + "addressLine2": "Test Address", + "addressLine3": "Test Address", + "city": "City", + "postalCode": "00000", + "region": "WA", + "country": "USA" }, - "billingContact": "ronald@contoso.com", - "emailInvoice": true, "isClassic": false, - "invoiceDay": "5th of the month", "currency": "USD", "enabledAzureSKUs": [ { @@ -48,26 +45,22 @@ } }, { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/billingProfiles/BillingProfileId2", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/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": "USA", - "PhoneNumber": "000-000-0000" + "addressLine1": "Test Address", + "addressLine2": "Test Address", + "addressLine3": "Test Address", + "city": "City", + "postalCode": "00000", + "region": "WA", + "country": "USA" }, - "billingContact": "ronald@contoso.com", - "emailInvoice": true, "isClassic": false, - "invoiceDay": "5th of the month", "currency": "USD", "enabledAzureSKUs": [ { diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionsListByBillingAccountName.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionsListByBillingAccountName.json index 09e76d8b127c..1452bd928159 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionsListByBillingAccountName.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionsListByBillingAccountName.json @@ -1,14 +1,14 @@ { "parameters": { "api-version": "2018-11-01-preview", - "billingAccountId": "{billingAccountId}" + "billingAccountName": "{billingAccountName}" }, "responses": { "200": { "body": { "value": [ { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/invoiceSections/invoiceSectionId1", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/invoiceSectionId1", "name": "invoiceSectionId1", "type": "Microsoft.Billing/invoiceSections", "properties": { @@ -16,7 +16,7 @@ } }, { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/invoiceSections/invoiceSectionId2", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/invoiceSectionId2", "name": "invoiceSectionId2", "type": "Microsoft.Billing/invoiceSections", "properties": { diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionsListByBillingAccountNameWithCreateSubPermission.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionsListByBillingAccountNameWithCreateSubPermission.json index 1f82196e93f5..6de80e74ad65 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionsListByBillingAccountNameWithCreateSubPermission.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionsListByBillingAccountNameWithCreateSubPermission.json @@ -1,14 +1,14 @@ { "parameters": { "api-version": "2018-11-01-preview", - "billingAccountId": "{billingAccountId}" + "billingAccountName": "{billingAccountName}" }, "responses": { "200": { "body": { "value": [ { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/invoiceSections/invoiceSectionId1", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/invoiceSectionId1", "name": "invoiceSectionId1", "type": "Microsoft.Billing/invoiceSections", "properties": { diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionsListByBillingAccountNameWithExpand.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionsListByBillingAccountNameWithExpand.json index da9e3637f51d..2e026e54d5e5 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionsListByBillingAccountNameWithExpand.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionsListByBillingAccountNameWithExpand.json @@ -1,7 +1,7 @@ { "parameters": { "api-version": "2018-11-01-preview", - "billingAccountId": "{billingAccountId}", + "billingAccountName": "{billingAccountName}", "$expand": "billingProfiles" }, "responses": { @@ -9,33 +9,29 @@ "body": { "value": [ { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/invoiceSections/invoiceSectionId1", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/invoiceSectionId1", "name": "invoiceSectionId1", "type": "Microsoft.Billing/invoiceSections", "properties": { "displayName": "invoiceSectionName1", "billingProfiles": [ { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/billingProfiles/BillingProfileId1", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/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" + "addressLine1": "Test Address", + "addressLine2": "Test Address", + "addressLine3": "Test Address", + "city": "City", + "postalCode": "00000", + "region": "WA", + "country": "US" }, - "billingContact": "ronald@contoso.com", - "emailInvoice": true, "isClassic": false, - "invoiceDay": "5th of the month", "currency": "USD", "enabledAzureSKUs": [ { @@ -50,26 +46,22 @@ } }, { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/billingProfiles/BillingProfileId2", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/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" + "addressLine1": "Test Address", + "addressLine2": "Test Address", + "addressLine3": "Test Address", + "city": "City", + "postalCode": "00000", + "region": "WA", + "country": "US" }, - "billingContact": "ronald@contoso.com", - "emailInvoice": true, "isClassic": false, - "invoiceDay": "5th of the month", "currency": "USD", "enabledAzureSKUs": [ { @@ -87,33 +79,29 @@ } }, { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/invoiceSections/invoiceSectionId2", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/invoiceSectionId2", "name": "invoiceSectionId2", "type": "Microsoft.Billing/invoiceSections", "properties": { "displayName": "invoiceSectionName2", "billingProfiles": [ { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/billingProfiles/BillingProfileId3", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/BillingProfileId3", "name": "BillingProfileId3", "type": "Microsoft.Billing/billingProfiles", "properties": { "displayName": "BillingProfileName3", "poNumber": "ABC12345", "billingAddress": { - "AddressLine1": "Test Address", - "AddressLine2": "Test Address", - "AddressLine3": "Test Address", - "City": "City", - "PostalCode": "00000", - "Region": "WA", - "Country": "US", - "PhoneNumber": "000-000-0000" + "addressLine1": "Test Address", + "addressLine2": "Test Address", + "addressLine3": "Test Address", + "city": "City", + "postalCode": "00000", + "region": "WA", + "country": "US" }, - "billingContact": "ronald@contoso.com", - "emailInvoice": true, "isClassic": false, - "invoiceDay": "5th of the month", "currency": "USD", "enabledAzureSKUs": [ { @@ -128,26 +116,22 @@ } }, { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/billingProfiles/BillingProfileId4", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/BillingProfileId4", "name": "BillingProfileId4", "type": "Microsoft.Billing/billingProfiles", "properties": { "displayName": "BillingProfileName4", "poNumber": "ABC12345", "billingAddress": { - "AddressLine1": "Test Address", - "AddressLine2": "Test Address", - "AddressLine3": "Test Address", - "City": "City", - "PostalCode": "00000", - "Region": "WA", - "Country": "US", - "PhoneNumber": "000-000-0000" + "addressLine1": "Test Address", + "addressLine2": "Test Address", + "addressLine3": "Test Address", + "city": "City", + "postalCode": "00000", + "region": "WA", + "country": "US" }, - "billingContact": "ronald@contoso.com", - "emailInvoice": true, "isClassic": false, - "invoiceDay": "5th of the month", "currency": "USD", "enabledAzureSKUs": [ { diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionsListByBillingAccountNameWithExpandAndCreateSubPermission.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionsListByBillingAccountNameWithExpandAndCreateSubPermission.json index 10b199065d01..b5ba7877c3e3 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionsListByBillingAccountNameWithExpandAndCreateSubPermission.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionsListByBillingAccountNameWithExpandAndCreateSubPermission.json @@ -1,7 +1,7 @@ { "parameters": { "api-version": "2018-11-01-preview", - "billingAccountId": "{billingAccountId}", + "billingAccountName": "{billingAccountName}", "$expand": "billingProfiles" }, "responses": { @@ -9,33 +9,29 @@ "body": { "value": [ { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/invoiceSections/invoiceSectionId1", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/invoiceSectionId1", "name": "invoiceSectionId1", "type": "Microsoft.Billing/invoiceSections", "properties": { "displayName": "invoiceSectionName1", "billingProfiles": [ { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/billingProfiles/BillingProfileId1", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/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" + "addressLine1": "Test Address", + "addressLine2": "Test Address", + "addressLine3": "Test Address", + "city": "City", + "postalCode": "00000", + "region": "WA", + "country": "US" }, - "billingContact": "ronald@contoso.com", - "emailInvoice": true, "isClassic": false, - "invoiceDay": "5th of the month", "currency": "USD", "enabledAzureSKUs": [ { @@ -50,26 +46,22 @@ } }, { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/billingProfiles/BillingProfileId2", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/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" + "addressLine1": "Test Address", + "addressLine2": "Test Address", + "addressLine3": "Test Address", + "city": "City", + "postalCode": "00000", + "region": "WA", + "country": "US" }, - "billingContact": "ronald@contoso.com", - "emailInvoice": true, "isClassic": false, - "invoiceDay": "5th of the month", "currency": "USD", "enabledAzureSKUs": [ { diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoicesListByBillingProfile.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoicesListByBillingProfile.json index 6a6bfe94650b..94f2974e9f88 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoicesListByBillingProfile.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoicesListByBillingProfile.json @@ -1,8 +1,8 @@ { "parameters": { "api-version": "2018-11-01-preview", - "billingAccountId": "2000200", - "billingProfileId": "BillingProfileId1", + "billingAccountName": "2000200", + "billingProfileName": "BillingProfileId1", "periodStartDate": "2018-01-01", "periodEndDate": "2018-06-30", "$filter": "invoicePeriodStartDate le 2018-06-01" @@ -16,8 +16,8 @@ "name": "1383723", "type": "Microsoft.Billing/invoices", "properties": { - "dueDate": "2018-01-16", - "invoiceDate": "2018-01-01", + "dueDate": "2018-01-16T17:32:28Z", + "invoiceDate": "2018-01-01T17:32:28Z", "status": "Due", "amountDue": { "currency": "USD", @@ -27,8 +27,8 @@ "currency": "USD", "value": 2000.00 }, - "invoicePeriodStartDate": "2018-01-01", - "invoicePeriodEndDate": "2018-01-15", + "invoicePeriodStartDate": "2018-01-01T17:32:28Z", + "invoicePeriodEndDate": "2018-01-15T17:32:28Z", "billingProfile": "345986", "purchaseOrderNumber": "123456", "documentUrls": [ @@ -47,7 +47,7 @@ ], "payments": [ { - "date": "2018-01-14", + "date": "2018-01-14T17:32:28Z", "paymentType": "credited", "amount": { "currency": "USD", @@ -62,8 +62,8 @@ "name": "1383724", "type": "Microsoft.Billing/invoices", "properties": { - "dueDate": "2018-03-01", - "invoiceDate": "2018-01-01", + "dueDate": "2018-03-01T17:32:28Z", + "invoiceDate": "2018-01-01T17:32:28Z", "status": "PastDue", "amountDue": { "currency": "USD", @@ -73,8 +73,8 @@ "currency": "USD", "value": 2000.00 }, - "invoicePeriodStartDate": "2018-02-01", - "invoicePeriodEndDate": "2018-02-30", + "invoicePeriodStartDate": "2018-02-01T17:32:28Z", + "invoicePeriodEndDate": "2018-02-30T17:32:28Z", "billingProfile": "345987", "purchaseOrderNumber": "123456", "documentUrls": [ @@ -93,7 +93,7 @@ ], "payments": [ { - "date": "2018-01-14", + "date": "2018-01-14T17:32:28Z", "paymentType": "credited", "amount": { "currency": "USD", diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/ListRecipientTransfers.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/ListRecipientTransfers.json index 385fc2363761..fe90496f94d4 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/ListRecipientTransfers.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/ListRecipientTransfers.json @@ -8,21 +8,13 @@ "body": { "value": [ { - "id": "/providers/Microsoft.Billing/transfers/transferName", - "type": "Microsoft.Billing/transfers", - "name": "transferName", "properties": { - "creationTime": "10/10/2018 9:40:01 PM", - "expirationTime": "11/5/2018 4:47:08 AM", - "allowedSubscriptionType": [ - "DevTestAzureSubscription", - "StandardAzureSubscription", - "AzureReservation" - ], + "creationTime": "2018-10-10T17:32:28Z", + "expirationTime": "2018-11-05T17:32:28Z", "transferStatus": "InProgress", "recipientEmailId": "user@contoso.com", "initiatorEmailId": "user@contoso.com", - "lastModifiedTime": "10/10/2018 9:45:01 PM", + "lastModifiedTime": "2018-10-10T17:32:28Z", "detailedTransferStatus": [ { "productType": "AzureSubscription", diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/ListTransfers.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/ListTransfers.json index 09b39e353c47..2fdc7002e9fb 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/ListTransfers.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/ListTransfers.json @@ -10,18 +10,15 @@ "body": { "value": [ { - "id": "/providers/Microsoft.Billing/billingAccounts/billingAccountName/invoiceSections/invoiceSectionName/transfers/transferName", - "type": "Microsoft.Billing/transfers", - "name": "transferName", "properties": { - "creationTime": "10/10/2018 9:40:01 PM", - "expirationTime": "11/5/2018 4:47:08 AM", + "creationTime": "2018-10-10T17:32:28Z", + "expirationTime": "2018-11-05T17:32:28Z", "invoiceSectionId": "invoiceSectionId", - "billingAccountId": "billingAccountId", + "billingAccountId": "billingAccountName", "transferStatus": "InProgress", "recipientEmailId": "user@contoso.com", "initiatorEmailId": "user@contoso.com", - "lastModifiedTime": "10/10/2018 9:45:01 PM", + "lastModifiedTime": "2018-10-10T17:32:28Z", "detailedTransferStatus": [ { "productType": "AzureSubscription", diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/PaymentMethodsListByBillingProfile.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/PaymentMethodsListByBillingProfile.json index 4fb233a7516d..470f59175f6d 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/PaymentMethodsListByBillingProfile.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/PaymentMethodsListByBillingProfile.json @@ -1,8 +1,8 @@ { "parameters": { "api-version": "2018-11-01-preview", - "billingAccountId": "84ae600f-763c-4a66-a8f0-4c497fc58d98", - "billingProfileId": "95869cd5-6f00-42b3-8708-04e85fef9e15" + "billingAccountName": "84ae600f-763c-4a66-a8f0-4c497fc58d98", + "billingProfileName": "95869cd5-6f00-42b3-8708-04e85fef9e15" }, "responses": { "200": { diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/Policy.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/Policy.json index abdb6a38d042..8e26a99fad5c 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/Policy.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/Policy.json @@ -1,19 +1,18 @@ { "parameters": { "api-version": "2018-11-01-preview", - "billingAccountId": "{billingAccountId}", - "billingProfileId": "BillingProfileId1" + "billingAccountName": "{billingAccountName}", + "billingProfileName": "BillingProfileId1" }, "responses": { "200": { "body": { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/billingProfiles/BillingProfileId1/policies/default", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/BillingProfileId1/policies/default", "name": "latest", "type": "Microsoft.Billing/policies", - "eTag": "\"1d34d012214157f\"", "properties": { "reservationPurchasesAllowed": true, - "marketplacePurchasesAllowed": true + "marketplacePurchasesAllowed": true } } } diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/PricesheetDownload.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/PricesheetDownload.json index 12ff7901365c..832b247cd2e9 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/PricesheetDownload.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/PricesheetDownload.json @@ -1,7 +1,7 @@ { "parameters": { "api-version": "2018-03-01-preview", - "billingAccountId": "84ae600f-763c-4a66-a8f0-4c497fc58d98", + "billingAccountName": "84ae600f-763c-4a66-a8f0-4c497fc58d98", "invoiceName": "95869cd5-6f00-42b3-8708-04e85fef9e15" }, "responses": { @@ -15,13 +15,8 @@ }, "200": { "body": { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/invoices/{invoiceName}/pricesheet/pricesheet1", - "name": "pricesheet1", - "type": "Microsoft.Billing/billingAccounts/invoices/pricesheet", - "properties": { - "downloadUrl": "https://myaccount.blob.core.windows.net/?restype=service&comp=properties&sv=2015-04-05&ss=bf&srt=s&st=2015-04-29T22%3A18%3A26Z&se=2015-04-30T02%3A23%3A26Z&sr=b&sp=rw&sip=168.1.5.60-168.1.5.70&spr=https&sig=F%6GRVAZ5Cdj2Pw4tgU7IlSTkWgn7bUkkAg8P6HESXwmf%4B", - "expiryTime": "2018-02-01T00:00:00Z" - } + "url": "https://myaccount.blob.core.windows.net/?restype=service&comp=properties&sv=2015-04-05&ss=bf&srt=s&st=2015-04-29T22%3A18%3A26Z&se=2015-04-30T02%3A23%3A26Z&sr=b&sp=rw&sip=168.1.5.60-168.1.5.70&spr=https&sig=F%6GRVAZ5Cdj2Pw4tgU7IlSTkWgn7bUkkAg8P6HESXwmf%4B", + "expiryTime": "2018-07-21T17:32:28Z" } } } diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/Product.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/Product.json index 38d25a4c35f4..0215c6357d17 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/Product.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/Product.json @@ -1,40 +1,37 @@ { "parameters": { "api-version": "2018-11-01-preview", - "billingAccountId": "1234", - "invoiceSectionId": "42425", + "billingAccountName": "1234", + "invoiceSectionName": "42425", "productName": "productSummaryId1" }, "responses": { "200": { "body": { - "value": { - "id": "/providers/Microsoft.Billing/BillingAccounts/1234/products/productSummaryId1", - "name": "productSummaryId1", - "type": "Microsoft.Consumption/products", - "properties": { - "productTypeId": "A12345", - "productType": "Subscription", - "displayName": "AIP Dev", - "status": "Active", - "EndDate": "2018-05-01", - "purchaseDate": "2018-05-01", - "lastCharge": { - "currency": "USD", - "value": 5000.00 - }, - "lastChargeDate": "2018-06-15", - "billingFrequency": "Monthly", - "quantity": 4, - "skuId": "0001", - "skuDescription": "Enterprise Agreement Development", - "availabilityId": "AvailabilityId1", - "parentProductId": "eligibleOffer2", - "invoiceSectionId": "42425", - "invoiceSectionName": "Contoso operations invoiceSection", - "billingProfileId": "789456", - "billingProfileName": "Contoso operations billing" - } + "id": "/providers/Microsoft.Billing/BillingAccounts/1234/products/productSummaryId1", + "name": "productSummaryId1", + "type": "Microsoft.Consumption/products", + "properties": { + "productTypeId": "A12345", + "productType": "Subscription", + "displayName": "AIP Dev", + "status": "Active", + "purchaseDate": "2018-05-01T17:32:28Z", + "lastCharge": { + "currency": "USD", + "value": 5000.00 + }, + "lastChargeDate": "2018-06-15T17:32:28Z", + "billingFrequency": "Monthly", + "quantity": 4, + "skuId": "0001", + "skuDescription": "Enterprise Agreement Development", + "availabilityId": "AvailabilityId1", + "parentProductId": "eligibleOffer2", + "invoiceSectionId": "42425", + "invoiceSectionName": "Contoso operations invoiceSection", + "billingProfileId": "789456", + "billingProfileName": "Contoso operations billing" } } } diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/ProductCancelByBillingAccount.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/ProductCancelByBillingAccount.json index 4c7e98ef6cb0..f8417411721c 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/ProductCancelByBillingAccount.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/ProductCancelByBillingAccount.json @@ -1,69 +1,18 @@ { "parameters": { "api-version": "2018-11-01-preview", - "billingAccountId": "1234" + "billingAccountName": "1234", + "productName": "productSummaryId1", + "body": { + "autoRenew": "false" + } }, "responses": { "200": { "body": { - "value": [ - { - "id": "/providers/Microsoft.Billing/BillingAccounts/1234/products/productSummaryId1", - "name": "productSummaryId1", - "type": "Microsoft.Consumption/products", - "properties": { - "productTypeId": "A12345", - "productType": "Reservation", - "displayName": "Eng Reservation (1a13s21awe)", - "status": "Active", - "EndDate": "2018-05-01", - "purchaseDate": "2018-05-01", - "lastCharge": { - "currency": "USD", - "value": 5000.00 - }, - "lastChargeDate": "2018-06-15", - "quantity": 4, - "skuId": "0001", - "skuDescription": "Enterprise Agreement Development", - "availabilityId": "AvailabilityId1", - "billingFrequency": "OneTime", - "parentProductId": "eligibleOffer2", - "invoiceSectionId": "42425", - "invoiceSectionName": "Contoso operations invoiceSection", - "billingProfileId": "789456", - "billingProfileName": "Contoso operations billing" - } - }, - { - "id": "/providers/Microsoft.Billing/BillingAccounts/1234/products/productSummaryId2", - "name": "productSummaryId2", - "type": "Microsoft.Consumption/products", - "properties": { - "productTypeId": "A12345", - "productType": "Azure subscription", - "displayName": "Engineering Email", - "status": "Active", - "EndDate": "2018-05-01", - "purchaseDate": "2018-04-01", - "lastCharge": { - "currency": "USD", - "value": 5000.00 - }, - "lastChargeDate": "2018-06-15", - "quantity": 4, - "skuId": "0001", - "skuDescription": "Enterprise Agreement Development", - "availabilityId": "AvailabilityId1", - "billingFrequency": "Monthly", - "parentProductId": "eligibleOffer2", - "invoiceSectionId": "456789", - "invoiceSectionName": "Contoso operations invoiceSection", - "billingProfileId": "789456", - "billingProfileName": "Contoso operations billing" - } - } - ] + "properties": { + "endDate": "2018-05-01T17:32:28Z" + } } } } diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/ProductCancelForInvoiceSection.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/ProductCancelForInvoiceSection.json index 4c7e98ef6cb0..2fa803b3be8a 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/ProductCancelForInvoiceSection.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/ProductCancelForInvoiceSection.json @@ -1,69 +1,19 @@ { "parameters": { "api-version": "2018-11-01-preview", - "billingAccountId": "1234" + "billingAccountName": "1234", + "invoiceSectionName": "1234", + "productName" : "234", + "body": { + "autoRenew" : "false" + } }, "responses": { "200": { "body": { - "value": [ - { - "id": "/providers/Microsoft.Billing/BillingAccounts/1234/products/productSummaryId1", - "name": "productSummaryId1", - "type": "Microsoft.Consumption/products", - "properties": { - "productTypeId": "A12345", - "productType": "Reservation", - "displayName": "Eng Reservation (1a13s21awe)", - "status": "Active", - "EndDate": "2018-05-01", - "purchaseDate": "2018-05-01", - "lastCharge": { - "currency": "USD", - "value": 5000.00 - }, - "lastChargeDate": "2018-06-15", - "quantity": 4, - "skuId": "0001", - "skuDescription": "Enterprise Agreement Development", - "availabilityId": "AvailabilityId1", - "billingFrequency": "OneTime", - "parentProductId": "eligibleOffer2", - "invoiceSectionId": "42425", - "invoiceSectionName": "Contoso operations invoiceSection", - "billingProfileId": "789456", - "billingProfileName": "Contoso operations billing" - } - }, - { - "id": "/providers/Microsoft.Billing/BillingAccounts/1234/products/productSummaryId2", - "name": "productSummaryId2", - "type": "Microsoft.Consumption/products", - "properties": { - "productTypeId": "A12345", - "productType": "Azure subscription", - "displayName": "Engineering Email", - "status": "Active", - "EndDate": "2018-05-01", - "purchaseDate": "2018-04-01", - "lastCharge": { - "currency": "USD", - "value": 5000.00 - }, - "lastChargeDate": "2018-06-15", - "quantity": 4, - "skuId": "0001", - "skuDescription": "Enterprise Agreement Development", - "availabilityId": "AvailabilityId1", - "billingFrequency": "Monthly", - "parentProductId": "eligibleOffer2", - "invoiceSectionId": "456789", - "invoiceSectionName": "Contoso operations invoiceSection", - "billingProfileId": "789456", - "billingProfileName": "Contoso operations billing" - } - } - ] + "properties": { + "endDate": "2018-05-01T17:32:28Z" + } } } } diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/ProductsListByBillingAccount.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/ProductsListByBillingAccount.json index 4c7e98ef6cb0..78907b5c37f4 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/ProductsListByBillingAccount.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/ProductsListByBillingAccount.json @@ -1,7 +1,7 @@ { "parameters": { "api-version": "2018-11-01-preview", - "billingAccountId": "1234" + "billingAccountName": "1234" }, "responses": { "200": { @@ -16,13 +16,12 @@ "productType": "Reservation", "displayName": "Eng Reservation (1a13s21awe)", "status": "Active", - "EndDate": "2018-05-01", - "purchaseDate": "2018-05-01", + "purchaseDate": "2018-05-01T17:32:28Z", "lastCharge": { "currency": "USD", "value": 5000.00 }, - "lastChargeDate": "2018-06-15", + "lastChargeDate": "2018-06-15T17:32:28Z", "quantity": 4, "skuId": "0001", "skuDescription": "Enterprise Agreement Development", @@ -44,13 +43,12 @@ "productType": "Azure subscription", "displayName": "Engineering Email", "status": "Active", - "EndDate": "2018-05-01", - "purchaseDate": "2018-04-01", + "purchaseDate": "2018-04-01T17:32:28Z", "lastCharge": { "currency": "USD", "value": 5000.00 }, - "lastChargeDate": "2018-06-15", + "lastChargeDate": "2018-06-15T17:32:28Z", "quantity": 4, "skuId": "0001", "skuDescription": "Enterprise Agreement Development", diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/ProductsListByInvoiceSection.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/ProductsListByInvoiceSection.json index 5f62a24e8e60..220c80e35ebb 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/ProductsListByInvoiceSection.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/ProductsListByInvoiceSection.json @@ -1,8 +1,8 @@ { "parameters": { "api-version": "2018-11-01-preview", - "billingAccountId": "1234", - "invoiceSectionId": "42425", + "billingAccountName": "1234", + "invoiceSectionName": "42425", "$expand": "subscriptions" }, "responses": { @@ -18,13 +18,12 @@ "productType": "Reservation", "displayName": "Eng Reservation (1a13s21awe)", "status": "Active", - "EndDate": "2018-05-01", - "purchaseDate": "2018-05-01", + "purchaseDate": "2018-05-01T17:32:28Z", "lastCharge": { "currency": "USD", "value": 5000.00 }, - "lastChargeDate": "2018-06-15", + "lastChargeDate": "2018-06-15T17:32:28Z", "billingFrequency": "OneTime", "quantity": 4, "skuId": "0001", @@ -46,13 +45,12 @@ "productType": "Azure subscription", "displayName": "Engineering Email", "status": "Active", - "EndDate": "2018-05-01", - "purchaseDate": "2018-04-01", + "purchaseDate": "2018-04-01T17:32:28Z", "lastCharge": { "currency": "USD", "value": 500.00 }, - "lastChargeDate": "2018-06-15", + "lastChargeDate": "2018-06-15T17:32:28Z", "billingFrequency": "Monthly", "quantity": 4, "skuId": "0001", diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/ReservationTransactionsListByBillingAccount.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/ReservationTransactionsListByBillingAccount.json index 16ce2dd9ee45..df9e5349e4e8 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/ReservationTransactionsListByBillingAccount.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/ReservationTransactionsListByBillingAccount.json @@ -1,7 +1,7 @@ { "parameters": { "api-version": "2018-11-01-preview", - "billingAccountId": "1234", + "billingAccountName": "1234", "startDate": "2018-04-01", "endDate": "2018-05-30", "$filter": "properties/kind eq 'Reservation'" @@ -11,18 +11,18 @@ "body": { "value": [ { - "id": "/providers/Microsoft.Billing/BillingAccounts/1234/BillingProfiles/42425/transactions/transactionSummaryId1", + "id": "/providers/Microsoft.Billing/BillingAccounts/1234/transactions/transactionSummaryId1", "name": "transactionSummaryId1", "type": "Microsoft.Billing/transactions", "properties": { - "kind": "all", + "kind": "reservation", "date": "2018-04-23T00:00:00Z", "invoice": "2344233", "orderName": "Contoso Reserved", "orderId": "6d8e7ed9-d3be-48b0-8c7a-e19246a6d30c", "productDescription": "Standard D1, US West 3", "transactionType": "Cancel", - "transactionAmount": + "transactionAmount": { "currency": "USD", "value": 5000.00 @@ -38,18 +38,18 @@ } }, { - "id": "/providers/Microsoft.Billing/BillingAccounts/1234/BillingProfiles/42425/transactions/transactionSummaryId2", + "id": "/providers/Microsoft.Billing/BillingAccounts/1234/transactions/transactionSummaryId2", "name": "transactionSummaryId2", "type": "Microsoft.Billing/transactions", "properties": { - "kind": "all", + "kind": "reservation", "date": "2018-05-05T00:00:00Z", "invoice": "Pending", "orderName": "MSFT Reserved", "orderId": "1c24006f-8350-4315-ad8f-6d11180448f9", "productDescription": "Standard D1, US West 3", "transactionType": "Purchase", - "transactionAmount": + "transactionAmount": { "currency": "USD", "value": 6000.00 diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/ReservationTransactionsListByBillingProfile.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/ReservationTransactionsListByBillingProfile.json index 0addf5f0b08a..69f063b1225e 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/ReservationTransactionsListByBillingProfile.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/ReservationTransactionsListByBillingProfile.json @@ -1,8 +1,8 @@ { "parameters": { "api-version": "2018-11-01-preview", - "billingAccountId": "1234", - "billingProfileId": "42425", + "billingAccountName": "1234", + "billingProfileName": "42425", "startDate": "2018-04-01", "endDate": "2018-05-30", "$filter": "properties/kind eq 'Reservation'" @@ -16,7 +16,7 @@ "name": "transactionSummaryId1", "type": "Microsoft.Billing/transactions", "properties": { - "kind": "all", + "kind": "reservation", "date": "2018-04-23T00:00:00Z", "invoice": "2344233", "orderName": "Contoso Reserved", @@ -30,7 +30,7 @@ "quantity": 4, "invoiceSectionId": "123456", "invoiceSectionName": "Contoso operations invoiceSection", - "billingProfileId": "789456", + "billingProfileId": "42425", "billingProfileName": "Contoso operations billing", "subscriptionId": "789456", "subscriptionName": "Contoso operations billing" @@ -41,7 +41,7 @@ "name": "transactionSummaryId2", "type": "Microsoft.Billing/transactions", "properties": { - "kind": "all", + "kind": "reservation", "date": "2018-05-05T00:00:00Z", "invoice": "Pending", "orderName": "MSFT Reserved", @@ -55,7 +55,7 @@ "quantity": 5, "invoiceSectionId": "123456", "invoiceSectionName": "Contoso operations invoiceSection", - "billingProfileId": "789456", + "billingProfileId": "42425", "billingProfileName": "Contoso operations billing", "subscriptionId": "789456", "subscriptionName": "Contoso operations billing" diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/ReservationTransactionsListByInvoiceSection.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/ReservationTransactionsListByInvoiceSection.json new file mode 100644 index 000000000000..aa068134bd3c --- /dev/null +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/ReservationTransactionsListByInvoiceSection.json @@ -0,0 +1,68 @@ +{ + "parameters": { + "api-version": "2018-11-01-preview", + "billingAccountName": "1234", + "invoiceSectionName": "42425", + "startDate": "2018-04-01", + "endDate": "2018-05-30", + "$filter": "properties/kind eq 'Reservation'" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/providers/Microsoft.Billing/BillingAccounts/1234/InvoiceSection/42425/transactions/transactionSummaryId1", + "name": "transactionSummaryId1", + "type": "Microsoft.Billing/transactions", + "properties": { + "kind": "reservation", + "date": "2018-04-23T00:00:00Z", + "invoice": "2344233", + "orderName": "Contoso Reserved", + "orderId": "6d8e7ed9-d3be-48b0-8c7a-e19246a6d30c", + "productDescription": "Standard D1, US West 3", + "transactionType": "Cancel", + "transactionAmount": { + "currency": "USD", + "value": 5000.00 + }, + "quantity": 4, + "invoiceSectionId": "42425", + "invoiceSectionName": "Contoso operations invoiceSection", + "billingProfileId": "789456", + "billingProfileName": "Contoso operations billing", + "subscriptionId": "789456", + "subscriptionName": "Contoso operations billing" + } + }, + { + "id": "/providers/Microsoft.Billing/BillingAccounts/1234/InvoiceSection/42425/transactions/transactionSummaryId2", + "name": "transactionSummaryId2", + "type": "Microsoft.Billing/transactions", + "properties": { + "kind": "reservation", + "date": "2018-05-05T00:00:00Z", + "invoice": "Pending", + "orderName": "MSFT Reserved", + "orderId": "1c24006f-8350-4315-ad8f-6d11180448f9", + "productDescription": "Standard D1, US West 3", + "transactionType": "Purchase", + "transactionAmount": { + "currency": "USD", + "value": 6000.00 + }, + "quantity": 5, + "invoiceSectionId": "42425", + "invoiceSectionName": "Contoso operations invoiceSection", + "billingProfileId": "789456", + "billingProfileName": "Contoso operations billing", + "subscriptionId": "789456", + "subscriptionName": "Contoso operations billing" + } + } + ] + } + } + } +} \ No newline at end of file diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/TransactionsListByBillingAccount.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/TransactionsListByBillingAccount.json index c889958e2ff8..4600862a2f05 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/TransactionsListByBillingAccount.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/TransactionsListByBillingAccount.json @@ -1,7 +1,7 @@ { "parameters": { "api-version": "2018-11-01-preview", - "billingAccountId": "1234", + "billingAccountName": "1234", "startDate": "2018-04-01", "endDate": "2018-05-30" }, @@ -10,14 +10,13 @@ "body": { "value": [ { - "id": "/providers/Microsoft.Billing/BillingAccounts/1234/BillingProfiles/42425/transactions/transactionSummaryId1", + "id": "/providers/Microsoft.Billing/BillingAccounts/1234/transactions/transactionSummaryId1", "name": "transactionSummaryId1", "type": "Microsoft.Billing/transactions", "properties": { - "kind": "reservation", + "kind": "all", "date": "2018-05-01T00:00:00Z", "invoice": "2344233", - "displayName": "afweaf", "productTypeId": "A12345", "productType": "Dev Support", "productDescription": "Standard D1, US West 3", @@ -33,14 +32,13 @@ } }, { - "id": "/providers/Microsoft.Billing/BillingAccounts/1234/BillingProfiles/42425/transactions/transactionSummaryId2", + "id": "/providers/Microsoft.Billing/BillingAccounts/1234/transactions/transactionSummaryId2", "name": "transactionSummaryId2", "type": "Microsoft.Billing/transactions", "properties": { - "kind": "reservation", + "kind": "all", "date": "2018-04-01T00:00:00Z", "invoice": "pending", - "displayName": "afweaf", "productTypeId": "A12345", "productType": "Azure subscription", "productDescription": "Send grid Gold", diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/TransactionsListByBillingProfile.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/TransactionsListByBillingProfile.json index 0457a57767ce..514cf329d75a 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/TransactionsListByBillingProfile.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/TransactionsListByBillingProfile.json @@ -1,8 +1,8 @@ { "parameters": { "api-version": "2018-11-01-preview", - "billingAccountId": "1234", - "billingProfileId": "42425", + "billingAccountName": "1234", + "billingProfileName": "42425", "startDate": "2018-04-01", "endDate": "2018-05-30" }, @@ -15,11 +15,11 @@ "name": "transactionSummaryId1", "type": "Microsoft.Billing/transactions", "properties": { - "kind": "reservation", + "kind": "all", "date": "2018-05-01T00:00:00Z", "invoice": "2344233", "productTypeId": "A12345", - "productType": "Reservered VM Instance", + "productType": "VM Instance", "productDescription": "Standard D1, US West 3", "transactionType": "Purchase", "transactionAmount": { @@ -28,7 +28,7 @@ }, "invoiceSectionId": "123456", "invoiceSectionName": "Contoso operations invoiceSection", - "billingProfileId": "789456", + "billingProfileId": "42425", "billingProfileName": "Contoso operations billing" } }, @@ -37,11 +37,11 @@ "name": "transactionSummaryId2", "type": "Microsoft.Billing/transactions", "properties": { - "kind": "reservation", + "kind": "all", "date": "2018-04-01T00:00:00Z", "invoice": "pending", "productTypeId": "A12345", - "productType": "Reservered VM Instance", + "productType": "VM Instance", "productDescription": "Standard Support", "transactionType": "Cancel", "transactionAmount": { @@ -50,7 +50,7 @@ }, "invoiceSectionId": "123456", "invoiceSectionName": "Contoso operations invoiceSection", - "billingProfileId": "789456", + "billingProfileId": "42425", "billingProfileName": "Contoso operations billing" } } diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/TransactionsListByInvoiceSection.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/TransactionsListByInvoiceSection.json new file mode 100644 index 000000000000..e0a46a14afc4 --- /dev/null +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/TransactionsListByInvoiceSection.json @@ -0,0 +1,61 @@ +{ + "parameters": { + "api-version": "2018-11-01-preview", + "billingAccountName": "1234", + "invoiceSectionName": "42425", + "startDate": "2018-04-01", + "endDate": "2018-05-30" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/providers/Microsoft.Billing/BillingAccounts/1234/InvoiceSection/42425/transactions/transactionSummaryId1", + "name": "transactionSummaryId1", + "type": "Microsoft.Billing/transactions", + "properties": { + "kind": "all", + "date": "2018-05-01T00:00:00Z", + "invoice": "2344233", + "productTypeId": "A12345", + "productType": "Reserved VM Instance", + "productDescription": "Standard D1, US West 3", + "transactionType": "Purchase", + "transactionAmount": { + "currency": "USD", + "value": 5000.00 + }, + "invoiceSectionId": "42425", + "invoiceSectionName": "Contoso operations invoiceSection", + "billingProfileId": "789456", + "billingProfileName": "Contoso operations billing" + } + }, + { + "id": "/providers/Microsoft.Billing/BillingAccounts/1234/InvoiceSection/42425/transactions/transactionSummaryId2", + "name": "transactionSummaryId2", + "type": "Microsoft.Billing/transactions", + "properties": { + "kind": "all", + "date": "2018-04-01T00:00:00Z", + "invoice": "pending", + "productTypeId": "A12345", + "productType": "VM Instance", + "productDescription": "Standard Support", + "transactionType": "Cancel", + "transactionAmount": { + "currency": "USD", + "value": 50.00 + }, + "invoiceSectionId": "42425", + "invoiceSectionName": "Contoso operations invoiceSection", + "billingProfileId": "789456", + "billingProfileName": "Contoso operations billing" + } + } + ] + } + } + } +} \ No newline at end of file diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/TransferBillingSubscription.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/TransferBillingSubscription.json index fd3748406710..4bed2fa3a8b0 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/TransferBillingSubscription.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/TransferBillingSubscription.json @@ -1,32 +1,26 @@ { "parameters": { "api-version": "2018-11-01-preview", - "billingAccountId": "billingAccountId", - "invoiceSectionId": "invoiceSectionId", - "subscriptionId": "subscriptionId", - "body": { - "properties": { - "destinationInvoiceSectionId": "destinationInvoiceSectionId" - } + "billingAccountName": "billingAccountName", + "invoiceSectionName": "invoiceSectionId", + "billingSubscriptionName": "subscriptionId", + "parameters": { + "destinationInvoiceSectionName": "destinationInvoiceSectionId" } }, "responses": { "200": { "body": { - "id": "/providers/Microsoft.Billing/billingAccounts/billingAccountId/invoiceSections/invoiceSectionId/billingSubscriptions/subscriptionId/transfer/operationResults/operationId", - "type": "Microsoft.Billing/transferOperationSummary", - "name": "operationId", - "properties": { - "AzureSubscriptionId": "subscriptionId", - "InvoiceSectionId": "destinationInvoiceSectionId" + "properties" : { + "billingSubscriptionName": "subscriptionId" } } }, "202": { "headers": { - "Location": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/billingAccountId/invoiceSections/invoiceSectionId/billingSubscriptions/subscriptionId/transfer/operationResults/84ae600f-763c-4a66-a8f0-4c497fc58d98?api-version=2018-11-01-preview", + "Location": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/billingAccountName/invoiceSections/invoiceSectionId/billingSubscriptions/subscriptionId/transfer/operationResults/84ae600f-763c-4a66-a8f0-4c497fc58d98?api-version=2018-11-01-preview", "Retry-After": "30", - "Azure-AsyncOperation": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/billingAccountId/invoiceSections/invoiceSectionId/billingSubscriptions/subscriptionId/transfer/operationStatus/84ae600f-763c-4a66-a8f0-4c497fc58d98?api-version=2018-11-01-preview" + "Azure-AsyncOperation": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/billingAccountName/invoiceSections/invoiceSectionId/billingSubscriptions/subscriptionId/transfer/operationStatus/84ae600f-763c-4a66-a8f0-4c497fc58d98?api-version=2018-11-01-preview" } } } diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/TransferProduct.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/TransferProduct.json index e39c4a0b21ec..50fed1191db9 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/TransferProduct.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/TransferProduct.json @@ -1,23 +1,50 @@ { "parameters": { "api-version": "2018-11-01-preview", - "billingAccountId": "{billingAccountId}", - "invoiceSectionId": "{invoiceSectionId1}", + "billingAccountName": "{billingAccountName}", + "invoiceSectionName": "{invoiceSectionId1}", "productName": "product1", "parameters": { - "request": { - "destinationInvoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/5660ed6e-7824-4795-a579-c0037e6c8da4/invoiceSections/2b2ff7ea-559c-41c0-adea-2550293e11e5" - } + "destinationInvoiceSectionName": "/providers/Microsoft.Billing/billingAccounts/5660ed6e-7824-4795-a579-c0037e6c8da4/invoiceSections/2b2ff7ea-559c-41c0-adea-2550293e11e5" } }, "responses": { - "202": { - "headers": { - "Location": "https://management.azure.com/providers/Microsoft.Billing/operationResults/84ae600f-763c-4a66-a8f0-4c497fc58d98?api-version=2018-11-01-preview", - "Retry-After": "60", - "Azure-AsyncOperation": "https://management.azure.com/providers/Microsoft.Billing/operationStatus/84ae600f-763c-4a66-a8f0-4c497fc58d98?api-version=2018-11-01-preview", - "OData-EntityId": "84ae600f-763c-4a66-a8f0-4c497fc58d98" + "200": { + "body": { + "id": "/providers/Microsoft.Billing/BillingAccounts/1234/products/productSummaryId1", + "name": "productSummaryId1", + "type": "Microsoft.Consumption/products", + "properties": { + "productTypeId": "A12345", + "productType": "Subscription", + "displayName": "AIP Dev", + "status": "Active", + "purchaseDate": "2018-05-01T17:32:28Z", + "lastCharge": { + "currency": "USD", + "value": 5000.00 + }, + "lastChargeDate": "2018-06-15T17:32:28Z", + "billingFrequency": "Monthly", + "quantity": 4, + "skuId": "0001", + "skuDescription": "Enterprise Agreement Development", + "availabilityId": "AvailabilityId1", + "parentProductId": "eligibleOffer2", + "invoiceSectionId": "42425", + "invoiceSectionName": "Contoso operations invoiceSection", + "billingProfileId": "789456", + "billingProfileName": "Contoso operations billing" + } + } + }, + "202": { + "headers": { + "Location": "https://management.azure.com/providers/Microsoft.Billing/operationResults/84ae600f-763c-4a66-a8f0-4c497fc58d98?api-version=2018-11-01-preview", + "Retry-After": "60", + "Azure-AsyncOperation": "https://management.azure.com/providers/Microsoft.Billing/operationStatus/84ae600f-763c-4a66-a8f0-4c497fc58d98?api-version=2018-11-01-preview", + "OData-EntityId": "84ae600f-763c-4a66-a8f0-4c497fc58d98" + } } } - } -} \ No newline at end of file + } \ No newline at end of file diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/UpdateBillingProfile.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/UpdateBillingProfile.json index 647e6d918003..c0c24e82b97f 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/UpdateBillingProfile.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/UpdateBillingProfile.json @@ -1,15 +1,13 @@ { "parameters": { "api-version": "2018-11-01-preview", - "billingAccountId": "2000100", - "billingProfileId": "BillingProfileId1", + "billingAccountName": "2000100", + "billingProfileName": "BillingProfileId1", "parameters": { "properties": { "displayName": "BillingProfileName1", "poNumber": "ABC12345", "billingAddress": "One Microsoft Way", - "billingContact": "ronald@contoso.com", - "emailInvoice": true, "isClassic": false } } @@ -23,24 +21,23 @@ }, "200": { "body": { - "id": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/billingProfiles/BillingProfileId1", + "id": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/BillingProfileId1", "name": "BillingProfileId1", "type": "Microsoft.Billing/billingProfiles", "properties": { "displayName": "BillingProfileName1", "poNumber": "ABC12345", - "address": { - "AddressLine1": "Test Address", - "AddressLine2": "Test Address", - "AddressLine3": "Test Address", - "City": "City", - "PostalCode": "00000", - "Region": "WA", - "Country": "US" + "billingAddress": { + "addressLine1": "Test Address", + "addressLine2": "Test Address", + "addressLine3": "Test Address", + "city": "City", + "postalCode": "00000", + "region": "WA", + "country": "US" }, "invoiceEmailOptIn": true, "isClassic": false, - "invoiceDay": 5, "currency": "USD", "enabledAzureSKUs": [ { diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/UpdateInvoiceSection.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/UpdateInvoiceSection.json index 2130e25de886..c0b5e2b4fa3b 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/UpdateInvoiceSection.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/UpdateInvoiceSection.json @@ -1,8 +1,8 @@ { "parameters": { "api-version": "2018-11-01-preview", - "billingAccountId": "{billingAccountId}", - "invoiceSectionId": "invoiceSectionId1", + "billingAccountName": "{billingAccountName}", + "invoiceSectionName": "invoiceSectionId1", "parameters": { "properties": { "displayName": "invoiceSectionName1" @@ -12,14 +12,14 @@ "responses": { "202": { "headers": { - "Location": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/invoiceSections/operationResults/ed2975a8-8f77-43bb-a717-ace54326b14b?api-version=2018-07-31", + "Location": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/operationResults/ed2975a8-8f77-43bb-a717-ace54326b14b?api-version=2018-07-31", "Retry-After": "60", - "Azure-AsyncOperation": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/invoiceSections/operationStatus/ed2975a8-8f77-43bb-a717-ace54326b14b?api-version=2018-07-31" + "Azure-AsyncOperation": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/operationStatus/ed2975a8-8f77-43bb-a717-ace54326b14b?api-version=2018-07-31" } }, "200": { "body": { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/invoiceSections/invoiceSectionId1", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/invoiceSectionId1", "name": "invoiceSectionId1", "type": "Microsoft.Billing/invoiceSections", "properties": { diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/UpdatePolicy.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/UpdatePolicy.json index 9d2334f19bdb..98f2373dd325 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/UpdatePolicy.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/UpdatePolicy.json @@ -1,26 +1,25 @@ { "parameters": { "api-version": "2018-11-01-preview", - "billingAccountId": "{billingAccountId}", - "billingProfileId": "BillingProfileId1", + "billingAccountName": "{billingAccountName}", + "billingProfileName": "BillingProfileId1", "eTag": "\"1d34d012214157f\"", "parameters": { "properties": { "reservationPurchasesAllowed": true, - "marketplacePurchasesAllowed": false + "marketplacePurchasesAllowed": false } } }, - "responses": { + "responses": { "200": { "body": { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/billingProfiles/BillingProfileId1/policies/default", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/BillingProfileId1/policies/default", "name": "latest", "type": "Microsoft.Billing/policies", - "eTag": "\"1d34d012214157f\"", "properties": { "reservationPurchasesAllowed": true, - "marketplacePurchasesAllowed": true + "marketplacePurchasesAllowed": true } } }