Corrected specs and examples for BillingRP (#5682)

* Added specs for Agreements API in version 2018-11-01-preview Added specs for Agreements API in version 2018-11-01-preview * Updated as per naming convension Updated as per naming convension * Corrected specs and examples for BillingRP Corrected specs and examples for BillingRP * Fixed the errors Fixed the errors * Fixing errors in spec Fixing errors in spec * Updated examples Updated examples * Incorporated review comments Incorporated review comments * Incorporated review comments * Incorporated review comments Incorporated review comments
Azure · Apr 18, 2019 · 989b7b1 · 989b7b1
1 parent ba3d021
commit 989b7b1
Show file tree

Hide file tree

Showing 80 changed files with 1,072 additions and 1,034 deletions.
diff --git a/...cation/billing/resource-manager/Microsoft.Billing/preview/2018-11-01-preview/billing.json b/...cation/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"
@@ -3581,7 +3541,7 @@
     "TransferProductRequestProperties": {
       "description": "The properties of the product to initiate a transfer.",
       "properties": {
-        "destinationInvoiceSectionName": {
+        "destinationInvoiceSectionId": {
           "description": "Destination invoice section id.",
           "type": "string"
         }
@@ -3623,9 +3583,9 @@
       "type": "object",
       "description": "Request parameters to transfer billing subscription.",
       "properties": {
-        "destinationInvoiceSectionName": {
+        "destinationInvoiceSectionId": {
           "type": "string",
-          "description": "The destination invoiceSectionName."
+          "description": "The destination invoice section id."
         }
       }
     },
@@ -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,25 @@
           "description": "The address associated with billing account.",
           "$ref": "#/definitions/Address"
         },
+        "company": {
+          "description": "Company Name.",
+          "type": "string",
+          "readOnly": true
+        },
         "country": {
-          "description": "The country associated with billing account..",
+          "description": "Country Name.",
           "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,17 +3708,33 @@
           "items": {
             "$ref": "#/definitions/EnrollmentAccount"
           }
+        },
+        "hasReadAccess": {
+          "description": "Specifies whether the user has read access on billing account.",
+          "type": "boolean",
+          "readOnly": true
         }
       }
     },
     "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": {
-          "description": "Product Id.",
-          "type": "string",
-          "readOnly": true
-        },
         "billingTenantId": {
           "description": "Billing tenant Id.",
           "type": "string",
@@ -3784,6 +3760,11 @@
           "type": "string",
           "readOnly": true
         },
+        "costCenter": {
+          "description": "Cost center name.",
+          "type": "string",
+          "readOnly": true
+        },
         "invoiceSectionId": {
           "description": "Invoice Section Id.",
           "type": "string",
@@ -3794,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",
@@ -4053,7 +4044,7 @@
           "description": "Purchase order number.",
           "type": "string"
         },
-        "billingAddress": {
+        "address": {
           "description": "Billing address.",
           "$ref": "#/definitions/Address"
         },
@@ -4189,11 +4180,12 @@
       }
     },
     "EnabledAzureSKUs": {
-      "description": "Details about the product.",
+      "description": "Details about the enabled azure sku.",
       "properties": {
         "skuId": {
           "description": "The sku id.",
-          "type": "string"
+          "type": "string",
+          "readOnly": true
         },
         "skuDescription": {
           "description": "The sku description.",
@@ -4369,13 +4361,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 +4662,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 +4672,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 +4786,11 @@
           "type": "string",
           "readOnly": true
         },
+        "productFamily": {
+          "description": "The product family.",
+          "type": "string",
+          "readOnly": true
+        },
         "productTypeId": {
           "description": "The product type id.",
           "type": "string",
@@ -4877,12 +4879,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 +4971,7 @@
     "PaymentMethodProperties": {
       "description": "The properties of the payment method.",
       "properties": {
-        "methodType": {
+        "paymentMethodType": {
           "description": "Payment method type.",
           "type": "string",
           "enum": [

diff --git a/...esource-manager/Microsoft.Billing/preview/2018-11-01-preview/examples/AcceptTransfer.json b/...esource-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": {
@@ -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/...rosoft.Billing/preview/2018-11-01-preview/examples/AddRoleAssignmentToBillingAccount.json b/...rosoft.Billing/preview/2018-11-01-preview/examples/AddRoleAssignmentToBillingAccount.json
@@ -1,9 +1,9 @@
 {
     "parameters": {
-      "api-version": "2018-08-01-preview",
+      "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"
                     }