From 2a236eb424b381bb392607c40a9ea40f0f7094f4 Mon Sep 17 00:00:00 2001 From: asarkar84 <33848291+asarkar84@users.noreply.github.com> Date: Wed, 3 Apr 2019 16:40:37 -0700 Subject: [PATCH 01/27] Added specs for Agreements API in version 2018-11-01-preview Added specs for Agreements API in version 2018-11-01-preview --- .../preview/2018-11-01-preview/billing.json | 186 ++++++++++++++++++ .../examples/Agreement.json | 33 ++++ .../AgreementsListByBillingAccountName.json | 54 +++++ 3 files changed, 273 insertions(+) create mode 100644 specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/Agreement.json create mode 100644 specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/AgreementsListByBillingAccountName.json 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 8ebfdfc56179..6e4953654e49 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 @@ -3143,6 +3143,95 @@ } } } + }, + "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/agreements": { + "get": { + "tags": [ + "Agreements" + ], + "x-ms-examples": { + "BillingProfilesListByBillingAccountName": { + "$ref": "./examples/AgreementsListByBillingAccountName.json" + } + }, + "operationId": "Agreements_ListByBillingAccountName", + "description": "Lists all agreements for a billing account.", + "parameters": [ + { + "$ref": "#/parameters/apiVersionParameter" + }, + { + "$ref": "#/parameters/billingAccountNameParameter" + }, + { + "name": "$expand", + "description": "May be used to expand the participants.", + "in": "query", + "required": false, + "type": "string" + } + ], + "responses": { + "200": { + "description": "OK. The request has succeeded.", + "schema": { + "$ref": "#/definitions/AgreementListResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + } + }, + "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/agreements/{agreementName}": { + "get": { + "tags": [ + "Agreements" + ], + "x-ms-examples": { + "BillingProfile": { + "$ref": "./examples/Agreement.json" + } + }, + "operationId": "Agreements_Get", + "description": "Get the agreement by name.", + "parameters": [ + { + "$ref": "#/parameters/apiVersionParameter" + }, + { + "$ref": "#/parameters/billingAccountNameParameter" + }, + { + "$ref": "#/parameters/agreementNameParameter" + }, + { + "name": "$expand", + "description": "May be used to expand the participants.", + "in": "query", + "required": false, + "type": "string" + } + ], + "responses": { + "200": { + "description": "OK. The request has succeeded.", + "schema": { + "$ref": "#/definitions/Agreement" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + } } }, "definitions": { @@ -5141,6 +5230,95 @@ } } }, + "AgreementListResult": { + "description": "Result of listing agreements.", + "properties": { + "value": { + "description": "The list of agreements.", + "type": "array", + "readOnly": true, + "items": { + "$ref": "#/definitions/Agreement" + } + }, + "nextLink": { + "description": "The link (url) to the next page of results.", + "type": "string", + "readOnly": true + } + } + }, + "Agreement": { + "description": "An agreement resource.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/Resource" + } + ], + "properties": { + "properties": { + "description": "An agreement.", + "x-ms-client-flatten": true, + "$ref": "#/definitions/AgreementProperties" + } + } + }, + "AgreementProperties": { + "description": "The properties of the agreement.", + "properties": { + "agreementLink": { + "description": "The link to the agreement.", + "type": "string", + "readOnly": true + }, + "effectiveDate": { + "description": "Effective date.", + "type": "string", + "format": "date-time", + "readOnly": true + }, + "expirationDate": { + "description": "Expiration date.", + "type": "string", + "format": "date-time", + "readOnly": true + }, + "participants": { + "description": "Participants or signer of the agreement.", + "type": "array", + "items": { + "$ref": "#/definitions/Participants" + } + }, + "status": { + "description": "The agreement status", + "type": "string", + "readOnly": true + } + } + }, + "Participants": { + "description": "Details about the participant or signer.", + "properties": { + "status": { + "description": "The signing status", + "type": "string", + "readOnly": true + }, + "statusDate": { + "description": "The date when status got changed.", + "type": "string", + "format": "date-time", + "readOnly": true + }, + "email": { + "description": "The email address of the participant or signer.", + "type": "string", + "readOnly": true + } + } + }, "Action": { "description": "the action the caller allowed to do", "type": "string", @@ -5292,6 +5470,14 @@ "schema": { "$ref": "#/definitions/AcceptTransferRequest" } + }, + "agreementNameParameter": { + "name": "agreementName", + "in": "path", + "description": "Agreement Id.", + "required": true, + "type": "string", + "x-ms-parameter-location": "method" } }, "security": [ diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/Agreement.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/Agreement.json new file mode 100644 index 000000000000..0c666f7588e3 --- /dev/null +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/Agreement.json @@ -0,0 +1,33 @@ +{ + "parameters": { + "api-version": "2018-11-01-preview", + "billingAccountName": "{billingAccountName}", + "agreementName": "Agreement1" + }, + "responses": { + "200": { + "body": { + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/agreements/Agreement1", + "name": "Agreement1", + "type": "Microsoft.Billing/agreements", + "properties": { + "agreementLink": "https://agreementuri1.com", + "effectiveDate": "2018-12-05T00:00:00Z", + "expirationDate": "2018-12-05T00:00:00Z", + "participants": [ + { + "status": "Accepted", + "statusDate": "2018-11-01T00:00:00Z", + "email": "abc@contoso.com" + }, + { + "status": "Declined", + "statusDate": "xyz@contoso.com" + } + ], + "status": "Published" + } + } + } + } +} \ No newline at end of file diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/AgreementsListByBillingAccountName.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/AgreementsListByBillingAccountName.json new file mode 100644 index 000000000000..f3117acc44d1 --- /dev/null +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/AgreementsListByBillingAccountName.json @@ -0,0 +1,54 @@ +{ + "parameters": { + "api-version": "2018-11-01-preview", + "billingAccountName": "{billingAccountName}" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/agreements/Agreement1", + "name": "Agreement1", + "type": "Microsoft.Billing/agreements", + "properties": { + "agreementLink": "https://agreementuri1.com", + "effectiveDate": "2018-12-05T00:00:00Z", + "expirationDate": "2018-12-05T00:00:00Z", + "participants": [ + { + "status": "Accepted", + "statusDate": "2018-11-01T00:00:00Z", + "email": "abc@contoso.com" + }, + { + "status": "Declined", + "statusDate": "xyz@contoso.com" + } + ], + "status": "Published" + } + }, + { + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/agreements/Agreement2", + "name": "Agreement2", + "type": "Microsoft.Billing/agreements", + "properties": { + "agreementLink": "https://agreementuri2.com", + "effectiveDate": "2018-12-05T00:00:00Z", + "expirationDate": "2018-12-05T00:00:00Z", + "participants": [ + { + "status": "Unknown", + "statusDate": "2018-11-01T00:00:00Z", + "email": "abc@contoso.com" + } + ], + "status": "PendingSignature" + } + } + ] + } + } + } +} \ No newline at end of file From a33bee2c158a15e212f4d054aee0d6c4b20742fd Mon Sep 17 00:00:00 2001 From: asarkar84 <33848291+asarkar84@users.noreply.github.com> Date: Wed, 3 Apr 2019 17:37:46 -0700 Subject: [PATCH 02/27] Updated as per naming convension Updated as per naming convension --- .../preview/2018-11-01-preview/billing.json | 6 +++--- .../examples/{Agreement.json => AgreementByName.json} | 0 2 files changed, 3 insertions(+), 3 deletions(-) rename specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/{Agreement.json => AgreementByName.json} (100%) 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 6e4953654e49..121f570b69af 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 @@ -3150,7 +3150,7 @@ "Agreements" ], "x-ms-examples": { - "BillingProfilesListByBillingAccountName": { + "AgreementsListByBillingAccountName": { "$ref": "./examples/AgreementsListByBillingAccountName.json" } }, @@ -3193,8 +3193,8 @@ "Agreements" ], "x-ms-examples": { - "BillingProfile": { - "$ref": "./examples/Agreement.json" + "AgreementByName": { + "$ref": "./examples/AgreementByName.json" } }, "operationId": "Agreements_Get", diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/Agreement.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/AgreementByName.json similarity index 100% rename from specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/Agreement.json rename to specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/AgreementByName.json From 04c53044d143a2b8cb0a51e1059a7b5ae09d25f3 Mon Sep 17 00:00:00 2001 From: asarkar84 <33848291+asarkar84@users.noreply.github.com> Date: Wed, 17 Apr 2019 12:02:12 -0700 Subject: [PATCH 03/27] Corrected specs and examples for BillingRP Corrected specs and examples for BillingRP --- .../preview/2018-11-01-preview/billing.json | 104 ++++------ .../examples/AcceptTransfer.json | 2 +- .../AddRoleAssignmentToBillingAccount.json | 2 +- .../AddRoleAssignmentToBillingProfile.json | 2 +- .../AddRoleAssignmentToInvoiceSection.json | 2 +- .../examples/AgreementByName.json | 6 +- .../AgreementsListByBillingAccountName.json | 4 +- .../AvailableBalanceByBillingProfile.json | 8 +- .../examples/BillingAccount.json | 12 +- .../examples/BillingAccountInvoicesList.json | 10 +- .../BillingAccountPermissionsList.json | 2 +- .../BillingAccountRoleAssignment.json | 2 +- .../BillingAccountRoleAssignmentDelete.json | 2 +- .../BillingAccountRoleAssignmentList.json | 2 +- .../BillingAccountRoleDefinition.json | 2 +- .../BillingAccountRoleDefinitionsList.json | 2 +- .../examples/BillingAccountWithExpand.json | 63 +++--- .../examples/BillingAccountsList.json | 33 ++-- ...istWithCreateInvoiceSectionPermission.json | 45 ----- .../BillingAccountsListWithExpand.json | 121 +++++++----- .../examples/BillingProfile.json | 30 +-- .../BillingProfilePermissionsList.json | 2 +- .../BillingProfileRoleAssignment.json | 2 +- .../BillingProfileRoleAssignmentDelete.json | 2 +- .../BillingProfileRoleAssignmentList.json | 2 +- .../BillingProfileRoleDefinition.json | 2 +- .../BillingProfileRoleDefinitionsList.json | 2 +- ...llingProfilesListByBillingAccountName.json | 52 ++--- .../examples/BillingProperty.json | 23 ++- .../examples/BillingSubscription.json | 28 ++- ...lingSubscriptionsListByBillingAccount.json | 177 ++++++++--------- ...lingSubscriptionsListByBillingProfile.json | 179 ++++++++---------- ...lingSubscriptionsListByInvoiceSection.json | 179 ++++++++---------- .../examples/CancelTransfer.json | 2 +- .../examples/CreateInvoiceSection.json | 29 +-- .../examples/DeclineTransfer.json | 2 +- .../examples/ElevateInvoiceSection.json | 2 +- .../examples/GetRecipientTransfer.json | 2 +- .../examples/GetTransfer.json | 2 +- .../examples/InitiateTransfer.json | 2 +- .../2018-11-01-preview/examples/Invoice.json | 7 +- .../examples/InvoiceSection.json | 8 +- .../InvoiceSectionPermissionsList.json | 2 +- .../InvoiceSectionRoleAssignment.json | 2 +- .../InvoiceSectionRoleAssignmentDelete.json | 2 +- .../InvoiceSectionRoleAssignmentList.json | 2 +- .../InvoiceSectionRoleDefinition.json | 2 +- .../InvoiceSectionRoleDefinitionsList.json | 2 +- .../examples/InvoiceSectionWithExpand.json | 54 +++--- ...voiceSectionsListByBillingAccountName.json | 12 +- ...ingAccountNameWithCreateSubPermission.json | 6 +- ...onsListByBillingAccountNameWithExpand.json | 112 ++++++----- ...tNameWithExpandAndCreateSubPermission.json | 56 +++--- ...voiceSectionsListByBillingProfileName.json | 16 +- .../InvoicesListByBillingProfile.json | 14 +- .../examples/ListRecipientTransfers.json | 2 +- .../examples/ListTransfers.json | 2 +- .../PaymentMethodsListByBillingProfile.json | 21 +- .../2018-11-01-preview/examples/Policy.json | 9 +- .../examples/PricesheetDownload.json | 12 +- .../2018-11-01-preview/examples/Product.json | 10 +- .../ProductsListByBillingAccount.json | 14 +- .../ProductsListByInvoiceSection.json | 17 +- ...ationTransactionsListByBillingAccount.json | 18 +- ...ationTransactionsListByBillingProfile.json | 20 +- ...ationTransactionsListByInvoiceSection.json | 20 +- .../TransactionsListByBillingAccount.json | 16 +- .../TransactionsListByBillingProfile.json | 18 +- .../TransactionsListByInvoiceSection.json | 18 +- .../examples/UpdateBillingProfile.json | 33 ++-- .../examples/UpdateInvoiceSection.json | 14 +- .../examples/UpdatePolicy.json | 12 +- 72 files changed, 850 insertions(+), 850 deletions(-) delete mode 100644 specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountsListWithCreateInvoiceSectionPermission.json 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 121f570b69af..523013327f77 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 @@ -62,46 +62,6 @@ } } }, - "/providers/Microsoft.Billing/listBillingAccountsWithCreateInvoiceSectionPermission": { - "get": { - "tags": [ - "BillingAccounts" - ], - "x-ms-examples": { - "BillingAccountsListWithCreateInvoiceSectionPermission": { - "$ref": "./examples/BillingAccountsListWithCreateInvoiceSectionPermission.json" - } - }, - "operationId": "BillingAccountsWithCreateInvoiceSectionPermission_List", - "description": "Lists all billing accounts with create invoiceSection permission for a user.", - "parameters": [ - { - "$ref": "#/parameters/apiVersionParameter" - }, - { - "name": "$expand", - "description": "May be used to expand the invoiceSections and billingProfiles.", - "in": "query", - "required": false, - "type": "string" - } - ], - "responses": { - "200": { - "description": "OK. The request has succeeded.", - "schema": { - "$ref": "#/definitions/BillingAccountListResult" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "#/definitions/ErrorResponse" - } - } - } - } - }, "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}": { "get": { "tags": [ @@ -1159,7 +1119,7 @@ } } }, - "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfile/{billingProfileName}/billingSubscriptions": { + "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/billingSubscriptions": { "get": { "tags": [ "BillingSubscriptions" @@ -3693,11 +3653,6 @@ "type": "string", "readOnly": true }, - "company": { - "description": "The Company this billing account belongs to.", - "type": "string", - "readOnly": true - }, "accountType": { "description": "The billing account Type.", "type": "string", @@ -3711,20 +3666,15 @@ "description": "The address associated with billing account.", "$ref": "#/definitions/Address" }, - "country": { - "description": "The country associated with billing account..", - "type": "string", - "readOnly": true - }, "invoiceSections": { - "description": "The invoice sections associated to the billing account.", + "description": "The invoice sections associated to the billing account. By default this is not populated, unless it's specified in $expand.", "type": "array", "items": { "$ref": "#/definitions/InvoiceSection" } }, "billingProfiles": { - "description": "The billing profiles associated to the billing account.", + "description": "The billing profiles associated to the billing account. By default this is not populated, unless it's specified in $expand.", "type": "array", "items": { "$ref": "#/definitions/BillingProfile" @@ -3748,6 +3698,11 @@ "items": { "$ref": "#/definitions/EnrollmentAccount" } + }, + "hasReadAccess": { + "description": "Specifies whether the user has read access on billing account.", + "type": "boolean", + "readOnly": true } } }, @@ -4053,7 +4008,7 @@ "description": "Purchase order number.", "type": "string" }, - "billingAddress": { + "address": { "description": "Billing address.", "$ref": "#/definitions/Address" }, @@ -4189,11 +4144,12 @@ } }, "EnabledAzureSKUs": { - "description": "Details about the product.", + "description": "Details about the enable azure sku.", "properties": { "skuId": { "description": "The sku id.", - "type": "string" + "type": "string", + "readOnly": true }, "skuDescription": { "description": "The sku description.", @@ -4369,13 +4325,13 @@ "format": "date-time", "readOnly": true }, - "billingProfile": { - "description": "The profile id which invoice belongs to.", + "billingProfileId": { + "description": "The billing profile id this invoice belongs to.", "type": "string", "readOnly": true }, "billingProfileName": { - "description": "The profile name which invoice belongs to.", + "description": "The profile name this invoice belongs to.", "type": "string", "readOnly": true }, @@ -4670,11 +4626,6 @@ "readOnly": true, "$ref": "#/definitions/Amount" }, - "enrollmentAccountContext": { - "description": "The enrollment account context.", - "$ref": "#/definitions/EnrollmentAccountContext", - "readOnly": true - }, "billingProfileId": { "description": "Billing Profile id to which this product belongs.", "type": "string", @@ -4685,6 +4636,16 @@ "type": "string", "readOnly": true }, + "invoiceSectionId": { + "description": "Invoice section id to which this product belongs.", + "type": "string", + "readOnly": true + }, + "invoiceSectionName": { + "description": "Invoice section name to which this product belongs.", + "type": "string", + "readOnly": true + }, "skuId": { "description": "The sku id.", "type": "string" @@ -4789,6 +4750,11 @@ "type": "string", "readOnly": true }, + "productFamily": { + "description": "The product family.", + "type": "string", + "readOnly": true + }, "productTypeId": { "description": "The product type id.", "type": "string", @@ -4877,12 +4843,16 @@ "PolicyProperties": { "description": "The properties of policy.", "properties": { + "marketplacePurchasesAllowed": { + "description": "The marketplacePurchasesAllowed flag.", + "type": "boolean" + }, "reservationPurchasesAllowed": { "description": "The reservationPurchasesAllowed flag.", "type": "boolean" }, - "marketplacePurchasesAllowed": { - "description": "The marketplacePurchasesAllowed flag.", + "subscriptionOwnerCanViewCharges": { + "description": "The subscriptionOwnerCanViewCharges flag.", "type": "boolean" } } @@ -4965,7 +4935,7 @@ "PaymentMethodProperties": { "description": "The properties of the payment method.", "properties": { - "methodType": { + "paymentMethodType": { "description": "Payment method type.", "type": "string", "enum": [ 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 290109371d8d..1ead99ed5401 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 @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2018-08-01-preview", + "api-version": "2018-11-01-preview", "transferName": "transferName", "body": { "properties": { 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 b73b6776d36b..3318879cb816 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 @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2018-08-01-preview", + "api-version": "2018-11-01-preview", "billingAccountName": "{billingAccountName}", "parameters": { "principalId": "6fd330f6-7d26-4aff-b9cf-7bd699f965b9", 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 53a19d4e1080..6372219ee99e 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 @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2018-08-01-preview", + "api-version": "2018-11-01-preview", "billingAccountName": "{billingAccountName}", "billingProfileName": "{billingProfileName}", "parameters": { 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 c3e4cedd6ec6..15ca0a2ea77b 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 @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2018-08-01-preview", + "api-version": "2018-11-01-preview", "billingAccountName": "{billingAccountName}", "invoiceSectionName": "{invoiceSectionName}", "parameters": { diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/AgreementByName.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/AgreementByName.json index 0c666f7588e3..4c95762db609 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/AgreementByName.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/AgreementByName.json @@ -2,13 +2,13 @@ "parameters": { "api-version": "2018-11-01-preview", "billingAccountName": "{billingAccountName}", - "agreementName": "Agreement1" + "agreementName": "{agreementName}" }, "responses": { "200": { "body": { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/agreements/Agreement1", - "name": "Agreement1", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/agreements/{agreementName}", + "name": "{agreementName}", "type": "Microsoft.Billing/agreements", "properties": { "agreementLink": "https://agreementuri1.com", diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/AgreementsListByBillingAccountName.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/AgreementsListByBillingAccountName.json index f3117acc44d1..b1c2d8a35eb6 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/AgreementsListByBillingAccountName.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/AgreementsListByBillingAccountName.json @@ -13,7 +13,7 @@ "type": "Microsoft.Billing/agreements", "properties": { "agreementLink": "https://agreementuri1.com", - "effectiveDate": "2018-12-05T00:00:00Z", + "effectiveDate": "2018-12-05T00:00:00Z", "expirationDate": "2018-12-05T00:00:00Z", "participants": [ { @@ -35,7 +35,7 @@ "type": "Microsoft.Billing/agreements", "properties": { "agreementLink": "https://agreementuri2.com", - "effectiveDate": "2018-12-05T00:00:00Z", + "effectiveDate": "2018-12-05T00:00:00Z", "expirationDate": "2018-12-05T00:00:00Z", "participants": [ { 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 2171d5f1eb4e..271afb3da20c 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,14 +1,14 @@ { "parameters": { "api-version": "2018-11-01-preview", - "billingAccountName": "04e9d123-ae03-5621-6c17-e70da00924ee", - "billingProfileName": "2291f7a6-e97a-4bb8-83d7-6090beb137e1" + "billingAccountName": "{billingAccountName}", + "billingProfileName": "{billingProfileName}" }, "responses": { "200": { "body": { - "id": "/providers/Microsoft.Billing/billingAccounts/04e9d123-ae03-5621-6c17-e70da00924ee/billingProfiles/2291f7a6-e97a-4bb8-83d7-6090beb137e1/availableBalance/3f2a7a28-985c-4451-8b77-f83f47c3d2c6", - "name": "3f2a7a28-985c-4451-8b77-f83f47c3d2c6", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/availableBalance/50000000-0000-0000-0000-000000000000", + "name": "50000000-0000-0000-0000-000000000000", "type": "Microsoft.Billing/availableBalance", "properties": { "amount": { 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 fb1fa9f87d27..9c3195aacc6a 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,19 +1,21 @@ { "parameters": { "api-version": "2018-11-01-preview", - "billingAccountName": "2000100" + "billingAccountName": "00000000-0000-0000-0000-000000000000" }, "responses": { "200": { "body": { - "id": "/providers/Microsoft.Billing/billingAccounts/2000100", - "name": "2000100", + "id": "/providers/Microsoft.Billing/billingAccounts/00000000-0000-0000-0000-000000000000", + "name": "00000000-0000-0000-0000-000000000000", "type": "Microsoft.Billing/billingAccounts", "properties": { "displayName": "Test Account", - "company": "Test Account", "accountType": "Organization", "address": { + "companyName": "Contoso", + "firstName": "Test", + "lastName": "User", "addressLine1": "Test Address", "addressLine2": "Test Address", "addressLine3": "Test Address", @@ -22,7 +24,7 @@ "region": "WA", "country": "US" }, - "country": "United States" + "hasReadAccess": true } } } 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 6539b00edd67..060e32df1bcf 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", - "billingAccountName": "2000200", + "billingAccountName": "{billingAccountName}", "periodStartDate": "2018-01-01", "periodEndDate": "2018-06-30", "$filter": "invoicePeriodStartDate le 2018-06-01" @@ -11,7 +11,7 @@ "body": { "value": [ { - "id": "providers/Microsoft.Billing/billingAccounts/2000200/billingProfile/345986/invoices/1383723", + "id": "providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000/invoices/1383723", "name": "1383723", "type": "Microsoft.Billing/invoices", "properties": { @@ -28,7 +28,7 @@ }, "invoicePeriodStartDate": "2018-01-01T17:32:28Z", "invoicePeriodEndDate": "2018-01-15T17:32:28Z", - "billingProfile": "345986", + "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000", "billingProfileName": "Contoso Operations Billing", "purchaseOrderNumber": "123456", "documentUrls": [ @@ -50,7 +50,7 @@ } }, { - "id": "providers/Microsoft.Billing/billingAccounts/2000200/billingProfile/345987/invoices/1383724", + "id": "providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000/invoices/1383724", "name": "1383724", "type": "Microsoft.Billing/invoices", "properties": { @@ -67,7 +67,7 @@ }, "invoicePeriodStartDate": "2018-02-01T17:32:28Z", "invoicePeriodEndDate": "2018-02-30T17:32:28Z", - "billingProfile": "345987", + "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000", "billingProfileName": "Contoso Operations Billing", "purchaseOrderNumber": "123456", "documentUrls": [ diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountPermissionsList.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountPermissionsList.json index f0f7e6a73dae..93327d3c9930 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountPermissionsList.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountPermissionsList.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2018-08-01-preview", + "api-version": "2018-11-01-preview", "billingAccountName": "{billingAccountName}" }, "responses": { 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 43f06a328078..4bad6a2e9971 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 @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2018-08-01-preview", + "api-version": "2018-11-01-preview", "billingAccountName": "2000100", "billingRoleAssignmentName": "{billingRoleAssignmentId}" }, 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 f082c8b3cb71..82a64c84c9d4 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 @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2018-08-01-preview", + "api-version": "2018-11-01-preview", "billingAccountName": "2000100", "billingRoleAssignmentName":"10000000-aaaa-bbbb-cccc-100000000000_6fd330f6-7d26-4aff-b9cf-7bd699f965b9" }, 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 bcabd5d600d1..63f51451cd77 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 @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2018-08-01-preview", + "api-version": "2018-11-01-preview", "billingAccountName": "2000100" }, "responses": { 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 1d2624c3eeb8..e9c6cd3875b0 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 @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2018-08-01-preview", + "api-version": "2018-11-01-preview", "billingAccountName": "2000100", "billingRoleDefinitionName": "{billingRoleDefinitionId}" }, diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountRoleDefinitionsList.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountRoleDefinitionsList.json index be3019990e27..9f3297c88449 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountRoleDefinitionsList.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountRoleDefinitionsList.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2018-08-01-preview", + "api-version": "2018-11-01-preview", "billingAccountName": "2000100" }, "responses": { 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 0adf021e55f8..9d9937451789 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,19 +1,22 @@ { "parameters": { "api-version": "2018-11-01-preview", - "billingAccountName": "2000100", + "billingAccountName": "00000000-0000-0000-0000-000000000000", "$expand": "invoiceSections, billingProfiles" }, "responses": { "200": { "body": { - "id": "/providers/Microsoft.Billing/billingAccounts/2000100", - "name": "2000100", + "id": "/providers/Microsoft.Billing/billingAccounts/00000000-0000-0000-0000-000000000000", + "name": "00000000-0000-0000-0000-000000000000", "type": "Microsoft.Billing/billingAccounts", "properties": { - "company": "Test Account", + "displayName": "Test Account 1", "accountType": "Organization", "address": { + "companyName": "Contoso", + "firstName": "Test", + "lastName": "User", "addressLine1": "Test Address", "addressLine2": "Test Address", "addressLine3": "Test Address", @@ -22,7 +25,7 @@ "region": "WA", "country": "US" }, - "country": "United States", + "hasReadAccess": true, "invoiceSections": [ { "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/invoiceSectionId1", @@ -43,22 +46,23 @@ ], "billingProfiles": [ { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/BillingProfileId1", - "name": "BillingProfileId1", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000", + "name": "11000000-0000-0000-0000-000000000000", "type": "Microsoft.Billing/billingProfiles", "properties": { - "displayName": "BillingProfileName1", - "poNumber": "ABC12345", - "billingAddress": { - "addressLine1": "Test Address", - "addressLine2": "Test Address", - "addressLine3": "Test Address", + "displayName": "BillingProfile1", + "address": { + "companyName": "Contoso", + "firstName": "Test", + "lastName": "User", + "addressLine1": "Test Address1", + "addressLine2": "Test Address2", + "addressLine3": "Test Address3", "city": "City", "postalCode": "00000", "region": "WA", "country": "US" }, - "isClassic": false, "currency": "USD", "enabledAzureSKUs": [ { @@ -69,26 +73,31 @@ "skuId": "0002", "skuDescription": "Microsoft Azure Standard" } - ] + ], + "isClassic": false, + "invoiceDay": 5, + "invoiceEmailOptIn": true, + "poNumber": "ABC12345" } }, { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/BillingProfileId2", - "name": "BillingProfileId2", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000001", + "name": "11000000-0000-0000-0000-000000000001", "type": "Microsoft.Billing/billingProfiles", "properties": { - "displayName": "BillingProfileName2", - "poNumber": "ABC12345", - "billingAddress": { - "addressLine1": "Test Address", - "addressLine2": "Test Address", - "addressLine3": "Test Address", + "displayName": "BillingProfile2", + "address": { + "companyName": "Contoso", + "firstName": "Test", + "lastName": "User", + "addressLine1": "Test Address1", + "addressLine2": "Test Address2", + "addressLine3": "Test Address3", "city": "City", "postalCode": "00000", "region": "WA", "country": "US" }, - "isClassic": false, "currency": "USD", "enabledAzureSKUs": [ { @@ -99,7 +108,11 @@ "skuId": "0002", "skuDescription": "Microsoft Azure Standard" } - ] + ], + "isClassic": false, + "invoiceDay": 5, + "invoiceEmailOptIn": true, + "poNumber": "ABC12345" } } ] 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 bae82490ef61..d272f3d64a3a 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 @@ -7,14 +7,16 @@ "body": { "value": [ { - "id": "/providers/Microsoft.Billing/billingAccounts/2000100", - "name": "2000100", + "id": "/providers/Microsoft.Billing/billingAccounts/00000000-0000-0000-0000-000000000000", + "name": "00000000-0000-0000-0000-000000000000", "type": "Microsoft.Billing/billingAccounts", "properties": { - "displayName": "Test Account", - "company": "Test Account1", + "displayName": "Test Account 1", "accountType": "Organization", "address": { + "companyName": "Contoso", + "firstName": "Test", + "lastName": "User", "addressLine1": "Test Address", "addressLine2": "Test Address", "addressLine3": "Test Address", @@ -23,30 +25,31 @@ "region": "WA", "country": "US" }, - "country": "United States" + "hasReadAccess": true } }, { - "id": "/providers/Microsoft.Billing/billingAccounts/2000200", - "name": "2000200", + "id": "/providers/Microsoft.Billing/billingAccounts/10000000-0000-0000-0000-000000000001", + "name": "10000000-0000-0000-0000-000000000001", "type": "Microsoft.Billing/billingAccounts", "properties": { - "displayName": "Test Account", - "company": "", + "displayName": "Test Account 2", "accountType": "Organization", "address": null, - "country": "" + "hasReadAccess": false } }, { - "id": "/providers/Microsoft.Billing/billingAccounts/2000300", - "name": "2000100", + "id": "/providers/Microsoft.Billing/billingAccounts/20000000-0000-0000-0000-000000000002", + "name": "20000000-0000-0000-0000-000000000002", "type": "Microsoft.Billing/billingAccounts", "properties": { - "displayName": "Test Account", - "company": "Test Account3", + "displayName": "Test Account 3", "accountType": "Organization", "address": { + "companyName": "Contoso Test", + "firstName": "Test", + "lastName": "User", "addressLine1": "Test Address", "addressLine2": "Test Address", "addressLine3": "Test Address", @@ -55,7 +58,7 @@ "region": "WA", "country": "US" }, - "country": "United States" + "hasReadAccess": true } } ] 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 deleted file mode 100644 index 0d35ea598444..000000000000 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountsListWithCreateInvoiceSectionPermission.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "parameters": { - "api-version": "2018-11-01-preview" - }, - "responses": { - "200": { - "body": { - "value": [ - { - "id": "/providers/Microsoft.Billing/billingAccounts/2000100", - "name": "2000100", - "type": "Microsoft.Billing/billingAccounts", - "properties": { - "displayName": "Test Account", - "company": "Test Account1", - "accountType": "Organization", - "address": { - "addressLine1": "Test Address", - "addressLine2": "Test Address", - "addressLine3": "Test Address", - "city": "City", - "postalCode": "00000", - "region": "WA", - "country": "US" - }, - "country": "United States" - } - }, - { - "id": "/providers/Microsoft.Billing/billingAccounts/2000200", - "name": "2000200", - "type": "Microsoft.Billing/billingAccounts", - "properties": { - "displayName": "Test Account", - "company": "", - "accountType": "Organization", - "address": null, - "country": "" - } - } - ] - } - } - } -} \ No newline at end of file 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 f9d6a55df412..af140a23fbcb 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 @@ -8,14 +8,16 @@ "body": { "value": [ { - "id": "/providers/Microsoft.Billing/billingAccounts/2000100", - "name": "2000100", + "id": "/providers/Microsoft.Billing/billingAccounts/00000000-0000-0000-0000-000000000000", + "name": "00000000-0000-0000-0000-000000000000", "type": "Microsoft.Billing/billingAccounts", "properties": { - "displayName": "Test Account", - "company": "Test Account1", + "displayName": "Test Account 1", "accountType": "Organization", "address": { + "companyName": "Contoso", + "firstName": "Test", + "lastName": "User", "addressLine1": "Test Address", "addressLine2": "Test Address", "addressLine3": "Test Address", @@ -24,7 +26,7 @@ "region": "WA", "country": "US" }, - "country": "United States", + "hasReadAccess": true, "invoiceSections": [ { "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/invoiceSectionId1", @@ -45,22 +47,23 @@ ], "billingProfiles": [ { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/BillingProfileId1", - "name": "BillingProfileId1", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000", + "name": "11000000-0000-0000-0000-000000000000", "type": "Microsoft.Billing/billingProfiles", "properties": { - "displayName": "BillingProfileName1", - "poNumber": "ABC12345", - "billingAddress": { - "addressLine1": "Test Address", - "addressLine2": "Test Address", - "addressLine3": "Test Address", + "displayName": "BillingProfile1", + "address": { + "companyName": "Contoso", + "firstName": "Test", + "lastName": "User", + "addressLine1": "Test Address1", + "addressLine2": "Test Address2", + "addressLine3": "Test Address3", "city": "City", "postalCode": "00000", "region": "WA", "country": "US" }, - "isClassic": false, "currency": "USD", "enabledAzureSKUs": [ { @@ -71,26 +74,31 @@ "skuId": "0002", "skuDescription": "Microsoft Azure Standard" } - ] + ], + "isClassic": false, + "invoiceDay": 5, + "invoiceEmailOptIn": true, + "poNumber": "ABC12345" } }, { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/BillingProfileId2", - "name": "BillingProfileId2", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000001", + "name": "11000000-0000-0000-0000-000000000001", "type": "Microsoft.Billing/billingProfiles", "properties": { - "displayName": "BillingProfileName2", - "poNumber": "ABC12345", - "billingAddress": { - "addressLine1": "Test Address", - "addressLine2": "Test Address", - "addressLine3": "Test Address", + "displayName": "BillingProfile2", + "address": { + "companyName": "Contoso", + "firstName": "Test", + "lastName": "User", + "addressLine1": "Test Address1", + "addressLine2": "Test Address2", + "addressLine3": "Test Address3", "city": "City", "postalCode": "00000", "region": "WA", "country": "US" }, - "isClassic": false, "currency": "USD", "enabledAzureSKUs": [ { @@ -101,22 +109,25 @@ "skuId": "0002", "skuDescription": "Microsoft Azure Standard" } - ] + ], + "isClassic": false, + "invoiceDay": 5, + "invoiceEmailOptIn": true, + "poNumber": "ABC12345" } } ] } }, { - "id": "/providers/Microsoft.Billing/billingAccounts/2000200", - "name": "2000200", + "id": "/providers/Microsoft.Billing/billingAccounts/10000000-0000-0000-0000-000000000001", + "name": "10000000-0000-0000-0000-000000000001", "type": "Microsoft.Billing/billingAccounts", "properties": { - "displayName": "Test Account", - "company": "", + "displayName": "Test Account 2", "accountType": "Organization", "address": null, - "country": "", + "hasReadAccess": false, "invoiceSections": [ { "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/invoiceSectionId3", @@ -137,22 +148,23 @@ ], "billingProfiles": [ { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/BillingProfileId3", - "name": "BillingProfileId3", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000004", + "name": "11000000-0000-0000-0000-000000000004", "type": "Microsoft.Billing/billingProfiles", "properties": { - "displayName": "BillingProfileName3", - "poNumber": "ABC12345", - "billingAddress": { - "addressLine1": "Test Address", - "addressLine2": "Test Address", - "addressLine3": "Test Address", + "displayName": "BillingProfile3", + "address": { + "companyName": "Contoso Test", + "firstName": "Test", + "lastName": "User", + "addressLine1": "Test Address1", + "addressLine2": "Test Address2", + "addressLine3": "Test Address3", "city": "City", "postalCode": "00000", "region": "WA", "country": "US" }, - "isClassic": false, "currency": "USD", "enabledAzureSKUs": [ { @@ -163,26 +175,31 @@ "skuId": "0002", "skuDescription": "Microsoft Azure Standard" } - ] + ], + "isClassic": false, + "invoiceDay": 5, + "invoiceEmailOptIn": true, + "poNumber": "ABC12345" } }, { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/BillingProfileId4", - "name": "BillingProfileId4", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000005", + "name": "11000000-0000-0000-0000-000000000005", "type": "Microsoft.Billing/billingProfiles", "properties": { - "displayName": "BillingProfileName4", - "poNumber": "ABC12345", - "billingAddress": { - "addressLine1": "Test Address", - "addressLine2": "Test Address", - "addressLine3": "Test Address", + "displayName": "BillingProfile4", + "address": { + "companyName": "Contoso Test", + "firstName": "Test", + "lastName": "User", + "addressLine1": "Test Address1", + "addressLine2": "Test Address2", + "addressLine3": "Test Address3", "city": "City", "postalCode": "00000", "region": "WA", "country": "US" }, - "isClassic": false, "currency": "USD", "enabledAzureSKUs": [ { @@ -193,7 +210,11 @@ "skuId": "0002", "skuDescription": "Microsoft Azure Standard" } - ] + ], + "isClassic": false, + "invoiceDay": 5, + "invoiceEmailOptIn": true, + "poNumber": "ABC12345" } } ] 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 1588313db77f..7f1f6c94b715 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,29 +1,29 @@ { "parameters": { "api-version": "2018-11-01-preview", - "billingAccountName": "2000100", - "billingProfileName": "BillingProfileId1" + "billingAccountName": "{billingAccountName}", + "billingProfileName": "00000000-0000-0000-0000-000000000000" }, "responses": { "200": { "body": { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/BillingProfileId1", - "name": "BillingProfileId1", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/00000000-0000-0000-0000-000000000000", + "name": "00000000-0000-0000-0000-000000000000", "type": "Microsoft.Billing/billingProfiles", "properties": { - "displayName": "BillingProfileName1", - "poNumber": "ABC12345", - "billingAddress": { - "addressLine1": "Test Address", - "addressLine2": "Test Address", - "addressLine3": "Test Address", + "displayName": "BillingProfileName", + "address": { + "companyName": "Contoso", + "firstName": "Test", + "lastName": "User", + "addressLine1": "Test Address1", + "addressLine2": "Test Address2", + "addressLine3": "Test Address3", "city": "City", "postalCode": "00000", "region": "WA", "country": "US" }, - "invoiceEmailOptIn": true, - "isClassic": false, "currency": "USD", "enabledAzureSKUs": [ { @@ -34,7 +34,11 @@ "skuId": "0002", "skuDescription": "Microsoft Azure Standard" } - ] + ], + "isClassic": false, + "invoiceDay": 5, + "invoiceEmailOptIn": true, + "poNumber": "ABC12345" } } } diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingProfilePermissionsList.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingProfilePermissionsList.json index 900de2bbfd55..bd93a1c806b6 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingProfilePermissionsList.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingProfilePermissionsList.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2018-08-01-preview", + "api-version": "2018-11-01-preview", "billingAccountName": "2000100", "billingProfileName": "123" }, 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 6a250ade8e6a..2dd3a409c7e0 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 @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2018-08-01-preview", + "api-version": "2018-11-01-preview", "billingAccountName": "2000100", "billingProfileName": "123", "billingRoleAssignmentName": "{billingRoleAssignmentId}" 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 56e71ff672cb..f38600152c60 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 @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2018-08-01-preview", + "api-version": "2018-11-01-preview", "billingAccountName": "2000100", "billingProfileName": "123", "billingRoleAssignmentName": "10000000-aaaa-bbbb-cccc-100000000000_b1839933-b3ac-42ca-8112-d29c43f3ab47" 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 0490007c7637..ff1622cb9110 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 @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2018-08-01-preview", + "api-version": "2018-11-01-preview", "billingAccountName": "2000100", "billingProfileName": "{billingProfileName}" }, 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 633e68d7ce69..245473373474 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 @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2018-08-01-preview", + "api-version": "2018-11-01-preview", "billingAccountName": "2000100", "billingProfileName": "123", "billingRoleDefinitionName": "10000000-aaaa-bbbb-cccc-100000000000" diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingProfileRoleDefinitionsList.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingProfileRoleDefinitionsList.json index 4406dc5e2908..8e134884d871 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingProfileRoleDefinitionsList.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingProfileRoleDefinitionsList.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2018-08-01-preview", + "api-version": "2018-11-01-preview", "billingAccountName": "2000100", "billingProfileName": "123" }, 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 abe68032e5a2..9f485dad54a5 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 @@ -8,23 +8,23 @@ "body": { "value": [ { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/BillingProfileId1", - "name": "BillingProfileId1", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000", + "name": "11000000-0000-0000-0000-000000000000", "type": "Microsoft.Billing/billingProfiles", "properties": { - "displayName": "BillingProfileName1", - "poNumber": "ABC12345", - "billingAddress": { - "addressLine1": "Test Address", - "addressLine2": "Test Address", - "addressLine3": "Test Address", + "displayName": "BillingProfile1", + "address": { + "companyName": "Contoso", + "firstName": "Test", + "lastName": "User", + "addressLine1": "Test Address1", + "addressLine2": "Test Address2", + "addressLine3": "Test Address3", "city": "City", "postalCode": "00000", "region": "WA", "country": "US" }, - "invoiceEmailOptIn": true, - "isClassic": false, "currency": "USD", "enabledAzureSKUs": [ { @@ -35,27 +35,31 @@ "skuId": "0002", "skuDescription": "Microsoft Azure Standard" } - ] + ], + "isClassic": false, + "invoiceDay": 5, + "invoiceEmailOptIn": true, + "poNumber": "ABC12345" } }, { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/BillingProfileName2", - "name": "BillingProfileName2", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000001", + "name": "11000000-0000-0000-0000-000000000001", "type": "Microsoft.Billing/billingProfiles", "properties": { - "displayName": "BillingProfileName2", - "poNumber": "ABC12345", - "billingAddress": { - "addressLine1": "Test Address", - "addressLine2": "Test Address", - "addressLine3": "Test Address", + "displayName": "BillingProfile2", + "address": { + "companyName": "Contoso", + "firstName": "Test", + "lastName": "User", + "addressLine1": "Test Address1", + "addressLine2": "Test Address2", + "addressLine3": "Test Address3", "city": "City", "postalCode": "00000", "region": "WA", "country": "US" }, - "invoiceEmailOptIn": true, - "isClassic": false, "currency": "USD", "enabledAzureSKUs": [ { @@ -66,7 +70,11 @@ "skuId": "0002", "skuDescription": "Microsoft Azure Standard" } - ] + ], + "isClassic": false, + "invoiceDay": 5, + "invoiceEmailOptIn": true, + "poNumber": "ABC12345" } } ] 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 c37e1dda02ee..546597b7af3b 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,21 +1,28 @@ { "parameters": { - "api-version": "2018-11-01", - "subscriptionId": "300de4e3-b973-4d69-8b57-da07971b4280" + "api-version": "2018-11-01-preview", + "subscriptionId": "88000000-0000-0000-0000-000000000000" }, "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", + "id": "/subscriptions/88000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingProperty/default", + "name": "default", + "type": "Microsoft.Billing/billingProperty", + "properties": { + "billingTenantId": "90000000-0000-0000-0000-000000000011", + "billingAccountId": "/providers/Microsoft.Billing/billingAccounts/00000000-0000-0000-0000-000000000000", "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", + "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/00000000-0000-0000-0000-000000000000/billingProfiles/11000000-0000-0000-0000-000000000000", "billingProfileName": "Contoso operations billing", + "costCenter": "1010", + "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/00000000-0000-0000-0000-000000000000/invoiceSections/22000000-0000-0000-0000-000000000000", + "invoiceSectionName": "Contoso operations invoice section", + "productId": "/providers/Microsoft.Billing/billingAccounts/00000000-0000-0000-0000-000000000000/invoiceSections/22000000-0000-0000-0000-000000000000/products/44000000-0000-0000-0000-000000000000", + "productName": "Standard Dev", "skuId": "0001", "skuDescription": "Microsoft Azure Standard" + } } } } 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 048ba48b068a..0920beb78b46 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,37 +1,33 @@ { "parameters": { "api-version": "2018-11-01-preview", - "billingAccountName": "1234", + "billingAccountName": "{billingAccountName}", "invoiceSectionName": "12345", - "billingSubscriptionName": "billinSubscriptionId1", + "billingSubscriptionName": "billingSubscriptionId1", "$expand": "billingProfile" }, "responses": { "200": { "body": { - "id": "/providers/Microsoft.Billing/BillingAccounts/1234/invoiceSections/12345/billingSubscriptions/billinSubscriptionId1", - "name": "billinSubscriptionId1", + "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000/billingSubscriptions/billinSubscriptionId1", + "name": "billingSubscriptionId1", "type": "Microsoft.Billing/billingSubscriptions", "properties": { - "displayName": "AIP Dev", + "displayName": "My Subscription", "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" + "monthToDateCharges": { + "currency": "USD", + "value": 600 }, - "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/BillingProfileId3", - "billingProfileName": "BillingProfileId3", + "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000", + "invoiceSectionName": "Contoso operations invoiceSection", + "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000", + "billingProfileName": "Contoso operations billing", "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 a42f6e093fea..75bad5828a3a 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,99 +1,86 @@ { - "parameters": { - "api-version": "2018-11-01-preview", - "billingAccountName": "1234", - "$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", - "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/BillingProfileId1", - "billingProfileName": "BillingProfileId1", - "skuId": "0001", - "skuDescription": "Microsoft Azure Dev/Test" - } - }, - { - "id": "/providers/Microsoft.Billing/BillingAccounts/1234/invoiceSections/12345/billingSubscriptions/billinSubscriptionId2", - "name": "billinSubscriptionId2", - "type": "Microsoft.Billing/billingSubscriptions", - "properties": { - "displayName": "AIP Int", - "subscriptionId": "6b96d3f2-9008-4a9d-912f-6b96d3f2", - "subscriptionBillingStatus": "Active", - "monthToDateCharges": { - "currency": "USD", - "value": 2000.00 - }, - "lastMonthCharges": { - "currency": "USD", - "value": 1000.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/BillingProfileId2", - "billingProfileName": "BillingProfileId2", - "skuId": "0001", - "skuDescription": "Microsoft Azure Dev/Test" - } - }, - { - "id": "/providers/Microsoft.Billing/BillingAccounts/1234/invoiceSections/12345/billingSubscriptions/billinSubscriptionId3", - "name": "billinSubscriptionId3", - "type": "Microsoft.Billing/billingSubscriptions", - "properties": { - "displayName": "AIP Prod", - "subscriptionId": "6b96d3f2-4a9d-9008-912f-f87744185aa3", - "subscriptionBillingStatus": "Active", - "monthToDateCharges": { - "currency": "USD", - "value": 4000.00 - }, - "lastMonthCharges": { - "currency": "USD", - "value": 6000.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" - } - } - ] + "parameters": { + "api-version": "2018-11-01-preview", + "billingAccountName": "{billingAccountName}" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000/billingSubscriptions/billinSubscriptionId1", + "name": "billingSubscriptionId1", + "type": "Microsoft.Billing/billingSubscriptions", + "properties": { + "displayName": "My subscription", + "subscriptionId": "6b96d3f2-9008-4a9d-912f-f87744185aa3", + "subscriptionBillingStatus": "Active", + "lastMonthCharges": { + "currency": "USD", + "value": 5000.00 + }, + "monthToDateCharges": { + "currency": "USD", + "value": 600 + }, + "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000", + "invoiceSectionName": "Contoso operations invoiceSection", + "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000", + "billingProfileName": "Contoso operations billing", + "skuId": "0001", + "skuDescription": "Microsoft Azure Dev/Test" } - } + }, + { + "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000/billingSubscriptions/billinSubscriptionId2", + "name": "billingSubscriptionId2", + "type": "Microsoft.Billing/billingSubscriptions", + "properties": { + "displayName": "Test subscription", + "subscriptionId": "6b96d3f2-9008-4a9d-912f-6b96d3f2", + "subscriptionBillingStatus": "Active", + "lastMonthCharges": { + "currency": "USD", + "value": 1000.00 + }, + "monthToDateCharges": { + "currency": "USD", + "value": 400 + }, + "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000", + "invoiceSectionName": "Contoso operations invoiceSection", + "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000", + "billingProfileName": "Contoso operations billing", + "skuId": "0001", + "skuDescription": "Microsoft Azure Dev/Test" + } + }, + { + "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000/billingSubscriptions/billinSubscriptionId3", + "name": "billingSubscriptionId3", + "type": "Microsoft.Billing/billingSubscriptions", + "properties": { + "displayName": "Dev Subscription", + "subscriptionId": "6b96d3f2-4a9d-9008-912f-f87744185aa3", + "subscriptionBillingStatus": "Active", + "lastMonthCharges": { + "currency": "USD", + "value": 6000.00 + }, + "monthToDateCharges": { + "currency": "USD", + "value": 900 + }, + "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000", + "invoiceSectionName": "Contoso operations invoiceSection", + "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000", + "billingProfileName": "Contoso operations billing", + "skuId": "0001", + "skuDescription": "Microsoft Azure Dev/Test" + } + } + ] + } } + } } \ No newline at end of file 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 64db962cbe55..aa84fbe5ec03 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,100 +1,87 @@ { - "parameters": { - "api-version": "2018-11-01-preview", - "billingAccountName": "{billingAccountName}", - "billingProfileName": "{BillingProfileId}", - "$expand": "billingProfile" - }, - "responses": { - "200": { - "body": { - "value": [ - { - "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/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/{BillingProfileId}", - "billingProfileName": "{BillingProfileId}", - "skuId": "0001", - "skuDescription": "Microsoft Azure Dev/Test" - } - }, - { - "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/invoiceSections/12345/billingSubscriptions/billinSubscriptionId2", - "name": "billinSubscriptionId2", - "type": "Microsoft.Billing/billingSubscriptions", - "properties": { - "displayName": "AIP Int", - "subscriptionId": "6b96d3f2-9008-4a9d-912f-6b96d3f2", - "subscriptionBillingStatus": "Active", - "monthToDateCharges": { - "currency": "USD", - "value": 2000.00 - }, - "lastMonthCharges": { - "currency": "USD", - "value": 1000.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/{BillingProfileId}", - "billingProfileName": "{BillingProfileId}", - "skuId": "0001", - "skuDescription": "Microsoft Azure Dev/Test" - } - }, - { - "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/invoiceSections/12345/billingSubscriptions/billinSubscriptionId3", - "name": "billinSubscriptionId3", - "type": "Microsoft.Billing/billingSubscriptions", - "properties": { - "displayName": "AIP Prod", - "subscriptionId": "6b96d3f2-4a9d-9008-912f-f87744185aa3", - "subscriptionBillingStatus": "Active", - "monthToDateCharges": { - "currency": "USD", - "value": 4000.00 - }, - "lastMonthCharges": { - "currency": "USD", - "value": 6000.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/{BillingProfileId}", - "billingProfileName": "{BillingProfileId}", - "skuId": "0001", - "skuDescription": "Microsoft Azure Dev/Test" - } - } - ] + "parameters": { + "api-version": "2018-11-01-preview", + "billingAccountName": "{billingAccountName}", + "billingProfileName": "11000000-0000-0000-0000-000000000000" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000/billingSubscriptions/billinSubscriptionId1", + "name": "billingSubscriptionId1", + "type": "Microsoft.Billing/billingSubscriptions", + "properties": { + "displayName": "My subscription", + "subscriptionId": "6b96d3f2-9008-4a9d-912f-f87744185aa3", + "subscriptionBillingStatus": "Active", + "lastMonthCharges": { + "currency": "USD", + "value": 5000.00 + }, + "monthToDateCharges": { + "currency": "USD", + "value": 600 + }, + "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000", + "invoiceSectionName": "Contoso operations invoiceSection", + "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000", + "billingProfileName": "Contoso operations billing", + "skuId": "0001", + "skuDescription": "Microsoft Azure Dev/Test" } - } + }, + { + "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000/billingSubscriptions/billinSubscriptionId2", + "name": "billingSubscriptionId2", + "type": "Microsoft.Billing/billingSubscriptions", + "properties": { + "displayName": "Test subscription", + "subscriptionId": "6b96d3f2-9008-4a9d-912f-6b96d3f2", + "subscriptionBillingStatus": "Active", + "lastMonthCharges": { + "currency": "USD", + "value": 1000.00 + }, + "monthToDateCharges": { + "currency": "USD", + "value": 400 + }, + "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000", + "invoiceSectionName": "Contoso operations invoiceSection", + "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000", + "billingProfileName": "Contoso operations billing", + "skuId": "0001", + "skuDescription": "Microsoft Azure Dev/Test" + } + }, + { + "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000/billingSubscriptions/billinSubscriptionId3", + "name": "billingSubscriptionId3", + "type": "Microsoft.Billing/billingSubscriptions", + "properties": { + "displayName": "Dev Subscription", + "subscriptionId": "6b96d3f2-4a9d-9008-912f-f87744185aa3", + "subscriptionBillingStatus": "Active", + "lastMonthCharges": { + "currency": "USD", + "value": 6000.00 + }, + "monthToDateCharges": { + "currency": "USD", + "value": 900 + }, + "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000", + "invoiceSectionName": "Contoso operations invoiceSection", + "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000", + "billingProfileName": "Contoso operations billing", + "skuId": "0001", + "skuDescription": "Microsoft Azure Dev/Test" + } + } + ] + } } + } } \ No newline at end of file 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 75905239f422..58b7eb911bd1 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,100 +1,87 @@ { - "parameters": { - "api-version": "2018-11-01-preview", - "billingAccountName": "1234", - "invoiceSectionName": "12345", - "$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", - "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/BillingProfileId1", - "billingProfileName": "BillingProfileId1", - "skuId": "0001", - "skuDescription": "Microsoft Azure Dev/Test" - } - }, - { - "id": "/providers/Microsoft.Billing/BillingAccounts/1234/invoiceSections/12345/billingSubscriptions/billinSubscriptionId2", - "name": "billinSubscriptionId2", - "type": "Microsoft.Billing/billingSubscriptions", - "properties": { - "displayName": "AIP Int", - "subscriptionId": "6b96d3f2-9008-4a9d-912f-6b96d3f2", - "subscriptionBillingStatus": "Active", - "monthToDateCharges": { - "currency": "USD", - "value": 2000.00 - }, - "lastMonthCharges": { - "currency": "USD", - "value": 1000.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/BillingProfileId2", - "billingProfileName": "BillingProfileId2", - "skuId": "0001", - "skuDescription": "Microsoft Azure Dev/Test" - } - }, - { - "id": "/providers/Microsoft.Billing/BillingAccounts/1234/invoiceSections/12345/billingSubscriptions/billinSubscriptionId3", - "name": "billinSubscriptionId3", - "type": "Microsoft.Billing/billingSubscriptions", - "properties": { - "displayName": "AIP Prod", - "subscriptionId": "6b96d3f2-4a9d-9008-912f-f87744185aa3", - "subscriptionBillingStatus": "Active", - "monthToDateCharges": { - "currency": "USD", - "value": 4000.00 - }, - "lastMonthCharges": { - "currency": "USD", - "value": 6000.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" - } - } - ] + "parameters": { + "api-version": "2018-11-01-preview", + "billingAccountName": "{billingAccountName}", + "invoiceSectionName": "22000000-0000-0000-0000-000000000000" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000/billingSubscriptions/billinSubscriptionId1", + "name": "billingSubscriptionId1", + "type": "Microsoft.Billing/billingSubscriptions", + "properties": { + "displayName": "My subscription", + "subscriptionId": "6b96d3f2-9008-4a9d-912f-f87744185aa3", + "subscriptionBillingStatus": "Active", + "lastMonthCharges": { + "currency": "USD", + "value": 5000.00 + }, + "monthToDateCharges": { + "currency": "USD", + "value": 600 + }, + "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000", + "invoiceSectionName": "Contoso operations invoiceSection", + "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000", + "billingProfileName": "Contoso operations billing", + "skuId": "0001", + "skuDescription": "Microsoft Azure Dev/Test" } - } + }, + { + "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000/billingSubscriptions/billinSubscriptionId2", + "name": "billingSubscriptionId2", + "type": "Microsoft.Billing/billingSubscriptions", + "properties": { + "displayName": "Test subscription", + "subscriptionId": "6b96d3f2-9008-4a9d-912f-6b96d3f2", + "subscriptionBillingStatus": "Active", + "lastMonthCharges": { + "currency": "USD", + "value": 1000.00 + }, + "monthToDateCharges": { + "currency": "USD", + "value": 400 + }, + "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000", + "invoiceSectionName": "Contoso operations invoiceSection", + "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000", + "billingProfileName": "Contoso operations billing", + "skuId": "0001", + "skuDescription": "Microsoft Azure Dev/Test" + } + }, + { + "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000/billingSubscriptions/billinSubscriptionId3", + "name": "billingSubscriptionId3", + "type": "Microsoft.Billing/billingSubscriptions", + "properties": { + "displayName": "Dev Subscription", + "subscriptionId": "6b96d3f2-4a9d-9008-912f-f87744185aa3", + "subscriptionBillingStatus": "Active", + "lastMonthCharges": { + "currency": "USD", + "value": 6000.00 + }, + "monthToDateCharges": { + "currency": "USD", + "value": 900 + }, + "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000", + "invoiceSectionName": "Contoso operations invoiceSection", + "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000", + "billingProfileName": "Contoso operations billing", + "skuId": "0001", + "skuDescription": "Microsoft Azure Dev/Test" + } + } + ] + } } + } } \ No newline at end of file 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 60e09fbf9941..a81ae3ddea40 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 @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2018-08-01-preview", + "api-version": "2018-11-01-preview", "billingAccountName": "billingAccountName", "invoiceSectionName": "invoiceSectionName", "transferName": "transferName" 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 9cf8ebb91252..2acd4cf61696 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 @@ -3,25 +3,26 @@ "api-version": "2018-11-01-preview", "billingAccountName": "{billingAccountName}", "parameters": { - "displayName": "invoiceSectionName1", + "displayName": "invoiceSection1", "billingProfiles": [ { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/BillingProfileId1", - "name": "BillingProfileId1", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000", + "name": "11000000-0000-0000-0000-000000000000", "type": "Microsoft.Billing/billingProfiles", "properties": { - "displayName": "BillingProfileName1", - "poNumber": "ABC12345", - "billingAddress": { - "addressLine1": "Test Address", - "addressLine2": "Test Address", - "addressLine3": "Test Address", + "displayName": "BillingProfile1", + "address": { + "companyName": "Contoso", + "firstName": "Test", + "lastName": "User", + "addressLine1": "Test Address1", + "addressLine2": "Test Address2", + "addressLine3": "Test Address3", "city": "City", "postalCode": "00000", "region": "WA", "country": "US" }, - "isClassic": false, "currency": "USD", "enabledAzureSKUs": [ { @@ -32,7 +33,11 @@ "skuId": "0002", "skuDescription": "Microsoft Azure Standard" } - ] + ], + "isClassic": false, + "invoiceDay": 5, + "invoiceEmailOptIn": true, + "poNumber": "ABC12345" } } ] @@ -52,7 +57,7 @@ "name": "invoiceSectionId1", "type": "Microsoft.Billing/invoiceSections", "properties": { - "displayName": "invoiceSectionName1" + "displayName": "invoiceSection1" } } } 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 16b13bc4ae9d..8e05eae96e6b 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 @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2018-08-01-preview", + "api-version": "2018-11-01-preview", "transferName": "transferName" }, diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/ElevateInvoiceSection.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/ElevateInvoiceSection.json index 7993bc6e1840..b03f83bef3c9 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/ElevateInvoiceSection.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/ElevateInvoiceSection.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2018-08-01-preview", + "api-version": "2018-11-01-preview", "billingAccountName": "billingAccountName", "invoiceSectionName": "invoiceSectionName" }, 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 9c6ec50284bd..5edbae185541 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 @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2018-08-01-preview", + "api-version": "2018-11-01-preview", "transferName": "transferName" }, 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 748f82827a51..1ae86948f9f0 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 @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2018-08-01-preview", + "api-version": "2018-11-01-preview", "billingAccountName": "billingAccountName", "invoiceSectionName": "invoiceSectionName", "transferName": "transferName" 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 749fc758ec1b..84d593910228 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 @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2018-08-01-preview", + "api-version": "2018-11-01-preview", "billingAccountName": "billingAccountName", "invoiceSectionName": "invoiceSectionName", "body": { 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 5be090ec4ec5..06d04f4ebd3b 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,14 +1,14 @@ { "parameters": { "api-version": "2018-11-01-preview", - "billingAccountName": "2000200", - "billingProfileName": "345986", + "billingAccountName": "{billingAccountName}", + "billingProfileName": "11000000-0000-0000-0000-000000000000", "invoiceName": "1383723" }, "responses": { "200": { "body": { - "id": "providers/Microsoft.Billing/billingAccounts/2000200/billingProfile/345986/invoices/1383723", + "id": "providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000/invoices/1383723", "name": "1383723", "type": "Microsoft.Billing/invoices", "properties": { @@ -25,6 +25,7 @@ }, "invoicePeriodStartDate": "2018-01-01T17:32:28Z", "invoicePeriodEndDate": "2018-01-15T17:32:28Z", + "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000", "billingProfileName": "Contoso Operations Billing", "purchaseOrderNumber": "123456", "documentUrls": [ 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 b98850157ef0..8a04d009ef9d 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 @@ -2,16 +2,16 @@ "parameters": { "api-version": "2018-11-01-preview", "billingAccountName": "{billingAccountName}", - "invoiceSectionName": "12345" + "invoiceSectionName": "22000000-0000-0000-0000-000000000000" }, "responses": { "200": { "body": { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionId}", - "name": "{invoiceSectionId}", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000", + "name": "22000000-0000-0000-0000-000000000000", "type": "Microsoft.Billing/invoiceSections", "properties": { - "displayName": "invoiceSectionName1" + "displayName": "invoiceSection1" } } } diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionPermissionsList.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionPermissionsList.json index 5d95fd846983..013aaa51a67b 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionPermissionsList.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionPermissionsList.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2018-08-01-preview", + "api-version": "2018-11-01-preview", "billingAccountName": "2000100", "invoiceSectionName": "123" }, 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 ab51f9e9e9d6..ec40483c1422 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 @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2018-08-01-preview", + "api-version": "2018-11-01-preview", "billingAccountName": "2000100", "invoiceSectionName": "123", "billingRoleAssignmentName": "{billingRoleAssignmentId}" 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 ab51f9e9e9d6..ec40483c1422 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 @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2018-08-01-preview", + "api-version": "2018-11-01-preview", "billingAccountName": "2000100", "invoiceSectionName": "123", "billingRoleAssignmentName": "{billingRoleAssignmentId}" 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 6bf91df5b8ae..ed7735a0ccea 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 @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2018-08-01-preview", + "api-version": "2018-11-01-preview", "billingAccountName": "2000100", "invoiceSectionName": "{invoiceSectionName}" }, 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 01744614bb81..35ed48c92575 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 @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2018-08-01-preview", + "api-version": "2018-11-01-preview", "billingAccountName": "2000100", "invoiceSectionName": "123", "billingRoleDefinitionName": "{billingRoleDefinitionId}" diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionRoleDefinitionsList.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionRoleDefinitionsList.json index eff798fdd233..6be03857b07f 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionRoleDefinitionsList.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionRoleDefinitionsList.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2018-08-01-preview", + "api-version": "2018-11-01-preview", "billingAccountName": "2000100", "invoiceSectionName": "123" }, 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 996fa1fd7e51..a5848d24bd0c 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 @@ -15,22 +15,23 @@ "displayName": "invoiceSectionName1", "billingProfiles": [ { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/BillingProfileId1", - "name": "BillingProfileId1", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000", + "name": "11000000-0000-0000-0000-000000000000", "type": "Microsoft.Billing/billingProfiles", "properties": { - "displayName": "BillingProfileName1", - "poNumber": "ABC12345", - "billingAddress": { - "addressLine1": "Test Address", - "addressLine2": "Test Address", - "addressLine3": "Test Address", + "displayName": "BillingProfile1", + "address": { + "companyName": "Contoso", + "firstName": "Test", + "lastName": "User", + "addressLine1": "Test Address1", + "addressLine2": "Test Address2", + "addressLine3": "Test Address3", "city": "City", "postalCode": "00000", "region": "WA", - "country": "USA" + "country": "US" }, - "isClassic": false, "currency": "USD", "enabledAzureSKUs": [ { @@ -41,26 +42,31 @@ "skuId": "0002", "skuDescription": "Microsoft Azure Standard" } - ] + ], + "isClassic": false, + "invoiceDay": 5, + "invoiceEmailOptIn": true, + "poNumber": "ABC12345" } }, { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/BillingProfileId2", - "name": "BillingProfileId2", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000001", + "name": "11000000-0000-0000-0000-000000000001", "type": "Microsoft.Billing/billingProfiles", "properties": { - "displayName": "BillingProfileName2", - "poNumber": "ABC12345", - "billingAddress": { - "addressLine1": "Test Address", - "addressLine2": "Test Address", - "addressLine3": "Test Address", + "displayName": "BillingProfile2", + "address": { + "companyName": "Contoso", + "firstName": "Test", + "lastName": "User", + "addressLine1": "Test Address1", + "addressLine2": "Test Address2", + "addressLine3": "Test Address3", "city": "City", "postalCode": "00000", "region": "WA", - "country": "USA" + "country": "US" }, - "isClassic": false, "currency": "USD", "enabledAzureSKUs": [ { @@ -71,7 +77,11 @@ "skuId": "0002", "skuDescription": "Microsoft Azure Standard" } - ] + ], + "isClassic": false, + "invoiceDay": 5, + "invoiceEmailOptIn": true, + "poNumber": "ABC12345" } } ] 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 1452bd928159..24a5eb263f61 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 @@ -8,19 +8,19 @@ "body": { "value": [ { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/invoiceSectionId1", - "name": "invoiceSectionId1", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000", + "name": "22000000-0000-0000-0000-000000000000", "type": "Microsoft.Billing/invoiceSections", "properties": { - "displayName": "invoiceSectionName1" + "displayName": "invoiceSection1" } }, { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/invoiceSectionId2", - "name": "invoiceSectionId2", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000011", + "name": "22000000-0000-0000-0000-000000000011", "type": "Microsoft.Billing/invoiceSections", "properties": { - "displayName": "invoiceSectionName2" + "displayName": "invoiceSection2" } } ] 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 6de80e74ad65..d308e0dd9cb0 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 @@ -8,11 +8,11 @@ "body": { "value": [ { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/invoiceSectionId1", - "name": "invoiceSectionId1", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000", + "name": "22000000-0000-0000-0000-000000000000", "type": "Microsoft.Billing/invoiceSections", "properties": { - "displayName": "invoiceSectionName1" + "displayName": "invoiceSection1" } } ] 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 2e026e54d5e5..92796cfb1488 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 @@ -9,29 +9,30 @@ "body": { "value": [ { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/invoiceSectionId1", - "name": "invoiceSectionId1", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000", + "name": "22000000-0000-0000-0000-000000000000", "type": "Microsoft.Billing/invoiceSections", "properties": { - "displayName": "invoiceSectionName1", + "displayName": "invoiceSection1", "billingProfiles": [ { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/BillingProfileId1", - "name": "BillingProfileId1", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000", + "name": "11000000-0000-0000-0000-000000000000", "type": "Microsoft.Billing/billingProfiles", "properties": { - "displayName": "BillingProfileName1", - "poNumber": "ABC12345", - "billingAddress": { - "addressLine1": "Test Address", - "addressLine2": "Test Address", - "addressLine3": "Test Address", + "displayName": "BillingProfile1", + "address": { + "companyName": "Contoso", + "firstName": "Test", + "lastName": "User", + "addressLine1": "Test Address1", + "addressLine2": "Test Address2", + "addressLine3": "Test Address3", "city": "City", "postalCode": "00000", "region": "WA", "country": "US" }, - "isClassic": false, "currency": "USD", "enabledAzureSKUs": [ { @@ -42,26 +43,31 @@ "skuId": "0002", "skuDescription": "Microsoft Azure Standard" } - ] + ], + "isClassic": false, + "invoiceDay": 5, + "invoiceEmailOptIn": true, + "poNumber": "ABC12345" } }, { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/BillingProfileId2", - "name": "BillingProfileId2", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000001", + "name": "11000000-0000-0000-0000-000000000001", "type": "Microsoft.Billing/billingProfiles", "properties": { - "displayName": "BillingProfileName2", - "poNumber": "ABC12345", - "billingAddress": { - "addressLine1": "Test Address", - "addressLine2": "Test Address", - "addressLine3": "Test Address", + "displayName": "BillingProfile2", + "address": { + "companyName": "Contoso", + "firstName": "Test", + "lastName": "User", + "addressLine1": "Test Address1", + "addressLine2": "Test Address2", + "addressLine3": "Test Address3", "city": "City", "postalCode": "00000", "region": "WA", "country": "US" }, - "isClassic": false, "currency": "USD", "enabledAzureSKUs": [ { @@ -72,36 +78,41 @@ "skuId": "0002", "skuDescription": "Microsoft Azure Standard" } - ] + ], + "isClassic": false, + "invoiceDay": 5, + "invoiceEmailOptIn": true, + "poNumber": "ABC12345" } } ] } }, { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/invoiceSectionId2", - "name": "invoiceSectionId2", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000011", + "name": "22000000-0000-0000-0000-000000000011", "type": "Microsoft.Billing/invoiceSections", "properties": { - "displayName": "invoiceSectionName2", + "displayName": "invoiceSection2", "billingProfiles": [ { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/BillingProfileId3", - "name": "BillingProfileId3", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000004", + "name": "11000000-0000-0000-0000-000000000004", "type": "Microsoft.Billing/billingProfiles", "properties": { - "displayName": "BillingProfileName3", - "poNumber": "ABC12345", - "billingAddress": { - "addressLine1": "Test Address", - "addressLine2": "Test Address", - "addressLine3": "Test Address", + "displayName": "BillingProfile3", + "address": { + "companyName": "Contoso Test", + "firstName": "Test", + "lastName": "User", + "addressLine1": "Test Address1", + "addressLine2": "Test Address2", + "addressLine3": "Test Address3", "city": "City", "postalCode": "00000", "region": "WA", "country": "US" }, - "isClassic": false, "currency": "USD", "enabledAzureSKUs": [ { @@ -112,26 +123,31 @@ "skuId": "0002", "skuDescription": "Microsoft Azure Standard" } - ] + ], + "isClassic": false, + "invoiceDay": 5, + "invoiceEmailOptIn": true, + "poNumber": "ABC12345" } }, { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/BillingProfileId4", - "name": "BillingProfileId4", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000005", + "name": "11000000-0000-0000-0000-000000000005", "type": "Microsoft.Billing/billingProfiles", "properties": { - "displayName": "BillingProfileName4", - "poNumber": "ABC12345", - "billingAddress": { - "addressLine1": "Test Address", - "addressLine2": "Test Address", - "addressLine3": "Test Address", + "displayName": "BillingProfile4", + "address": { + "companyName": "Contoso Test", + "firstName": "Test", + "lastName": "User", + "addressLine1": "Test Address1", + "addressLine2": "Test Address2", + "addressLine3": "Test Address3", "city": "City", "postalCode": "00000", "region": "WA", "country": "US" }, - "isClassic": false, "currency": "USD", "enabledAzureSKUs": [ { @@ -142,7 +158,11 @@ "skuId": "0002", "skuDescription": "Microsoft Azure Standard" } - ] + ], + "isClassic": false, + "invoiceDay": 5, + "invoiceEmailOptIn": true, + "poNumber": "ABC12345" } } ] 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 b5ba7877c3e3..e6bbd954ad8a 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 @@ -9,29 +9,30 @@ "body": { "value": [ { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/invoiceSectionId1", - "name": "invoiceSectionId1", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000", + "name": "22000000-0000-0000-0000-000000000000", "type": "Microsoft.Billing/invoiceSections", "properties": { - "displayName": "invoiceSectionName1", + "displayName": "invoiceSection1", "billingProfiles": [ { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/BillingProfileId1", - "name": "BillingProfileId1", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000", + "name": "11000000-0000-0000-0000-000000000000", "type": "Microsoft.Billing/billingProfiles", "properties": { - "displayName": "BillingProfileName1", - "poNumber": "ABC12345", - "billingAddress": { - "addressLine1": "Test Address", - "addressLine2": "Test Address", - "addressLine3": "Test Address", + "displayName": "BillingProfile1", + "address": { + "companyName": "Contoso", + "firstName": "Test", + "lastName": "User", + "addressLine1": "Test Address1", + "addressLine2": "Test Address2", + "addressLine3": "Test Address3", "city": "City", "postalCode": "00000", "region": "WA", "country": "US" }, - "isClassic": false, "currency": "USD", "enabledAzureSKUs": [ { @@ -42,26 +43,31 @@ "skuId": "0002", "skuDescription": "Microsoft Azure Standard" } - ] + ], + "isClassic": false, + "invoiceDay": 5, + "invoiceEmailOptIn": true, + "poNumber": "ABC12345" } }, { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/BillingProfileId2", - "name": "BillingProfileId2", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000001", + "name": "11000000-0000-0000-0000-000000000001", "type": "Microsoft.Billing/billingProfiles", "properties": { - "displayName": "BillingProfileName2", - "poNumber": "ABC12345", - "billingAddress": { - "addressLine1": "Test Address", - "addressLine2": "Test Address", - "addressLine3": "Test Address", + "displayName": "BillingProfile2", + "address": { + "companyName": "Contoso", + "firstName": "Test", + "lastName": "User", + "addressLine1": "Test Address1", + "addressLine2": "Test Address2", + "addressLine3": "Test Address3", "city": "City", "postalCode": "00000", "region": "WA", "country": "US" }, - "isClassic": false, "currency": "USD", "enabledAzureSKUs": [ { @@ -72,7 +78,11 @@ "skuId": "0002", "skuDescription": "Microsoft Azure Standard" } - ] + ], + "isClassic": false, + "invoiceDay": 5, + "invoiceEmailOptIn": true, + "poNumber": "ABC12345" } } ] diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionsListByBillingProfileName.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionsListByBillingProfileName.json index 06936c1697fe..104d9ef7fd4d 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionsListByBillingProfileName.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionsListByBillingProfileName.json @@ -1,27 +1,27 @@ { "parameters": { "api-version": "2018-11-01-preview", - "billingAccountName": "billingAccountName", - "billingProfileName": "billingProfileName" + "billingAccountName": "{billingAccountName}", + "billingProfileName": "{billingProfileName}" }, "responses": { "200": { "body": { "value": [ { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/invoiceSectionId1", - "name": "invoiceSectionId1", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000", + "name": "22000000-0000-0000-0000-000000000000", "type": "Microsoft.Billing/invoiceSections", "properties": { - "displayName": "invoiceSectionName1" + "displayName": "invoiceSection1" } }, { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/invoiceSectionId2", - "name": "invoiceSectionId2", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000011", + "name": "22000000-0000-0000-0000-000000000011", "type": "Microsoft.Billing/invoiceSections", "properties": { - "displayName": "invoiceSectionName2" + "displayName": "invoiceSection2" } } ] 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 94f2974e9f88..fafca0512c77 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", - "billingAccountName": "2000200", - "billingProfileName": "BillingProfileId1", + "billingAccountName": "{billingAccountName}", + "billingProfileName": "11000000-0000-0000-0000-000000000000", "periodStartDate": "2018-01-01", "periodEndDate": "2018-06-30", "$filter": "invoicePeriodStartDate le 2018-06-01" @@ -12,7 +12,7 @@ "body": { "value": [ { - "id": "providers/Microsoft.Billing/billingAccounts/2000200/billingProfile/345986/invoices/1383723", + "id": "providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000/invoices/1383723", "name": "1383723", "type": "Microsoft.Billing/invoices", "properties": { @@ -29,7 +29,8 @@ }, "invoicePeriodStartDate": "2018-01-01T17:32:28Z", "invoicePeriodEndDate": "2018-01-15T17:32:28Z", - "billingProfile": "345986", + "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000", + "billingProfileName": "Contoso Operations Billing", "purchaseOrderNumber": "123456", "documentUrls": [ { @@ -58,7 +59,7 @@ } }, { - "id": "providers/Microsoft.Billing/billingAccounts/2000200/billingProfile/345986/invoices/1383724", + "id": "providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000/invoices/1383724", "name": "1383724", "type": "Microsoft.Billing/invoices", "properties": { @@ -75,7 +76,8 @@ }, "invoicePeriodStartDate": "2018-02-01T17:32:28Z", "invoicePeriodEndDate": "2018-02-30T17:32:28Z", - "billingProfile": "345987", + "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000", + "billingProfileName": "Contoso Operations Billing", "purchaseOrderNumber": "123456", "documentUrls": [ { 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 fe90496f94d4..9b981931b458 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 @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2018-08-01-preview" + "api-version": "2018-11-01-preview" }, "responses": { 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 2fdc7002e9fb..da4f494b2f4d 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 @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2018-08-01-preview", + "api-version": "2018-11-01-preview", "billingAccountName": "billingAccountName", "invoiceSectionName": "invoiceSectionName" }, 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 470f59175f6d..1f5324e5c673 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,29 +1,30 @@ { "parameters": { "api-version": "2018-11-01-preview", - "billingAccountName": "84ae600f-763c-4a66-a8f0-4c497fc58d98", - "billingProfileName": "95869cd5-6f00-42b3-8708-04e85fef9e15" + "billingAccountName": "{billingAccountName}", + "billingProfileName": "{billingProfileName}" }, "responses": { "200": { "value": [ { - "id": "/providers/Microsoft.Billing/billingAccounts/04e9d123-ae03-5621-6c17-e70da00924ee/billingProfiles/2291f7a6-e97a-4bb8-83d7-6090beb137e1/paymentMethods/001bb358-822c-42c0-a8a2-fa05a52c3dcd", - "name": "001bb358-822c-42c0-a8a2-fa05a52c3dcd", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/paymentMethods/00000000-0000-0000-0000-000000000055", + "name": "00000000-0000-0000-0000-000000000055", "type": "Microsoft.Billing/paymentMethods", "properties": { - "paymentMethodType": "Credits", + "currency": "USD", "details": "Credits", - "currency": "USD" + "expiration": "4/2020", + "paymentMethodType": "Credits" } }, { - "id": "/providers/Microsoft.Billing/billingAccounts/04e9d123-ae03-5621-6c17-e70da00924ee/billingProfiles/2291f7a6-e97a-4bb8-83d7-6090beb137e1/paymentMethods/21dd9edc-af71-4d62-80ce-37151d475326", - "name": "21dd9edc-af71-4d62-80ce-37151d475326", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/paymentMethods/00000000-0000-0000-0000-000000000026", + "name": "00000000-0000-0000-0000-000000000026", "type": "Microsoft.Billing/paymentMethods", "properties": { - "paymentMethodType": "CheckWire", - "details": "CheckWire" + "details": "Check Wire", + "paymentMethodType": "CheckWire" } } ] 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 8e26a99fad5c..9a617ffbf1a7 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 @@ -2,17 +2,18 @@ "parameters": { "api-version": "2018-11-01-preview", "billingAccountName": "{billingAccountName}", - "billingProfileName": "BillingProfileId1" + "billingProfileName": "{billingProfileName}" }, "responses": { "200": { "body": { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/BillingProfileId1/policies/default", - "name": "latest", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/policies/default", + "name": "default", "type": "Microsoft.Billing/policies", "properties": { + "marketplacePurchasesAllowed": true, "reservationPurchasesAllowed": true, - "marketplacePurchasesAllowed": true + "subscriptionOwnerCanViewCharges": 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 832b247cd2e9..9b43bad2ec41 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,21 +1,21 @@ { "parameters": { "api-version": "2018-03-01-preview", - "billingAccountName": "84ae600f-763c-4a66-a8f0-4c497fc58d98", - "invoiceName": "95869cd5-6f00-42b3-8708-04e85fef9e15" + "billingAccountName": "45000000-0000-0000-0000-000000000000", + "invoiceName": "00000000-0000-0000-0000-000000000000" }, "responses": { "202": { "headers": { - "Location": "https://management.azure.com/providers/Microsoft.Billing/operationResults/84ae600f-763c-4a66-a8f0-4c497fc58d98?api-version=2018-07-31", + "Location": "https://management.azure.com/providers/Microsoft.Billing/operationResults/45000000-0000-0000-0000-000000000000?api-version=2018-07-31", "Retry-After": "60", - "Azure-AsyncOperation": "https://management.azure.com/providers/Microsoft.Billing/operationStatus/84ae600f-763c-4a66-a8f0-4c497fc58d98?api-version=2018-07-31", - "OData-EntityId": "84ae600f-763c-4a66-a8f0-4c497fc58d98" + "Azure-AsyncOperation": "https://management.azure.com/providers/Microsoft.Billing/operationStatus/45000000-0000-0000-0000-000000000000?api-version=2018-07-31", + "OData-EntityId": "45000000-0000-0000-0000-000000000000" } }, "200": { "body": { - "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", + "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&spr=https&sig=G%2TEST%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 0215c6357d17..2bcec24bee53 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,14 +1,14 @@ { "parameters": { "api-version": "2018-11-01-preview", - "billingAccountName": "1234", - "invoiceSectionName": "42425", + "billingAccountName": "{billingAccountName}", + "invoiceSectionName": "22000000-0000-0000-0000-000000000000", "productName": "productSummaryId1" }, "responses": { "200": { "body": { - "id": "/providers/Microsoft.Billing/BillingAccounts/1234/products/productSummaryId1", + "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/products/productSummaryId1", "name": "productSummaryId1", "type": "Microsoft.Consumption/products", "properties": { @@ -28,9 +28,9 @@ "skuDescription": "Enterprise Agreement Development", "availabilityId": "AvailabilityId1", "parentProductId": "eligibleOffer2", - "invoiceSectionId": "42425", + "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000", "invoiceSectionName": "Contoso operations invoiceSection", - "billingProfileId": "789456", + "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000", "billingProfileName": "Contoso operations billing" } } 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 78907b5c37f4..1811494a741f 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,14 +1,14 @@ { "parameters": { "api-version": "2018-11-01-preview", - "billingAccountName": "1234" + "billingAccountName": "{billingAccountName}" }, "responses": { "200": { "body": { "value": [ { - "id": "/providers/Microsoft.Billing/BillingAccounts/1234/products/productSummaryId1", + "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/products/productSummaryId1", "name": "productSummaryId1", "type": "Microsoft.Consumption/products", "properties": { @@ -28,14 +28,14 @@ "availabilityId": "AvailabilityId1", "billingFrequency": "OneTime", "parentProductId": "eligibleOffer2", - "invoiceSectionId": "42425", + "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000", "invoiceSectionName": "Contoso operations invoiceSection", - "billingProfileId": "789456", + "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000", "billingProfileName": "Contoso operations billing" } }, { - "id": "/providers/Microsoft.Billing/BillingAccounts/1234/products/productSummaryId2", + "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/products/productSummaryId2", "name": "productSummaryId2", "type": "Microsoft.Consumption/products", "properties": { @@ -55,9 +55,9 @@ "availabilityId": "AvailabilityId1", "billingFrequency": "Monthly", "parentProductId": "eligibleOffer2", - "invoiceSectionId": "456789", + "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000", "invoiceSectionName": "Contoso operations invoiceSection", - "billingProfileId": "789456", + "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000", "billingProfileName": "Contoso operations billing" } } 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 220c80e35ebb..a13edb2ebc07 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,16 +1,15 @@ { "parameters": { "api-version": "2018-11-01-preview", - "billingAccountName": "1234", - "invoiceSectionName": "42425", - "$expand": "subscriptions" + "billingAccountName": "{billingAccountName}", + "invoiceSectionName": "22000000-0000-0000-0000-000000000000" }, "responses": { "200": { "body": { "value": [ { - "id": "/providers/Microsoft.Billing/BillingAccounts/1234/products/productSummaryId1", + "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/products/productSummaryId1", "name": "productSummaryId1", "type": "Microsoft.Consumption/products", "properties": { @@ -30,14 +29,14 @@ "skuDescription": "Enterprise Agreement Development", "availabilityId": "AvailabilityId1", "parentProductId": "eligibleOffer2", - "invoiceSectionId": "42425", + "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000", "invoiceSectionName": "Contoso operations invoiceSection", - "billingProfileId": "789456", + "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000", "billingProfileName": "Contoso operations billing" } }, { - "id": "/providers/Microsoft.Billing/BillingAccounts/products/productSummaryId2", + "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/products/productSummaryId2", "name": "productSummaryId2", "type": "Microsoft.Consumption/products", "properties": { @@ -57,9 +56,9 @@ "skuDescription": "Enterprise Agreement Development", "availabilityId": "AvailabilityId1", "parentProductId": "eligibleOffer2", - "invoiceSectionId": "42425", + "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000", "invoiceSectionName": "Contoso operations invoiceSection", - "billingProfileId": "789456", + "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000", "billingProfileName": "Contoso operations billing" } } 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 df9e5349e4e8..02c154c73c11 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", - "billingAccountName": "1234", + "billingAccountName": "{billingAccountName}", "startDate": "2018-04-01", "endDate": "2018-05-30", "$filter": "properties/kind eq 'Reservation'" @@ -11,7 +11,7 @@ "body": { "value": [ { - "id": "/providers/Microsoft.Billing/BillingAccounts/1234/transactions/transactionSummaryId1", + "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/transactions/transactionSummaryId1", "name": "transactionSummaryId1", "type": "Microsoft.Billing/transactions", "properties": { @@ -29,16 +29,16 @@ } , "quantity": 4, - "invoiceSectionId": "123456", + "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000", "invoiceSectionName": "Contoso operations invoiceSection", - "billingProfileId": "789456", + "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000", "billingProfileName": "Contoso operations billing", - "subscriptionId": "789456", + "subscriptionId": "7800000000-0000-0000-0000-0000000000009456", "subscriptionName": "Contoso operations billing" } }, { - "id": "/providers/Microsoft.Billing/BillingAccounts/1234/transactions/transactionSummaryId2", + "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/transactions/transactionSummaryId2", "name": "transactionSummaryId2", "type": "Microsoft.Billing/transactions", "properties": { @@ -56,11 +56,11 @@ } , "quantity": 5, - "invoiceSectionId": "123456", + "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000", "invoiceSectionName": "Contoso operations invoiceSection", - "billingProfileId": "789456", + "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000", "billingProfileName": "Contoso operations billing", - "subscriptionId": "789456", + "subscriptionId": "00000000-0000-0000-0000-000000000000", "subscriptionName": "Contoso operations billing" } } 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 69f063b1225e..897149730783 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", - "billingAccountName": "1234", - "billingProfileName": "42425", + "billingAccountName": "{billingAccountName}", + "billingProfileName": "11000000-0000-0000-0000-000000000000", "startDate": "2018-04-01", "endDate": "2018-05-30", "$filter": "properties/kind eq 'Reservation'" @@ -12,7 +12,7 @@ "body": { "value": [ { - "id": "/providers/Microsoft.Billing/BillingAccounts/1234/BillingProfiles/42425/transactions/transactionSummaryId1", + "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/BillingProfiles/11000000-0000-0000-0000-000000000000/transactions/transactionSummaryId1", "name": "transactionSummaryId1", "type": "Microsoft.Billing/transactions", "properties": { @@ -28,16 +28,16 @@ "value": 5000.00 }, "quantity": 4, - "invoiceSectionId": "123456", + "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000", "invoiceSectionName": "Contoso operations invoiceSection", - "billingProfileId": "42425", + "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000", "billingProfileName": "Contoso operations billing", - "subscriptionId": "789456", + "subscriptionId": "00000000-0000-0000-0000-000000000000", "subscriptionName": "Contoso operations billing" } }, { - "id": "/providers/Microsoft.Billing/BillingAccounts/1234/BillingProfiles/42425/transactions/transactionSummaryId2", + "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/BillingProfiles/11000000-0000-0000-0000-000000000000/transactions/transactionSummaryId2", "name": "transactionSummaryId2", "type": "Microsoft.Billing/transactions", "properties": { @@ -53,11 +53,11 @@ "value": 6000.00 }, "quantity": 5, - "invoiceSectionId": "123456", + "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000", "invoiceSectionName": "Contoso operations invoiceSection", - "billingProfileId": "42425", + "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000", "billingProfileName": "Contoso operations billing", - "subscriptionId": "789456", + "subscriptionId": "00000000-0000-0000-0000-000000000000", "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 index aa068134bd3c..5cc99761fcde 100644 --- 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 @@ -1,8 +1,8 @@ { "parameters": { "api-version": "2018-11-01-preview", - "billingAccountName": "1234", - "invoiceSectionName": "42425", + "billingAccountName": "{billingAccountName}", + "invoiceSectionName": "22000000-0000-0000-0000-000000000000", "startDate": "2018-04-01", "endDate": "2018-05-30", "$filter": "properties/kind eq 'Reservation'" @@ -12,7 +12,7 @@ "body": { "value": [ { - "id": "/providers/Microsoft.Billing/BillingAccounts/1234/InvoiceSection/42425/transactions/transactionSummaryId1", + "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/InvoiceSection/22000000-0000-0000-0000-000000000000/transactions/transactionSummaryId1", "name": "transactionSummaryId1", "type": "Microsoft.Billing/transactions", "properties": { @@ -28,16 +28,16 @@ "value": 5000.00 }, "quantity": 4, - "invoiceSectionId": "42425", + "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000", "invoiceSectionName": "Contoso operations invoiceSection", - "billingProfileId": "789456", + "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000", "billingProfileName": "Contoso operations billing", - "subscriptionId": "789456", + "subscriptionId": "00000000-0000-0000-0000-000000000000", "subscriptionName": "Contoso operations billing" } }, { - "id": "/providers/Microsoft.Billing/BillingAccounts/1234/InvoiceSection/42425/transactions/transactionSummaryId2", + "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/InvoiceSection/22000000-0000-0000-0000-000000000000/transactions/transactionSummaryId2", "name": "transactionSummaryId2", "type": "Microsoft.Billing/transactions", "properties": { @@ -53,11 +53,11 @@ "value": 6000.00 }, "quantity": 5, - "invoiceSectionId": "42425", + "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000", "invoiceSectionName": "Contoso operations invoiceSection", - "billingProfileId": "789456", + "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000", "billingProfileName": "Contoso operations billing", - "subscriptionId": "789456", + "subscriptionId": "00000000-0000-0000-0000-000000000000", "subscriptionName": "Contoso operations billing" } } 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 4600862a2f05..dd0c654ad44e 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", - "billingAccountName": "1234", + "billingAccountName": "{billingAccountName}", "startDate": "2018-04-01", "endDate": "2018-05-30" }, @@ -10,13 +10,14 @@ "body": { "value": [ { - "id": "/providers/Microsoft.Billing/BillingAccounts/1234/transactions/transactionSummaryId1", + "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/transactions/transactionSummaryId1", "name": "transactionSummaryId1", "type": "Microsoft.Billing/transactions", "properties": { "kind": "all", "date": "2018-05-01T00:00:00Z", "invoice": "2344233", + "productFamily": "Storage", "productTypeId": "A12345", "productType": "Dev Support", "productDescription": "Standard D1, US West 3", @@ -25,20 +26,21 @@ "currency": "USD", "value": 5000.00 }, - "invoiceSectionId": "123456", + "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000", "invoiceSectionName": "Contoso operations invoiceSection", - "billingProfileId": "789456", + "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000", "billingProfileName": "Contoso operations billing" } }, { - "id": "/providers/Microsoft.Billing/BillingAccounts/1234/transactions/transactionSummaryId2", + "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/transactions/transactionSummaryId2", "name": "transactionSummaryId2", "type": "Microsoft.Billing/transactions", "properties": { "kind": "all", "date": "2018-04-01T00:00:00Z", "invoice": "pending", + "productFamily": "Storage", "productTypeId": "A12345", "productType": "Azure subscription", "productDescription": "Send grid Gold", @@ -47,9 +49,9 @@ "currency": "USD", "value": 50.00 }, - "invoiceSectionId": "123456", + "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000", "invoiceSectionName": "Contoso operations invoiceSection", - "billingProfileId": "789456", + "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000", "billingProfileName": "Contoso operations billing" } } 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 514cf329d75a..37fb682018d1 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", - "billingAccountName": "1234", - "billingProfileName": "42425", + "billingAccountName": "{billingAccountName}", + "billingProfileName": "11000000-0000-0000-0000-000000000000", "startDate": "2018-04-01", "endDate": "2018-05-30" }, @@ -11,13 +11,14 @@ "body": { "value": [ { - "id": "/providers/Microsoft.Billing/BillingAccounts/1234/BillingProfiles/42425/transactions/transactionSummaryId1", + "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/BillingProfiles/11000000-0000-0000-0000-000000000000/transactions/transactionSummaryId1", "name": "transactionSummaryId1", "type": "Microsoft.Billing/transactions", "properties": { "kind": "all", "date": "2018-05-01T00:00:00Z", "invoice": "2344233", + "productFamily": "Storage", "productTypeId": "A12345", "productType": "VM Instance", "productDescription": "Standard D1, US West 3", @@ -26,20 +27,21 @@ "currency": "USD", "value": 5000.00 }, - "invoiceSectionId": "123456", + "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000", "invoiceSectionName": "Contoso operations invoiceSection", - "billingProfileId": "42425", + "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000", "billingProfileName": "Contoso operations billing" } }, { - "id": "/providers/Microsoft.Billing/BillingAccounts/1234/BillingProfiles/42425/transactions/transactionSummaryId2", + "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/BillingProfiles/11000000-0000-0000-0000-000000000000/transactions/transactionSummaryId2", "name": "transactionSummaryId2", "type": "Microsoft.Billing/transactions", "properties": { "kind": "all", "date": "2018-04-01T00:00:00Z", "invoice": "pending", + "productFamily": "Storage", "productTypeId": "A12345", "productType": "VM Instance", "productDescription": "Standard Support", @@ -48,9 +50,9 @@ "currency": "USD", "value": 50.00 }, - "invoiceSectionId": "123456", + "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000", "invoiceSectionName": "Contoso operations invoiceSection", - "billingProfileId": "42425", + "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000", "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 index e0a46a14afc4..13416347e310 100644 --- 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 @@ -1,8 +1,8 @@ { "parameters": { "api-version": "2018-11-01-preview", - "billingAccountName": "1234", - "invoiceSectionName": "42425", + "billingAccountName": "{billingAccountName}", + "invoiceSectionName": "22000000-0000-0000-0000-000000000000", "startDate": "2018-04-01", "endDate": "2018-05-30" }, @@ -11,13 +11,14 @@ "body": { "value": [ { - "id": "/providers/Microsoft.Billing/BillingAccounts/1234/InvoiceSection/42425/transactions/transactionSummaryId1", + "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/InvoiceSection/22000000-0000-0000-0000-000000000000/transactions/transactionSummaryId1", "name": "transactionSummaryId1", "type": "Microsoft.Billing/transactions", "properties": { "kind": "all", "date": "2018-05-01T00:00:00Z", "invoice": "2344233", + "productFamily": "Storage", "productTypeId": "A12345", "productType": "Reserved VM Instance", "productDescription": "Standard D1, US West 3", @@ -26,20 +27,21 @@ "currency": "USD", "value": 5000.00 }, - "invoiceSectionId": "42425", + "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000", "invoiceSectionName": "Contoso operations invoiceSection", - "billingProfileId": "789456", + "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000", "billingProfileName": "Contoso operations billing" } }, { - "id": "/providers/Microsoft.Billing/BillingAccounts/1234/InvoiceSection/42425/transactions/transactionSummaryId2", + "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/InvoiceSection/22000000-0000-0000-0000-000000000000/transactions/transactionSummaryId2", "name": "transactionSummaryId2", "type": "Microsoft.Billing/transactions", "properties": { "kind": "all", "date": "2018-04-01T00:00:00Z", "invoice": "pending", + "productFamily": "Storage", "productTypeId": "A12345", "productType": "VM Instance", "productDescription": "Standard Support", @@ -48,9 +50,9 @@ "currency": "USD", "value": 50.00 }, - "invoiceSectionId": "42425", + "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000", "invoiceSectionName": "Contoso operations invoiceSection", - "billingProfileId": "789456", + "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000", "billingProfileName": "Contoso operations billing" } } 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 c0c24e82b97f..a5bc8c709016 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,13 +1,12 @@ { "parameters": { "api-version": "2018-11-01-preview", - "billingAccountName": "2000100", - "billingProfileName": "BillingProfileId1", + "billingAccountName": "{billingAccountName}", + "billingProfileName": "11000000-0000-0000-0000-000000000000", "parameters": { "properties": { - "displayName": "BillingProfileName1", + "displayName": "BillingProfile11", "poNumber": "ABC12345", - "billingAddress": "One Microsoft Way", "isClassic": false } } @@ -21,23 +20,23 @@ }, "200": { "body": { - "id": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/BillingProfileId1", - "name": "BillingProfileId1", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000", + "name": "11000000-0000-0000-0000-000000000000", "type": "Microsoft.Billing/billingProfiles", "properties": { - "displayName": "BillingProfileName1", - "poNumber": "ABC12345", - "billingAddress": { - "addressLine1": "Test Address", - "addressLine2": "Test Address", - "addressLine3": "Test Address", + "displayName": "BillingProfile11", + "address": { + "companyName": "Contoso", + "firstName": "Test", + "lastName": "User", + "addressLine1": "Test Address1", + "addressLine2": "Test Address2", + "addressLine3": "Test Address3", "city": "City", "postalCode": "00000", "region": "WA", "country": "US" }, - "invoiceEmailOptIn": true, - "isClassic": false, "currency": "USD", "enabledAzureSKUs": [ { @@ -48,7 +47,11 @@ "skuId": "0002", "skuDescription": "Microsoft Azure Standard" } - ] + ], + "isClassic": false, + "invoiceDay": 5, + "invoiceEmailOptIn": true, + "poNumber": "ABC12345" } } } 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 c0b5e2b4fa3b..7cdc4f32fdd2 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 @@ -2,28 +2,28 @@ "parameters": { "api-version": "2018-11-01-preview", "billingAccountName": "{billingAccountName}", - "invoiceSectionName": "invoiceSectionId1", + "invoiceSectionName": "{invoiceSectionName}", "parameters": { "properties": { - "displayName": "invoiceSectionName1" + "displayName": "invoiceSection1" } } }, "responses": { "202": { "headers": { - "Location": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/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-11-01-preview", "Retry-After": "60", - "Azure-AsyncOperation": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/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-11-01-preview" } }, "200": { "body": { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/invoiceSectionId1", - "name": "invoiceSectionId1", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionName}", + "name": "{invoiceSectionName}", "type": "Microsoft.Billing/invoiceSections", "properties": { - "displayName": "invoiceSectionName1" + "displayName": "invoiceSection1" } } } 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 98f2373dd325..cbe94aae78da 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 @@ -2,24 +2,26 @@ "parameters": { "api-version": "2018-11-01-preview", "billingAccountName": "{billingAccountName}", - "billingProfileName": "BillingProfileId1", + "billingProfileName": "{billingProfileName}", "eTag": "\"1d34d012214157f\"", "parameters": { "properties": { "reservationPurchasesAllowed": true, - "marketplacePurchasesAllowed": false + "marketplacePurchasesAllowed": false, + "subscriptionOwnerCanViewCharges": true } } }, "responses": { "200": { "body": { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/BillingProfileId1/policies/default", - "name": "latest", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/policies/default", + "name": "default", "type": "Microsoft.Billing/policies", "properties": { "reservationPurchasesAllowed": true, - "marketplacePurchasesAllowed": true + "marketplacePurchasesAllowed": false, + "subscriptionOwnerCanViewCharges": true } } } From bbf0f75654a02f3b434dfde3e89733b8456e96e4 Mon Sep 17 00:00:00 2001 From: asarkar84 <33848291+asarkar84@users.noreply.github.com> Date: Wed, 17 Apr 2019 13:20:07 -0700 Subject: [PATCH 04/27] Fixed the errors Fixed the errors --- .../preview/2018-11-01-preview/billing.json | 20 +++++++++++++++++++ .../examples/AgreementByName.json | 3 ++- .../AgreementsListByBillingAccountName.json | 3 ++- 3 files changed, 24 insertions(+), 2 deletions(-) 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 523013327f77..576ef0d3a782 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 @@ -3666,6 +3666,10 @@ "description": "The address associated with billing account.", "$ref": "#/definitions/Address" }, + "company": { + "description": "Company Name.", + "type": "string" + }, "invoiceSections": { "description": "The invoice sections associated to the billing account. By default this is not populated, unless it's specified in $expand.", "type": "array", @@ -3707,6 +3711,22 @@ } }, "BillingProperty": { + "description": "A billing property resource.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/Resource" + } + ], + "properties": { + "properties": { + "description": "A billing property.", + "x-ms-client-flatten": true, + "$ref": "#/definitions/BillingPropertySummary" + } + } + }, + "BillingPropertySummary": { "description": "The billing property.", "properties": { "productId": { diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/AgreementByName.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/AgreementByName.json index 4c95762db609..f5be974d81d8 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/AgreementByName.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/AgreementByName.json @@ -22,7 +22,8 @@ }, { "status": "Declined", - "statusDate": "xyz@contoso.com" + "statusDate": "2018-11-02T00:00:00Z", + "email": "xyz@contoso.com" } ], "status": "Published" diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/AgreementsListByBillingAccountName.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/AgreementsListByBillingAccountName.json index b1c2d8a35eb6..3059c2dbddd6 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/AgreementsListByBillingAccountName.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/AgreementsListByBillingAccountName.json @@ -23,7 +23,8 @@ }, { "status": "Declined", - "statusDate": "xyz@contoso.com" + "statusDate": "2018-11-02T00:00:00Z", + "email": "xtz@contoso.com" } ], "status": "Published" From 91060fe18f14b09cc2ef3b9b1563ef969acdc52d Mon Sep 17 00:00:00 2001 From: asarkar84 <33848291+asarkar84@users.noreply.github.com> Date: Wed, 17 Apr 2019 13:53:52 -0700 Subject: [PATCH 05/27] Fixing errors in spec Fixing errors in spec --- .../preview/2018-11-01-preview/billing.json | 28 +++++++++++++++---- 1 file changed, 22 insertions(+), 6 deletions(-) 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 576ef0d3a782..153ffe86c952 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 @@ -3668,7 +3668,13 @@ }, "company": { "description": "Company Name.", - "type": "string" + "type": "string", + "readOnly": true + }, + "country": { + "description": "Country Name.", + "type": "string", + "readOnly": true }, "invoiceSections": { "description": "The invoice sections associated to the billing account. By default this is not populated, unless it's specified in $expand.", @@ -3729,11 +3735,6 @@ "BillingPropertySummary": { "description": "The billing property.", "properties": { - "productId": { - "description": "Product Id.", - "type": "string", - "readOnly": true - }, "billingTenantId": { "description": "Billing tenant Id.", "type": "string", @@ -3759,6 +3760,11 @@ "type": "string", "readOnly": true }, + "costCenter": { + "description": "Cost center name.", + "type": "string", + "readOnly": true + }, "invoiceSectionId": { "description": "Invoice Section Id.", "type": "string", @@ -3769,6 +3775,16 @@ "type": "string", "readOnly": true }, + "productId": { + "description": "Product Id.", + "type": "string", + "readOnly": true + }, + "productName": { + "description": "Product name.", + "type": "string", + "readOnly": true + }, "skuId": { "description": "SKU Id.", "type": "string", From a16aba34b67645c35d9ae5e7869d33ecfd275162 Mon Sep 17 00:00:00 2001 From: asarkar84 <33848291+asarkar84@users.noreply.github.com> Date: Wed, 17 Apr 2019 17:46:02 -0700 Subject: [PATCH 06/27] Updated examples Updated examples --- .../preview/2018-11-01-preview/billing.json | 4 +-- .../AddRoleAssignmentToBillingAccount.json | 20 +++++++------- .../AddRoleAssignmentToBillingProfile.json | 12 ++++----- .../AddRoleAssignmentToInvoiceSection.json | 12 ++++----- .../examples/BillingAccount.json | 6 ++--- .../BillingAccountRoleAssignmentDelete.json | 4 +-- .../BillingAccountRoleAssignmentList.json | 6 ++--- .../BillingAccountRoleDefinition.json | 8 +++--- .../BillingAccountRoleDefinitionsList.json | 14 +++++----- .../examples/BillingAccountWithExpand.json | 6 ++--- .../examples/BillingProfile.json | 8 +++--- .../BillingProfilePermissionsList.json | 4 +-- .../BillingProfileRoleAssignment.json | 8 +++--- .../BillingProfileRoleAssignmentDelete.json | 8 +++--- .../BillingProfileRoleAssignmentList.json | 26 +++++++++---------- .../BillingProfileRoleDefinition.json | 10 +++---- .../BillingProfileRoleDefinitionsList.json | 8 +++--- .../examples/BillingProperty.json | 4 +-- .../examples/BillingSubscription.json | 10 +++---- ...lingSubscriptionsListByBillingAccount.json | 12 ++++----- ...lingSubscriptionsListByBillingProfile.json | 8 +++--- ...lingSubscriptionsListByInvoiceSection.json | 14 +++++----- .../examples/Department.json | 8 +++--- .../examples/DepartmentWithExpand.json | 6 ++--- .../examples/ElevateInvoiceSection.json | 4 +-- .../examples/EnrollmentAccount.json | 4 +-- .../examples/EnrollmentAccountWithExpand.json | 4 +-- .../2018-11-01-preview/examples/Invoice.json | 10 +++---- .../examples/InvoiceSection.json | 6 ++--- .../InvoiceSectionPermissionsList.json | 4 +-- .../InvoiceSectionRoleAssignment.json | 8 +++--- .../InvoiceSectionRoleAssignmentDelete.json | 8 +++--- .../InvoiceSectionRoleAssignmentList.json | 12 ++++----- .../InvoiceSectionRoleDefinition.json | 10 +++---- .../InvoiceSectionRoleDefinitionsList.json | 8 +++--- .../examples/InvoiceSectionWithExpand.json | 6 ++--- .../InvoicesListByBillingProfile.json | 10 +++---- .../examples/PricesheetDownload.json | 4 +-- .../2018-11-01-preview/examples/Product.json | 14 +++++----- .../ProductCancelByBillingAccount.json | 4 +-- .../ProductCancelForInvoiceSection.json | 6 ++--- .../ProductsListByBillingAccount.json | 16 ++++++------ .../ProductsListByInvoiceSection.json | 22 ++++++++-------- ...ationTransactionsListByBillingAccount.json | 10 +++---- ...ationTransactionsListByBillingProfile.json | 18 ++++++------- ...ationTransactionsListByInvoiceSection.json | 16 ++++++------ .../TransactionsListByBillingAccount.json | 8 +++--- .../TransactionsListByBillingProfile.json | 14 +++++----- .../TransactionsListByInvoiceSection.json | 14 +++++----- .../examples/TransferBillingSubscription.json | 14 +++++----- .../examples/TransferProduct.json | 26 +++++++++---------- .../examples/UpdateBillingProfile.json | 6 ++--- 52 files changed, 256 insertions(+), 256 deletions(-) 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 153ffe86c952..a54e0732b435 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 @@ -3541,7 +3541,7 @@ "TransferProductRequestProperties": { "description": "The properties of the product to initiate a transfer.", "properties": { - "destinationInvoiceSectionName": { + "destinationInvoiceSectionId": { "description": "Destination invoice section id.", "type": "string" } @@ -3583,7 +3583,7 @@ "type": "object", "description": "Request parameters to transfer billing subscription.", "properties": { - "destinationInvoiceSectionName": { + "destinationInvoiceSectionId": { "type": "string", "description": "The destination invoiceSectionName." } 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 3318879cb816..12a70e881d1d 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 @@ -3,7 +3,7 @@ "api-version": "2018-11-01-preview", "billingAccountName": "{billingAccountName}", "parameters": { - "principalId": "6fd330f6-7d26-4aff-b9cf-7bd699f965b9", + "principalId": "00000000-0000-0000-0000-000000000000", "billingRoleDefinitionName": "10000000-aaaa-bbbb-cccc-100000000000" } }, @@ -12,15 +12,15 @@ "body": { "value": [ { - "id": "10000000-aaaa-bbbb-cccc-100000000000_6fd330f6-7d26-4aff-b9cf-7bd699f965b9", - "name": "10000000-aaaa-bbbb-cccc-100000000000_6fd330f6-7d26-4aff-b9cf-7bd699f965b9", + "id": "10000000-aaaa-bbbb-cccc-100000000000_00000000-0000-0000-0000-000000000000", + "name": "10000000-aaaa-bbbb-cccc-100000000000_00000000-0000-0000-0000-000000000000", "properties": { "createdOn": "2018-06-21T21:34:12.2363515+00:00", "createdByPrincipalTenantId": "7ca289b9-c32d-4f01-8566-7ff93261d76f", "createdByPrincipalId": "", - "name": "10000000-aaaa-bbbb-cccc-100000000000_6fd330f6-7d26-4aff-b9cf-7bd699f965b9", - "principalId": "6fd330f6-7d26-4aff-b9cf-7bd699f965b9", - "scope": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671" + "name": "10000000-aaaa-bbbb-cccc-100000000000_00000000-0000-0000-0000-000000000000", + "principalId": "00000000-0000-0000-0000-000000000000", + "scope": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}" }, "type": "Microsoft.Billing/billingRoleAssignments" }, @@ -33,7 +33,7 @@ "createdByPrincipalId": "46b831ec-42b2-4f1a-8b54-3fd5ff9d6aa1", "name": "10000000-aaaa-bbbb-cccc-100000000000_b1839933-b3ac-42ca-8112-d29c43f3ab47", "principalId": "b1839933-b3ac-42ca-8112-d29c43f3ab47", - "scope": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671" + "scope": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}" }, "type": "Microsoft.Billing/billingRoleAssignments" }, @@ -46,7 +46,7 @@ "createdByPrincipalId": "b1839933-b3ac-42ca-8112-d29c43f3ab47", "name": "10000000-aaaa-bbbb-cccc-100000000002_129db794-64a5-44e0-9838-002780478959", "principalId": "129db794-64a5-44e0-9838-002780478959", - "scope": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671" + "scope": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}" }, "type": "Microsoft.Billing/billingRoleAssignments" }, @@ -59,7 +59,7 @@ "createdByPrincipalId": "b1839933-b3ac-42ca-8112-d29c43f3ab47", "name": "10000000-aaaa-bbbb-cccc-100000000001_d7b03fbc-ecd9-49b8-8e38-285b75eaa8f7", "principalId": "d7b03fbc-ecd9-49b8-8e38-285b75eaa8f7", - "scope": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671" + "scope": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}" }, "type": "Microsoft.Billing/billingRoleAssignments" }, @@ -72,7 +72,7 @@ "createdByPrincipalId": "b1839933-b3ac-42ca-8112-d29c43f3ab47", "name": "10000000-aaaa-bbbb-cccc-100000000000_c4f54fd2-d920-4c49-9b4d-9f09387b881c", "principalId": "c4f54fd2-d920-4c49-9b4d-9f09387b881c", - "scope": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671" + "scope": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}" }, "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 6372219ee99e..38c3c0e86f62 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 @@ -4,7 +4,7 @@ "billingAccountName": "{billingAccountName}", "billingProfileName": "{billingProfileName}", "parameters": { - "principalId": "6fd330f6-7d26-4aff-b9cf-7bd699f965b9", + "principalId": "00000000-0000-0000-0000-000000000000", "billingRoleDefinitionName": "10000000-aaaa-bbbb-cccc-100000000000" } }, @@ -13,15 +13,15 @@ "body": { "value": [ { - "id": "10000000-aaaa-bbbb-cccc-100000000000_6fd330f6-7d26-4aff-b9cf-7bd699f965b9", - "name": "10000000-aaaa-bbbb-cccc-100000000000_6fd330f6-7d26-4aff-b9cf-7bd699f965b9", + "id": "10000000-aaaa-bbbb-cccc-100000000000_00000000-0000-0000-0000-000000000000", + "name": "10000000-aaaa-bbbb-cccc-100000000000_00000000-0000-0000-0000-000000000000", "properties": { "createdOn": "2018-06-21T21:34:12.2363515+00:00", "createdByPrincipalTenantId": "7ca289b9-c32d-4f01-8566-7ff93261d76f", "createdByPrincipalId": "", - "name": "10000000-aaaa-bbbb-cccc-100000000000_6fd330f6-7d26-4aff-b9cf-7bd699f965b9", - "principalId": "6fd330f6-7d26-4aff-b9cf-7bd699f965b9", - "scope": "/providers/Microsoft.Billing/billingAccounts/billingProfiles/123/ee4241f3-de74-5631-3e6b-5df2c3d66671" + "name": "10000000-aaaa-bbbb-cccc-100000000000_00000000-0000-0000-0000-000000000000", + "principalId": "00000000-0000-0000-0000-000000000000", + "scope": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}" }, "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 15ca0a2ea77b..fec5048a247b 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 @@ -4,7 +4,7 @@ "billingAccountName": "{billingAccountName}", "invoiceSectionName": "{invoiceSectionName}", "parameters": { - "principalId": "6fd330f6-7d26-4aff-b9cf-7bd699f965b9", + "principalId": "00000000-0000-0000-0000-000000000000", "billingRoleDefinitionName": "10000000-aaaa-bbbb-cccc-100000000000" } }, @@ -13,15 +13,15 @@ "body": { "value": [ { - "id": "10000000-aaaa-bbbb-cccc-100000000000_6fd330f6-7d26-4aff-b9cf-7bd699f965b9", - "name": "10000000-aaaa-bbbb-cccc-100000000000_6fd330f6-7d26-4aff-b9cf-7bd699f965b9", + "id": "10000000-aaaa-bbbb-cccc-100000000000_00000000-0000-0000-0000-000000000000", + "name": "10000000-aaaa-bbbb-cccc-100000000000_00000000-0000-0000-0000-000000000000", "properties": { "createdOn": "2018-06-21T21:34:12.2363515+00:00", "createdByPrincipalTenantId": "7ca289b9-c32d-4f01-8566-7ff93261d76f", "createdByPrincipalId": "", - "name": "10000000-aaaa-bbbb-cccc-100000000000_6fd330f6-7d26-4aff-b9cf-7bd699f965b9", - "principalId": "6fd330f6-7d26-4aff-b9cf-7bd699f965b9", - "scope": "/providers/Microsoft.Billing/billingAccounts/invoiceSections/123/ee4241f3-de74-5631-3e6b-5df2c3d66671" + "name": "10000000-aaaa-bbbb-cccc-100000000000_00000000-0000-0000-0000-000000000000", + "principalId": "00000000-0000-0000-0000-000000000000", + "scope": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionName}" }, "type": "Microsoft.Billing/billingRoleAssignments" } 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 9c3195aacc6a..18106a91a4b1 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,13 +1,13 @@ { "parameters": { "api-version": "2018-11-01-preview", - "billingAccountName": "00000000-0000-0000-0000-000000000000" + "billingAccountName": "{billingAccountName}" }, "responses": { "200": { "body": { - "id": "/providers/Microsoft.Billing/billingAccounts/00000000-0000-0000-0000-000000000000", - "name": "00000000-0000-0000-0000-000000000000", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}", + "name": "{billingAccountName}", "type": "Microsoft.Billing/billingAccounts", "properties": { "displayName": "Test Account", 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 82a64c84c9d4..b1bc04de239d 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 @@ -1,7 +1,7 @@ { "parameters": { "api-version": "2018-11-01-preview", - "billingAccountName": "2000100", + "billingAccountName": "{billingAccountName}", "billingRoleAssignmentName":"10000000-aaaa-bbbb-cccc-100000000000_6fd330f6-7d26-4aff-b9cf-7bd699f965b9" }, "responses": { @@ -16,7 +16,7 @@ "createdByPrincipalId": "", "name": "10000000-aaaa-bbbb-cccc-100000000000_6fd330f6-7d26-4aff-b9cf-7bd699f965b9", "principalId": "6fd330f6-7d26-4aff-b9cf-7bd699f965b9", - "scope": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671" + "scope": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}" } } } 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 63f51451cd77..5d2362153324 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 @@ -1,7 +1,7 @@ { "parameters": { "api-version": "2018-11-01-preview", - "billingAccountName": "2000100" + "billingAccountName": "{billingAccountName}" }, "responses": { "200": { @@ -16,7 +16,7 @@ "createdByPrincipalId": "", "name": "10000000-aaaa-bbbb-cccc-100000000000_6fd330f6-7d26-4aff-b9cf-7bd699f965b9", "principalId": "6fd330f6-7d26-4aff-b9cf-7bd699f965b9", - "scope": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671" + "scope": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}" }, "type": "Microsoft.Billing/billingRoleAssignments" }, @@ -29,7 +29,7 @@ "createdByPrincipalId": "46b831ec-42b2-4f1a-8b54-3fd5ff9d6aa1", "name": "10000000-aaaa-bbbb-cccc-100000000000_b1839933-b3ac-42ca-8112-d29c43f3ab47", "principalId": "b1839933-b3ac-42ca-8112-d29c43f3ab47", - "scope": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671" + "scope": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}" }, "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 e9c6cd3875b0..c2aee86ab492 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 @@ -1,14 +1,14 @@ { "parameters": { "api-version": "2018-11-01-preview", - "billingAccountName": "2000100", - "billingRoleDefinitionName": "{billingRoleDefinitionId}" + "billingAccountName": "{billingAccountName}", + "billingRoleDefinitionName": "{billingRoleDefinitionName}" }, "responses": { "200": { "body": { - "id": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/providers/Microsoft.Billing/billingRoleDefinitions/10000000-aaaa-bbbb-cccc-100000000000", - "name": "10000000-aaaa-bbbb-cccc-100000000000", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/providers/Microsoft.Billing/billingRoleDefinitions/{billingRoleDefinitionName}", + "name": "{billingRoleDefinitionName}", "properties": { "description": "The Owner role gives the user all permissions including access management rights to the Commerce Root.", "permissions": [ diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountRoleDefinitionsList.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountRoleDefinitionsList.json index 9f3297c88449..559d391a2ce9 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountRoleDefinitionsList.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingAccountRoleDefinitionsList.json @@ -1,14 +1,14 @@ { "parameters": { "api-version": "2018-11-01-preview", - "billingAccountName": "2000100" + "billingAccountName": "{billingAccountName}" }, "responses": { "200": { "body": { "value": [ { - "id": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/providers/Microsoft.Billing/billingRoleDefinitions/10000000-aaaa-bbbb-cccc-100000000000", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/providers/Microsoft.Billing/billingRoleDefinitions/10000000-aaaa-bbbb-cccc-100000000000", "name": "10000000-aaaa-bbbb-cccc-100000000000", "properties": { "description": "The Owner role gives the user all permissions including access management rights to the Commerce Root.", @@ -44,7 +44,7 @@ "type": "Microsoft.Billing/billingRoleDefinitions" }, { - "id": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/providers/Microsoft.Billing/billingRoleDefinitions/10000000-aaaa-bbbb-cccc-100000000001", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/providers/Microsoft.Billing/billingRoleDefinitions/10000000-aaaa-bbbb-cccc-100000000001", "name": "10000000-aaaa-bbbb-cccc-100000000001", "properties": { "description": "The Contributor role give the user all permissions except access management rights to the Commerce Root.", @@ -76,7 +76,7 @@ "type": "Microsoft.Billing/billingRoleDefinitions" }, { - "id": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/providers/Microsoft.Billing/billingRoleDefinitions/10000000-aaaa-bbbb-cccc-100000000002", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/providers/Microsoft.Billing/billingRoleDefinitions/10000000-aaaa-bbbb-cccc-100000000002", "name": "10000000-aaaa-bbbb-cccc-100000000002", "properties": { "description": "The Reader role gives the user read only access to the Commerce Root.", @@ -103,7 +103,7 @@ "type": "Microsoft.Billing/billingRoleDefinitions" }, { - "id": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/providers/Microsoft.Billing/billingRoleDefinitions/10000000-aaaa-bbbb-cccc-100000000003", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/providers/Microsoft.Billing/billingRoleDefinitions/10000000-aaaa-bbbb-cccc-100000000003", "name": "10000000-aaaa-bbbb-cccc-100000000003", "properties": { "description": "The Signatory role can sign agreements on behalf of the customer.", @@ -121,7 +121,7 @@ "type": "Microsoft.Billing/billingRoleDefinitions" }, { - "id": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/providers/Microsoft.Billing/billingRoleDefinitions/10000000-aaaa-bbbb-cccc-100000000004", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/providers/Microsoft.Billing/billingRoleDefinitions/10000000-aaaa-bbbb-cccc-100000000004", "name": "10000000-aaaa-bbbb-cccc-100000000004", "properties": { "description": "The Basic Purchaser role gives the user the ability to make purchases by creating new Projects and Billing Groups.", @@ -139,7 +139,7 @@ "type": "Microsoft.Billing/billingRoleDefinitions" }, { - "id": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/providers/Microsoft.Billing/billingRoleDefinitions/10000000-aaaa-bbbb-cccc-100000000005", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/providers/Microsoft.Billing/billingRoleDefinitions/10000000-aaaa-bbbb-cccc-100000000005", "name": "10000000-aaaa-bbbb-cccc-100000000005", "properties": { "description": "The Project Creator role gives the user the ability to create new Projects.", 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 9d9937451789..9e45880f4295 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,14 +1,14 @@ { "parameters": { "api-version": "2018-11-01-preview", - "billingAccountName": "00000000-0000-0000-0000-000000000000", + "billingAccountName": "{billingAccountName}", "$expand": "invoiceSections, billingProfiles" }, "responses": { "200": { "body": { - "id": "/providers/Microsoft.Billing/billingAccounts/00000000-0000-0000-0000-000000000000", - "name": "00000000-0000-0000-0000-000000000000", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}", + "name": "{billingAccountName}", "type": "Microsoft.Billing/billingAccounts", "properties": { "displayName": "Test Account 1", 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 7f1f6c94b715..41e9c6073aac 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 @@ -2,16 +2,16 @@ "parameters": { "api-version": "2018-11-01-preview", "billingAccountName": "{billingAccountName}", - "billingProfileName": "00000000-0000-0000-0000-000000000000" + "billingProfileName": "{billingProfileName}" }, "responses": { "200": { "body": { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/00000000-0000-0000-0000-000000000000", - "name": "00000000-0000-0000-0000-000000000000", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}", + "name": "{billingProfileName}", "type": "Microsoft.Billing/billingProfiles", "properties": { - "displayName": "BillingProfileName", + "displayName": "Billing Profile1", "address": { "companyName": "Contoso", "firstName": "Test", diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingProfilePermissionsList.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingProfilePermissionsList.json index bd93a1c806b6..112fd8bfb785 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingProfilePermissionsList.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingProfilePermissionsList.json @@ -1,8 +1,8 @@ { "parameters": { "api-version": "2018-11-01-preview", - "billingAccountName": "2000100", - "billingProfileName": "123" + "billingAccountName": "{billingAccountName}", + "billingProfileName": "{billingProfileName}" }, "responses": { "200": { 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 2dd3a409c7e0..aa9170349b47 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 @@ -1,9 +1,9 @@ { "parameters": { "api-version": "2018-11-01-preview", - "billingAccountName": "2000100", - "billingProfileName": "123", - "billingRoleAssignmentName": "{billingRoleAssignmentId}" + "billingAccountName": "{billingAccountName}", + "billingProfileName": "{billingProfileName}", + "billingRoleAssignmentName": "{billingRoleAssignmentName}" }, "responses": { "200": { @@ -16,7 +16,7 @@ "createdByPrincipalId": "46b831ec-42b2-4f1a-8b54-3fd5ff9d6aa1", "name": "10000000-aaaa-bbbb-cccc-100000000000_b1839933-b3ac-42ca-8112-d29c43f3ab47", "principalId": "b1839933-b3ac-42ca-8112-d29c43f3ab47", - "scope": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/billingProfiles/123" + "scope": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}" }, "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 f38600152c60..aa9170349b47 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 @@ -1,9 +1,9 @@ { "parameters": { "api-version": "2018-11-01-preview", - "billingAccountName": "2000100", - "billingProfileName": "123", - "billingRoleAssignmentName": "10000000-aaaa-bbbb-cccc-100000000000_b1839933-b3ac-42ca-8112-d29c43f3ab47" + "billingAccountName": "{billingAccountName}", + "billingProfileName": "{billingProfileName}", + "billingRoleAssignmentName": "{billingRoleAssignmentName}" }, "responses": { "200": { @@ -16,7 +16,7 @@ "createdByPrincipalId": "46b831ec-42b2-4f1a-8b54-3fd5ff9d6aa1", "name": "10000000-aaaa-bbbb-cccc-100000000000_b1839933-b3ac-42ca-8112-d29c43f3ab47", "principalId": "b1839933-b3ac-42ca-8112-d29c43f3ab47", - "scope": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/billingProfiles/123" + "scope": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}" }, "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 ff1622cb9110..c6f1d978a078 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 @@ -1,7 +1,7 @@ { "parameters": { "api-version": "2018-11-01-preview", - "billingAccountName": "2000100", + "billingAccountName": "{billingAccountName}", "billingProfileName": "{billingProfileName}" }, "responses": { @@ -17,20 +17,20 @@ "createdByPrincipalId": "", "name": "10000000-aaaa-bbbb-cccc-100000000000_6fd330f6-7d26-4aff-b9cf-7bd699f965b9", "principalId": "6fd330f6-7d26-4aff-b9cf-7bd699f965b9", - "scope": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/billingProfile/123" + "scope": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}" }, "type": "Microsoft.Billing/billingRoleAssignments" }, { - "id": "10000000-aaaa-bbbb-cccc-100000000000_b1839933-b3ac-42ca-8112-d29c43f3ab47", - "name": "10000000-aaaa-bbbb-cccc-100000000000_b1839933-b3ac-42ca-8112-d29c43f3ab47", + "id": "10000000-aaaa-bbbb-cccc-100000000000_00000000-0000-0000-0000-000000000000", + "name": "10000000-aaaa-bbbb-cccc-100000000000_00000000-0000-0000-0000-000000000000", "properties": { "createdOn": "2018-06-21T21:58:19.9073876+00:00", "createdByPrincipalTenantId": "7ca289b9-c32d-4f01-8566-7ff93261d76f", "createdByPrincipalId": "46b831ec-42b2-4f1a-8b54-3fd5ff9d6aa1", - "name": "10000000-aaaa-bbbb-cccc-100000000000_b1839933-b3ac-42ca-8112-d29c43f3ab47", - "principalId": "b1839933-b3ac-42ca-8112-d29c43f3ab47", - "scope": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/billingProfile/123" + "name": "10000000-aaaa-bbbb-cccc-100000000000_00000000-0000-0000-0000-000000000000", + "principalId": "00000000-0000-0000-0000-000000000000", + "scope": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}" }, "type": "Microsoft.Billing/billingRoleAssignments" }, @@ -40,10 +40,10 @@ "properties": { "createdOn": "2018-06-22T06:03:51.430844+00:00", "createdByPrincipalTenantId": "7ca289b9-c32d-4f01-8566-7ff93261d76f", - "createdByPrincipalId": "b1839933-b3ac-42ca-8112-d29c43f3ab47", + "createdByPrincipalId": "00000000-0000-0000-0000-000000000000", "name": "10000000-aaaa-bbbb-cccc-100000000002_129db794-64a5-44e0-9838-002780478959", "principalId": "129db794-64a5-44e0-9838-002780478959", - "scope": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/billingProfile/123" + "scope": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}" }, "type": "Microsoft.Billing/billingRoleAssignments" }, @@ -53,10 +53,10 @@ "properties": { "createdOn": "2018-07-06T05:52:57.1463874+00:00", "createdByPrincipalTenantId": "7ca289b9-c32d-4f01-8566-7ff93261d76f", - "createdByPrincipalId": "b1839933-b3ac-42ca-8112-d29c43f3ab47", + "createdByPrincipalId": "00000000-0000-0000-0000-000000000000", "name": "10000000-aaaa-bbbb-cccc-100000000001_d7b03fbc-ecd9-49b8-8e38-285b75eaa8f7", "principalId": "d7b03fbc-ecd9-49b8-8e38-285b75eaa8f7", - "scope": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/billingProfile/123" + "scope": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}" }, "type": "Microsoft.Billing/billingRoleAssignments" }, @@ -66,10 +66,10 @@ "properties": { "createdOn": "2018-07-10T22:04:33.8309285+00:00", "createdByPrincipalTenantId": "7ca289b9-c32d-4f01-8566-7ff93261d76f", - "createdByPrincipalId": "b1839933-b3ac-42ca-8112-d29c43f3ab47", + "createdByPrincipalId": "00000000-0000-0000-0000-000000000000", "name": "10000000-aaaa-bbbb-cccc-100000000000_c4f54fd2-d920-4c49-9b4d-9f09387b881c", "principalId": "c4f54fd2-d920-4c49-9b4d-9f09387b881c", - "scope": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/billingProfile/123" + "scope": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}" }, "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 245473373474..823820a5e0bf 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 @@ -1,15 +1,15 @@ { "parameters": { "api-version": "2018-11-01-preview", - "billingAccountName": "2000100", - "billingProfileName": "123", - "billingRoleDefinitionName": "10000000-aaaa-bbbb-cccc-100000000000" + "billingAccountName": "{billingAccountName}", + "billingProfileName": "{billingProfileName}", + "billingRoleDefinitionName": "{billingRoleDefinitionName}" }, "responses": { "200": { "body": { - "id": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/billingProfiles/123/providers/Microsoft.Billing/billingRoleDefinitions/10000000-aaaa-bbbb-cccc-100000000000", - "name": "10000000-aaaa-bbbb-cccc-100000000000", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/providers/Microsoft.Billing/billingRoleDefinitions/{billingRoleDefinitionName}", + "name": "{billingRoleDefinitionName}", "properties": { "description": "The Owner role gives the user all permissions including access management rights to the Commerce Root.", "permissions": [ diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingProfileRoleDefinitionsList.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingProfileRoleDefinitionsList.json index 8e134884d871..7caae02a7e70 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingProfileRoleDefinitionsList.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/BillingProfileRoleDefinitionsList.json @@ -1,15 +1,15 @@ { "parameters": { "api-version": "2018-11-01-preview", - "billingAccountName": "2000100", - "billingProfileName": "123" + "billingAccountName": "{billingAccountName}", + "billingProfileName": "{billingProfileName}" }, "responses": { "200": { "body": { "value": [ { - "id": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/billingProfiles/123/providers/Microsoft.Billing/billingRoleDefinitions/10000000-aaaa-bbbb-cccc-100000000000", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/providers/Microsoft.Billing/billingRoleDefinitions/10000000-aaaa-bbbb-cccc-100000000000", "name": "10000000-aaaa-bbbb-cccc-100000000000", "properties": { "description": "The Owner role gives the user all permissions including access management rights to the Commerce Root.", @@ -45,7 +45,7 @@ "type": "Microsoft.Billing/billingRoleDefinitions" }, { - "id": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/billingProfiles/456/providers/Microsoft.Billing/billingRoleDefinitions/10000000-aaaa-bbbb-cccc-100000000001", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/providers/Microsoft.Billing/billingRoleDefinitions/10000000-aaaa-bbbb-cccc-100000000001", "name": "10000000-aaaa-bbbb-cccc-100000000001", "properties": { "description": "The Contributor role give the user all permissions except access management rights to the Commerce Root.", 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 546597b7af3b..712e2ac42132 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,12 +1,12 @@ { "parameters": { "api-version": "2018-11-01-preview", - "subscriptionId": "88000000-0000-0000-0000-000000000000" + "subscriptionId": "{subscriptionId}" }, "responses": { "200": { "body": { - "id": "/subscriptions/88000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingProperty/default", + "id": "/subscriptions/{subscriptionId}/providers/Microsoft.Billing/billingProperty/default", "name": "default", "type": "Microsoft.Billing/billingProperty", "properties": { 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 0920beb78b46..d9b3fac7f4e2 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 @@ -2,15 +2,15 @@ "parameters": { "api-version": "2018-11-01-preview", "billingAccountName": "{billingAccountName}", - "invoiceSectionName": "12345", - "billingSubscriptionName": "billingSubscriptionId1", + "invoiceSectionName": "{invoiceSectionName}", + "billingSubscriptionName": "{billingSubscriptionName}", "$expand": "billingProfile" }, "responses": { "200": { "body": { - "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000/billingSubscriptions/billinSubscriptionId1", - "name": "billingSubscriptionId1", + "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionName}/billingSubscriptions/{billingSubscriptionName}", + "name": "{billingSubscriptionName}", "type": "Microsoft.Billing/billingSubscriptions", "properties": { "displayName": "My Subscription", @@ -24,7 +24,7 @@ "currency": "USD", "value": 600 }, - "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000", + "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionName}", "invoiceSectionName": "Contoso operations invoiceSection", "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000", "billingProfileName": "Contoso operations billing", 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 75bad5828a3a..769c6589d993 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 @@ -8,8 +8,8 @@ "body": { "value": [ { - "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000/billingSubscriptions/billinSubscriptionId1", - "name": "billingSubscriptionId1", + "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000/billingSubscriptions/90000000-0000-0000-0000-000000000000", + "name": "90000000-0000-0000-0000-000000000000", "type": "Microsoft.Billing/billingSubscriptions", "properties": { "displayName": "My subscription", @@ -32,8 +32,8 @@ } }, { - "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000/billingSubscriptions/billinSubscriptionId2", - "name": "billingSubscriptionId2", + "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000/billingSubscriptions/90000000-0000-0000-0000-000000000001", + "name": "90000000-0000-0000-0000-000000000001", "type": "Microsoft.Billing/billingSubscriptions", "properties": { "displayName": "Test subscription", @@ -56,8 +56,8 @@ } }, { - "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000/billingSubscriptions/billinSubscriptionId3", - "name": "billingSubscriptionId3", + "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000/billingSubscriptions/90000000-0000-0000-0000-000000000002", + "name": "90000000-0000-0000-0000-000000000002", "type": "Microsoft.Billing/billingSubscriptions", "properties": { "displayName": "Dev Subscription", 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 aa84fbe5ec03..32c552439480 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 @@ -2,7 +2,7 @@ "parameters": { "api-version": "2018-11-01-preview", "billingAccountName": "{billingAccountName}", - "billingProfileName": "11000000-0000-0000-0000-000000000000" + "billingProfileName": "{billingProfileName}" }, "responses": { "200": { @@ -26,7 +26,7 @@ }, "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000", "invoiceSectionName": "Contoso operations invoiceSection", - "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000", + "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}", "billingProfileName": "Contoso operations billing", "skuId": "0001", "skuDescription": "Microsoft Azure Dev/Test" @@ -50,7 +50,7 @@ }, "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000", "invoiceSectionName": "Contoso operations invoiceSection", - "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000", + "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}", "billingProfileName": "Contoso operations billing", "skuId": "0001", "skuDescription": "Microsoft Azure Dev/Test" @@ -74,7 +74,7 @@ }, "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000", "invoiceSectionName": "Contoso operations invoiceSection", - "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000", + "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}", "billingProfileName": "Contoso operations billing", "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 58b7eb911bd1..7f0c000cd7c7 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 @@ -2,14 +2,14 @@ "parameters": { "api-version": "2018-11-01-preview", "billingAccountName": "{billingAccountName}", - "invoiceSectionName": "22000000-0000-0000-0000-000000000000" + "invoiceSectionName": "{invoiceSectionName}" }, "responses": { "200": { "body": { "value": [ { - "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000/billingSubscriptions/billinSubscriptionId1", + "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionName}/billingSubscriptions/billinSubscriptionId1", "name": "billingSubscriptionId1", "type": "Microsoft.Billing/billingSubscriptions", "properties": { @@ -24,7 +24,7 @@ "currency": "USD", "value": 600 }, - "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000", + "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionName}", "invoiceSectionName": "Contoso operations invoiceSection", "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000", "billingProfileName": "Contoso operations billing", @@ -33,7 +33,7 @@ } }, { - "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000/billingSubscriptions/billinSubscriptionId2", + "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionName}/billingSubscriptions/billinSubscriptionId2", "name": "billingSubscriptionId2", "type": "Microsoft.Billing/billingSubscriptions", "properties": { @@ -48,7 +48,7 @@ "currency": "USD", "value": 400 }, - "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000", + "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionName}", "invoiceSectionName": "Contoso operations invoiceSection", "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000", "billingProfileName": "Contoso operations billing", @@ -57,7 +57,7 @@ } }, { - "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000/billingSubscriptions/billinSubscriptionId3", + "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionName}/billingSubscriptions/billinSubscriptionId3", "name": "billingSubscriptionId3", "type": "Microsoft.Billing/billingSubscriptions", "properties": { @@ -72,7 +72,7 @@ "currency": "USD", "value": 900 }, - "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000", + "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionName}", "invoiceSectionName": "Contoso operations invoiceSection", "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000", "billingProfileName": "Contoso operations billing", 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 ae9d6941bd70..f99c70fca3ed 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 @@ -2,16 +2,16 @@ "parameters": { "api-version": "2018-11-01-preview", "billingAccountName": "{billingAccountName}", - "departmentName": "{departmentId1}" + "departmentName": "{departmentName}" }, "responses": { "200": { "body": { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/departments/departmentId1", - "name": "departmentId1", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/departments/{departmentName}", + "name": "{departmentName}", "type": "Microsoft.Billing/departments", "properties": { - "departmentName": "departmentName1", + "departmentName": "Test department", "costCenter": "C1", "status": "Active" } 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 b197be83d360..692eab97f467 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 @@ -2,14 +2,14 @@ "parameters": { "api-version": "2018-11-01-preview", "billingAccountName": "{billingAccountName}", - "departmentName": "{departmentId}", + "departmentName": "{departmentName}", "$expand": "properties/enrollmentAccounts" }, "responses": { "200": { "body": { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/departments/departmentId1", - "name": "departmentId1", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/departments/{departmentName}", + "name": "{departmentName}", "type": "Microsoft.Billing/departments", "properties": { "departmentName": "departmentName1", diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/ElevateInvoiceSection.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/ElevateInvoiceSection.json index b03f83bef3c9..1a5d91230f4e 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/ElevateInvoiceSection.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/ElevateInvoiceSection.json @@ -1,8 +1,8 @@ { "parameters": { "api-version": "2018-11-01-preview", - "billingAccountName": "billingAccountName", - "invoiceSectionName": "invoiceSectionName" + "billingAccountName": "{billingAccountName}", + "invoiceSectionName": "{invoiceSectionName}" }, "responses": { 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 1cef16310673..d71d36ec19be 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 @@ -7,8 +7,8 @@ "responses": { "200": { "body": { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/enrollmentAccounts/accountId0", - "name": "accountId0", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/enrollmentAccounts/{enrollmentAccountName}", + "name": "{enrollmentAccountName}", "type": "Microsoft.Billing/enrollmentAccounts", "properties": { "accountName": "AccountName0", 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 d8ee2bdc49ac..e742417a737e 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 @@ -8,8 +8,8 @@ "responses": { "200": { "body": { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/enrollmentAccounts/accountId0", - "name": "accountId0", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/enrollmentAccounts/{enrollmentAccountName}", + "name": "{enrollmentAccountName}", "type": "Microsoft.Billing/enrollmentAccounts", "properties": { "accountName": "AccountName0", 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 06d04f4ebd3b..3e0a5aeab86e 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 @@ -2,14 +2,14 @@ "parameters": { "api-version": "2018-11-01-preview", "billingAccountName": "{billingAccountName}", - "billingProfileName": "11000000-0000-0000-0000-000000000000", - "invoiceName": "1383723" + "billingProfileName": "{billingProfileName}", + "invoiceName": "{invoiceName}" }, "responses": { "200": { "body": { - "id": "providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000/invoices/1383723", - "name": "1383723", + "id": "providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/invoices/{invoiceName}", + "name": "{invoiceName}", "type": "Microsoft.Billing/invoices", "properties": { "dueDate": "2018-01-16T17:32:28Z", @@ -25,7 +25,7 @@ }, "invoicePeriodStartDate": "2018-01-01T17:32:28Z", "invoicePeriodEndDate": "2018-01-15T17:32:28Z", - "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000", + "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}", "billingProfileName": "Contoso Operations Billing", "purchaseOrderNumber": "123456", "documentUrls": [ 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 8a04d009ef9d..4908a6ec6609 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 @@ -2,13 +2,13 @@ "parameters": { "api-version": "2018-11-01-preview", "billingAccountName": "{billingAccountName}", - "invoiceSectionName": "22000000-0000-0000-0000-000000000000" + "invoiceSectionName": "{invoiceSectionName}" }, "responses": { "200": { "body": { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000", - "name": "22000000-0000-0000-0000-000000000000", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionName}", + "name": "{invoiceSectionName}", "type": "Microsoft.Billing/invoiceSections", "properties": { "displayName": "invoiceSection1" diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionPermissionsList.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionPermissionsList.json index 013aaa51a67b..fe3af57626e2 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionPermissionsList.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionPermissionsList.json @@ -1,8 +1,8 @@ { "parameters": { "api-version": "2018-11-01-preview", - "billingAccountName": "2000100", - "invoiceSectionName": "123" + "billingAccountName": "{billingAccountName}", + "invoiceSectionName": "{invoiceSectionName}" }, "responses": { "200": { 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 ec40483c1422..870f5f0273bc 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 @@ -1,9 +1,9 @@ { "parameters": { "api-version": "2018-11-01-preview", - "billingAccountName": "2000100", - "invoiceSectionName": "123", - "billingRoleAssignmentName": "{billingRoleAssignmentId}" + "billingAccountName": "{billingAccountName}", + "invoiceSectionName": "{invoiceSectionName}", + "billingRoleAssignmentName": "{billingRoleAssignmentName}" }, "responses": { "200": { @@ -16,7 +16,7 @@ "createdByPrincipalId": "", "name": "10000000-aaaa-bbbb-cccc-100000000000_6fd330f6-7d26-4aff-b9cf-7bd699f965b9", "principalId": "6fd330f6-7d26-4aff-b9cf-7bd699f965b9", - "scope": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/invoiceSections/123" + "scope": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionName}" }, "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 ec40483c1422..870f5f0273bc 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 @@ -1,9 +1,9 @@ { "parameters": { "api-version": "2018-11-01-preview", - "billingAccountName": "2000100", - "invoiceSectionName": "123", - "billingRoleAssignmentName": "{billingRoleAssignmentId}" + "billingAccountName": "{billingAccountName}", + "invoiceSectionName": "{invoiceSectionName}", + "billingRoleAssignmentName": "{billingRoleAssignmentName}" }, "responses": { "200": { @@ -16,7 +16,7 @@ "createdByPrincipalId": "", "name": "10000000-aaaa-bbbb-cccc-100000000000_6fd330f6-7d26-4aff-b9cf-7bd699f965b9", "principalId": "6fd330f6-7d26-4aff-b9cf-7bd699f965b9", - "scope": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/invoiceSections/123" + "scope": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionName}" }, "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 ed7735a0ccea..e726e9a7df6a 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 @@ -1,7 +1,7 @@ { "parameters": { "api-version": "2018-11-01-preview", - "billingAccountName": "2000100", + "billingAccountName": "{billingAccountName}", "invoiceSectionName": "{invoiceSectionName}" }, "responses": { @@ -17,7 +17,7 @@ "createdByPrincipalId": "", "name": "10000000-aaaa-bbbb-cccc-100000000000_6fd330f6-7d26-4aff-b9cf-7bd699f965b9", "principalId": "6fd330f6-7d26-4aff-b9cf-7bd699f965b9", - "scope": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/invoiceSections/123" + "scope": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionName}" }, "type": "Microsoft.Billing/billingRoleAssignments" }, @@ -30,7 +30,7 @@ "createdByPrincipalId": "46b831ec-42b2-4f1a-8b54-3fd5ff9d6aa1", "name": "10000000-aaaa-bbbb-cccc-100000000000_b1839933-b3ac-42ca-8112-d29c43f3ab47", "principalId": "b1839933-b3ac-42ca-8112-d29c43f3ab47", - "scope": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/invoiceSections/123" + "scope": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionName}" }, "type": "Microsoft.Billing/billingRoleAssignments" }, @@ -43,7 +43,7 @@ "createdByPrincipalId": "b1839933-b3ac-42ca-8112-d29c43f3ab47", "name": "10000000-aaaa-bbbb-cccc-100000000002_129db794-64a5-44e0-9838-002780478959", "principalId": "129db794-64a5-44e0-9838-002780478959", - "scope": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/invoiceSections/123" + "scope": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionName}" }, "type": "Microsoft.Billing/billingRoleAssignments" }, @@ -56,7 +56,7 @@ "createdByPrincipalId": "b1839933-b3ac-42ca-8112-d29c43f3ab47", "name": "10000000-aaaa-bbbb-cccc-100000000001_d7b03fbc-ecd9-49b8-8e38-285b75eaa8f7", "principalId": "d7b03fbc-ecd9-49b8-8e38-285b75eaa8f7", - "scope": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/invoiceSections/123" + "scope": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionName}" }, "type": "Microsoft.Billing/billingRoleAssignments" }, @@ -69,7 +69,7 @@ "createdByPrincipalId": "b1839933-b3ac-42ca-8112-d29c43f3ab47", "name": "10000000-aaaa-bbbb-cccc-100000000000_c4f54fd2-d920-4c49-9b4d-9f09387b881c", "principalId": "c4f54fd2-d920-4c49-9b4d-9f09387b881c", - "scope": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/invoiceSections/123" + "scope": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionName}" }, "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 35ed48c92575..c1b5f553474b 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 @@ -1,15 +1,15 @@ { "parameters": { "api-version": "2018-11-01-preview", - "billingAccountName": "2000100", - "invoiceSectionName": "123", - "billingRoleDefinitionName": "{billingRoleDefinitionId}" + "billingAccountName": "{billingAccountName}", + "invoiceSectionName": "{invoiceSectionName}", + "billingRoleDefinitionName": "{billingRoleDefinitionName}" }, "responses": { "200": { "body": { - "id": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/invoiceSections/123/providers/Microsoft.Billing/billingRoleDefinitions/10000000-aaaa-bbbb-cccc-100000000000", - "name": "10000000-aaaa-bbbb-cccc-100000000000", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionName}/providers/Microsoft.Billing/billingRoleDefinitions/{billingRoleDefinitionName}", + "name": "{billingRoleDefinitionName}", "properties": { "description": "The Owner role gives the user all permissions including access management rights to the Commerce Root.", "permissions": [ diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionRoleDefinitionsList.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionRoleDefinitionsList.json index 6be03857b07f..44d9a4612da0 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionRoleDefinitionsList.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/InvoiceSectionRoleDefinitionsList.json @@ -1,15 +1,15 @@ { "parameters": { "api-version": "2018-11-01-preview", - "billingAccountName": "2000100", - "invoiceSectionName": "123" + "billingAccountName": "{billingAccountName}", + "invoiceSectionName": "{invoiceSectionName}" }, "responses": { "200": { "body": { "value": [ { - "id": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/invoiceSections/123/providers/Microsoft.Billing/billingRoleDefinitions/10000000-aaaa-bbbb-cccc-100000000000", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionName}/providers/Microsoft.Billing/billingRoleDefinitions/10000000-aaaa-bbbb-cccc-100000000000", "name": "10000000-aaaa-bbbb-cccc-100000000000", "properties": { "description": "The Owner role gives the user all permissions including access management rights to the Commerce Root.", @@ -45,7 +45,7 @@ "type": "Microsoft.Billing/billingRoleDefinitions" }, { - "id": "/providers/Microsoft.Billing/billingAccounts/ee4241f3-de74-5631-3e6b-5df2c3d66671/projects/234/providers/Microsoft.Billing/billingRoleDefinitions/10000000-aaaa-bbbb-cccc-100000000001", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionName}/providers/Microsoft.Billing/billingRoleDefinitions/10000000-aaaa-bbbb-cccc-100000000001", "name": "10000000-aaaa-bbbb-cccc-100000000001", "properties": { "description": "The Contributor role give the user all permissions except access management rights to the Commerce Root.", 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 a5848d24bd0c..f7f73a1689be 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,15 +1,15 @@ { "parameters": { "api-version": "2018-11-01-preview", - "billingAccountName": "2000200", + "billingAccountName": "{billingAccountName}", "invoiceSectionName": "{invoiceSectionName}", "$expand": "billingProfiles" }, "responses": { "200": { "body": { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionId}", - "name": "{invoiceSectionId}", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionName}", + "name": "{invoiceSectionName}", "type": "Microsoft.Billing/invoiceSections", "properties": { "displayName": "invoiceSectionName1", 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 fafca0512c77..14efb757dd07 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 @@ -2,7 +2,7 @@ "parameters": { "api-version": "2018-11-01-preview", "billingAccountName": "{billingAccountName}", - "billingProfileName": "11000000-0000-0000-0000-000000000000", + "billingProfileName": "{billingProfileName}", "periodStartDate": "2018-01-01", "periodEndDate": "2018-06-30", "$filter": "invoicePeriodStartDate le 2018-06-01" @@ -12,7 +12,7 @@ "body": { "value": [ { - "id": "providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000/invoices/1383723", + "id": "providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/invoices/1383723", "name": "1383723", "type": "Microsoft.Billing/invoices", "properties": { @@ -29,7 +29,7 @@ }, "invoicePeriodStartDate": "2018-01-01T17:32:28Z", "invoicePeriodEndDate": "2018-01-15T17:32:28Z", - "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000", + "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}", "billingProfileName": "Contoso Operations Billing", "purchaseOrderNumber": "123456", "documentUrls": [ @@ -59,7 +59,7 @@ } }, { - "id": "providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000/invoices/1383724", + "id": "providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/invoices/1383724", "name": "1383724", "type": "Microsoft.Billing/invoices", "properties": { @@ -76,7 +76,7 @@ }, "invoicePeriodStartDate": "2018-02-01T17:32:28Z", "invoicePeriodEndDate": "2018-02-30T17:32:28Z", - "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000", + "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}", "billingProfileName": "Contoso Operations Billing", "purchaseOrderNumber": "123456", "documentUrls": [ 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 9b43bad2ec41..d8381deb650e 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,8 +1,8 @@ { "parameters": { "api-version": "2018-03-01-preview", - "billingAccountName": "45000000-0000-0000-0000-000000000000", - "invoiceName": "00000000-0000-0000-0000-000000000000" + "billingAccountName": "{billingAccountName}", + "invoiceName": "{invoiceName}" }, "responses": { "202": { 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 2bcec24bee53..9ca77df91fca 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 @@ -2,15 +2,15 @@ "parameters": { "api-version": "2018-11-01-preview", "billingAccountName": "{billingAccountName}", - "invoiceSectionName": "22000000-0000-0000-0000-000000000000", - "productName": "productSummaryId1" + "invoiceSectionName": "{invoiceSectionName}", + "productName": "{productName}" }, "responses": { "200": { "body": { - "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/products/productSummaryId1", - "name": "productSummaryId1", - "type": "Microsoft.Consumption/products", + "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/products/{productName}", + "name": "{productName}", + "type": "Microsoft.Billing/products", "properties": { "productTypeId": "A12345", "productType": "Subscription", @@ -27,8 +27,8 @@ "skuId": "0001", "skuDescription": "Enterprise Agreement Development", "availabilityId": "AvailabilityId1", - "parentProductId": "eligibleOffer2", - "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000", + "parentProductId": "45000000-0000-0000-0000-0000000001242", + "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionName}", "invoiceSectionName": "Contoso operations invoiceSection", "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000", "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 f8417411721c..980ced832971 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,8 +1,8 @@ { "parameters": { "api-version": "2018-11-01-preview", - "billingAccountName": "1234", - "productName": "productSummaryId1", + "billingAccountName": "{billingAccountName}", + "productName": "{productName}", "body": { "autoRenew": "false" } 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 2fa803b3be8a..905e91c9e31b 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,9 +1,9 @@ { "parameters": { "api-version": "2018-11-01-preview", - "billingAccountName": "1234", - "invoiceSectionName": "1234", - "productName" : "234", + "billingAccountName": "{billingAccountName}", + "invoiceSectionName": "{invoiceSectionName}", + "productName" : "{productName}", "body": { "autoRenew" : "false" } 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 1811494a741f..1f4fc2243437 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 @@ -8,9 +8,9 @@ "body": { "value": [ { - "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/products/productSummaryId1", - "name": "productSummaryId1", - "type": "Microsoft.Consumption/products", + "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/products/00000000-0000-0000-0000-000000000000", + "name": "00000000-0000-0000-0000-000000000000", + "type": "Microsoft.Billing/products", "properties": { "productTypeId": "A12345", "productType": "Reservation", @@ -27,7 +27,7 @@ "skuDescription": "Enterprise Agreement Development", "availabilityId": "AvailabilityId1", "billingFrequency": "OneTime", - "parentProductId": "eligibleOffer2", + "parentProductId": "45000000-0000-0000-0000-0000000001242", "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000", "invoiceSectionName": "Contoso operations invoiceSection", "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000", @@ -35,9 +35,9 @@ } }, { - "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/products/productSummaryId2", - "name": "productSummaryId2", - "type": "Microsoft.Consumption/products", + "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/products/10000000-0000-0000-0000-000000000001", + "name": "10000000-0000-0000-0000-000000000001", + "type": "Microsoft.Billing/products", "properties": { "productTypeId": "A12345", "productType": "Azure subscription", @@ -54,7 +54,7 @@ "skuDescription": "Enterprise Agreement Development", "availabilityId": "AvailabilityId1", "billingFrequency": "Monthly", - "parentProductId": "eligibleOffer2", + "parentProductId": "45000000-0000-0000-0000-0000000001242", "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000", "invoiceSectionName": "Contoso operations invoiceSection", "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000", 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 a13edb2ebc07..905490407118 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 @@ -2,16 +2,16 @@ "parameters": { "api-version": "2018-11-01-preview", "billingAccountName": "{billingAccountName}", - "invoiceSectionName": "22000000-0000-0000-0000-000000000000" + "invoiceSectionName": "{invoiceSectionName}" }, "responses": { "200": { "body": { "value": [ { - "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/products/productSummaryId1", - "name": "productSummaryId1", - "type": "Microsoft.Consumption/products", + "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/products/00000000-0000-0000-0000-000000000000", + "name": "00000000-0000-0000-0000-000000000000", + "type": "Microsoft.Billing/products", "properties": { "productTypeId": "A12345", "productType": "Reservation", @@ -28,17 +28,17 @@ "skuId": "0001", "skuDescription": "Enterprise Agreement Development", "availabilityId": "AvailabilityId1", - "parentProductId": "eligibleOffer2", - "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000", + "parentProductId": "45000000-0000-0000-0000-0000000001242", + "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionName}", "invoiceSectionName": "Contoso operations invoiceSection", "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000", "billingProfileName": "Contoso operations billing" } }, { - "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/products/productSummaryId2", - "name": "productSummaryId2", - "type": "Microsoft.Consumption/products", + "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/products/10000000-0000-0000-0000-000000000001", + "name": "10000000-0000-0000-0000-000000000001", + "type": "Microsoft.Billing/products", "properties": { "productTypeId": "A12345", "productType": "Azure subscription", @@ -55,8 +55,8 @@ "skuId": "0001", "skuDescription": "Enterprise Agreement Development", "availabilityId": "AvailabilityId1", - "parentProductId": "eligibleOffer2", - "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000", + "parentProductId": "45000000-0000-0000-0000-0000000001242", + "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionName}", "invoiceSectionName": "Contoso operations invoiceSection", "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000", "billingProfileName": "Contoso operations billing" 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 02c154c73c11..97d3d9dc1918 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 @@ -11,8 +11,8 @@ "body": { "value": [ { - "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/transactions/transactionSummaryId1", - "name": "transactionSummaryId1", + "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/transactions/41000000-0000-0000-0000-000000000000", + "name": "41000000-0000-0000-0000-000000000000", "type": "Microsoft.Billing/transactions", "properties": { "kind": "reservation", @@ -38,14 +38,14 @@ } }, { - "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/transactions/transactionSummaryId2", - "name": "transactionSummaryId2", + "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/transactions/21000000-0000-0000-0000-000000000000", + "name": "21000000-0000-0000-0000-000000000000", "type": "Microsoft.Billing/transactions", "properties": { "kind": "reservation", "date": "2018-05-05T00:00:00Z", "invoice": "Pending", - "orderName": "MSFT Reserved", + "orderName": "Test Reserved", "orderId": "1c24006f-8350-4315-ad8f-6d11180448f9", "productDescription": "Standard D1, US West 3", "transactionType": "Purchase", 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 897149730783..a76bee9aa632 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 @@ -2,7 +2,7 @@ "parameters": { "api-version": "2018-11-01-preview", "billingAccountName": "{billingAccountName}", - "billingProfileName": "11000000-0000-0000-0000-000000000000", + "billingProfileName": "{billingProfileName}", "startDate": "2018-04-01", "endDate": "2018-05-30", "$filter": "properties/kind eq 'Reservation'" @@ -12,8 +12,8 @@ "body": { "value": [ { - "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/BillingProfiles/11000000-0000-0000-0000-000000000000/transactions/transactionSummaryId1", - "name": "transactionSummaryId1", + "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/BillingProfiles/{billingProfileName}/transactions/41000000-0000-0000-0000-000000000000", + "name": "41000000-0000-0000-0000-000000000000", "type": "Microsoft.Billing/transactions", "properties": { "kind": "reservation", @@ -30,21 +30,21 @@ "quantity": 4, "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000", "invoiceSectionName": "Contoso operations invoiceSection", - "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000", + "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}", "billingProfileName": "Contoso operations billing", "subscriptionId": "00000000-0000-0000-0000-000000000000", "subscriptionName": "Contoso operations billing" } }, { - "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/BillingProfiles/11000000-0000-0000-0000-000000000000/transactions/transactionSummaryId2", - "name": "transactionSummaryId2", + "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/BillingProfiles/{billingProfileName}/transactions/65000000-0000-0000-0000-000000000000", + "name": "65000000-0000-0000-0000-000000000000", "type": "Microsoft.Billing/transactions", "properties": { "kind": "reservation", "date": "2018-05-05T00:00:00Z", "invoice": "Pending", - "orderName": "MSFT Reserved", + "orderName": "Test Reserved", "orderId": "1c24006f-8350-4315-ad8f-6d11180448f9", "productDescription": "Standard D1, US West 3", "transactionType": "Purchase", @@ -55,9 +55,9 @@ "quantity": 5, "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000", "invoiceSectionName": "Contoso operations invoiceSection", - "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000", + "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}", "billingProfileName": "Contoso operations billing", - "subscriptionId": "00000000-0000-0000-0000-000000000000", + "subscriptionId": "82000000-0000-0000-0000-000000000000", "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 index 5cc99761fcde..104da0e9a4e9 100644 --- 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 @@ -2,7 +2,7 @@ "parameters": { "api-version": "2018-11-01-preview", "billingAccountName": "{billingAccountName}", - "invoiceSectionName": "22000000-0000-0000-0000-000000000000", + "invoiceSectionName": "{invoiceSectionName}", "startDate": "2018-04-01", "endDate": "2018-05-30", "$filter": "properties/kind eq 'Reservation'" @@ -12,8 +12,8 @@ "body": { "value": [ { - "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/InvoiceSection/22000000-0000-0000-0000-000000000000/transactions/transactionSummaryId1", - "name": "transactionSummaryId1", + "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/InvoiceSections/{invoiceSectionName}/transactions/41000000-0000-0000-0000-000000000000", + "name": "41000000-0000-0000-0000-000000000000", "type": "Microsoft.Billing/transactions", "properties": { "kind": "reservation", @@ -28,7 +28,7 @@ "value": 5000.00 }, "quantity": 4, - "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000", + "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionName}", "invoiceSectionName": "Contoso operations invoiceSection", "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000", "billingProfileName": "Contoso operations billing", @@ -37,14 +37,14 @@ } }, { - "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/InvoiceSection/22000000-0000-0000-0000-000000000000/transactions/transactionSummaryId2", - "name": "transactionSummaryId2", + "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/InvoiceSections/{invoiceSectionName}/transactions/82000000-0000-0000-0000-000000000000", + "name": "82000000-0000-0000-0000-000000000000", "type": "Microsoft.Billing/transactions", "properties": { "kind": "reservation", "date": "2018-05-05T00:00:00Z", "invoice": "Pending", - "orderName": "MSFT Reserved", + "orderName": "Test Reserved", "orderId": "1c24006f-8350-4315-ad8f-6d11180448f9", "productDescription": "Standard D1, US West 3", "transactionType": "Purchase", @@ -53,7 +53,7 @@ "value": 6000.00 }, "quantity": 5, - "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000", + "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionName}", "invoiceSectionName": "Contoso operations invoiceSection", "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000", "billingProfileName": "Contoso operations billing", 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 dd0c654ad44e..d96bb3d6fc3e 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 @@ -10,8 +10,8 @@ "body": { "value": [ { - "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/transactions/transactionSummaryId1", - "name": "transactionSummaryId1", + "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/transactions/41000000-0000-0000-0000-000000000000", + "name": "41000000-0000-0000-0000-000000000000", "type": "Microsoft.Billing/transactions", "properties": { "kind": "all", @@ -33,8 +33,8 @@ } }, { - "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/transactions/transactionSummaryId2", - "name": "transactionSummaryId2", + "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/transactions/51000000-0000-0000-0000-000000000000", + "name": "51000000-0000-0000-0000-000000000000", "type": "Microsoft.Billing/transactions", "properties": { "kind": "all", 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 37fb682018d1..9f074b2c00b2 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 @@ -2,7 +2,7 @@ "parameters": { "api-version": "2018-11-01-preview", "billingAccountName": "{billingAccountName}", - "billingProfileName": "11000000-0000-0000-0000-000000000000", + "billingProfileName": "{billingProfileName}", "startDate": "2018-04-01", "endDate": "2018-05-30" }, @@ -11,8 +11,8 @@ "body": { "value": [ { - "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/BillingProfiles/11000000-0000-0000-0000-000000000000/transactions/transactionSummaryId1", - "name": "transactionSummaryId1", + "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/BillingProfiles/{billingProfileName}/transactions/41000000-0000-0000-0000-000000000000", + "name": "41000000-0000-0000-0000-000000000000", "type": "Microsoft.Billing/transactions", "properties": { "kind": "all", @@ -29,13 +29,13 @@ }, "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000", "invoiceSectionName": "Contoso operations invoiceSection", - "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000", + "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}", "billingProfileName": "Contoso operations billing" } }, { - "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/BillingProfiles/11000000-0000-0000-0000-000000000000/transactions/transactionSummaryId2", - "name": "transactionSummaryId2", + "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/BillingProfiles/{billingProfileName}/transactions/51000000-0000-0000-0000-000000000000", + "name": "51000000-0000-0000-0000-000000000000", "type": "Microsoft.Billing/transactions", "properties": { "kind": "all", @@ -52,7 +52,7 @@ }, "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000", "invoiceSectionName": "Contoso operations invoiceSection", - "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000", + "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}", "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 index 13416347e310..7113b74ac574 100644 --- 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 @@ -2,7 +2,7 @@ "parameters": { "api-version": "2018-11-01-preview", "billingAccountName": "{billingAccountName}", - "invoiceSectionName": "22000000-0000-0000-0000-000000000000", + "invoiceSectionName": "{invoiceSectionName}", "startDate": "2018-04-01", "endDate": "2018-05-30" }, @@ -11,8 +11,8 @@ "body": { "value": [ { - "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/InvoiceSection/22000000-0000-0000-0000-000000000000/transactions/transactionSummaryId1", - "name": "transactionSummaryId1", + "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/InvoiceSections/{invoiceSectionName}/transactions/41000000-0000-0000-0000-000000000000", + "name": "41000000-0000-0000-0000-000000000000", "type": "Microsoft.Billing/transactions", "properties": { "kind": "all", @@ -27,15 +27,15 @@ "currency": "USD", "value": 5000.00 }, - "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000", + "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionName}", "invoiceSectionName": "Contoso operations invoiceSection", "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000", "billingProfileName": "Contoso operations billing" } }, { - "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/InvoiceSection/22000000-0000-0000-0000-000000000000/transactions/transactionSummaryId2", - "name": "transactionSummaryId2", + "id": "/providers/Microsoft.Billing/BillingAccounts/{billingAccountName}/InvoiceSections/{invoiceSectionName}/transactions/51000000-0000-0000-0000-000000000000", + "name": "51000000-0000-0000-0000-000000000000", "type": "Microsoft.Billing/transactions", "properties": { "kind": "all", @@ -50,7 +50,7 @@ "currency": "USD", "value": 50.00 }, - "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/22000000-0000-0000-0000-000000000000", + "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionName}", "invoiceSectionName": "Contoso operations invoiceSection", "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000", "billingProfileName": "Contoso operations billing" 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 4bed2fa3a8b0..70de2e8db7a4 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,26 +1,26 @@ { "parameters": { "api-version": "2018-11-01-preview", - "billingAccountName": "billingAccountName", - "invoiceSectionName": "invoiceSectionId", - "billingSubscriptionName": "subscriptionId", + "billingAccountName": "{billingAccountName}", + "invoiceSectionName": "{invoiceSectionName}", + "billingSubscriptionName": "{billingSubscriptionName}", "parameters": { - "destinationInvoiceSectionName": "destinationInvoiceSectionId" + "destinationInvoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{newInvoiceSectionName}" } }, "responses": { "200": { "body": { "properties" : { - "billingSubscriptionName": "subscriptionId" + "billingSubscriptionName": "Test subscription" } } }, "202": { "headers": { - "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", + "Location": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionName}/billingSubscriptions/{billingSubscriptionName}/transfer/operationResults/10000000-0000-0000-0000-000000000001?api-version=2018-11-01-preview", "Retry-After": "30", - "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" + "Azure-AsyncOperation": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionName}/billingSubscriptions/{billingSubscriptionName}/transfer/operationStatus/10000000-0000-0000-0000-000000000001?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 50fed1191db9..50947f088709 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 @@ -2,22 +2,22 @@ "parameters": { "api-version": "2018-11-01-preview", "billingAccountName": "{billingAccountName}", - "invoiceSectionName": "{invoiceSectionId1}", - "productName": "product1", + "invoiceSectionName": "{invoiceSectionName}", + "productName": "{productName}", "parameters": { - "destinationInvoiceSectionName": "/providers/Microsoft.Billing/billingAccounts/5660ed6e-7824-4795-a579-c0037e6c8da4/invoiceSections/2b2ff7ea-559c-41c0-adea-2550293e11e5" + "destinationInvoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{newInvoiceSectionName}" } }, "responses": { "200": { "body": { - "id": "/providers/Microsoft.Billing/BillingAccounts/1234/products/productSummaryId1", - "name": "productSummaryId1", - "type": "Microsoft.Consumption/products", + "id": "/providers/Microsoft.Billing/BillingAccounts/1234/products/{productName}", + "name": "{productName}", + "type": "Microsoft.Billing/products", "properties": { "productTypeId": "A12345", "productType": "Subscription", - "displayName": "AIP Dev", + "displayName": "Test Product", "status": "Active", "purchaseDate": "2018-05-01T17:32:28Z", "lastCharge": { @@ -30,20 +30,20 @@ "skuId": "0001", "skuDescription": "Enterprise Agreement Development", "availabilityId": "AvailabilityId1", - "parentProductId": "eligibleOffer2", - "invoiceSectionId": "42425", + "parentProductId": "45000000-0000-0000-0000-0000000001242", + "invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{newInvoiceSectionName}", "invoiceSectionName": "Contoso operations invoiceSection", - "billingProfileId": "789456", + "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000", "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", + "Location": "https://management.azure.com/providers/Microsoft.Billing/operationResults/44000000-0000-0000-0000-000000000000?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" + "Azure-AsyncOperation": "https://management.azure.com/providers/Microsoft.Billing/operationStatus/44000000-0000-0000-0000-000000000000?api-version=2018-11-01-preview", + "OData-EntityId": "44000000-0000-0000-0000-000000000000" } } } 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 a5bc8c709016..e64dff01e2a3 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 @@ -2,7 +2,7 @@ "parameters": { "api-version": "2018-11-01-preview", "billingAccountName": "{billingAccountName}", - "billingProfileName": "11000000-0000-0000-0000-000000000000", + "billingProfileName": "{billingProfileName}", "parameters": { "properties": { "displayName": "BillingProfile11", @@ -20,8 +20,8 @@ }, "200": { "body": { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000", - "name": "11000000-0000-0000-0000-000000000000", + "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}", + "name": "{billingProfileName}", "type": "Microsoft.Billing/billingProfiles", "properties": { "displayName": "BillingProfile11", From bb7a4455944a72797de410f8405e10f6568e534d Mon Sep 17 00:00:00 2001 From: Anirban Sarkar Date: Wed, 17 Apr 2019 22:29:58 -0700 Subject: [PATCH 07/27] Incorporated review comments Incorporated review comments --- .../Microsoft.Billing/preview/2018-11-01-preview/billing.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 a54e0732b435..9c754932fc61 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 @@ -4180,7 +4180,7 @@ } }, "EnabledAzureSKUs": { - "description": "Details about the enable azure sku.", + "description": "Details about the enabled azure sku.", "properties": { "skuId": { "description": "The sku id.", From 281784f0033ee8d853d17ce674e90278067a9812 Mon Sep 17 00:00:00 2001 From: Anirban Sarkar Date: Wed, 17 Apr 2019 22:39:17 -0700 Subject: [PATCH 08/27] Incorporated review comments --- .../Microsoft.Billing/preview/2018-11-01-preview/billing.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 9c754932fc61..828afc5d8672 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 @@ -3585,7 +3585,7 @@ "properties": { "destinationInvoiceSectionId": { "type": "string", - "description": "The destination invoiceSectionName." + "description": "The destination invoice section id." } } }, From 9a957ac780fbaa12d29d56fcebbd7e002bde9920 Mon Sep 17 00:00:00 2001 From: Anirban Sarkar Date: Wed, 17 Apr 2019 23:28:02 -0700 Subject: [PATCH 09/27] Incorporated review comments Incorporated review comments --- .../preview/2018-11-01-preview/examples/AcceptTransfer.json | 2 +- .../preview/2018-11-01-preview/examples/CancelTransfer.json | 2 +- .../preview/2018-11-01-preview/examples/DeclineTransfer.json | 2 +- .../2018-11-01-preview/examples/GetRecipientTransfer.json | 2 +- .../preview/2018-11-01-preview/examples/GetTransfer.json | 2 +- .../preview/2018-11-01-preview/examples/InitiateTransfer.json | 2 +- .../2018-11-01-preview/examples/ListRecipientTransfers.json | 2 +- .../preview/2018-11-01-preview/examples/ListTransfers.json | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) 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 1ead99ed5401..23325f00f3ef 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 @@ -26,7 +26,7 @@ "expirationTime": "2018-11-05T17:32:28Z", "transferStatus": "InProgress", "recipientEmailId": "user@contoso.com", - "initiatorEmailId": "user@contoso.com", + "initiatorEmailId": "xyz@contoso.com", "lastModifiedTime": "2018-10-10T17:32:28Z", "detailedTransferStatus": [ { 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 a81ae3ddea40..7fc6cc54eed7 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 @@ -16,7 +16,7 @@ "billingAccountId": "billingAccountName", "transferStatus": "Pending", "recipientEmailId": "user@contoso.com", - "initiatorEmailId": "user@contoso.com", + "initiatorEmailId": "xyz@contoso.com", "canceledBy": "user@contoso.com", "lastModifiedTime": "2018-10-10T17:32:28Z" } 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 8e05eae96e6b..1e2e37da894d 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 @@ -12,7 +12,7 @@ "expirationTime": "2018-11-05T17:32:28Z", "transferStatus": "Declined", "recipientEmailId": "user@contoso.com", - "initiatorEmailId": "user@contoso.com", + "initiatorEmailId": "xyz@contoso.com", "lastModifiedTime": "2018-10-10T17:32:28Z" } } 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 5edbae185541..26454fb930c6 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 @@ -12,7 +12,7 @@ "expirationTime": "2018-11-05T17:32:28Z", "transferStatus": "InProgress", "recipientEmailId": "user@contoso.com", - "initiatorEmailId": "user@contoso.com", + "initiatorEmailId": "xyz@contoso.com", "lastModifiedTime": "2018-10-10T17:32:28Z", "detailedTransferStatus": [ { 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 1ae86948f9f0..124cc60f1734 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 @@ -16,7 +16,7 @@ "billingAccountId": "billingAccountName", "transferStatus": "InProgress", "recipientEmailId": "user@contoso.com", - "initiatorEmailId": "user@contoso.com", + "initiatorEmailId": "xyz@contoso.com", "lastModifiedTime": "2018-10-10T17:32:28Z", "detailedTransferStatus": [ { 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 84d593910228..160d7ab592ea 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 @@ -22,7 +22,7 @@ "billingAccountId": "billingAccountName", "transferStatus": "Pending", "recipientEmailId": "user@contoso.com", - "initiatorEmailId": "user@contoso.com", + "initiatorEmailId": "xyz@contoso.com", "lastModifiedTime": "2018-10-10T17:32:28Z" } } 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 9b981931b458..87e1290fbcc5 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 @@ -13,7 +13,7 @@ "expirationTime": "2018-11-05T17:32:28Z", "transferStatus": "InProgress", "recipientEmailId": "user@contoso.com", - "initiatorEmailId": "user@contoso.com", + "initiatorEmailId": "xyz@contoso.com", "lastModifiedTime": "2018-10-10T17:32:28Z", "detailedTransferStatus": [ { 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 da4f494b2f4d..423228a6bc88 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 @@ -17,7 +17,7 @@ "billingAccountId": "billingAccountName", "transferStatus": "InProgress", "recipientEmailId": "user@contoso.com", - "initiatorEmailId": "user@contoso.com", + "initiatorEmailId": "xyz@contoso.com", "lastModifiedTime": "2018-10-10T17:32:28Z", "detailedTransferStatus": [ { From ee0beac64f07da25f6750350d6b902ee465356c6 Mon Sep 17 00:00:00 2001 From: asarkar84 <33848291+asarkar84@users.noreply.github.com> Date: Mon, 22 Apr 2019 13:06:16 -0700 Subject: [PATCH 10/27] Updated the operation id for Billing spec Updated the operation id for Billing spec --- .../preview/2018-11-01-preview/billing.json | 197 ++++++++++-------- 1 file changed, 112 insertions(+), 85 deletions(-) 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 828afc5d8672..40769cf5a716 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 @@ -111,9 +111,9 @@ "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/availableBalance/default": { "get": { "tags": [ - "Credits" + "AvailableBalance" ], - "operationId": "AvailableBalanceByBillingProfile_Get", + "operationId": "AvailableBalance_GetByBillingProfile", "description": "The latest available credit balance for a given billingAccountName and billingProfileName.", "x-ms-examples": { "AvailableBalanceByBillingProfile": { @@ -152,7 +152,7 @@ "tags": [ "PaymentMethods" ], - "operationId": "PaymentMethodsByBillingProfile_List", + "operationId": "PaymentMethods_ListByBillingProfileName", "description": "Lists the Payment Methods by billing profile Id.", "externalDocs": { "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" @@ -202,7 +202,7 @@ "$ref": "./examples/BillingProfilesListByBillingAccountName.json" } }, - "operationId": "BillingProfilesByBillingAccountName_List", + "operationId": "BillingProfiles_ListByBillingAccountName", "description": "Lists all billing profiles for a user which that user has access to.", "parameters": [ { @@ -354,7 +354,7 @@ "$ref": "./examples/InvoiceSectionsListByBillingAccountNameWithExpand.json" } }, - "operationId": "InvoiceSectionsByBillingAccountName_List", + "operationId": "InvoiceSections_ListByBillingAccountName", "description": "Lists all invoice sections for a user which he has access to.", "parameters": [ { @@ -500,7 +500,7 @@ "$ref": "./examples/InvoiceSectionsListByBillingAccountNameWithExpandAndCreateSubPermission.json" } }, - "operationId": "InvoiceSectionsWithCreateSubscriptionPermission_List", + "operationId": "InvoiceSections_ListByCreateSubscriptionPermission", "description": "Lists all invoiceSections with create subscription permission for a user.", "parameters": [ { @@ -655,7 +655,7 @@ "$ref": "./examples/DepartmentsListByBillingAccountNameWithExpand.json" } }, - "operationId": "DepartmentsByBillingAccountName_List", + "operationId": "Departments_ListByBillingAccountName", "description": "Lists all departments for a user which he has access to.", "parameters": [ { @@ -764,7 +764,7 @@ "$ref": "./examples/EnrollmentAccountsListByBillingAccountNameWithExpand.json" } }, - "operationId": "EnrollmentAccountsByBillingAccountName_List", + "operationId": "EnrollmentAccounts_ListByBillingAccountName", "description": "Lists all Enrollment Accounts for a user which he has access to.", "parameters": [ { @@ -817,7 +817,7 @@ "$ref": "./examples/EnrollmentAccountWithExpand.json" } }, - "operationId": "EnrollmentAccounts_GetByEnrollmentAccountAccountId", + "operationId": "EnrollmentAccounts_GetByEnrollmentAccountId", "description": "Get the enrollment account by id.", "parameters": [ { @@ -870,7 +870,7 @@ "$ref": "./examples/BillingAccountInvoicesList.json" } }, - "operationId": "InvoicesByBillingAccount_List", + "operationId": "Invoices_ListByBillingAccountName", "description": "List of invoices for a billing account.", "parameters": [ { @@ -913,19 +913,19 @@ "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoices/{invoiceName}/pricesheet/default/download": { "post": { "tags": [ - "Pricesheets" + "PriceSheet" ], "x-ms-examples": { "PricesheetDownload": { "$ref": "./examples/PricesheetDownload.json" } }, - "operationId": "InvoicePricesheet_Download", + "operationId": "PriceSheet_Download", "x-ms-long-running-operation": true, "x-ms-long-running-operation-options": { "final-state-via": "location" }, - "description": "Get pricesheet data for invoice id (invoiceName).", + "description": "Get pricesheet for invoice id (invoiceName).", "parameters": [ { "$ref": "#/parameters/apiVersionParameter" @@ -992,7 +992,7 @@ "$ref": "./examples/InvoicesListByBillingProfile.json" } }, - "operationId": "InvoicesByBillingProfile_List", + "operationId": "Invoices_ListByBillingProfile", "description": "List of invoices for a billing profile.", "parameters": [ { @@ -1045,7 +1045,7 @@ "$ref": "./examples/Invoice.json" } }, - "operationId": "Invoice_Get", + "operationId": "Invoices_Get", "description": "Get the invoice by id.", "parameters": [ { @@ -1082,8 +1082,8 @@ "tags": [ "BillingSubscriptions" ], - "operationId": "ProductsByBillingSubscriptions_List", - "description": "Lists billing subscriptions by billingAccountName.", + "operationId": "BillingSubscriptions_ListByBillingAccountName", + "description": "Lists billing subscriptions by billing account name.", "externalDocs": { "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" }, @@ -1124,8 +1124,8 @@ "tags": [ "BillingSubscriptions" ], - "operationId": "BillingSubscriptionsByBillingProfile_List", - "description": "Lists billing subscriptions by billingProfileName.", + "operationId": "BillingSubscriptions_ListByBillingProfileName", + "description": "Lists billing subscriptions by billing profile name.", "externalDocs": { "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" }, @@ -1166,8 +1166,8 @@ "tags": [ "BillingSubscriptions" ], - "operationId": "BillingSubscriptionsByInvoiceSection_List", - "description": "Lists billing subscription by invoiceSectionName.", + "operationId": "BillingSubscriptions_ListByInvoiceSectionName", + "description": "Lists billing subscription by invoice section name.", "externalDocs": { "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" }, @@ -1208,7 +1208,7 @@ "tags": [ "BillingSubscriptions" ], - "operationId": "BillingSubscription_Get", + "operationId": "BillingSubscriptions_Get", "description": "Get a single billing subscription by name.", "externalDocs": { "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" @@ -1250,8 +1250,8 @@ }, "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionName}/billingSubscriptions/{billingSubscriptionName}/transfer": { "post": { - "description": "Transfers the GTM subscription from one invoice section to another within a billing account.", - "operationId": "BillingSubscription_Transfer", + "description": "Transfers the modern subscription from one invoice section to another within a billing account.", + "operationId": "BillingSubscriptions_Transfer", "x-ms-long-running-operation": true, "x-ms-examples": { "TransferBillingSubscription": { @@ -1316,8 +1316,8 @@ "tags": [ "Products" ], - "operationId": "ProductsByBillingAccount_List", - "description": "Lists products by billingAccountName.", + "operationId": "Products_ListByBillingAccountName", + "description": "Lists products by billing account name.", "externalDocs": { "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" }, @@ -1365,8 +1365,8 @@ "tags": [ "Products" ], - "operationId": "ProductsByInvoiceSection_List", - "description": "Lists products by invoiceSectionName.", + "operationId": "Products_ListByInvoiceSectionName", + "description": "Lists products by invoice section name.", "externalDocs": { "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" }, @@ -1460,7 +1460,7 @@ "Products" ], "operationId": "Products_Transfer", - "description": "The operation to transfer a Product to another InvoiceSection.", + "description": "The operation to transfer a Product to another invoice section.", "x-ms-examples": { "TransferProduct": { "$ref": "./examples/TransferProduct.json" @@ -1527,8 +1527,8 @@ "tags": [ "Transactions" ], - "operationId": "TransactionsByBillingAccount_List", - "description": "Lists the transactions by billingAccountName for given start and end date.", + "operationId": "Transactions_ListByBillingAccountName", + "description": "Lists the transactions by billing account name for given start and end date.", "externalDocs": { "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" }, @@ -1593,8 +1593,8 @@ "tags": [ "Transactions" ], - "operationId": "TransactionsByBillingProfile_List", - "description": "Lists the transactions by billingProfileName for given start date and end date.", + "operationId": "Transactions_ListByBillingProfileName", + "description": "Lists the transactions by billing profile name for given start date and end date.", "externalDocs": { "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" }, @@ -1659,8 +1659,8 @@ "tags": [ "Transactions" ], - "operationId": "TransactionsByInvoiceSection_List", - "description": "Lists the transactions by invoiceSectionName for given start date and end date.", + "operationId": "Transactions_ListByInvoiceSectionName", + "description": "Lists the transactions by invoice section name for given start date and end date.", "externalDocs": { "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" }, @@ -1725,8 +1725,8 @@ "tags": [ "Policy" ], - "operationId": "Policy_GetByBillingProfile", - "description": "The policy for a given billingAccountName and billingProfileName.", + "operationId": "Policy_GetByBillingProfileName", + "description": "The policy for a given billing account name and billing profile name.", "externalDocs": { "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" }, @@ -1852,8 +1852,8 @@ "tags": [ "Products" ], - "operationId": "UpdateAutoRenewForBillingAccount", - "description": "Cancel product by product id", + "operationId": "Products_UpdateAutoRenewByBillingAccountName", + "description": "Cancel auto renew for product by product id and billing account name", "x-ms-examples": { "ProductsCancelByBillingAccount": { "$ref": "./examples/ProductCancelByBillingAccount.json" @@ -1894,8 +1894,8 @@ "tags": [ "Products" ], - "operationId": "UpdateAutoRenewForInvoiceSection", - "description": "Cancel auto renew for product by product id", + "operationId": "Products_UpdateAutoRenewByInvoiceSectionName", + "description": "Cancel auto renew for product by product id and invoice section name", "x-ms-examples": { "CancelProductForInvoiceSection": { "$ref": "./examples/ProductCancelForInvoiceSection.json" @@ -1936,6 +1936,9 @@ }, "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionName}/elevate": { "post": { + "tags": [ + "InvoiceSections" + ], "description": "Elevates the caller's access to match their billing profile access.", "operationId": "InvoiceSections_ElevateToBillingProfile", "x-ms-examples": { @@ -1966,7 +1969,10 @@ }, "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionName}/initiateTransfer": { "post": { - "description": "Initiates the request to transfer the GTM or legacy subscriptions or RIs to GTM.", + "tags": [ + "Transfers" + ], + "description": "Initiates the request to transfer the modern or legacy subscriptions or RIs to modern.", "operationId": "Transfers_Initiate", "x-ms-examples": { "InitiateTransfer": { @@ -2002,6 +2008,9 @@ }, "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionName}/transfers/{transferName}": { "get": { + "tags": [ + "Transfers" + ], "description": "Gets the transfer details for given transfer Id.", "operationId": "Transfers_Get", "x-ms-examples": { @@ -2036,6 +2045,9 @@ } }, "delete": { + "tags": [ + "Transfers" + ], "description": "Cancels the transfer for given transfer Id.", "operationId": "Transfers_Cancel", "x-ms-examples": { @@ -2072,6 +2084,9 @@ }, "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionName}/transfers": { "get": { + "tags": [ + "Transfers" + ], "description": "Lists all transfer's details initiated from given invoice section.", "operationId": "Transfers_List", "x-ms-examples": { @@ -2108,6 +2123,9 @@ }, "/providers/Microsoft.Billing/transfers/{transferName}/acceptTransfer": { "post": { + "tags": [ + "RecipientTransfers" + ], "summary": "Accepts the transfer with given transfer Id.", "operationId": "RecipientTransfers_Accept", "x-ms-examples": { @@ -2141,6 +2159,9 @@ }, "/providers/Microsoft.Billing/transfers/{transferName}/declineTransfer": { "post": { + "tags": [ + "RecipientTransfers" + ], "summary": "Declines the transfer with given transfer Id.", "operationId": "RecipientTransfers_Decline", "x-ms-examples": { @@ -2171,6 +2192,9 @@ }, "/providers/Microsoft.Billing/transfers/{transferName}/": { "get": { + "tags": [ + "RecipientTransfers" + ], "summary": "Gets the transfer with given transfer Id.", "operationId": "RecipientTransfers_Get", "x-ms-examples": { @@ -2201,6 +2225,9 @@ }, "/providers/Microsoft.Billing/transfers": { "get": { + "tags": [ + "RecipientTransfers" + ], "summary": "Lists the transfers received by caller.", "operationId": "RecipientTransfers_List", "x-ms-examples": { @@ -2261,15 +2288,15 @@ "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/providers/Microsoft.Billing/billingPermissions": { "get": { "tags": [ - "billingPermissions" + "BillingPermissions" ], "x-ms-examples": { "BillingAccountPermissionsList": { "$ref": "./examples/BillingAccountPermissionsList.json" } }, - "operationId": "BillingAccountBillingPermissions_List", - "description": "Lists all billingPermissions for the caller has for a billing account.", + "operationId": "BillingPermissions_ListByBillingAccount", + "description": "Lists all billing permissions for the caller under a billing account.", "parameters": [ { "$ref": "#/parameters/apiVersionParameter" @@ -2304,8 +2331,8 @@ "$ref": "./examples/InvoiceSectionPermissionsList.json" } }, - "operationId": "InvoiceSectionsBillingPermissions_List", - "description": "Lists all billingPermissions for the caller has for a Invoice Section.", + "operationId": "BillingPermissions_ListByInvoiceSections", + "description": "Lists all billing permissions for the caller under Invoice Section.", "parameters": [ { "$ref": "#/parameters/apiVersionParameter" @@ -2375,14 +2402,14 @@ "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/providers/Microsoft.Billing/billingRoleDefinitions/{billingRoleDefinitionName}": { "get": { "tags": [ - "billingRoleDefinition" + "BillingRoleDefinition" ], "x-ms-examples": { "BillingAccountRoleDefinition": { "$ref": "./examples/BillingAccountRoleDefinition.json" } }, - "operationId": "BillingAccountBillingRoleDefinition_Get", + "operationId": "BillingRoleDefinition_GetByBillingAccountName", "description": "Gets the role definition for a role", "parameters": [ { @@ -2414,14 +2441,14 @@ "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionName}/providers/Microsoft.Billing/billingRoleDefinitions/{billingRoleDefinitionName}": { "get": { "tags": [ - "billingRoleDefinition" + "BillingRoleDefinition" ], "x-ms-examples": { "InvoiceSectionRoleDefinition": { "$ref": "./examples/InvoiceSectionRoleDefinition.json" } }, - "operationId": "InvoiceSectionBillingRoleDefinition_Get", + "operationId": "BillingRoleDefinition_GetByInvoiceSectionName", "description": "Gets the role definition for a role", "parameters": [ { @@ -2456,14 +2483,14 @@ "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/providers/Microsoft.Billing/billingRoleDefinitions/{billingRoleDefinitionName}": { "get": { "tags": [ - "billingRoleDefinition" + "BillingRoleDefinition" ], "x-ms-examples": { "BillingProfileRoleDefinition": { "$ref": "./examples/BillingProfileRoleDefinition.json" } }, - "operationId": "BillingProfileBillingRoleDefinition_Get", + "operationId": "BillingRoleDefinition_GetByBillingProfileName", "description": "Gets the role definition for a role", "parameters": [ { @@ -2498,14 +2525,14 @@ "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/providers/Microsoft.Billing/billingRoleDefinitions": { "get": { "tags": [ - "billingRoleDefinition" + "BillingRoleDefinition" ], "x-ms-examples": { "BillingAccountRoleDefinitionsList": { "$ref": "./examples/BillingAccountRoleDefinitionsList.json" } }, - "operationId": "BillingAccountBillingRoleDefinition_List", + "operationId": "BillingRoleDefinition_ListByBillingAccountName", "description": "Lists the role definition for a billing account", "parameters": [ { @@ -2534,15 +2561,15 @@ "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionName}/providers/Microsoft.Billing/billingRoleDefinitions": { "get": { "tags": [ - "billingRoleDefinition" + "BillingRoleDefinition" ], "x-ms-examples": { "InvoiceSectionRoleDefinitionsList": { "$ref": "./examples/InvoiceSectionRoleDefinitionsList.json" } }, - "operationId": "InvoiceSectionBillingRoleDefinition_List", - "description": "Lists the role definition for a invoice Section", + "operationId": "BillingRoleDefinition_ListByInvoiceSectionName", + "description": "Lists the role definition for an invoice Section", "parameters": [ { "$ref": "#/parameters/apiVersionParameter" @@ -2573,14 +2600,14 @@ "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/providers/Microsoft.Billing/billingRoleDefinitions": { "get": { "tags": [ - "billingRoleDefinition" + "BillingRoleDefinition" ], "x-ms-examples": { "BillingProfileRoleDefinitionsList": { "$ref": "./examples/BillingProfileRoleDefinitionsList.json" } }, - "operationId": "BillingProfileBillingRoleDefinition_List", + "operationId": "BillingRoleDefinition_ListByBillingProfileName", "description": "Lists the role definition for a Billing Profile", "parameters": [ { @@ -2612,14 +2639,14 @@ "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/providers/Microsoft.Billing/billingRoleAssignments/{billingRoleAssignmentName}": { "get": { "tags": [ - "billingRoleAssignment" + "BillingRoleAssignment" ], "x-ms-examples": { "BillingAccountRoleAssignment": { "$ref": "./examples/BillingAccountRoleAssignment.json" } }, - "operationId": "BillingAccountBillingRoleAssignment_Get", + "operationId": "BillingRoleAssignment_GetByBillingAccount", "description": "Get the role assignment for the caller", "parameters": [ { @@ -2649,14 +2676,14 @@ }, "delete": { "tags": [ - "billingRoleAssignment" + "BillingRoleAssignment" ], "x-ms-examples": { "BillingAccountRoleAssignmentDelete": { "$ref": "./examples/BillingAccountRoleAssignmentDelete.json" } }, - "operationId": "BillingAccountBillingRoleAssignment_Delete", + "operationId": "BillingRoleAssignment_DeleteByBillingAccountName", "description": "Delete the role assignment on this billing account", "parameters": [ { @@ -2688,14 +2715,14 @@ "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionName}/providers/Microsoft.Billing/billingRoleAssignments/{billingRoleAssignmentName}": { "get": { "tags": [ - "billingRoleAssignment" + "BillingRoleAssignment" ], "x-ms-examples": { "InvoiceSectionRoleAssignment": { "$ref": "./examples/InvoiceSectionRoleAssignment.json" } }, - "operationId": "InvoiceSectionBillingRoleAssignment_Get", + "operationId": "BillingRoleAssignment_GetByInvoiceSectionName", "description": "Get the role assignment for the caller on the invoice Section", "parameters": [ { @@ -2728,15 +2755,15 @@ }, "delete": { "tags": [ - "billingRoleAssignment" + "BillingRoleAssignment" ], "x-ms-examples": { "InvoiceSectionRoleAssignmentDelete": { "$ref": "./examples/InvoiceSectionRoleAssignmentDelete.json" } }, - "operationId": "InvoiceSectionBillingRoleAssignment_Delete", - "description": "Delete the role assignment on this invoice Section", + "operationId": "BillingRoleAssignment_DeleteByInvoiceSectionName", + "description": "Delete the role assignment on the invoice Section", "parameters": [ { "$ref": "#/parameters/apiVersionParameter" @@ -2770,14 +2797,14 @@ "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/providers/Microsoft.Billing/billingRoleAssignments/{billingRoleAssignmentName}": { "get": { "tags": [ - "billingRoleAssignment" + "BillingRoleAssignment" ], "x-ms-examples": { "BillingProfileRoleAssignment": { "$ref": "./examples/BillingProfileRoleAssignment.json" } }, - "operationId": "BillingProfileBillingRoleAssignment_Get", + "operationId": "BillingRoleAssignment_GetByBillingProfileName", "description": "Get the role assignment for the caller on the Billing Profile", "parameters": [ { @@ -2810,14 +2837,14 @@ }, "delete": { "tags": [ - "billingRoleAssignment" + "BillingRoleAssignment" ], "x-ms-examples": { "BillingProfileRoleAssignmentDelete": { "$ref": "./examples/BillingProfileRoleAssignmentDelete.json" } }, - "operationId": "BillingProfileBillingRoleAssignment_Delete", + "operationId": "BillingRoleAssignment_DeleteByBillingProfileName", "description": "Delete the role assignment on this Billing Profile", "parameters": [ { @@ -2852,14 +2879,14 @@ "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/providers/Microsoft.Billing/billingRoleAssignments": { "get": { "tags": [ - "billingRoleAssignment" + "BillingRoleAssignment" ], "x-ms-examples": { "BillingAccountRoleAssignmentList": { "$ref": "./examples/BillingAccountRoleAssignmentList.json" } }, - "operationId": "BillingAccountBillingRoleAssignment_List", + "operationId": "BillingRoleAssignment_ListByBillingAccountName", "description": "Get the role assignments on the Billing Account", "parameters": [ { @@ -2888,9 +2915,9 @@ "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/providers/Microsoft.Billing/createBillingRoleAssignment": { "post": { "tags": [ - "billingRoleAssignment" + "BillingRoleAssignment" ], - "operationId": "BillingAccountBillingRoleAssignment_Add", + "operationId": "BillingRoleAssignment_AddByBillingAccountName", "description": "The operation to add a role assignment to a billing account.", "x-ms-examples": { "AddRoleAssignmentToBillingAccount": { @@ -2933,14 +2960,14 @@ "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionName}/providers/Microsoft.Billing/billingRoleAssignments": { "get": { "tags": [ - "billingRoleAssignment" + "BillingRoleAssignment" ], "x-ms-examples": { "InvoiceSectionRoleAssignmentList": { "$ref": "./examples/InvoiceSectionRoleAssignmentList.json" } }, - "operationId": "InvoiceSectionBillingRoleAssignment_List", + "operationId": "BillingRoleAssignment_ListByInvoiceSectionName", "description": "Get the role assignments on the invoice Section", "parameters": [ { @@ -2972,9 +2999,9 @@ "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionName}/providers/Microsoft.Billing/createBillingRoleAssignment": { "post": { "tags": [ - "billingRoleAssignment" + "BillingRoleAssignment" ], - "operationId": "InvoiceSectionBillingRoleAssignment_Add", + "operationId": "BillingRoleAssignment_AddByInvoiceSectionName", "description": "The operation to add a role assignment to a invoice Section.", "x-ms-examples": { "AddRoleAssignmentToInvoiceSection": { @@ -3020,14 +3047,14 @@ "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/providers/Microsoft.Billing/billingRoleAssignments": { "get": { "tags": [ - "billingRoleAssignment" + "BillingRoleAssignment" ], "x-ms-examples": { "BillingProfileRoleAssignmentList": { "$ref": "./examples/BillingProfileRoleAssignmentList.json" } }, - "operationId": "BillingProfileBillingRoleAssignment_List", + "operationId": "BillingRoleAssignment_ListByBillingProfileName", "description": "Get the role assignments on the Billing Profile", "parameters": [ { @@ -3059,9 +3086,9 @@ "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/providers/Microsoft.Billing/createBillingRoleAssignment": { "post": { "tags": [ - "billingRoleAssignment" + "BillingRoleAssignment" ], - "operationId": "BillingProfileBillingRoleAssignment_Add", + "operationId": "BillingRoleAssignment_AddByBillingProfileName", "description": "The operation to add a role assignment to a billing profile.", "x-ms-examples": { "AddRoleAssignmentToBillingProfile": { From 2b94171267e0c6acb4701e3c2b1f4355216188ff Mon Sep 17 00:00:00 2001 From: asarkar84 <33848291+asarkar84@users.noreply.github.com> Date: Mon, 22 Apr 2019 13:41:34 -0700 Subject: [PATCH 11/27] Incorporated review comments Incorporated review comments --- .../preview/2018-11-01-preview/billing.json | 92 +++++++++---------- 1 file changed, 46 insertions(+), 46 deletions(-) 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 40769cf5a716..1cda71a486fa 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 @@ -925,7 +925,7 @@ "x-ms-long-running-operation-options": { "final-state-via": "location" }, - "description": "Get pricesheet for invoice id (invoiceName).", + "description": "Download price sheet for an invoice.", "parameters": [ { "$ref": "#/parameters/apiVersionParameter" @@ -1046,7 +1046,7 @@ } }, "operationId": "Invoices_Get", - "description": "Get the invoice by id.", + "description": "Get the invoice by name.", "parameters": [ { "$ref": "#/parameters/apiVersionParameter" @@ -1250,7 +1250,7 @@ }, "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionName}/billingSubscriptions/{billingSubscriptionName}/transfer": { "post": { - "description": "Transfers the modern subscription from one invoice section to another within a billing account.", + "description": "Transfers the subscription from one invoice section to another within a billing account.", "operationId": "BillingSubscriptions_Transfer", "x-ms-long-running-operation": true, "x-ms-examples": { @@ -1723,9 +1723,9 @@ "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/policies/default": { "get": { "tags": [ - "Policy" + "Policies" ], - "operationId": "Policy_GetByBillingProfileName", + "operationId": "Policies_GetByBillingProfileName", "description": "The policy for a given billing account name and billing profile name.", "externalDocs": { "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" @@ -1763,9 +1763,9 @@ }, "put": { "tags": [ - "Policy" + "Policies" ], - "operationId": "Policy_Update", + "operationId": "Policies_Update", "description": "The operation to update a policy.", "x-ms-examples": { "UpdateBillingProfile": { @@ -1972,7 +1972,7 @@ "tags": [ "Transfers" ], - "description": "Initiates the request to transfer the modern or legacy subscriptions or RIs to modern.", + "description": "Initiates the request to transfer the legacy subscriptions or RIs.", "operationId": "Transfers_Initiate", "x-ms-examples": { "InitiateTransfer": { @@ -2402,14 +2402,14 @@ "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/providers/Microsoft.Billing/billingRoleDefinitions/{billingRoleDefinitionName}": { "get": { "tags": [ - "BillingRoleDefinition" + "BillingRoleDefinitions" ], "x-ms-examples": { "BillingAccountRoleDefinition": { "$ref": "./examples/BillingAccountRoleDefinition.json" } }, - "operationId": "BillingRoleDefinition_GetByBillingAccountName", + "operationId": "BillingRoleDefinitions_GetByBillingAccountName", "description": "Gets the role definition for a role", "parameters": [ { @@ -2441,14 +2441,14 @@ "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionName}/providers/Microsoft.Billing/billingRoleDefinitions/{billingRoleDefinitionName}": { "get": { "tags": [ - "BillingRoleDefinition" + "BillingRoleDefinitions" ], "x-ms-examples": { "InvoiceSectionRoleDefinition": { "$ref": "./examples/InvoiceSectionRoleDefinition.json" } }, - "operationId": "BillingRoleDefinition_GetByInvoiceSectionName", + "operationId": "BillingRoleDefinitions_GetByInvoiceSectionName", "description": "Gets the role definition for a role", "parameters": [ { @@ -2483,14 +2483,14 @@ "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/providers/Microsoft.Billing/billingRoleDefinitions/{billingRoleDefinitionName}": { "get": { "tags": [ - "BillingRoleDefinition" + "BillingRoleDefinitions" ], "x-ms-examples": { "BillingProfileRoleDefinition": { "$ref": "./examples/BillingProfileRoleDefinition.json" } }, - "operationId": "BillingRoleDefinition_GetByBillingProfileName", + "operationId": "BillingRoleDefinitions_GetByBillingProfileName", "description": "Gets the role definition for a role", "parameters": [ { @@ -2525,14 +2525,14 @@ "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/providers/Microsoft.Billing/billingRoleDefinitions": { "get": { "tags": [ - "BillingRoleDefinition" + "BillingRoleDefinitions" ], "x-ms-examples": { "BillingAccountRoleDefinitionsList": { "$ref": "./examples/BillingAccountRoleDefinitionsList.json" } }, - "operationId": "BillingRoleDefinition_ListByBillingAccountName", + "operationId": "BillingRoleDefinitions_ListByBillingAccountName", "description": "Lists the role definition for a billing account", "parameters": [ { @@ -2561,14 +2561,14 @@ "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionName}/providers/Microsoft.Billing/billingRoleDefinitions": { "get": { "tags": [ - "BillingRoleDefinition" + "BillingRoleDefinitions" ], "x-ms-examples": { "InvoiceSectionRoleDefinitionsList": { "$ref": "./examples/InvoiceSectionRoleDefinitionsList.json" } }, - "operationId": "BillingRoleDefinition_ListByInvoiceSectionName", + "operationId": "BillingRoleDefinitions_ListByInvoiceSectionName", "description": "Lists the role definition for an invoice Section", "parameters": [ { @@ -2600,14 +2600,14 @@ "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/providers/Microsoft.Billing/billingRoleDefinitions": { "get": { "tags": [ - "BillingRoleDefinition" + "BillingRoleDefinitions" ], "x-ms-examples": { "BillingProfileRoleDefinitionsList": { "$ref": "./examples/BillingProfileRoleDefinitionsList.json" } }, - "operationId": "BillingRoleDefinition_ListByBillingProfileName", + "operationId": "BillingRoleDefinitions_ListByBillingProfileName", "description": "Lists the role definition for a Billing Profile", "parameters": [ { @@ -2639,14 +2639,14 @@ "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/providers/Microsoft.Billing/billingRoleAssignments/{billingRoleAssignmentName}": { "get": { "tags": [ - "BillingRoleAssignment" + "BillingRoleAssignments" ], "x-ms-examples": { "BillingAccountRoleAssignment": { "$ref": "./examples/BillingAccountRoleAssignment.json" } }, - "operationId": "BillingRoleAssignment_GetByBillingAccount", + "operationId": "BillingRoleAssignments_GetByBillingAccount", "description": "Get the role assignment for the caller", "parameters": [ { @@ -2676,14 +2676,14 @@ }, "delete": { "tags": [ - "BillingRoleAssignment" + "BillingRoleAssignments" ], "x-ms-examples": { "BillingAccountRoleAssignmentDelete": { "$ref": "./examples/BillingAccountRoleAssignmentDelete.json" } }, - "operationId": "BillingRoleAssignment_DeleteByBillingAccountName", + "operationId": "BillingRoleAssignments_DeleteByBillingAccountName", "description": "Delete the role assignment on this billing account", "parameters": [ { @@ -2715,14 +2715,14 @@ "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionName}/providers/Microsoft.Billing/billingRoleAssignments/{billingRoleAssignmentName}": { "get": { "tags": [ - "BillingRoleAssignment" + "BillingRoleAssignments" ], "x-ms-examples": { "InvoiceSectionRoleAssignment": { "$ref": "./examples/InvoiceSectionRoleAssignment.json" } }, - "operationId": "BillingRoleAssignment_GetByInvoiceSectionName", + "operationId": "BillingRoleAssignments_GetByInvoiceSectionName", "description": "Get the role assignment for the caller on the invoice Section", "parameters": [ { @@ -2755,14 +2755,14 @@ }, "delete": { "tags": [ - "BillingRoleAssignment" + "BillingRoleAssignments" ], "x-ms-examples": { "InvoiceSectionRoleAssignmentDelete": { "$ref": "./examples/InvoiceSectionRoleAssignmentDelete.json" } }, - "operationId": "BillingRoleAssignment_DeleteByInvoiceSectionName", + "operationId": "BillingRoleAssignments_DeleteByInvoiceSectionName", "description": "Delete the role assignment on the invoice Section", "parameters": [ { @@ -2797,14 +2797,14 @@ "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/providers/Microsoft.Billing/billingRoleAssignments/{billingRoleAssignmentName}": { "get": { "tags": [ - "BillingRoleAssignment" + "BillingRoleAssignments" ], "x-ms-examples": { "BillingProfileRoleAssignment": { "$ref": "./examples/BillingProfileRoleAssignment.json" } }, - "operationId": "BillingRoleAssignment_GetByBillingProfileName", + "operationId": "BillingRoleAssignments_GetByBillingProfileName", "description": "Get the role assignment for the caller on the Billing Profile", "parameters": [ { @@ -2837,14 +2837,14 @@ }, "delete": { "tags": [ - "BillingRoleAssignment" + "BillingRoleAssignments" ], "x-ms-examples": { "BillingProfileRoleAssignmentDelete": { "$ref": "./examples/BillingProfileRoleAssignmentDelete.json" } }, - "operationId": "BillingRoleAssignment_DeleteByBillingProfileName", + "operationId": "BillingRoleAssignments_DeleteByBillingProfileName", "description": "Delete the role assignment on this Billing Profile", "parameters": [ { @@ -2879,14 +2879,14 @@ "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/providers/Microsoft.Billing/billingRoleAssignments": { "get": { "tags": [ - "BillingRoleAssignment" + "BillingRoleAssignments" ], "x-ms-examples": { "BillingAccountRoleAssignmentList": { "$ref": "./examples/BillingAccountRoleAssignmentList.json" } }, - "operationId": "BillingRoleAssignment_ListByBillingAccountName", + "operationId": "BillingRoleAssignments_ListByBillingAccountName", "description": "Get the role assignments on the Billing Account", "parameters": [ { @@ -2915,9 +2915,9 @@ "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/providers/Microsoft.Billing/createBillingRoleAssignment": { "post": { "tags": [ - "BillingRoleAssignment" + "BillingRoleAssignments" ], - "operationId": "BillingRoleAssignment_AddByBillingAccountName", + "operationId": "BillingRoleAssignments_AddByBillingAccountName", "description": "The operation to add a role assignment to a billing account.", "x-ms-examples": { "AddRoleAssignmentToBillingAccount": { @@ -2960,14 +2960,14 @@ "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionName}/providers/Microsoft.Billing/billingRoleAssignments": { "get": { "tags": [ - "BillingRoleAssignment" + "BillingRoleAssignments" ], "x-ms-examples": { "InvoiceSectionRoleAssignmentList": { "$ref": "./examples/InvoiceSectionRoleAssignmentList.json" } }, - "operationId": "BillingRoleAssignment_ListByInvoiceSectionName", + "operationId": "BillingRoleAssignments_ListByInvoiceSectionName", "description": "Get the role assignments on the invoice Section", "parameters": [ { @@ -2999,9 +2999,9 @@ "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionName}/providers/Microsoft.Billing/createBillingRoleAssignment": { "post": { "tags": [ - "BillingRoleAssignment" + "BillingRoleAssignments" ], - "operationId": "BillingRoleAssignment_AddByInvoiceSectionName", + "operationId": "BillingRoleAssignments_AddByInvoiceSectionName", "description": "The operation to add a role assignment to a invoice Section.", "x-ms-examples": { "AddRoleAssignmentToInvoiceSection": { @@ -3047,14 +3047,14 @@ "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/providers/Microsoft.Billing/billingRoleAssignments": { "get": { "tags": [ - "BillingRoleAssignment" + "BillingRoleAssignments" ], "x-ms-examples": { "BillingProfileRoleAssignmentList": { "$ref": "./examples/BillingProfileRoleAssignmentList.json" } }, - "operationId": "BillingRoleAssignment_ListByBillingProfileName", + "operationId": "BillingRoleAssignments_ListByBillingProfileName", "description": "Get the role assignments on the Billing Profile", "parameters": [ { @@ -3086,9 +3086,9 @@ "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/providers/Microsoft.Billing/createBillingRoleAssignment": { "post": { "tags": [ - "BillingRoleAssignment" + "BillingRoleAssignments" ], - "operationId": "BillingRoleAssignment_AddByBillingProfileName", + "operationId": "BillingRoleAssignments_AddByBillingProfileName", "description": "The operation to add a role assignment to a billing profile.", "x-ms-examples": { "AddRoleAssignmentToBillingProfile": { @@ -5123,7 +5123,7 @@ } } }, - "BillingRoleAssignment": { + "BillingRoleAssignments": { "description": "a role assignment", "type": "object", "allOf": [ @@ -5192,7 +5192,7 @@ } } }, - "BillingRoleDefinition": { + "BillingRoleDefinitions": { "description": "Result of get role definition for a role.", "type": "object", "allOf": [ From 1b0eb1e1cfd863f09177d571b6fda9e5d2c09194 Mon Sep 17 00:00:00 2001 From: asarkar84 <33848291+asarkar84@users.noreply.github.com> Date: Mon, 22 Apr 2019 13:43:08 -0700 Subject: [PATCH 12/27] Incorporated review comments Incorporated review comments --- .../Microsoft.Billing/preview/2018-11-01-preview/billing.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 1cda71a486fa..0e8974c05af6 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 @@ -111,9 +111,9 @@ "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/availableBalance/default": { "get": { "tags": [ - "AvailableBalance" + "AvailableBalances" ], - "operationId": "AvailableBalance_GetByBillingProfile", + "operationId": "AvailableBalances_GetByBillingProfile", "description": "The latest available credit balance for a given billingAccountName and billingProfileName.", "x-ms-examples": { "AvailableBalanceByBillingProfile": { From 86c8bcfa38eb98457c66057f99b62b79b5cf9c96 Mon Sep 17 00:00:00 2001 From: asarkar84 <33848291+asarkar84@users.noreply.github.com> Date: Mon, 22 Apr 2019 13:47:45 -0700 Subject: [PATCH 13/27] Fixed the errors Fixed the errors --- .../Microsoft.Billing/preview/2018-11-01-preview/billing.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 0e8974c05af6..0aae27dc0d5e 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 @@ -5123,7 +5123,7 @@ } } }, - "BillingRoleAssignments": { + "BillingRoleAssignment": { "description": "a role assignment", "type": "object", "allOf": [ @@ -5192,7 +5192,7 @@ } } }, - "BillingRoleDefinitions": { + "BillingRoleDefinition": { "description": "Result of get role definition for a role.", "type": "object", "allOf": [ From b73f7f68106a4232ff5587384925154ef5d7e5e8 Mon Sep 17 00:00:00 2001 From: asarkar84 <33848291+asarkar84@users.noreply.github.com> Date: Mon, 22 Apr 2019 13:52:13 -0700 Subject: [PATCH 14/27] Added multiple inputs Added multiple inputs --- specification/billing/resource-manager/readme.md | 1 + 1 file changed, 1 insertion(+) diff --git a/specification/billing/resource-manager/readme.md b/specification/billing/resource-manager/readme.md index 67b98f84dab4..535304f6f086 100644 --- a/specification/billing/resource-manager/readme.md +++ b/specification/billing/resource-manager/readme.md @@ -36,6 +36,7 @@ These settings apply only when `--tag=package-2018-11-preview` is specified on t ``` yaml $(tag) == 'package-2018-11-preview' input-file: - Microsoft.Billing/preview/2018-11-01-preview/billing.json +- Microsoft.Billing/preview/2017-04-24-preview/billing.json ``` ### Tag: package-2018-03-preview From 276a50fff264a4b0bd73f7f1d518f139463e465a Mon Sep 17 00:00:00 2001 From: asarkar84 <33848291+asarkar84@users.noreply.github.com> Date: Mon, 22 Apr 2019 14:35:43 -0700 Subject: [PATCH 15/27] Fixed build errors Fixed build errors --- specification/billing/resource-manager/readme.md | 1 - 1 file changed, 1 deletion(-) diff --git a/specification/billing/resource-manager/readme.md b/specification/billing/resource-manager/readme.md index 535304f6f086..67b98f84dab4 100644 --- a/specification/billing/resource-manager/readme.md +++ b/specification/billing/resource-manager/readme.md @@ -36,7 +36,6 @@ These settings apply only when `--tag=package-2018-11-preview` is specified on t ``` yaml $(tag) == 'package-2018-11-preview' input-file: - Microsoft.Billing/preview/2018-11-01-preview/billing.json -- Microsoft.Billing/preview/2017-04-24-preview/billing.json ``` ### Tag: package-2018-03-preview From 9fb11a5fab1eae53424e0fa9f5c6b0b1da825b90 Mon Sep 17 00:00:00 2001 From: asarkar84 <33848291+asarkar84@users.noreply.github.com> Date: Tue, 23 Apr 2019 13:09:29 -0700 Subject: [PATCH 16/27] Incorporated review comments Incorporated review comments --- .../preview/2018-11-01-preview/billing.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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 0aae27dc0d5e..f7773dd449bc 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 @@ -2324,7 +2324,7 @@ "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionName}/providers/Microsoft.Billing/billingPermissions": { "get": { "tags": [ - "billingPermissions" + "BillingPermissions" ], "x-ms-examples": { "InvoiceSectionPermissionsList": { @@ -2332,7 +2332,7 @@ } }, "operationId": "BillingPermissions_ListByInvoiceSections", - "description": "Lists all billing permissions for the caller under Invoice Section.", + "description": "Lists all billing permissions for the caller under invoice section.", "parameters": [ { "$ref": "#/parameters/apiVersionParameter" @@ -2363,14 +2363,14 @@ "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/providers/Microsoft.Billing/billingPermissions": { "get": { "tags": [ - "billingPermissions" + "BillingPermissions" ], "x-ms-examples": { "BillingProfilePermissionsList": { "$ref": "./examples/BillingProfilePermissionsList.json" } }, - "operationId": "BillingProfileBillingPermissions_List", + "operationId": "BillingPermissions_ListByBillingProfile", "description": "Lists all billingPermissions for the caller has for a billing account.", "parameters": [ { @@ -5236,12 +5236,12 @@ "type": "array", "readOnly": true, "items": { - "$ref": "#/definitions/BillingPermissions" + "$ref": "#/definitions/BillingPermissionsProperties" } } } }, - "BillingPermissions": { + "BillingPermissionsProperties": { "description": "The set of allowed action and not allowed actions a caller has on a billing account", "type": "object", "properties": { From 861de2bcdd2c92612af5aa3c8afaf11120dcb740 Mon Sep 17 00:00:00 2001 From: asarkar84 <33848291+asarkar84@users.noreply.github.com> Date: Tue, 23 Apr 2019 13:14:28 -0700 Subject: [PATCH 17/27] Incorporated review comments --- .../Microsoft.Billing/preview/2018-11-01-preview/billing.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 f7773dd449bc..f8c9d1adb28e 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 @@ -1811,7 +1811,7 @@ "/subscriptions/{subscriptionId}/providers/Microsoft.Billing/billingProperty": { "get": { "tags": [ - "BillingProperty" + "BillingProperties" ], "operationId": "BillingProperty_Get", "description": "Get billing property by subscription Id.", From 7dc3649e3e29fa741073f639589cbda471ec7d0b Mon Sep 17 00:00:00 2001 From: asarkar84 <33848291+asarkar84@users.noreply.github.com> Date: Tue, 21 May 2019 15:17:53 -0700 Subject: [PATCH 18/27] Spec for LineOfCredit API and other corrections Spec for LineOfCredit API and other corrections --- .../preview/2018-11-01-preview/billing.json | 148 +++++++++++++++++- .../IncreaseLineOfCreditBySubscription.json | 19 +++ .../examples/LineOfCreditBySubscription.json | 27 ++++ 3 files changed, 192 insertions(+), 2 deletions(-) create mode 100644 specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/IncreaseLineOfCreditBySubscription.json create mode 100644 specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/LineOfCreditBySubscription.json 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 e4b9fcd940d2..31d8a858d749 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 @@ -322,7 +322,7 @@ } } }, - "put": { + "patch": { "tags": [ "BillingProfiles" ], @@ -623,7 +623,7 @@ } } }, - "put": { + "patch": { "tags": [ "InvoiceSections" ], @@ -3261,6 +3261,99 @@ } } } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.Billing/billingAccounts/default/lineOfCredit/default": { + "get": { + "tags": [ + "LineOfCredits" + ], + "x-ms-examples": { + "LineOfCreditBySubscription": { + "$ref": "./examples/LineOfCreditBySubscription.json" + } + }, + "operationId": "LineOfCredits_Get", + "description": "Get the current line of credit.", + "parameters": [ + { + "$ref": "#/parameters/apiVersionParameter" + }, + { + "$ref": "#/parameters/subscriptionIdParameter" + } + ], + "responses": { + "200": { + "description": "OK. The request has succeeded.", + "schema": { + "$ref": "#/definitions/LineOfCredit" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.Billing/billingAccounts/default/lineOfCredit/default/increase": { + "post": { + "tags": [ + "LineOfCredits" + ], + "operationId": "LineOfCredits_Increase", + "x-ms-long-running-operation": true, + "x-ms-examples": { + "IncreaseLineOfCreditBySubscription": { + "$ref": "./examples/IncreaseLineOfCreditBySubscription.json" + } + }, + "description": "Increase the current line of credit.", + "parameters": [ + { + "$ref": "#/parameters/apiVersionParameter" + }, + { + "$ref": "#/parameters/subscriptionIdParameter" + }, + { + "name": "parameters", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/IncreaseLineOfCreditRequestProperties" + }, + "description": "Parameters supplied to the increase line of credit operation." + } + ], + "responses": { + "202": { + "description": "Accepted. Line of credit increase is in progress.", + "headers": { + "Location": { + "description": "Location URI to poll for result.", + "type": "string" + }, + "Retry-After": { + "description": "Recommends the retryable time after receiving this.", + "type": "integer" + }, + "Azure-AsyncOperation": { + "description": "URI to poll for the operation status", + "type": "string" + } + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + } } }, "definitions": { @@ -5394,6 +5487,57 @@ } } }, + "LineOfCredit": { + "description": "Line of credit resource.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/Resource" + } + ], + "properties": { + "properties": { + "description": "A line of credit.", + "x-ms-client-flatten": true, + "$ref": "#/definitions/LineOfCreditProperties" + } + } + }, + "LineOfCreditProperties": { + "description": "The properties of the line of credit.", + "properties": { + "creditLimit": { + "description": "The current credit limit.", + "$ref": "#/definitions/Amount", + "readOnly": true + }, + "reason": { + "description": "The reason for the line of credit status when not approved.", + "type": "string", + "readOnly": true + }, + "remainingBalance": { + "description": "Remaining balance.", + "$ref": "#/definitions/Amount", + "readOnly": true + }, + "status": { + "description": "The line of credit status.", + "type": "string", + "readOnly": true + } + } + }, + "IncreaseLineOfCreditRequestProperties": { + "type": "object", + "description": "Request parameters to increase line of credit.", + "properties": { + "desiredCreditLimit": { + "description": "The desired credit limit.", + "type": "number" + } + } + }, "Action": { "description": "the action the caller allowed to do", "type": "string", diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/IncreaseLineOfCreditBySubscription.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/IncreaseLineOfCreditBySubscription.json new file mode 100644 index 000000000000..ddf188736474 --- /dev/null +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/IncreaseLineOfCreditBySubscription.json @@ -0,0 +1,19 @@ +{ + "parameters": { + "api-version": "2018-11-01-preview", + "subscriptionId": "{subscriptionId}", + "parameters": { + "desiredCreditLimit": 10000 + } + }, + "responses": { + "202": { + "headers": { + "Location": "https://management.azure.com/providers/Microsoft.Billing/operationResults/44000000-0000-0000-0000-000000000000?api-version=2018-11-01-preview", + "Retry-After": "60", + "Azure-AsyncOperation": "https://management.azure.com/providers/Microsoft.Billing/operationStatus/44000000-0000-0000-0000-000000000000?api-version=2018-11-01-preview", + "OData-EntityId": "44000000-0000-0000-0000-000000000000" + } + } + } +} diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/LineOfCreditBySubscription.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/LineOfCreditBySubscription.json new file mode 100644 index 000000000000..94436b04b4d2 --- /dev/null +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/LineOfCreditBySubscription.json @@ -0,0 +1,27 @@ +{ + "parameters": { + "api-version": "2018-11-01-preview", + "subscriptionId": "{subscriptionId}" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/{subscriptionId}/providers/Microsoft.Billing/billingAccounts/default/lineOfCredit/default", + "name": "default", + "type": "Microsoft.Billing/lineOfCredit", + "properties": { + "creditLimit": { + "currency": "USD", + "value": 20000.00 + }, + "reason": null, + "remainingBalance": { + "currency": "USD", + "value": 6000.00 + }, + "status": "approved" + } + } + } + } +} From 8b7638cffc50f458881188691f39a8e5d563436d Mon Sep 17 00:00:00 2001 From: asarkar84 <33848291+asarkar84@users.noreply.github.com> Date: Tue, 21 May 2019 15:54:45 -0700 Subject: [PATCH 19/27] Fixed build error --- .../preview/2018-11-01-preview/billing.json | 6 ++++++ .../IncreaseLineOfCreditBySubscription.json | 19 +++++++++++++++++++ 2 files changed, 25 insertions(+) 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 31d8a858d749..e237ec538ca0 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 @@ -3329,6 +3329,12 @@ } ], "responses": { + "200": { + "description": "OK. The request has succeeded.", + "schema": { + "$ref": "#/definitions/LineOfCredit" + } + }, "202": { "description": "Accepted. Line of credit increase is in progress.", "headers": { diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/IncreaseLineOfCreditBySubscription.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/IncreaseLineOfCreditBySubscription.json index ddf188736474..078787fcad45 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/IncreaseLineOfCreditBySubscription.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/IncreaseLineOfCreditBySubscription.json @@ -7,6 +7,25 @@ } }, "responses": { + "200": { + "body": { + "id": "/subscriptions/{subscriptionId}/providers/Microsoft.Billing/billingAccounts/default/lineOfCredit/default", + "name": "default", + "type": "Microsoft.Billing/lineOfCredit", + "properties": { + "creditLimit": { + "currency": "USD", + "value": 20000.00 + }, + "reason": null, + "remainingBalance": { + "currency": "USD", + "value": 6000.00 + }, + "status": "approved" + } + } + }, "202": { "headers": { "Location": "https://management.azure.com/providers/Microsoft.Billing/operationResults/44000000-0000-0000-0000-000000000000?api-version=2018-11-01-preview", From 80551f21cab1e4f92c88998ba33a31f8ecf3cb11 Mon Sep 17 00:00:00 2001 From: asarkar84 <33848291+asarkar84@users.noreply.github.com> Date: Fri, 24 May 2019 13:35:02 -0700 Subject: [PATCH 20/27] Incorporated review comments Incorporated review comments --- .../preview/2018-11-01-preview/billing.json | 12 +++++++++++- .../examples/IncreaseLineOfCreditBySubscription.json | 2 +- .../examples/LineOfCreditBySubscription.json | 2 +- 3 files changed, 13 insertions(+), 3 deletions(-) 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 e237ec538ca0..a8e1a7055563 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 @@ -3305,6 +3305,9 @@ ], "operationId": "LineOfCredits_Increase", "x-ms-long-running-operation": true, + "x-ms-long-running-operation-options": { + "final-state-via": "location" + }, "x-ms-examples": { "IncreaseLineOfCreditBySubscription": { "$ref": "./examples/IncreaseLineOfCreditBySubscription.json" @@ -5530,7 +5533,14 @@ "status": { "description": "The line of credit status.", "type": "string", - "readOnly": true + "enum": [ + "Approved", + "Rejected" + ], + "x-ms-enum": { + "name": "status", + "modelAsString": true + } } } }, diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/IncreaseLineOfCreditBySubscription.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/IncreaseLineOfCreditBySubscription.json index 078787fcad45..7578ccd7f53a 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/IncreaseLineOfCreditBySubscription.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/IncreaseLineOfCreditBySubscription.json @@ -22,7 +22,7 @@ "currency": "USD", "value": 6000.00 }, - "status": "approved" + "status": "Approved" } } }, diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/LineOfCreditBySubscription.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/LineOfCreditBySubscription.json index 94436b04b4d2..56ec57a1abe9 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/LineOfCreditBySubscription.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/LineOfCreditBySubscription.json @@ -19,7 +19,7 @@ "currency": "USD", "value": 6000.00 }, - "status": "approved" + "status": "Approved" } } } From 78b382bcf6f31a2a155f0373c8ef55c8d18b6a90 Mon Sep 17 00:00:00 2001 From: asarkar84 <33848291+asarkar84@users.noreply.github.com> Date: Tue, 28 May 2019 11:34:29 -0700 Subject: [PATCH 21/27] Incorporated review comments Incorporated review comments --- .../preview/2018-11-01-preview/billing.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 a8e1a7055563..4dfa3fe06d8e 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 @@ -322,7 +322,7 @@ } } }, - "patch": { + "put": { "tags": [ "BillingProfiles" ], @@ -623,7 +623,7 @@ } } }, - "patch": { + "put": { "tags": [ "InvoiceSections" ], @@ -3299,7 +3299,7 @@ } }, "/subscriptions/{subscriptionId}/providers/Microsoft.Billing/billingAccounts/default/lineOfCredit/default/increase": { - "post": { + "put": { "tags": [ "LineOfCredits" ], From 0c5738c1ac902fc62400b432cbf3f0459ba831ea Mon Sep 17 00:00:00 2001 From: asarkar84 <33848291+asarkar84@users.noreply.github.com> Date: Tue, 28 May 2019 13:53:31 -0700 Subject: [PATCH 22/27] Updated the increase api Updated the increase api --- .../Microsoft.Billing/preview/2018-11-01-preview/billing.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 4dfa3fe06d8e..c4666dfe33e6 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 @@ -3299,7 +3299,7 @@ } }, "/subscriptions/{subscriptionId}/providers/Microsoft.Billing/billingAccounts/default/lineOfCredit/default/increase": { - "put": { + "post": { "tags": [ "LineOfCredits" ], From 0c6a6c618998dedffab5ac77c332a80c1c2aa06a Mon Sep 17 00:00:00 2001 From: asarkar84 <33848291+asarkar84@users.noreply.github.com> Date: Wed, 29 May 2019 21:03:22 -0700 Subject: [PATCH 23/27] Incorporated review comments Incorporated review comments --- .../preview/2018-11-01-preview/billing.json | 21 ++++--------------- .../IncreaseLineOfCreditBySubscription.json | 6 +++++- 2 files changed, 9 insertions(+), 18 deletions(-) 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 c4666dfe33e6..a25901bbda5d 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 @@ -3296,10 +3296,8 @@ } } } - } - }, - "/subscriptions/{subscriptionId}/providers/Microsoft.Billing/billingAccounts/default/lineOfCredit/default/increase": { - "post": { + }, + "put": { "tags": [ "LineOfCredits" ], @@ -3326,7 +3324,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/IncreaseLineOfCreditRequestProperties" + "$ref": "#/definitions/LineOfCredit" }, "description": "Parameters supplied to the increase line of credit operation." } @@ -5517,8 +5515,7 @@ "properties": { "creditLimit": { "description": "The current credit limit.", - "$ref": "#/definitions/Amount", - "readOnly": true + "$ref": "#/definitions/Amount" }, "reason": { "description": "The reason for the line of credit status when not approved.", @@ -5544,16 +5541,6 @@ } } }, - "IncreaseLineOfCreditRequestProperties": { - "type": "object", - "description": "Request parameters to increase line of credit.", - "properties": { - "desiredCreditLimit": { - "description": "The desired credit limit.", - "type": "number" - } - } - }, "Action": { "description": "the action the caller allowed to do", "type": "string", diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/IncreaseLineOfCreditBySubscription.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/IncreaseLineOfCreditBySubscription.json index 7578ccd7f53a..1f774348c076 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/IncreaseLineOfCreditBySubscription.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/IncreaseLineOfCreditBySubscription.json @@ -3,7 +3,11 @@ "api-version": "2018-11-01-preview", "subscriptionId": "{subscriptionId}", "parameters": { - "desiredCreditLimit": 10000 + "properties": { + "creditLimit": { + "value": 20000.00 + } + } } }, "responses": { From dd4cb506251f5a5209ec0f79d80cd0cbec3ee667 Mon Sep 17 00:00:00 2001 From: asarkar84 <33848291+asarkar84@users.noreply.github.com> Date: Wed, 29 May 2019 21:07:29 -0700 Subject: [PATCH 24/27] Updated the operation id --- .../Microsoft.Billing/preview/2018-11-01-preview/billing.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 a25901bbda5d..0cd34cbd5c9c 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 @@ -3301,7 +3301,7 @@ "tags": [ "LineOfCredits" ], - "operationId": "LineOfCredits_Increase", + "operationId": "LineOfCredits_Update", "x-ms-long-running-operation": true, "x-ms-long-running-operation-options": { "final-state-via": "location" From 1db7d6a963b5cb1642343d397de70aaf6373c7c3 Mon Sep 17 00:00:00 2001 From: asarkar84 <33848291+asarkar84@users.noreply.github.com> Date: Thu, 30 May 2019 12:00:04 -0700 Subject: [PATCH 25/27] Fixed errors --- .../Microsoft.Billing/preview/2018-11-01-preview/billing.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 0cd34cbd5c9c..6c39b016e6c8 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 @@ -5098,8 +5098,7 @@ }, "value": { "description": "Amount value.", - "type": "number", - "readOnly": true + "type": "number" } } }, From 8049885968550a64f973b8a2b620f6b28c4b0c9f Mon Sep 17 00:00:00 2001 From: asarkar84 <33848291+asarkar84@users.noreply.github.com> Date: Thu, 30 May 2019 12:27:03 -0700 Subject: [PATCH 26/27] Fixed errors --- .../preview/2018-11-01-preview/billing.json | 18 ++++++++- .../examples/CreateInvoiceSection.json | 38 +------------------ .../examples/UpdateBillingProfile.json | 3 +- 3 files changed, 18 insertions(+), 41 deletions(-) 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 6c39b016e6c8..92cbbfb16575 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 @@ -452,7 +452,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/InvoiceSectionProperties" + "$ref": "#/definitions/InvoiceSectionCreationRequest" }, "description": "Parameters supplied to the Create InvoiceSection operation." } @@ -4298,6 +4298,19 @@ } } }, + "InvoiceSectionCreationRequest": { + "description": "The properties of an InvoiceSection.", + "properties": { + "displayName": { + "description": "The name of the InvoiceSection.", + "type": "string" + }, + "billingProfileId": { + "description": "The billing profile id.", + "type": "string" + } + } + }, "InvoiceSectionListResult": { "description": "Result of listing invoice sections.", "properties": { @@ -5514,7 +5527,8 @@ "properties": { "creditLimit": { "description": "The current credit limit.", - "$ref": "#/definitions/Amount" + "$ref": "#/definitions/Amount", + "readOnly": false }, "reason": { "description": "The reason for the line of credit status when not approved.", 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 8ae4027a6062..18115ac60ade 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 @@ -4,43 +4,7 @@ "billingAccountName": "{billingAccountName}", "parameters": { "displayName": "invoiceSection1", - "billingProfiles": [ - { - "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000", - "name": "11000000-0000-0000-0000-000000000000", - "type": "Microsoft.Billing/billingProfiles", - "properties": { - "displayName": "BillingProfile1", - "address": { - "companyName": "Contoso", - "firstName": "Test", - "lastName": "User", - "addressLine1": "Test Address1", - "addressLine2": "Test Address2", - "addressLine3": "Test Address3", - "city": "City", - "postalCode": "00000", - "region": "WA", - "country": "US" - }, - "currency": "USD", - "enabledAzureSKUs": [ - { - "skuId": "0001", - "skuDescription": "Microsoft Azure Dev/Test" - }, - { - "skuId": "0002", - "skuDescription": "Microsoft Azure Standard" - } - ], - "isClassic": false, - "invoiceDay": 5, - "invoiceEmailOptIn": true, - "poNumber": "ABC12345" - } - } - ] + "billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000" } }, "responses": { 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 7ac6eef2413b..f4599bd453b7 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 @@ -6,8 +6,7 @@ "parameters": { "properties": { "displayName": "BillingProfile11", - "poNumber": "ABC12345", - "isClassic": false + "poNumber": "ABC12345" } } }, From d7c7b77577ba8f929f2468122ff00fca7cc49753 Mon Sep 17 00:00:00 2001 From: asarkar84 <33848291+asarkar84@users.noreply.github.com> Date: Thu, 30 May 2019 12:33:59 -0700 Subject: [PATCH 27/27] Fixed error Fixed error --- .../preview/2018-11-01-preview/billing.json | 8 +++----- .../examples/AddRoleAssignmentToBillingAccount.json | 2 +- .../examples/AddRoleAssignmentToBillingProfile.json | 2 +- .../examples/AddRoleAssignmentToInvoiceSection.json | 2 +- 4 files changed, 6 insertions(+), 8 deletions(-) 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 92cbbfb16575..3eadd91378b2 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 @@ -5254,13 +5254,11 @@ "properties": { "principalId": { "description": "The user's principal id that the role gets assigned to", - "type": "string", - "readOnly": true + "type": "string" }, - "billingRoleDefinitionName": { + "billingRoleDefinitionId": { "description": "The role definition id", - "type": "string", - "readOnly": true + "type": "string" } } }, 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 eb49ecf69253..ce7497ed96d7 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": "00000000-0000-0000-0000-000000000000", - "billingRoleDefinitionName": "10000000-aaaa-bbbb-cccc-100000000000" + "billingRoleDefinitionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/providers/Microsoft.Billing/billingRoleDefinition/10000000-aaaa-bbbb-cccc-100000000000" } }, "responses": { 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 cd517a9f64e0..620efb6d2376 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": "00000000-0000-0000-0000-000000000000", - "billingRoleDefinitionName": "10000000-aaaa-bbbb-cccc-100000000000" + "billingRoleDefinitionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/providers/Microsoft.Billing/billingRoleDefinition/10000000-aaaa-bbbb-cccc-100000000000" } }, "responses": { 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 147fc6e98e1b..dd28f30193fb 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": "00000000-0000-0000-0000-000000000000", - "billingRoleDefinitionName": "10000000-aaaa-bbbb-cccc-100000000000" + "billingRoleDefinitionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionName}/providers/Microsoft.Billing/billingRoleDefinition/10000000-aaaa-bbbb-cccc-100000000000" } }, "responses": {