diff --git a/azure-mgmt-billing/azure/mgmt/billing/billing_management_client.py b/azure-mgmt-billing/azure/mgmt/billing/billing_management_client.py index bbca6c5568d3..aafbc90ef229 100644 --- a/azure-mgmt-billing/azure/mgmt/billing/billing_management_client.py +++ b/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( diff --git a/azure-mgmt-billing/azure/mgmt/billing/models/__init__.py b/azure-mgmt-billing/azure/mgmt/billing/models/__init__.py index df3bc8c9a5c1..aaa96626717a 100644 --- a/azure-mgmt-billing/azure/mgmt/billing/models/__init__.py +++ b/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', diff --git a/azure-mgmt-billing/azure/mgmt/billing/models/billing_account.py b/azure-mgmt-billing/azure/mgmt/billing/models/billing_account.py index 4769f51c9457..2f36b5ce3732 100644 --- a/azure-mgmt-billing/azure/mgmt/billing/models/billing_account.py +++ b/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,6 +52,9 @@ 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 = { @@ -57,10 +62,11 @@ class BillingAccount(Resource): '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 = { @@ -68,26 +74,28 @@ class BillingAccount(Resource): '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 diff --git a/azure-mgmt-billing/azure/mgmt/billing/models/billing_account_py3.py b/azure-mgmt-billing/azure/mgmt/billing/models/billing_account_py3.py index 06f2f04535b0..5ecccfed7272 100644 --- a/azure-mgmt-billing/azure/mgmt/billing/models/billing_account_py3.py +++ b/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,6 +52,9 @@ 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 = { @@ -57,10 +62,11 @@ class BillingAccount(Resource): '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 = { @@ -68,26 +74,28 @@ class BillingAccount(Resource): '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 diff --git a/azure-mgmt-billing/azure/mgmt/billing/models/billing_profile.py b/azure-mgmt-billing/azure/mgmt/billing/models/billing_profile.py index 9fbb2d68a214..daf0f24078cc 100644 --- a/azure-mgmt-billing/azure/mgmt/billing/models/billing_profile.py +++ b/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 diff --git a/azure-mgmt-billing/azure/mgmt/billing/models/billing_profile_py3.py b/azure-mgmt-billing/azure/mgmt/billing/models/billing_profile_py3.py index d7113faf83f3..4e1feba37af7 100644 --- a/azure-mgmt-billing/azure/mgmt/billing/models/billing_profile_py3.py +++ b/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 diff --git a/azure-mgmt-billing/azure/mgmt/billing/models/billing_property.py b/azure-mgmt-billing/azure/mgmt/billing/models/billing_property.py index 03e1f2c5c142..bb89970c45a4 100644 --- a/azure-mgmt-billing/azure/mgmt/billing/models/billing_property.py +++ b/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,10 +34,16 @@ 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. @@ -41,40 +51,52 @@ class BillingProperty(Model): """ _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 diff --git a/azure-mgmt-billing/azure/mgmt/billing/models/billing_property_py3.py b/azure-mgmt-billing/azure/mgmt/billing/models/billing_property_py3.py index 0334fde90ca7..ab5bcfe3a8ca 100644 --- a/azure-mgmt-billing/azure/mgmt/billing/models/billing_property_py3.py +++ b/azure-mgmt-billing/azure/mgmt/billing/models/billing_property_py3.py @@ -9,17 +9,21 @@ # regenerated. # -------------------------------------------------------------------------- -from msrest.serialization import Model +from .resource_py3 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,10 +34,16 @@ 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. @@ -41,40 +51,52 @@ class BillingProperty(Model): """ _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) -> None: 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 diff --git a/azure-mgmt-billing/azure/mgmt/billing/models/billing_subscription_summary.py b/azure-mgmt-billing/azure/mgmt/billing/models/billing_subscription_summary.py index 3aaab43349f8..2bc957b75bd3 100644 --- a/azure-mgmt-billing/azure/mgmt/billing/models/billing_subscription_summary.py +++ b/azure-mgmt-billing/azure/mgmt/billing/models/billing_subscription_summary.py @@ -36,15 +36,18 @@ class BillingSubscriptionSummary(Resource): :vartype last_month_charges: ~azure.mgmt.billing.models.Amount :ivar month_to_date_charges: Month to date charges. :vartype month_to_date_charges: ~azure.mgmt.billing.models.Amount - :ivar enrollment_account_context: The enrollment account context. - :vartype enrollment_account_context: - ~azure.mgmt.billing.models.EnrollmentAccountContext :ivar billing_profile_id: Billing Profile id to which this product belongs. :vartype billing_profile_id: str :ivar billing_profile_name: Billing Profile name to which this product belongs. :vartype billing_profile_name: str + :ivar invoice_section_id: Invoice section id to which this product + belongs. + :vartype invoice_section_id: str + :ivar invoice_section_name: Invoice section name to which this product + belongs. + :vartype invoice_section_name: str :param sku_id: The sku id. :type sku_id: str :ivar sku_description: The sku description. @@ -59,9 +62,10 @@ class BillingSubscriptionSummary(Resource): 'subscription_id': {'readonly': True}, 'last_month_charges': {'readonly': True}, 'month_to_date_charges': {'readonly': True}, - 'enrollment_account_context': {'readonly': True}, 'billing_profile_id': {'readonly': True}, 'billing_profile_name': {'readonly': True}, + 'invoice_section_id': {'readonly': True}, + 'invoice_section_name': {'readonly': True}, 'sku_description': {'readonly': True}, } @@ -74,9 +78,10 @@ class BillingSubscriptionSummary(Resource): 'subscription_billing_status': {'key': 'properties.subscriptionBillingStatus', 'type': 'str'}, 'last_month_charges': {'key': 'properties.lastMonthCharges', 'type': 'Amount'}, 'month_to_date_charges': {'key': 'properties.monthToDateCharges', 'type': 'Amount'}, - 'enrollment_account_context': {'key': 'properties.enrollmentAccountContext', 'type': 'EnrollmentAccountContext'}, 'billing_profile_id': {'key': 'properties.billingProfileId', 'type': 'str'}, 'billing_profile_name': {'key': 'properties.billingProfileName', 'type': 'str'}, + 'invoice_section_id': {'key': 'properties.invoiceSectionId', 'type': 'str'}, + 'invoice_section_name': {'key': 'properties.invoiceSectionName', 'type': 'str'}, 'sku_id': {'key': 'properties.skuId', 'type': 'str'}, 'sku_description': {'key': 'properties.skuDescription', 'type': 'str'}, } @@ -88,8 +93,9 @@ def __init__(self, **kwargs): self.subscription_billing_status = kwargs.get('subscription_billing_status', None) self.last_month_charges = None self.month_to_date_charges = None - self.enrollment_account_context = None self.billing_profile_id = None self.billing_profile_name = None + self.invoice_section_id = None + self.invoice_section_name = None self.sku_id = kwargs.get('sku_id', None) self.sku_description = None diff --git a/azure-mgmt-billing/azure/mgmt/billing/models/billing_subscription_summary_py3.py b/azure-mgmt-billing/azure/mgmt/billing/models/billing_subscription_summary_py3.py index 38234f197df2..be61f23b614f 100644 --- a/azure-mgmt-billing/azure/mgmt/billing/models/billing_subscription_summary_py3.py +++ b/azure-mgmt-billing/azure/mgmt/billing/models/billing_subscription_summary_py3.py @@ -36,15 +36,18 @@ class BillingSubscriptionSummary(Resource): :vartype last_month_charges: ~azure.mgmt.billing.models.Amount :ivar month_to_date_charges: Month to date charges. :vartype month_to_date_charges: ~azure.mgmt.billing.models.Amount - :ivar enrollment_account_context: The enrollment account context. - :vartype enrollment_account_context: - ~azure.mgmt.billing.models.EnrollmentAccountContext :ivar billing_profile_id: Billing Profile id to which this product belongs. :vartype billing_profile_id: str :ivar billing_profile_name: Billing Profile name to which this product belongs. :vartype billing_profile_name: str + :ivar invoice_section_id: Invoice section id to which this product + belongs. + :vartype invoice_section_id: str + :ivar invoice_section_name: Invoice section name to which this product + belongs. + :vartype invoice_section_name: str :param sku_id: The sku id. :type sku_id: str :ivar sku_description: The sku description. @@ -59,9 +62,10 @@ class BillingSubscriptionSummary(Resource): 'subscription_id': {'readonly': True}, 'last_month_charges': {'readonly': True}, 'month_to_date_charges': {'readonly': True}, - 'enrollment_account_context': {'readonly': True}, 'billing_profile_id': {'readonly': True}, 'billing_profile_name': {'readonly': True}, + 'invoice_section_id': {'readonly': True}, + 'invoice_section_name': {'readonly': True}, 'sku_description': {'readonly': True}, } @@ -74,9 +78,10 @@ class BillingSubscriptionSummary(Resource): 'subscription_billing_status': {'key': 'properties.subscriptionBillingStatus', 'type': 'str'}, 'last_month_charges': {'key': 'properties.lastMonthCharges', 'type': 'Amount'}, 'month_to_date_charges': {'key': 'properties.monthToDateCharges', 'type': 'Amount'}, - 'enrollment_account_context': {'key': 'properties.enrollmentAccountContext', 'type': 'EnrollmentAccountContext'}, 'billing_profile_id': {'key': 'properties.billingProfileId', 'type': 'str'}, 'billing_profile_name': {'key': 'properties.billingProfileName', 'type': 'str'}, + 'invoice_section_id': {'key': 'properties.invoiceSectionId', 'type': 'str'}, + 'invoice_section_name': {'key': 'properties.invoiceSectionName', 'type': 'str'}, 'sku_id': {'key': 'properties.skuId', 'type': 'str'}, 'sku_description': {'key': 'properties.skuDescription', 'type': 'str'}, } @@ -88,8 +93,9 @@ def __init__(self, *, subscription_billing_status=None, sku_id: str=None, **kwar self.subscription_billing_status = subscription_billing_status self.last_month_charges = None self.month_to_date_charges = None - self.enrollment_account_context = None self.billing_profile_id = None self.billing_profile_name = None + self.invoice_section_id = None + self.invoice_section_name = None self.sku_id = sku_id self.sku_description = None diff --git a/azure-mgmt-billing/azure/mgmt/billing/models/enabled_azure_sk_us.py b/azure-mgmt-billing/azure/mgmt/billing/models/enabled_azure_sk_us.py index 234bc54178a6..5eea898a7ca5 100644 --- a/azure-mgmt-billing/azure/mgmt/billing/models/enabled_azure_sk_us.py +++ b/azure-mgmt-billing/azure/mgmt/billing/models/enabled_azure_sk_us.py @@ -13,18 +13,19 @@ class EnabledAzureSKUs(Model): - """Details about the product. + """Details about the enabled azure sku. Variables are only populated by the server, and will be ignored when sending a request. - :param sku_id: The sku id. - :type sku_id: str + :ivar sku_id: The sku id. + :vartype sku_id: str :ivar sku_description: The sku description. :vartype sku_description: str """ _validation = { + 'sku_id': {'readonly': True}, 'sku_description': {'readonly': True}, } @@ -35,5 +36,5 @@ class EnabledAzureSKUs(Model): def __init__(self, **kwargs): super(EnabledAzureSKUs, self).__init__(**kwargs) - self.sku_id = kwargs.get('sku_id', None) + self.sku_id = None self.sku_description = None diff --git a/azure-mgmt-billing/azure/mgmt/billing/models/enabled_azure_sk_us_py3.py b/azure-mgmt-billing/azure/mgmt/billing/models/enabled_azure_sk_us_py3.py index 9fca814fe284..bd031bd7176a 100644 --- a/azure-mgmt-billing/azure/mgmt/billing/models/enabled_azure_sk_us_py3.py +++ b/azure-mgmt-billing/azure/mgmt/billing/models/enabled_azure_sk_us_py3.py @@ -13,18 +13,19 @@ class EnabledAzureSKUs(Model): - """Details about the product. + """Details about the enabled azure sku. Variables are only populated by the server, and will be ignored when sending a request. - :param sku_id: The sku id. - :type sku_id: str + :ivar sku_id: The sku id. + :vartype sku_id: str :ivar sku_description: The sku description. :vartype sku_description: str """ _validation = { + 'sku_id': {'readonly': True}, 'sku_description': {'readonly': True}, } @@ -33,7 +34,7 @@ class EnabledAzureSKUs(Model): 'sku_description': {'key': 'skuDescription', 'type': 'str'}, } - def __init__(self, *, sku_id: str=None, **kwargs) -> None: + def __init__(self, **kwargs) -> None: super(EnabledAzureSKUs, self).__init__(**kwargs) - self.sku_id = sku_id + self.sku_id = None self.sku_description = None diff --git a/azure-mgmt-billing/azure/mgmt/billing/models/invoice_summary.py b/azure-mgmt-billing/azure/mgmt/billing/models/invoice_summary.py index 3698b45764ea..ad984d6e6f83 100644 --- a/azure-mgmt-billing/azure/mgmt/billing/models/invoice_summary.py +++ b/azure-mgmt-billing/azure/mgmt/billing/models/invoice_summary.py @@ -39,9 +39,9 @@ class InvoiceSummary(Resource): :vartype invoice_period_start_date: datetime :ivar invoice_period_end_date: The end date of the billing period. :vartype invoice_period_end_date: datetime - :ivar billing_profile: The profile id which invoice belongs to. - :vartype billing_profile: str - :ivar billing_profile_name: The profile name which invoice belongs to. + :ivar billing_profile_id: The billing profile id this invoice belongs to. + :vartype billing_profile_id: str + :ivar billing_profile_name: The profile name this invoice belongs to. :vartype billing_profile_name: str :ivar purchase_order_number: The purchase identifier for the invoice. :vartype purchase_order_number: str @@ -64,7 +64,7 @@ class InvoiceSummary(Resource): 'billed_amount': {'readonly': True}, 'invoice_period_start_date': {'readonly': True}, 'invoice_period_end_date': {'readonly': True}, - 'billing_profile': {'readonly': True}, + 'billing_profile_id': {'readonly': True}, 'billing_profile_name': {'readonly': True}, 'purchase_order_number': {'readonly': True}, 'document_urls': {'readonly': True}, @@ -82,7 +82,7 @@ class InvoiceSummary(Resource): 'billed_amount': {'key': 'properties.billedAmount', 'type': 'Amount'}, 'invoice_period_start_date': {'key': 'properties.invoicePeriodStartDate', 'type': 'iso-8601'}, 'invoice_period_end_date': {'key': 'properties.invoicePeriodEndDate', 'type': 'iso-8601'}, - 'billing_profile': {'key': 'properties.billingProfile', 'type': 'str'}, + 'billing_profile_id': {'key': 'properties.billingProfileId', 'type': 'str'}, 'billing_profile_name': {'key': 'properties.billingProfileName', 'type': 'str'}, 'purchase_order_number': {'key': 'properties.purchaseOrderNumber', 'type': 'str'}, 'document_urls': {'key': 'properties.documentUrls', 'type': '[DownloadProperties]'}, @@ -98,7 +98,7 @@ def __init__(self, **kwargs): self.billed_amount = None self.invoice_period_start_date = None self.invoice_period_end_date = None - self.billing_profile = None + self.billing_profile_id = None self.billing_profile_name = None self.purchase_order_number = None self.document_urls = None diff --git a/azure-mgmt-billing/azure/mgmt/billing/models/invoice_summary_py3.py b/azure-mgmt-billing/azure/mgmt/billing/models/invoice_summary_py3.py index 0d2a6b98f978..2c49b9a389fa 100644 --- a/azure-mgmt-billing/azure/mgmt/billing/models/invoice_summary_py3.py +++ b/azure-mgmt-billing/azure/mgmt/billing/models/invoice_summary_py3.py @@ -39,9 +39,9 @@ class InvoiceSummary(Resource): :vartype invoice_period_start_date: datetime :ivar invoice_period_end_date: The end date of the billing period. :vartype invoice_period_end_date: datetime - :ivar billing_profile: The profile id which invoice belongs to. - :vartype billing_profile: str - :ivar billing_profile_name: The profile name which invoice belongs to. + :ivar billing_profile_id: The billing profile id this invoice belongs to. + :vartype billing_profile_id: str + :ivar billing_profile_name: The profile name this invoice belongs to. :vartype billing_profile_name: str :ivar purchase_order_number: The purchase identifier for the invoice. :vartype purchase_order_number: str @@ -64,7 +64,7 @@ class InvoiceSummary(Resource): 'billed_amount': {'readonly': True}, 'invoice_period_start_date': {'readonly': True}, 'invoice_period_end_date': {'readonly': True}, - 'billing_profile': {'readonly': True}, + 'billing_profile_id': {'readonly': True}, 'billing_profile_name': {'readonly': True}, 'purchase_order_number': {'readonly': True}, 'document_urls': {'readonly': True}, @@ -82,7 +82,7 @@ class InvoiceSummary(Resource): 'billed_amount': {'key': 'properties.billedAmount', 'type': 'Amount'}, 'invoice_period_start_date': {'key': 'properties.invoicePeriodStartDate', 'type': 'iso-8601'}, 'invoice_period_end_date': {'key': 'properties.invoicePeriodEndDate', 'type': 'iso-8601'}, - 'billing_profile': {'key': 'properties.billingProfile', 'type': 'str'}, + 'billing_profile_id': {'key': 'properties.billingProfileId', 'type': 'str'}, 'billing_profile_name': {'key': 'properties.billingProfileName', 'type': 'str'}, 'purchase_order_number': {'key': 'properties.purchaseOrderNumber', 'type': 'str'}, 'document_urls': {'key': 'properties.documentUrls', 'type': '[DownloadProperties]'}, @@ -98,7 +98,7 @@ def __init__(self, **kwargs) -> None: self.billed_amount = None self.invoice_period_start_date = None self.invoice_period_end_date = None - self.billing_profile = None + self.billing_profile_id = None self.billing_profile_name = None self.purchase_order_number = None self.document_urls = None diff --git a/azure-mgmt-billing/azure/mgmt/billing/models/payment_method.py b/azure-mgmt-billing/azure/mgmt/billing/models/payment_method.py index a9cd09cf9799..b2551b8f4fa2 100644 --- a/azure-mgmt-billing/azure/mgmt/billing/models/payment_method.py +++ b/azure-mgmt-billing/azure/mgmt/billing/models/payment_method.py @@ -24,9 +24,10 @@ class PaymentMethod(Resource): :vartype name: str :ivar type: Resource type. :vartype type: str - :param method_type: Payment method type. Possible values include: + :param payment_method_type: Payment method type. Possible values include: 'Credits', 'ChequeWire' - :type method_type: str or ~azure.mgmt.billing.models.PaymentMethodType + :type payment_method_type: str or + ~azure.mgmt.billing.models.PaymentMethodType :ivar details: Details about the payment method. :vartype details: str :ivar expiration: Expiration date. @@ -48,7 +49,7 @@ class PaymentMethod(Resource): 'id': {'key': 'id', 'type': 'str'}, 'name': {'key': 'name', 'type': 'str'}, 'type': {'key': 'type', 'type': 'str'}, - 'method_type': {'key': 'properties.methodType', 'type': 'str'}, + 'payment_method_type': {'key': 'properties.paymentMethodType', 'type': 'str'}, 'details': {'key': 'properties.details', 'type': 'str'}, 'expiration': {'key': 'properties.expiration', 'type': 'iso-8601'}, 'currency': {'key': 'properties.currency', 'type': 'str'}, @@ -56,7 +57,7 @@ class PaymentMethod(Resource): def __init__(self, **kwargs): super(PaymentMethod, self).__init__(**kwargs) - self.method_type = kwargs.get('method_type', None) + self.payment_method_type = kwargs.get('payment_method_type', None) self.details = None self.expiration = None self.currency = None diff --git a/azure-mgmt-billing/azure/mgmt/billing/models/payment_method_py3.py b/azure-mgmt-billing/azure/mgmt/billing/models/payment_method_py3.py index 6a2e1b485c99..1c4ad14cd61a 100644 --- a/azure-mgmt-billing/azure/mgmt/billing/models/payment_method_py3.py +++ b/azure-mgmt-billing/azure/mgmt/billing/models/payment_method_py3.py @@ -24,9 +24,10 @@ class PaymentMethod(Resource): :vartype name: str :ivar type: Resource type. :vartype type: str - :param method_type: Payment method type. Possible values include: + :param payment_method_type: Payment method type. Possible values include: 'Credits', 'ChequeWire' - :type method_type: str or ~azure.mgmt.billing.models.PaymentMethodType + :type payment_method_type: str or + ~azure.mgmt.billing.models.PaymentMethodType :ivar details: Details about the payment method. :vartype details: str :ivar expiration: Expiration date. @@ -48,15 +49,15 @@ class PaymentMethod(Resource): 'id': {'key': 'id', 'type': 'str'}, 'name': {'key': 'name', 'type': 'str'}, 'type': {'key': 'type', 'type': 'str'}, - 'method_type': {'key': 'properties.methodType', 'type': 'str'}, + 'payment_method_type': {'key': 'properties.paymentMethodType', 'type': 'str'}, 'details': {'key': 'properties.details', 'type': 'str'}, 'expiration': {'key': 'properties.expiration', 'type': 'iso-8601'}, 'currency': {'key': 'properties.currency', 'type': 'str'}, } - def __init__(self, *, method_type=None, **kwargs) -> None: + def __init__(self, *, payment_method_type=None, **kwargs) -> None: super(PaymentMethod, self).__init__(**kwargs) - self.method_type = method_type + self.payment_method_type = payment_method_type self.details = None self.expiration = None self.currency = None diff --git a/azure-mgmt-billing/azure/mgmt/billing/models/policy.py b/azure-mgmt-billing/azure/mgmt/billing/models/policy.py index 3f4d47ed064d..a153f1d3aa8c 100644 --- a/azure-mgmt-billing/azure/mgmt/billing/models/policy.py +++ b/azure-mgmt-billing/azure/mgmt/billing/models/policy.py @@ -24,12 +24,15 @@ class Policy(Resource): :vartype name: str :ivar type: Resource type. :vartype type: str - :param reservation_purchases_allowed: The reservationPurchasesAllowed - flag. - :type reservation_purchases_allowed: bool :param marketplace_purchases_allowed: The marketplacePurchasesAllowed flag. :type marketplace_purchases_allowed: bool + :param reservation_purchases_allowed: The reservationPurchasesAllowed + flag. + :type reservation_purchases_allowed: bool + :param subscription_owner_can_view_charges: The + subscriptionOwnerCanViewCharges flag. + :type subscription_owner_can_view_charges: bool """ _validation = { @@ -42,11 +45,13 @@ class Policy(Resource): 'id': {'key': 'id', 'type': 'str'}, 'name': {'key': 'name', 'type': 'str'}, 'type': {'key': 'type', 'type': 'str'}, - 'reservation_purchases_allowed': {'key': 'properties.reservationPurchasesAllowed', 'type': 'bool'}, 'marketplace_purchases_allowed': {'key': 'properties.marketplacePurchasesAllowed', 'type': 'bool'}, + 'reservation_purchases_allowed': {'key': 'properties.reservationPurchasesAllowed', 'type': 'bool'}, + 'subscription_owner_can_view_charges': {'key': 'properties.subscriptionOwnerCanViewCharges', 'type': 'bool'}, } def __init__(self, **kwargs): super(Policy, self).__init__(**kwargs) - self.reservation_purchases_allowed = kwargs.get('reservation_purchases_allowed', None) self.marketplace_purchases_allowed = kwargs.get('marketplace_purchases_allowed', None) + self.reservation_purchases_allowed = kwargs.get('reservation_purchases_allowed', None) + self.subscription_owner_can_view_charges = kwargs.get('subscription_owner_can_view_charges', None) diff --git a/azure-mgmt-billing/azure/mgmt/billing/models/policy_py3.py b/azure-mgmt-billing/azure/mgmt/billing/models/policy_py3.py index aef3034f2654..6fcb7d8b1561 100644 --- a/azure-mgmt-billing/azure/mgmt/billing/models/policy_py3.py +++ b/azure-mgmt-billing/azure/mgmt/billing/models/policy_py3.py @@ -24,12 +24,15 @@ class Policy(Resource): :vartype name: str :ivar type: Resource type. :vartype type: str - :param reservation_purchases_allowed: The reservationPurchasesAllowed - flag. - :type reservation_purchases_allowed: bool :param marketplace_purchases_allowed: The marketplacePurchasesAllowed flag. :type marketplace_purchases_allowed: bool + :param reservation_purchases_allowed: The reservationPurchasesAllowed + flag. + :type reservation_purchases_allowed: bool + :param subscription_owner_can_view_charges: The + subscriptionOwnerCanViewCharges flag. + :type subscription_owner_can_view_charges: bool """ _validation = { @@ -42,11 +45,13 @@ class Policy(Resource): 'id': {'key': 'id', 'type': 'str'}, 'name': {'key': 'name', 'type': 'str'}, 'type': {'key': 'type', 'type': 'str'}, - 'reservation_purchases_allowed': {'key': 'properties.reservationPurchasesAllowed', 'type': 'bool'}, 'marketplace_purchases_allowed': {'key': 'properties.marketplacePurchasesAllowed', 'type': 'bool'}, + 'reservation_purchases_allowed': {'key': 'properties.reservationPurchasesAllowed', 'type': 'bool'}, + 'subscription_owner_can_view_charges': {'key': 'properties.subscriptionOwnerCanViewCharges', 'type': 'bool'}, } - def __init__(self, *, reservation_purchases_allowed: bool=None, marketplace_purchases_allowed: bool=None, **kwargs) -> None: + def __init__(self, *, marketplace_purchases_allowed: bool=None, reservation_purchases_allowed: bool=None, subscription_owner_can_view_charges: bool=None, **kwargs) -> None: super(Policy, self).__init__(**kwargs) - self.reservation_purchases_allowed = reservation_purchases_allowed self.marketplace_purchases_allowed = marketplace_purchases_allowed + self.reservation_purchases_allowed = reservation_purchases_allowed + self.subscription_owner_can_view_charges = subscription_owner_can_view_charges diff --git a/azure-mgmt-billing/azure/mgmt/billing/models/transactions_summary.py b/azure-mgmt-billing/azure/mgmt/billing/models/transactions_summary.py index 9dd286bb63bb..b614b9deb73d 100644 --- a/azure-mgmt-billing/azure/mgmt/billing/models/transactions_summary.py +++ b/azure-mgmt-billing/azure/mgmt/billing/models/transactions_summary.py @@ -35,6 +35,8 @@ class TransactionsSummary(Resource): :vartype order_id: str :ivar order_name: The reservation order name. :vartype order_name: str + :ivar product_family: The product family. + :vartype product_family: str :ivar product_type_id: The product type id. :vartype product_type_id: str :ivar product_type: The type of product. @@ -74,6 +76,7 @@ class TransactionsSummary(Resource): 'invoice': {'readonly': True}, 'order_id': {'readonly': True}, 'order_name': {'readonly': True}, + 'product_family': {'readonly': True}, 'product_type_id': {'readonly': True}, 'product_type': {'readonly': True}, 'product_description': {'readonly': True}, @@ -96,6 +99,7 @@ class TransactionsSummary(Resource): 'invoice': {'key': 'properties.invoice', 'type': 'str'}, 'order_id': {'key': 'properties.orderId', 'type': 'str'}, 'order_name': {'key': 'properties.orderName', 'type': 'str'}, + 'product_family': {'key': 'properties.productFamily', 'type': 'str'}, 'product_type_id': {'key': 'properties.productTypeId', 'type': 'str'}, 'product_type': {'key': 'properties.productType', 'type': 'str'}, 'product_description': {'key': 'properties.productDescription', 'type': 'str'}, @@ -117,6 +121,7 @@ def __init__(self, **kwargs): self.invoice = None self.order_id = None self.order_name = None + self.product_family = None self.product_type_id = None self.product_type = None self.product_description = None diff --git a/azure-mgmt-billing/azure/mgmt/billing/models/transactions_summary_py3.py b/azure-mgmt-billing/azure/mgmt/billing/models/transactions_summary_py3.py index 7d51ec8bec74..8e438dbdf077 100644 --- a/azure-mgmt-billing/azure/mgmt/billing/models/transactions_summary_py3.py +++ b/azure-mgmt-billing/azure/mgmt/billing/models/transactions_summary_py3.py @@ -35,6 +35,8 @@ class TransactionsSummary(Resource): :vartype order_id: str :ivar order_name: The reservation order name. :vartype order_name: str + :ivar product_family: The product family. + :vartype product_family: str :ivar product_type_id: The product type id. :vartype product_type_id: str :ivar product_type: The type of product. @@ -74,6 +76,7 @@ class TransactionsSummary(Resource): 'invoice': {'readonly': True}, 'order_id': {'readonly': True}, 'order_name': {'readonly': True}, + 'product_family': {'readonly': True}, 'product_type_id': {'readonly': True}, 'product_type': {'readonly': True}, 'product_description': {'readonly': True}, @@ -96,6 +99,7 @@ class TransactionsSummary(Resource): 'invoice': {'key': 'properties.invoice', 'type': 'str'}, 'order_id': {'key': 'properties.orderId', 'type': 'str'}, 'order_name': {'key': 'properties.orderName', 'type': 'str'}, + 'product_family': {'key': 'properties.productFamily', 'type': 'str'}, 'product_type_id': {'key': 'properties.productTypeId', 'type': 'str'}, 'product_type': {'key': 'properties.productType', 'type': 'str'}, 'product_description': {'key': 'properties.productDescription', 'type': 'str'}, @@ -117,6 +121,7 @@ def __init__(self, *, kind=None, transaction_type=None, **kwargs) -> None: self.invoice = None self.order_id = None self.order_name = None + self.product_family = None self.product_type_id = None self.product_type = None self.product_description = None diff --git a/azure-mgmt-billing/azure/mgmt/billing/models/transfer_billing_subscription_request.py b/azure-mgmt-billing/azure/mgmt/billing/models/transfer_billing_subscription_request.py index 6af50002d8cc..db0e4281ef8c 100644 --- a/azure-mgmt-billing/azure/mgmt/billing/models/transfer_billing_subscription_request.py +++ b/azure-mgmt-billing/azure/mgmt/billing/models/transfer_billing_subscription_request.py @@ -15,15 +15,14 @@ class TransferBillingSubscriptionRequest(Model): """Request parameters to transfer billing subscription. - :param destination_invoice_section_name: The destination - invoiceSectionName. - :type destination_invoice_section_name: str + :param destination_invoice_section_id: The destination invoice section id. + :type destination_invoice_section_id: str """ _attribute_map = { - 'destination_invoice_section_name': {'key': 'properties.destinationInvoiceSectionName', 'type': 'str'}, + 'destination_invoice_section_id': {'key': 'properties.destinationInvoiceSectionId', 'type': 'str'}, } def __init__(self, **kwargs): super(TransferBillingSubscriptionRequest, self).__init__(**kwargs) - self.destination_invoice_section_name = kwargs.get('destination_invoice_section_name', None) + self.destination_invoice_section_id = kwargs.get('destination_invoice_section_id', None) diff --git a/azure-mgmt-billing/azure/mgmt/billing/models/transfer_billing_subscription_request_properties.py b/azure-mgmt-billing/azure/mgmt/billing/models/transfer_billing_subscription_request_properties.py index 32e96f842cdf..0f9174df2be3 100644 --- a/azure-mgmt-billing/azure/mgmt/billing/models/transfer_billing_subscription_request_properties.py +++ b/azure-mgmt-billing/azure/mgmt/billing/models/transfer_billing_subscription_request_properties.py @@ -15,15 +15,14 @@ class TransferBillingSubscriptionRequestProperties(Model): """Request parameters to transfer billing subscription. - :param destination_invoice_section_name: The destination - invoiceSectionName. - :type destination_invoice_section_name: str + :param destination_invoice_section_id: The destination invoice section id. + :type destination_invoice_section_id: str """ _attribute_map = { - 'destination_invoice_section_name': {'key': 'destinationInvoiceSectionName', 'type': 'str'}, + 'destination_invoice_section_id': {'key': 'destinationInvoiceSectionId', 'type': 'str'}, } def __init__(self, **kwargs): super(TransferBillingSubscriptionRequestProperties, self).__init__(**kwargs) - self.destination_invoice_section_name = kwargs.get('destination_invoice_section_name', None) + self.destination_invoice_section_id = kwargs.get('destination_invoice_section_id', None) diff --git a/azure-mgmt-billing/azure/mgmt/billing/models/transfer_billing_subscription_request_properties_py3.py b/azure-mgmt-billing/azure/mgmt/billing/models/transfer_billing_subscription_request_properties_py3.py index 95d748e6b66d..ceb12cf89262 100644 --- a/azure-mgmt-billing/azure/mgmt/billing/models/transfer_billing_subscription_request_properties_py3.py +++ b/azure-mgmt-billing/azure/mgmt/billing/models/transfer_billing_subscription_request_properties_py3.py @@ -15,15 +15,14 @@ class TransferBillingSubscriptionRequestProperties(Model): """Request parameters to transfer billing subscription. - :param destination_invoice_section_name: The destination - invoiceSectionName. - :type destination_invoice_section_name: str + :param destination_invoice_section_id: The destination invoice section id. + :type destination_invoice_section_id: str """ _attribute_map = { - 'destination_invoice_section_name': {'key': 'destinationInvoiceSectionName', 'type': 'str'}, + 'destination_invoice_section_id': {'key': 'destinationInvoiceSectionId', 'type': 'str'}, } - def __init__(self, *, destination_invoice_section_name: str=None, **kwargs) -> None: + def __init__(self, *, destination_invoice_section_id: str=None, **kwargs) -> None: super(TransferBillingSubscriptionRequestProperties, self).__init__(**kwargs) - self.destination_invoice_section_name = destination_invoice_section_name + self.destination_invoice_section_id = destination_invoice_section_id diff --git a/azure-mgmt-billing/azure/mgmt/billing/models/transfer_billing_subscription_request_py3.py b/azure-mgmt-billing/azure/mgmt/billing/models/transfer_billing_subscription_request_py3.py index 6d12cbdb86c7..707b9e89ef01 100644 --- a/azure-mgmt-billing/azure/mgmt/billing/models/transfer_billing_subscription_request_py3.py +++ b/azure-mgmt-billing/azure/mgmt/billing/models/transfer_billing_subscription_request_py3.py @@ -15,15 +15,14 @@ class TransferBillingSubscriptionRequest(Model): """Request parameters to transfer billing subscription. - :param destination_invoice_section_name: The destination - invoiceSectionName. - :type destination_invoice_section_name: str + :param destination_invoice_section_id: The destination invoice section id. + :type destination_invoice_section_id: str """ _attribute_map = { - 'destination_invoice_section_name': {'key': 'properties.destinationInvoiceSectionName', 'type': 'str'}, + 'destination_invoice_section_id': {'key': 'properties.destinationInvoiceSectionId', 'type': 'str'}, } - def __init__(self, *, destination_invoice_section_name: str=None, **kwargs) -> None: + def __init__(self, *, destination_invoice_section_id: str=None, **kwargs) -> None: super(TransferBillingSubscriptionRequest, self).__init__(**kwargs) - self.destination_invoice_section_name = destination_invoice_section_name + self.destination_invoice_section_id = destination_invoice_section_id diff --git a/azure-mgmt-billing/azure/mgmt/billing/models/transfer_product_request_properties.py b/azure-mgmt-billing/azure/mgmt/billing/models/transfer_product_request_properties.py index 47ca8b229e97..9feaa795f8f8 100644 --- a/azure-mgmt-billing/azure/mgmt/billing/models/transfer_product_request_properties.py +++ b/azure-mgmt-billing/azure/mgmt/billing/models/transfer_product_request_properties.py @@ -15,14 +15,14 @@ class TransferProductRequestProperties(Model): """The properties of the product to initiate a transfer. - :param destination_invoice_section_name: Destination invoice section id. - :type destination_invoice_section_name: str + :param destination_invoice_section_id: Destination invoice section id. + :type destination_invoice_section_id: str """ _attribute_map = { - 'destination_invoice_section_name': {'key': 'destinationInvoiceSectionName', 'type': 'str'}, + 'destination_invoice_section_id': {'key': 'destinationInvoiceSectionId', 'type': 'str'}, } def __init__(self, **kwargs): super(TransferProductRequestProperties, self).__init__(**kwargs) - self.destination_invoice_section_name = kwargs.get('destination_invoice_section_name', None) + self.destination_invoice_section_id = kwargs.get('destination_invoice_section_id', None) diff --git a/azure-mgmt-billing/azure/mgmt/billing/models/transfer_product_request_properties_py3.py b/azure-mgmt-billing/azure/mgmt/billing/models/transfer_product_request_properties_py3.py index 715e24e5b95b..029af2856f0e 100644 --- a/azure-mgmt-billing/azure/mgmt/billing/models/transfer_product_request_properties_py3.py +++ b/azure-mgmt-billing/azure/mgmt/billing/models/transfer_product_request_properties_py3.py @@ -15,14 +15,14 @@ class TransferProductRequestProperties(Model): """The properties of the product to initiate a transfer. - :param destination_invoice_section_name: Destination invoice section id. - :type destination_invoice_section_name: str + :param destination_invoice_section_id: Destination invoice section id. + :type destination_invoice_section_id: str """ _attribute_map = { - 'destination_invoice_section_name': {'key': 'destinationInvoiceSectionName', 'type': 'str'}, + 'destination_invoice_section_id': {'key': 'destinationInvoiceSectionId', 'type': 'str'}, } - def __init__(self, *, destination_invoice_section_name: str=None, **kwargs) -> None: + def __init__(self, *, destination_invoice_section_id: str=None, **kwargs) -> None: super(TransferProductRequestProperties, self).__init__(**kwargs) - self.destination_invoice_section_name = destination_invoice_section_name + self.destination_invoice_section_id = destination_invoice_section_id diff --git a/azure-mgmt-billing/azure/mgmt/billing/operations/__init__.py b/azure-mgmt-billing/azure/mgmt/billing/operations/__init__.py index 8955c7e83662..03590866e10e 100644 --- a/azure-mgmt-billing/azure/mgmt/billing/operations/__init__.py +++ b/azure-mgmt-billing/azure/mgmt/billing/operations/__init__.py @@ -10,7 +10,6 @@ # -------------------------------------------------------------------------- from .billing_accounts_operations import BillingAccountsOperations -from .billing_accounts_with_create_invoice_section_permission_operations import BillingAccountsWithCreateInvoiceSectionPermissionOperations from .available_balance_by_billing_profile_operations import AvailableBalanceByBillingProfileOperations from .payment_methods_by_billing_profile_operations import PaymentMethodsByBillingProfileOperations from .billing_profiles_by_billing_account_name_operations import BillingProfilesByBillingAccountNameOperations @@ -54,7 +53,6 @@ __all__ = [ 'BillingAccountsOperations', - 'BillingAccountsWithCreateInvoiceSectionPermissionOperations', 'AvailableBalanceByBillingProfileOperations', 'PaymentMethodsByBillingProfileOperations', 'BillingProfilesByBillingAccountNameOperations', diff --git a/azure-mgmt-billing/azure/mgmt/billing/operations/billing_accounts_with_create_invoice_section_permission_operations.py b/azure-mgmt-billing/azure/mgmt/billing/operations/billing_accounts_with_create_invoice_section_permission_operations.py deleted file mode 100644 index fe37879251b8..000000000000 --- a/azure-mgmt-billing/azure/mgmt/billing/operations/billing_accounts_with_create_invoice_section_permission_operations.py +++ /dev/null @@ -1,94 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. -# -# Code generated by Microsoft (R) AutoRest Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is -# regenerated. -# -------------------------------------------------------------------------- - -import uuid -from msrest.pipeline import ClientRawResponse - -from .. import models - - -class BillingAccountsWithCreateInvoiceSectionPermissionOperations(object): - """BillingAccountsWithCreateInvoiceSectionPermissionOperations operations. - - :param client: Client for service requests. - :param config: Configuration of service client. - :param serializer: An object model serializer. - :param deserializer: An object model deserializer. - :ivar api_version: Version of the API to be used with the client request. The current version is 2018-11-01-preview. Constant value: "2018-11-01-preview". - """ - - models = models - - def __init__(self, client, config, serializer, deserializer): - - self._client = client - self._serialize = serializer - self._deserialize = deserializer - self.api_version = "2018-11-01-preview" - - self.config = config - - def list( - self, expand=None, custom_headers=None, raw=False, **operation_config): - """Lists all billing accounts with create invoiceSection permission for a - user. - - :param expand: May be used to expand the invoiceSections and - billingProfiles. - :type expand: str - :param dict custom_headers: headers that will be added to the request - :param bool raw: returns the direct response alongside the - deserialized response - :param operation_config: :ref:`Operation configuration - overrides`. - :return: BillingAccountListResult or ClientRawResponse if raw=true - :rtype: ~azure.mgmt.billing.models.BillingAccountListResult or - ~msrest.pipeline.ClientRawResponse - :raises: - :class:`ErrorResponseException` - """ - # Construct URL - url = self.list.metadata['url'] - - # Construct parameters - query_parameters = {} - query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') - if expand is not None: - query_parameters['$expand'] = self._serialize.query("expand", expand, 'str') - - # Construct headers - header_parameters = {} - header_parameters['Accept'] = 'application/json' - if self.config.generate_client_request_id: - header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) - if custom_headers: - header_parameters.update(custom_headers) - if self.config.accept_language is not None: - header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') - - # Construct and send request - request = self._client.get(url, query_parameters, header_parameters) - response = self._client.send(request, stream=False, **operation_config) - - if response.status_code not in [200]: - raise models.ErrorResponseException(self._deserialize, response) - - deserialized = None - - if response.status_code == 200: - deserialized = self._deserialize('BillingAccountListResult', response) - - if raw: - client_raw_response = ClientRawResponse(deserialized, response) - return client_raw_response - - return deserialized - list.metadata = {'url': '/providers/Microsoft.Billing/listBillingAccountsWithCreateInvoiceSectionPermission'} diff --git a/azure-mgmt-billing/azure/mgmt/billing/operations/billing_subscription_operations.py b/azure-mgmt-billing/azure/mgmt/billing/operations/billing_subscription_operations.py index 2da5d990012d..c33dae9080a6 100644 --- a/azure-mgmt-billing/azure/mgmt/billing/operations/billing_subscription_operations.py +++ b/azure-mgmt-billing/azure/mgmt/billing/operations/billing_subscription_operations.py @@ -103,8 +103,8 @@ def get( def _transfer_initial( - self, billing_account_name, invoice_section_name, billing_subscription_name, destination_invoice_section_name=None, custom_headers=None, raw=False, **operation_config): - parameters = models.TransferBillingSubscriptionRequestProperties(destination_invoice_section_name=destination_invoice_section_name) + self, billing_account_name, invoice_section_name, billing_subscription_name, destination_invoice_section_id=None, custom_headers=None, raw=False, **operation_config): + parameters = models.TransferBillingSubscriptionRequestProperties(destination_invoice_section_id=destination_invoice_section_id) # Construct URL url = self.transfer.metadata['url'] @@ -158,7 +158,7 @@ def _transfer_initial( return deserialized def transfer( - self, billing_account_name, invoice_section_name, billing_subscription_name, destination_invoice_section_name=None, custom_headers=None, raw=False, polling=True, **operation_config): + self, billing_account_name, invoice_section_name, billing_subscription_name, destination_invoice_section_id=None, custom_headers=None, raw=False, polling=True, **operation_config): """Transfers the GTM subscription from one invoice section to another within a billing account. @@ -168,9 +168,9 @@ def transfer( :type invoice_section_name: str :param billing_subscription_name: Billing Subscription Id. :type billing_subscription_name: str - :param destination_invoice_section_name: The destination - invoiceSectionName. - :type destination_invoice_section_name: str + :param destination_invoice_section_id: The destination invoice section + id. + :type destination_invoice_section_id: str :param dict custom_headers: headers that will be added to the request :param bool raw: The poller return type is ClientRawResponse, the direct response alongside the deserialized response @@ -190,7 +190,7 @@ def transfer( billing_account_name=billing_account_name, invoice_section_name=invoice_section_name, billing_subscription_name=billing_subscription_name, - destination_invoice_section_name=destination_invoice_section_name, + destination_invoice_section_id=destination_invoice_section_id, custom_headers=custom_headers, raw=True, **operation_config diff --git a/azure-mgmt-billing/azure/mgmt/billing/operations/billing_subscriptions_by_billing_profile_operations.py b/azure-mgmt-billing/azure/mgmt/billing/operations/billing_subscriptions_by_billing_profile_operations.py index 788ce0e94f88..36803e3ca700 100644 --- a/azure-mgmt-billing/azure/mgmt/billing/operations/billing_subscriptions_by_billing_profile_operations.py +++ b/azure-mgmt-billing/azure/mgmt/billing/operations/billing_subscriptions_by_billing_profile_operations.py @@ -95,4 +95,4 @@ def list( return client_raw_response return deserialized - list.metadata = {'url': '/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfile/{billingProfileName}/billingSubscriptions'} + list.metadata = {'url': '/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/billingSubscriptions'} diff --git a/azure-mgmt-billing/azure/mgmt/billing/operations/policy_operations.py b/azure-mgmt-billing/azure/mgmt/billing/operations/policy_operations.py index 674f8c4ca445..65e34a53f0d1 100644 --- a/azure-mgmt-billing/azure/mgmt/billing/operations/policy_operations.py +++ b/azure-mgmt-billing/azure/mgmt/billing/operations/policy_operations.py @@ -97,19 +97,15 @@ def get_by_billing_profile( get_by_billing_profile.metadata = {'url': '/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/policies/default'} def update( - self, billing_account_name, billing_profile_name, reservation_purchases_allowed=None, marketplace_purchases_allowed=None, custom_headers=None, raw=False, **operation_config): + self, billing_account_name, billing_profile_name, parameters, custom_headers=None, raw=False, **operation_config): """The operation to update a policy. :param billing_account_name: billing Account Id. :type billing_account_name: str :param billing_profile_name: Billing Profile Id. :type billing_profile_name: str - :param reservation_purchases_allowed: The reservationPurchasesAllowed - flag. - :type reservation_purchases_allowed: bool - :param marketplace_purchases_allowed: The marketplacePurchasesAllowed - flag. - :type marketplace_purchases_allowed: bool + :param parameters: Parameters supplied to the update policy operation. + :type parameters: ~azure.mgmt.billing.models.Policy :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the deserialized response @@ -121,8 +117,6 @@ def update( :raises: :class:`ErrorResponseException` """ - parameters = models.Policy(reservation_purchases_allowed=reservation_purchases_allowed, marketplace_purchases_allowed=marketplace_purchases_allowed) - # Construct URL url = self.update.metadata['url'] path_format_arguments = { diff --git a/azure-mgmt-billing/azure/mgmt/billing/operations/products_operations.py b/azure-mgmt-billing/azure/mgmt/billing/operations/products_operations.py index 5b1e91b354fd..2fa6497a7f1c 100644 --- a/azure-mgmt-billing/azure/mgmt/billing/operations/products_operations.py +++ b/azure-mgmt-billing/azure/mgmt/billing/operations/products_operations.py @@ -100,7 +100,7 @@ def get( get.metadata = {'url': '/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionName}/products/{productName}'} def transfer( - self, billing_account_name, invoice_section_name, product_name, destination_invoice_section_name=None, custom_headers=None, raw=False, **operation_config): + self, billing_account_name, invoice_section_name, product_name, destination_invoice_section_id=None, custom_headers=None, raw=False, **operation_config): """The operation to transfer a Product to another InvoiceSection. :param billing_account_name: billing Account Id. @@ -109,9 +109,8 @@ def transfer( :type invoice_section_name: str :param product_name: Invoice Id. :type product_name: str - :param destination_invoice_section_name: Destination invoice section - id. - :type destination_invoice_section_name: str + :param destination_invoice_section_id: Destination invoice section id. + :type destination_invoice_section_id: str :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the deserialized response @@ -123,7 +122,7 @@ def transfer( :raises: :class:`ErrorResponseException` """ - parameters = models.TransferProductRequestProperties(destination_invoice_section_name=destination_invoice_section_name) + parameters = models.TransferProductRequestProperties(destination_invoice_section_id=destination_invoice_section_id) # Construct URL url = self.transfer.metadata['url'] diff --git a/azure-mgmt-billing/setup.py b/azure-mgmt-billing/setup.py index b2aa12bf873f..946b7232e50d 100644 --- a/azure-mgmt-billing/setup.py +++ b/azure-mgmt-billing/setup.py @@ -53,6 +53,7 @@ version=version, description='Microsoft Azure {} Client Library for Python'.format(PACKAGE_PPRINT_NAME), long_description=readme + '\n\n' + history, + long_description_content_type='text/x-rst', license='MIT License', author='Microsoft Corporation', author_email='azpysdkhelp@microsoft.com',