[AutoPR billing/resource-manager] Corrected specs and examples for BillingRP

azure-mgmt-billing/azure/mgmt/billing/billing_management_client.py

@@ -18,7 +18,6 @@
 from msrestazure.polling.arm_polling import ARMPolling
 import uuid
 from .operations.billing_accounts_operations import BillingAccountsOperations
-from .operations.billing_accounts_with_create_invoice_section_permission_operations import BillingAccountsWithCreateInvoiceSectionPermissionOperations
 from .operations.available_balance_by_billing_profile_operations import AvailableBalanceByBillingProfileOperations
 from .operations.payment_methods_by_billing_profile_operations import PaymentMethodsByBillingProfileOperations
 from .operations.billing_profiles_by_billing_account_name_operations import BillingProfilesByBillingAccountNameOperations
@@ -102,8 +101,6 @@ class BillingManagementClient(SDKClient):
 
     :ivar billing_accounts: BillingAccounts operations
     :vartype billing_accounts: azure.mgmt.billing.operations.BillingAccountsOperations
-    :ivar billing_accounts_with_create_invoice_section_permission: BillingAccountsWithCreateInvoiceSectionPermission operations
-    :vartype billing_accounts_with_create_invoice_section_permission: azure.mgmt.billing.operations.BillingAccountsWithCreateInvoiceSectionPermissionOperations
     :ivar available_balance_by_billing_profile: AvailableBalanceByBillingProfile operations
     :vartype available_balance_by_billing_profile: azure.mgmt.billing.operations.AvailableBalanceByBillingProfileOperations
     :ivar payment_methods_by_billing_profile: PaymentMethodsByBillingProfile operations
@@ -206,8 +203,6 @@ def __init__(
 
         self.billing_accounts = BillingAccountsOperations(
             self._client, self.config, self._serialize, self._deserialize)
-        self.billing_accounts_with_create_invoice_section_permission = BillingAccountsWithCreateInvoiceSectionPermissionOperations(
-            self._client, self.config, self._serialize, self._deserialize)
         self.available_balance_by_billing_profile = AvailableBalanceByBillingProfileOperations(
             self._client, self.config, self._serialize, self._deserialize)
         self.payment_methods_by_billing_profile = PaymentMethodsByBillingProfileOperations(

azure-mgmt-billing/azure/mgmt/billing/models/__init__.py

@@ -50,9 +50,9 @@
     from .invoice_list_result_py3 import InvoiceListResult
     from .product_summary_py3 import ProductSummary
     from .products_list_result_py3 import ProductsListResult
-    from .enrollment_account_context_py3 import EnrollmentAccountContext
     from .billing_subscription_summary_py3 import BillingSubscriptionSummary
     from .billing_subscriptions_list_result_py3 import BillingSubscriptionsListResult
+    from .enrollment_account_context_py3 import EnrollmentAccountContext
     from .transactions_summary_py3 import TransactionsSummary
     from .transactions_list_result_py3 import TransactionsListResult
     from .policy_py3 import Policy
@@ -112,9 +112,9 @@
     from .invoice_list_result import InvoiceListResult
     from .product_summary import ProductSummary
     from .products_list_result import ProductsListResult
-    from .enrollment_account_context import EnrollmentAccountContext
     from .billing_subscription_summary import BillingSubscriptionSummary
     from .billing_subscriptions_list_result import BillingSubscriptionsListResult
+    from .enrollment_account_context import EnrollmentAccountContext
     from .transactions_summary import TransactionsSummary
     from .transactions_list_result import TransactionsListResult
     from .policy import Policy
@@ -195,9 +195,9 @@
     'InvoiceListResult',
     'ProductSummary',
     'ProductsListResult',
-    'EnrollmentAccountContext',
     'BillingSubscriptionSummary',
     'BillingSubscriptionsListResult',
+    'EnrollmentAccountContext',
     'TransactionsSummary',
     'TransactionsListResult',
     'Policy',

azure-mgmt-billing/azure/mgmt/billing/models/billing_account.py

@@ -26,20 +26,22 @@ class BillingAccount(Resource):
     :vartype type: str
     :ivar display_name: The billing account name.
     :vartype display_name: str
-    :ivar company: The Company this billing account belongs to.
-    :vartype company: str
     :ivar account_type: The billing account Type. Possible values include:
      'Organization', 'Enrollment'
     :vartype account_type: str or ~azure.mgmt.billing.models.enum
     :param address: The address associated with billing account.
     :type address: ~azure.mgmt.billing.models.Address
-    :ivar country: The country associated with billing account..
+    :ivar company: Company Name.
+    :vartype company: str
+    :ivar country: Country Name.
     :vartype country: str
     :param invoice_sections: The invoice sections associated to the billing
-     account.
+     account. By default this is not populated, unless it's specified in
+     $expand.
     :type invoice_sections: list[~azure.mgmt.billing.models.InvoiceSection]
     :param billing_profiles: The billing profiles associated to the billing
-     account.
+     account. By default this is not populated, unless it's specified in
+     $expand.
     :type billing_profiles: list[~azure.mgmt.billing.models.BillingProfile]
     :ivar enrollment_details: The details about the associated legacy
      enrollment. By default this is not populated, unless it's specified in
@@ -50,44 +52,50 @@ class BillingAccount(Resource):
     :param enrollment_accounts: The accounts associated to the enrollment.
     :type enrollment_accounts:
      list[~azure.mgmt.billing.models.EnrollmentAccount]
+    :ivar has_read_access: Specifies whether the user has read access on
+     billing account.
+    :vartype has_read_access: bool
     """
 
     _validation = {
         'id': {'readonly': True},
         'name': {'readonly': True},
         'type': {'readonly': True},
         'display_name': {'readonly': True},
-        'company': {'readonly': True},
         'account_type': {'readonly': True},
+        'company': {'readonly': True},
         'country': {'readonly': True},
         'enrollment_details': {'readonly': True},
+        'has_read_access': {'readonly': True},
     }
 
     _attribute_map = {
         'id': {'key': 'id', 'type': 'str'},
         'name': {'key': 'name', 'type': 'str'},
         'type': {'key': 'type', 'type': 'str'},
         'display_name': {'key': 'properties.displayName', 'type': 'str'},
-        'company': {'key': 'properties.company', 'type': 'str'},
         'account_type': {'key': 'properties.accountType', 'type': 'str'},
         'address': {'key': 'properties.address', 'type': 'Address'},
+        'company': {'key': 'properties.company', 'type': 'str'},
         'country': {'key': 'properties.country', 'type': 'str'},
         'invoice_sections': {'key': 'properties.invoiceSections', 'type': '[InvoiceSection]'},
         'billing_profiles': {'key': 'properties.billingProfiles', 'type': '[BillingProfile]'},
         'enrollment_details': {'key': 'properties.enrollmentDetails', 'type': 'Enrollment'},
         'departments': {'key': 'properties.departments', 'type': '[Department]'},
         'enrollment_accounts': {'key': 'properties.enrollmentAccounts', 'type': '[EnrollmentAccount]'},
+        'has_read_access': {'key': 'properties.hasReadAccess', 'type': 'bool'},
     }
 
     def __init__(self, **kwargs):
         super(BillingAccount, self).__init__(**kwargs)
         self.display_name = None
-        self.company = None
         self.account_type = None
         self.address = kwargs.get('address', None)
+        self.company = None
         self.country = None
         self.invoice_sections = kwargs.get('invoice_sections', None)
         self.billing_profiles = kwargs.get('billing_profiles', None)
         self.enrollment_details = None
         self.departments = kwargs.get('departments', None)
         self.enrollment_accounts = kwargs.get('enrollment_accounts', None)
+        self.has_read_access = None

azure-mgmt-billing/azure/mgmt/billing/models/billing_account_py3.py

@@ -26,20 +26,22 @@ class BillingAccount(Resource):
     :vartype type: str
     :ivar display_name: The billing account name.
     :vartype display_name: str
-    :ivar company: The Company this billing account belongs to.
-    :vartype company: str
     :ivar account_type: The billing account Type. Possible values include:
      'Organization', 'Enrollment'
     :vartype account_type: str or ~azure.mgmt.billing.models.enum
     :param address: The address associated with billing account.
     :type address: ~azure.mgmt.billing.models.Address
-    :ivar country: The country associated with billing account..
+    :ivar company: Company Name.
+    :vartype company: str
+    :ivar country: Country Name.
     :vartype country: str
     :param invoice_sections: The invoice sections associated to the billing
-     account.
+     account. By default this is not populated, unless it's specified in
+     $expand.
     :type invoice_sections: list[~azure.mgmt.billing.models.InvoiceSection]
     :param billing_profiles: The billing profiles associated to the billing
-     account.
+     account. By default this is not populated, unless it's specified in
+     $expand.
     :type billing_profiles: list[~azure.mgmt.billing.models.BillingProfile]
     :ivar enrollment_details: The details about the associated legacy
      enrollment. By default this is not populated, unless it's specified in
@@ -50,44 +52,50 @@ class BillingAccount(Resource):
     :param enrollment_accounts: The accounts associated to the enrollment.
     :type enrollment_accounts:
      list[~azure.mgmt.billing.models.EnrollmentAccount]
+    :ivar has_read_access: Specifies whether the user has read access on
+     billing account.
+    :vartype has_read_access: bool
     """
 
     _validation = {
         'id': {'readonly': True},
         'name': {'readonly': True},
         'type': {'readonly': True},
         'display_name': {'readonly': True},
-        'company': {'readonly': True},
         'account_type': {'readonly': True},
+        'company': {'readonly': True},
         'country': {'readonly': True},
         'enrollment_details': {'readonly': True},
+        'has_read_access': {'readonly': True},
     }
 
     _attribute_map = {
         'id': {'key': 'id', 'type': 'str'},
         'name': {'key': 'name', 'type': 'str'},
         'type': {'key': 'type', 'type': 'str'},
         'display_name': {'key': 'properties.displayName', 'type': 'str'},
-        'company': {'key': 'properties.company', 'type': 'str'},
         'account_type': {'key': 'properties.accountType', 'type': 'str'},
         'address': {'key': 'properties.address', 'type': 'Address'},
+        'company': {'key': 'properties.company', 'type': 'str'},
         'country': {'key': 'properties.country', 'type': 'str'},
         'invoice_sections': {'key': 'properties.invoiceSections', 'type': '[InvoiceSection]'},
         'billing_profiles': {'key': 'properties.billingProfiles', 'type': '[BillingProfile]'},
         'enrollment_details': {'key': 'properties.enrollmentDetails', 'type': 'Enrollment'},
         'departments': {'key': 'properties.departments', 'type': '[Department]'},
         'enrollment_accounts': {'key': 'properties.enrollmentAccounts', 'type': '[EnrollmentAccount]'},
+        'has_read_access': {'key': 'properties.hasReadAccess', 'type': 'bool'},
     }
 
     def __init__(self, *, address=None, invoice_sections=None, billing_profiles=None, departments=None, enrollment_accounts=None, **kwargs) -> None:
         super(BillingAccount, self).__init__(**kwargs)
         self.display_name = None
-        self.company = None
         self.account_type = None
         self.address = address
+        self.company = None
         self.country = None
         self.invoice_sections = invoice_sections
         self.billing_profiles = billing_profiles
         self.enrollment_details = None
         self.departments = departments
         self.enrollment_accounts = enrollment_accounts
+        self.has_read_access = None

azure-mgmt-billing/azure/mgmt/billing/models/billing_profile.py

@@ -28,8 +28,8 @@ class BillingProfile(Resource):
     :type display_name: str
     :param po_number: Purchase order number.
     :type po_number: str
-    :param billing_address: Billing address.
-    :type billing_address: ~azure.mgmt.billing.models.Address
+    :param address: Billing address.
+    :type address: ~azure.mgmt.billing.models.Address
     :ivar invoice_email_opt_in: If the billing profile is opted in to receive
      invoices via email.
     :vartype invoice_email_opt_in: bool
@@ -63,7 +63,7 @@ class BillingProfile(Resource):
         'type': {'key': 'type', 'type': 'str'},
         'display_name': {'key': 'properties.displayName', 'type': 'str'},
         'po_number': {'key': 'properties.poNumber', 'type': 'str'},
-        'billing_address': {'key': 'properties.billingAddress', 'type': 'Address'},
+        'address': {'key': 'properties.address', 'type': 'Address'},
         'invoice_email_opt_in': {'key': 'properties.invoiceEmailOptIn', 'type': 'bool'},
         'is_classic': {'key': 'properties.isClassic', 'type': 'bool'},
         'invoice_day': {'key': 'properties.invoiceDay', 'type': 'int'},
@@ -76,7 +76,7 @@ def __init__(self, **kwargs):
         super(BillingProfile, self).__init__(**kwargs)
         self.display_name = kwargs.get('display_name', None)
         self.po_number = kwargs.get('po_number', None)
-        self.billing_address = kwargs.get('billing_address', None)
+        self.address = kwargs.get('address', None)
         self.invoice_email_opt_in = None
         self.is_classic = None
         self.invoice_day = None

azure-mgmt-billing/azure/mgmt/billing/models/billing_profile_py3.py

@@ -28,8 +28,8 @@ class BillingProfile(Resource):
     :type display_name: str
     :param po_number: Purchase order number.
     :type po_number: str
-    :param billing_address: Billing address.
-    :type billing_address: ~azure.mgmt.billing.models.Address
+    :param address: Billing address.
+    :type address: ~azure.mgmt.billing.models.Address
     :ivar invoice_email_opt_in: If the billing profile is opted in to receive
      invoices via email.
     :vartype invoice_email_opt_in: bool
@@ -63,7 +63,7 @@ class BillingProfile(Resource):
         'type': {'key': 'type', 'type': 'str'},
         'display_name': {'key': 'properties.displayName', 'type': 'str'},
         'po_number': {'key': 'properties.poNumber', 'type': 'str'},
-        'billing_address': {'key': 'properties.billingAddress', 'type': 'Address'},
+        'address': {'key': 'properties.address', 'type': 'Address'},
         'invoice_email_opt_in': {'key': 'properties.invoiceEmailOptIn', 'type': 'bool'},
         'is_classic': {'key': 'properties.isClassic', 'type': 'bool'},
         'invoice_day': {'key': 'properties.invoiceDay', 'type': 'int'},
@@ -72,11 +72,11 @@ class BillingProfile(Resource):
         'invoice_sections': {'key': 'properties.invoiceSections', 'type': '[InvoiceSection]'},
     }
 
-    def __init__(self, *, display_name: str=None, po_number: str=None, billing_address=None, enabled_azure_sk_us=None, invoice_sections=None, **kwargs) -> None:
+    def __init__(self, *, display_name: str=None, po_number: str=None, address=None, enabled_azure_sk_us=None, invoice_sections=None, **kwargs) -> None:
         super(BillingProfile, self).__init__(**kwargs)
         self.display_name = display_name
         self.po_number = po_number
-        self.billing_address = billing_address
+        self.address = address
         self.invoice_email_opt_in = None
         self.is_classic = None
         self.invoice_day = None

azure-mgmt-billing/azure/mgmt/billing/models/billing_property.py

@@ -9,17 +9,21 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from msrest.serialization import Model
+from .resource import Resource
 
 
-class BillingProperty(Model):
-    """The billing property.
+class BillingProperty(Resource):
+    """A billing property resource.
 
     Variables are only populated by the server, and will be ignored when
     sending a request.
 
-    :ivar product_id: Product Id.
-    :vartype product_id: str
+    :ivar id: Resource Id.
+    :vartype id: str
+    :ivar name: Resource name.
+    :vartype name: str
+    :ivar type: Resource type.
+    :vartype type: str
     :ivar billing_tenant_id: Billing tenant Id.
     :vartype billing_tenant_id: str
     :ivar billing_account_id: Billing account Id.
@@ -30,51 +34,69 @@ class BillingProperty(Model):
     :vartype billing_profile_id: str
     :ivar billing_profile_name: Billing profile name.
     :vartype billing_profile_name: str
+    :ivar cost_center: Cost center name.
+    :vartype cost_center: str
     :ivar invoice_section_id: Invoice Section Id.
     :vartype invoice_section_id: str
     :ivar invoice_section_name: Invoice Section name.
     :vartype invoice_section_name: str
+    :ivar product_id: Product Id.
+    :vartype product_id: str
+    :ivar product_name: Product name.
+    :vartype product_name: str
     :ivar sku_id: SKU Id.
     :vartype sku_id: str
     :ivar sku_description: SKU description.
     :vartype sku_description: str
     """
 
     _validation = {
-        'product_id': {'readonly': True},
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
         'billing_tenant_id': {'readonly': True},
         'billing_account_id': {'readonly': True},
         'billing_account_name': {'readonly': True},
         'billing_profile_id': {'readonly': True},
         'billing_profile_name': {'readonly': True},
+        'cost_center': {'readonly': True},
         'invoice_section_id': {'readonly': True},
         'invoice_section_name': {'readonly': True},
+        'product_id': {'readonly': True},
+        'product_name': {'readonly': True},
         'sku_id': {'readonly': True},
         'sku_description': {'readonly': True},
     }
 
     _attribute_map = {
-        'product_id': {'key': 'productId', 'type': 'str'},
-        'billing_tenant_id': {'key': 'billingTenantId', 'type': 'str'},
-        'billing_account_id': {'key': 'billingAccountId', 'type': 'str'},
-        'billing_account_name': {'key': 'billingAccountName', 'type': 'str'},
-        'billing_profile_id': {'key': 'billingProfileId', 'type': 'str'},
-        'billing_profile_name': {'key': 'billingProfileName', 'type': 'str'},
-        'invoice_section_id': {'key': 'invoiceSectionId', 'type': 'str'},
-        'invoice_section_name': {'key': 'invoiceSectionName', 'type': 'str'},
-        'sku_id': {'key': 'skuId', 'type': 'str'},
-        'sku_description': {'key': 'skuDescription', 'type': 'str'},
+        'id': {'key': 'id', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'type': {'key': 'type', 'type': 'str'},
+        'billing_tenant_id': {'key': 'properties.billingTenantId', 'type': 'str'},
+        'billing_account_id': {'key': 'properties.billingAccountId', 'type': 'str'},
+        'billing_account_name': {'key': 'properties.billingAccountName', 'type': 'str'},
+        'billing_profile_id': {'key': 'properties.billingProfileId', 'type': 'str'},
+        'billing_profile_name': {'key': 'properties.billingProfileName', 'type': 'str'},
+        'cost_center': {'key': 'properties.costCenter', 'type': 'str'},
+        'invoice_section_id': {'key': 'properties.invoiceSectionId', 'type': 'str'},
+        'invoice_section_name': {'key': 'properties.invoiceSectionName', 'type': 'str'},
+        'product_id': {'key': 'properties.productId', 'type': 'str'},
+        'product_name': {'key': 'properties.productName', 'type': 'str'},
+        'sku_id': {'key': 'properties.skuId', 'type': 'str'},
+        'sku_description': {'key': 'properties.skuDescription', 'type': 'str'},
     }
 
     def __init__(self, **kwargs):
         super(BillingProperty, self).__init__(**kwargs)
-        self.product_id = None
         self.billing_tenant_id = None
         self.billing_account_id = None
         self.billing_account_name = None
         self.billing_profile_id = None
         self.billing_profile_name = None
+        self.cost_center = None
         self.invoice_section_id = None
         self.invoice_section_name = None
+        self.product_id = None
+        self.product_name = None
         self.sku_id = None
         self.sku_description = None