[AutoPR track2_azure-mgmt-billing] Revert "Task 9639284: Swagger changes for new UK agreement templates"

sdk/billing/azure-mgmt-billing/MANIFEST.in

@@ -1,3 +1,4 @@
+include _meta.json
 recursive-include tests *.py *.yaml
 include *.md
 include azure/__init__.py

sdk/billing/azure-mgmt-billing/_meta.json

@@ -0,0 +1,8 @@
+{
+  "autorest": "V2",
+  "use": "@microsoft.azure/autorest.python@~4.0.71",
+  "commit": "b81bd01311671cd7ee35dfb39bb31df5d64b4dbe",
+  "repository_url": "https://github.com/Azure/azure-rest-api-specs",
+  "autorest_command": "autorest specification/billing/resource-manager/readme.md --keep-version-file --multiapi --no-async --python --python-mode=update --python-sdks-folder=/home/vsts/work/1/s/azure-sdk-for-python/sdk --use=@microsoft.azure/autorest.python@~4.0.71 --version=V2",
+  "readme": "specification/billing/resource-manager/readme.md"
+}

sdk/billing/azure-mgmt-billing/azure/mgmt/billing/_billing_management_client.py

@@ -31,6 +31,7 @@
 from .operations import BillingRoleDefinitionsOperations
 from .operations import BillingRoleAssignmentsOperations
 from .operations import AgreementsOperations
+from .operations import ReservationsOperations
 from .operations import EnrollmentAccountsOperations
 from .operations import BillingPeriodsOperations
 from . import models
@@ -78,6 +79,8 @@ class BillingManagementClient(SDKClient):
     :vartype billing_role_assignments: azure.mgmt.billing.operations.BillingRoleAssignmentsOperations
     :ivar agreements: Agreements operations
     :vartype agreements: azure.mgmt.billing.operations.AgreementsOperations
+    :ivar reservations: Reservations operations
+    :vartype reservations: azure.mgmt.billing.operations.ReservationsOperations
     :ivar enrollment_accounts: EnrollmentAccounts operations
     :vartype enrollment_accounts: azure.mgmt.billing.operations.EnrollmentAccountsOperations
     :ivar billing_periods: BillingPeriods operations
@@ -138,6 +141,8 @@ def __init__(
             self._client, self.config, self._serialize, self._deserialize)
         self.agreements = AgreementsOperations(
             self._client, self.config, self._serialize, self._deserialize)
+        self.reservations = ReservationsOperations(
+            self._client, self.config, self._serialize, self._deserialize)
         self.enrollment_accounts = EnrollmentAccountsOperations(
             self._client, self.config, self._serialize, self._deserialize)
         self.billing_periods = BillingPeriodsOperations(

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

@@ -54,6 +54,11 @@
     from ._models_py3 import Product
     from ._models_py3 import RebillDetails
     from ._models_py3 import Reseller
+    from ._models_py3 import Reservation
+    from ._models_py3 import ReservationPropertyUtilization
+    from ._models_py3 import ReservationSkuProperty
+    from ._models_py3 import ReservationSummary
+    from ._models_py3 import ReservationUtilizationAggregates
     from ._models_py3 import Resource
     from ._models_py3 import Transaction
     from ._models_py3 import TransferBillingSubscriptionRequestProperties
@@ -108,6 +113,11 @@
     from ._models import Product
     from ._models import RebillDetails
     from ._models import Reseller
+    from ._models import Reservation
+    from ._models import ReservationPropertyUtilization
+    from ._models import ReservationSkuProperty
+    from ._models import ReservationSummary
+    from ._models import ReservationUtilizationAggregates
     from ._models import Resource
     from ._models import Transaction
     from ._models import TransferBillingSubscriptionRequestProperties
@@ -133,6 +143,7 @@
 from ._paged_models import InvoiceSectionWithCreateSubPermissionPaged
 from ._paged_models import OperationPaged
 from ._paged_models import ProductPaged
+from ._paged_models import ReservationPaged
 from ._paged_models import TransactionPaged
 from ._billing_management_client_enums import (
     AddressValidationStatus,
@@ -216,6 +227,11 @@
     'Product',
     'RebillDetails',
     'Reseller',
+    'Reservation',
+    'ReservationPropertyUtilization',
+    'ReservationSkuProperty',
+    'ReservationSummary',
+    'ReservationUtilizationAggregates',
     'Resource',
     'Transaction',
     'TransferBillingSubscriptionRequestProperties',
@@ -240,6 +256,7 @@
     'BillingRoleDefinitionPaged',
     'BillingRoleAssignmentPaged',
     'AgreementPaged',
+    'ReservationPaged',
     'EnrollmentAccountSummaryPaged',
     'BillingPeriodPaged',
     'AddressValidationStatus',

sdk/billing/azure-mgmt-billing/azure/mgmt/billing/models/_billing_management_client_enums.py

@@ -20,14 +20,26 @@ class AddressValidationStatus(str, Enum):
 
 class SubscriptionTransferValidationErrorCode(str, Enum):
 
+    billing_account_inactive = "BillingAccountInactive"
+    cross_billing_account_not_allowed = "CrossBillingAccountNotAllowed"
+    destination_billing_profile_inactive = "DestinationBillingProfileInactive"
+    destination_billing_profile_not_found = "DestinationBillingProfileNotFound"
+    destination_billing_profile_past_due = "DestinationBillingProfilePastDue"
+    destination_invoice_section_inactive = "DestinationInvoiceSectionInactive"
+    destination_invoice_section_not_found = "DestinationInvoiceSectionNotFound"
+    insufficient_permission_on_destination = "InsufficientPermissionOnDestination"
+    insufficient_permission_on_source = "InsufficientPermissionOnSource"
+    invalid_destination = "InvalidDestination"
     invalid_source = "InvalidSource"
+    marketplace_not_enabled_on_destination = "MarketplaceNotEnabledOnDestination"
+    not_available_for_destination_market = "NotAvailableForDestinationMarket"
+    product_inactive = "ProductInactive"
+    product_not_found = "ProductNotFound"
+    product_type_not_supported = "ProductTypeNotSupported"
+    source_billing_profile_past_due = "SourceBillingProfilePastDue"
+    source_invoice_section_inactive = "SourceInvoiceSectionInactive"
     subscription_not_active = "SubscriptionNotActive"
-    insufficient_permission_on_source = "InsufficientPermissionOnSource"
-    insufficient_permission_on_destination = "InsufficientPermissionOnDestination"
-    destination_billing_profile_past_due = "DestinationBillingProfilePastDue"
     subscription_type_not_supported = "SubscriptionTypeNotSupported"
-    cross_billing_account_not_allowed = "CrossBillingAccountNotAllowed"
-    not_available_for_destination_market = "NotAvailableForDestinationMarket"
 
 
 class AgreementType(str, Enum):