From b53a498fc9a1e13fa97fae14020693ed70f83423 Mon Sep 17 00:00:00 2001 From: Anirban Sarkar <33848291+asarkar84@users.noreply.github.com> Date: Tue, 4 Feb 2020 16:04:23 -0800 Subject: [PATCH] [BillingRP] Correcting the API response as per the actual implementation. Removing LineOfCredit API from 2019 version, it was never supported. (#8290) * Added missing fields and corrected enum values as per actual implementation * Removing unsupported LineOfCredit API Removing unsupported LineOfCredit API * Delete IncreaseLineOfCreditBySubscription.json --- .../preview/2019-10-01-preview/billing.json | 161 ++---------------- .../examples/BillingSubscriptionInvoice.json | 7 +- .../BillingSubscriptionInvoicesList.json | 8 +- .../IncreaseLineOfCreditBySubscription.json | 41 ----- .../InvoicesListByBillingProfile.json | 2 +- .../examples/LineOfCreditBySubscription.json | 27 --- 6 files changed, 23 insertions(+), 223 deletions(-) delete mode 100644 specification/billing/resource-manager/Microsoft.Billing/preview/2019-10-01-preview/examples/IncreaseLineOfCreditBySubscription.json delete mode 100644 specification/billing/resource-manager/Microsoft.Billing/preview/2019-10-01-preview/examples/LineOfCreditBySubscription.json diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2019-10-01-preview/billing.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2019-10-01-preview/billing.json index 4974a8a75dc8..51db4fb34e87 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2019-10-01-preview/billing.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2019-10-01-preview/billing.json @@ -4592,102 +4592,6 @@ } } } - }, - "/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" - } - } - } - }, - "put": { - "tags": [ - "LineOfCredits" - ], - "operationId": "LineOfCredits_Update", - "x-ms-long-running-operation": true, - "x-ms-long-running-operation-options": { - "final-state-via": "location" - }, - "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/LineOfCredit" - }, - "description": "Parameters supplied to the increase line of credit operation." - } - ], - "responses": { - "200": { - "description": "OK. The request has succeeded.", - "schema": { - "$ref": "#/definitions/LineOfCredit" - } - }, - "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" - } - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "#/definitions/ErrorResponse" - } - } - } - } } }, "definitions": { @@ -5833,6 +5737,11 @@ "description": "The date this billing instruction is no longer in effect.", "type": "string", "format": "date-time" + }, + "creationDate": { + "description": "The date this billing instruction was created.", + "type": "string", + "format": "date-time" } } }, @@ -6281,10 +6190,9 @@ "description": "Invoice status.", "type": "string", "enum": [ - "PastDue", "Due", - "Paid", - "Void" + "OverDue", + "Paid" ], "readOnly": true, "x-ms-enum": { @@ -6357,6 +6265,11 @@ "items": { "$ref": "#/definitions/PaymentProperties" } + }, + "subscriptionId": { + "description": "The subscription id this invoice belongs to.", + "type": "string", + "readOnly": true } } }, @@ -6409,7 +6322,7 @@ "enum": [ "Invoice", "VoidNote", - "Receipt", + "TaxReceipt", "CreditNote" ], "readOnly": true, @@ -7606,54 +7519,6 @@ } } }, - "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": false - }, - "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", - "enum": [ - "Approved", - "Rejected" - ], - "x-ms-enum": { - "name": "status", - "modelAsString": true - } - } - } - }, "Action": { "description": "the action the caller allowed to do", "type": "string", diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2019-10-01-preview/examples/BillingSubscriptionInvoice.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2019-10-01-preview/examples/BillingSubscriptionInvoice.json index 2069af1a1bbc..d830d356aa1e 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2019-10-01-preview/examples/BillingSubscriptionInvoice.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2019-10-01-preview/examples/BillingSubscriptionInvoice.json @@ -14,7 +14,7 @@ "properties": { "dueDate": "2018-03-01T17:32:28Z", "invoiceDate": "2018-02-01T17:32:28Z", - "status": "PastDue", + "status": "Paid", "amountDue": { "currency": "USD", "value": 2000.00 @@ -46,9 +46,10 @@ "paymentMethodFamily": "CreditCard", "paymentMethodType": "visa" } - ] + ], + "subscriptionId": "55000000-0000-0000-0000-000000000011" } - } + } } } } diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2019-10-01-preview/examples/BillingSubscriptionInvoicesList.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2019-10-01-preview/examples/BillingSubscriptionInvoicesList.json index dcdf47e35401..7341d584d273 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2019-10-01-preview/examples/BillingSubscriptionInvoicesList.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2019-10-01-preview/examples/BillingSubscriptionInvoicesList.json @@ -25,7 +25,8 @@ "invoicePeriodStartDate": "2018-01-01T17:32:28Z", "invoicePeriodEndDate": "2018-01-15T17:32:28Z", "invoiceType": "AzureServices", - "purchaseOrderNumber": "123456" + "purchaseOrderNumber": "123456", + "subscriptionId": "55000000-0000-0000-0000-000000000011" } }, { @@ -35,7 +36,7 @@ "properties": { "dueDate": "2018-03-01T17:32:28Z", "invoiceDate": "2018-02-01T17:32:28Z", - "status": "PastDue", + "status": "Paid", "amountDue": { "currency": "USD", "value": 2000.00 @@ -67,7 +68,8 @@ "paymentMethodFamily": "CreditCard", "paymentMethodType": "visa" } - ] + ], + "subscriptionId": "55000000-0000-0000-0000-000000000011" } } ] diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2019-10-01-preview/examples/IncreaseLineOfCreditBySubscription.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2019-10-01-preview/examples/IncreaseLineOfCreditBySubscription.json deleted file mode 100644 index ba785726b009..000000000000 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2019-10-01-preview/examples/IncreaseLineOfCreditBySubscription.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "parameters": { - "api-version": "2019-10-01-preview", - "subscriptionId": "{subscriptionId}", - "parameters": { - "properties": { - "creditLimit": { - "value": 20000.00 - } - } - } - }, - "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=2019-10-01-preview", - "Retry-After": "60", - "OData-EntityId": "44000000-0000-0000-0000-000000000000" - } - } - } -} diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2019-10-01-preview/examples/InvoicesListByBillingProfile.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2019-10-01-preview/examples/InvoicesListByBillingProfile.json index 5f62c236eeba..ebddfc84b77b 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2019-10-01-preview/examples/InvoicesListByBillingProfile.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2019-10-01-preview/examples/InvoicesListByBillingProfile.json @@ -67,7 +67,7 @@ "properties": { "dueDate": "2018-03-01T17:32:28Z", "invoiceDate": "2018-01-01T17:32:28Z", - "status": "PastDue", + "status": "Due", "amountDue": { "currency": "USD", "value": 2000.00 diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2019-10-01-preview/examples/LineOfCreditBySubscription.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2019-10-01-preview/examples/LineOfCreditBySubscription.json deleted file mode 100644 index 8e1fb4a25ff5..000000000000 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2019-10-01-preview/examples/LineOfCreditBySubscription.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "parameters": { - "api-version": "2019-10-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" - } - } - } - } -}