CodeGen from PR 14849 in Azure/azure-rest-api-specs

Merge dfda624c379686fd0036e5062a42efc8b6e1503a into f7535f8

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

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

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

@@ -0,0 +1,8 @@
+{
+  "autorest": "V2",
+  "use": "@microsoft.azure/autorest.python@~4.0.71",
+  "commit": "844c49c07e73b61086ce0a901cc4f616e4360cdb",
+  "repository_url": "https://github.com/Azure/azure-rest-api-specs",
+  "autorest_command": "autorest specification/reservations/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/reservations/resource-manager/readme.md"
+}

sdk/reservations/azure-mgmt-reservations/azure/mgmt/reservations/_azure_reservation_api.py

@@ -14,36 +14,27 @@
 
 from ._configuration import AzureReservationAPIConfiguration
 from .operations import AzureReservationAPIOperationsMixin
-from .operations import ReservationOperations
 from .operations import ReservationOrderOperations
+from .operations import ReservationOperations
 from .operations import OperationOperations
-from .operations import CalculateExchangeOperations
-from .operations import ExchangeOperations
-from .operations import QuotaOperations
-from .operations import QuotaRequestStatusOperations
+from .operations import ReservationsOperations
 from . import models
 
 
 class AzureReservationAPI(AzureReservationAPIOperationsMixin, SDKClient):
-    """AzureReservationAPI
+    """This API describe Azure Reservation
 
     :ivar config: Configuration for client.
     :vartype config: AzureReservationAPIConfiguration
 
-    :ivar reservation: Reservation operations
-    :vartype reservation: azure.mgmt.reservations.operations.ReservationOperations
     :ivar reservation_order: ReservationOrder operations
     :vartype reservation_order: azure.mgmt.reservations.operations.ReservationOrderOperations
+    :ivar reservation: Reservation operations
+    :vartype reservation: azure.mgmt.reservations.operations.ReservationOperations
     :ivar operation: Operation operations
     :vartype operation: azure.mgmt.reservations.operations.OperationOperations
-    :ivar calculate_exchange: CalculateExchange operations
-    :vartype calculate_exchange: azure.mgmt.reservations.operations.CalculateExchangeOperations
-    :ivar exchange: Exchange operations
-    :vartype exchange: azure.mgmt.reservations.operations.ExchangeOperations
-    :ivar quota: Quota operations
-    :vartype quota: azure.mgmt.reservations.operations.QuotaOperations
-    :ivar quota_request_status: QuotaRequestStatus operations
-    :vartype quota_request_status: azure.mgmt.reservations.operations.QuotaRequestStatusOperations
+    :ivar reservations: Reservations operations
+    :vartype reservations: azure.mgmt.reservations.operations.ReservationsOperations
 
     :param credentials: Credentials needed for the client to connect to Azure.
     :type credentials: :mod:`A msrestazure Credentials
@@ -58,20 +49,15 @@ def __init__(
         super(AzureReservationAPI, self).__init__(self.config.credentials, self.config)
 
         client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
+        self.api_version = '2021-07-01'
         self._serialize = Serializer(client_models)
         self._deserialize = Deserializer(client_models)
 
-        self.reservation = ReservationOperations(
-            self._client, self.config, self._serialize, self._deserialize)
         self.reservation_order = ReservationOrderOperations(
             self._client, self.config, self._serialize, self._deserialize)
-        self.operation = OperationOperations(
-            self._client, self.config, self._serialize, self._deserialize)
-        self.calculate_exchange = CalculateExchangeOperations(
-            self._client, self.config, self._serialize, self._deserialize)
-        self.exchange = ExchangeOperations(
+        self.reservation = ReservationOperations(
             self._client, self.config, self._serialize, self._deserialize)
-        self.quota = QuotaOperations(
+        self.operation = OperationOperations(
             self._client, self.config, self._serialize, self._deserialize)
-        self.quota_request_status = QuotaRequestStatusOperations(
+        self.reservations = ReservationsOperations(
             self._client, self.config, self._serialize, self._deserialize)

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

@@ -12,246 +12,135 @@
 try:
     from ._models_py3 import AppliedReservationList
     from ._models_py3 import AppliedReservations
-    from ._models_py3 import AvailableScopeProperties
-    from ._models_py3 import AvailableScopeRequest
-    from ._models_py3 import AvailableScopeRequestProperties
-    from ._models_py3 import BillingInformation
-    from ._models_py3 import CalculateExchangeOperationResultResponse
-    from ._models_py3 import CalculateExchangeRequest
-    from ._models_py3 import CalculateExchangeRequestProperties
-    from ._models_py3 import CalculateExchangeResponseProperties
-    from ._models_py3 import CalculatePriceResponse
-    from ._models_py3 import CalculatePriceResponseProperties
-    from ._models_py3 import CalculatePriceResponsePropertiesBillingCurrencyTotal
-    from ._models_py3 import CalculatePriceResponsePropertiesPricingCurrencyTotal
     from ._models_py3 import Catalog
-    from ._models_py3 import CreateGenericQuotaRequestParameters
-    from ._models_py3 import CurrentQuotaLimit
-    from ._models_py3 import CurrentQuotaLimitBase
     from ._models_py3 import Error, ErrorException
-    from ._models_py3 import ExceptionResponse, ExceptionResponseException
-    from ._models_py3 import ExchangeOperationResultResponse
-    from ._models_py3 import ExchangePolicyError
-    from ._models_py3 import ExchangePolicyErrors
-    from ._models_py3 import ExchangeRequest
-    from ._models_py3 import ExchangeRequestProperties
-    from ._models_py3 import ExchangeResponseProperties
+    from ._models_py3 import ErrorDetails
+    from ._models_py3 import ErrorResponse, ErrorResponseException
     from ._models_py3 import ExtendedErrorInfo
     from ._models_py3 import ExtendedStatusInfo
     from ._models_py3 import MergeRequest
     from ._models_py3 import OperationDisplay
     from ._models_py3 import OperationResponse
-    from ._models_py3 import OperationResultError
     from ._models_py3 import Patch
     from ._models_py3 import PatchPropertiesRenewProperties
     from ._models_py3 import PaymentDetail
     from ._models_py3 import Price
     from ._models_py3 import PurchaseRequest
     from ._models_py3 import PurchaseRequestPropertiesReservedResourceProperties
-    from ._models_py3 import QuotaLimitsResponse
-    from ._models_py3 import QuotaProperties
-    from ._models_py3 import QuotaRequestDetails
-    from ._models_py3 import QuotaRequestOneResourceSubmitResponse
-    from ._models_py3 import QuotaRequestProperties
-    from ._models_py3 import QuotaRequestSubmitResponse
-    from ._models_py3 import QuotaRequestSubmitResponse201
     from ._models_py3 import RenewPropertiesResponse
     from ._models_py3 import RenewPropertiesResponseBillingCurrencyTotal
     from ._models_py3 import RenewPropertiesResponsePricingCurrencyTotal
     from ._models_py3 import ReservationMergeProperties
     from ._models_py3 import ReservationOrderBillingPlanInformation
     from ._models_py3 import ReservationOrderResponse
-    from ._models_py3 import ReservationProperties
     from ._models_py3 import ReservationResponse
     from ._models_py3 import ReservationSplitProperties
-    from ._models_py3 import ReservationToExchange
-    from ._models_py3 import ReservationToPurchaseCalculateExchange
-    from ._models_py3 import ReservationToPurchaseExchange
-    from ._models_py3 import ReservationToReturn
-    from ._models_py3 import ReservationToReturnForExchange
-    from ._models_py3 import ResourceName
-    from ._models_py3 import ScopeProperties
-    from ._models_py3 import ServiceError
-    from ._models_py3 import ServiceErrorDetail
+    from ._models_py3 import ReservationsProperties
+    from ._models_py3 import ReservationsPropertiesUtilization
+    from ._models_py3 import ReservationSummary
+    from ._models_py3 import ReservationUtilizationAggregates
     from ._models_py3 import SkuName
     from ._models_py3 import SkuProperty
     from ._models_py3 import SkuRestriction
     from ._models_py3 import SplitRequest
-    from ._models_py3 import SubRequest
-    from ._models_py3 import SubscriptionScopeProperties
+    from ._models_py3 import SystemData
 except (SyntaxError, ImportError):
     from ._models import AppliedReservationList
     from ._models import AppliedReservations
-    from ._models import AvailableScopeProperties
-    from ._models import AvailableScopeRequest
-    from ._models import AvailableScopeRequestProperties
-    from ._models import BillingInformation
-    from ._models import CalculateExchangeOperationResultResponse
-    from ._models import CalculateExchangeRequest
-    from ._models import CalculateExchangeRequestProperties
-    from ._models import CalculateExchangeResponseProperties
-    from ._models import CalculatePriceResponse
-    from ._models import CalculatePriceResponseProperties
-    from ._models import CalculatePriceResponsePropertiesBillingCurrencyTotal
-    from ._models import CalculatePriceResponsePropertiesPricingCurrencyTotal
     from ._models import Catalog
-    from ._models import CreateGenericQuotaRequestParameters
-    from ._models import CurrentQuotaLimit
-    from ._models import CurrentQuotaLimitBase
     from ._models import Error, ErrorException
-    from ._models import ExceptionResponse, ExceptionResponseException
-    from ._models import ExchangeOperationResultResponse
-    from ._models import ExchangePolicyError
-    from ._models import ExchangePolicyErrors
-    from ._models import ExchangeRequest
-    from ._models import ExchangeRequestProperties
-    from ._models import ExchangeResponseProperties
+    from ._models import ErrorDetails
+    from ._models import ErrorResponse, ErrorResponseException
     from ._models import ExtendedErrorInfo
     from ._models import ExtendedStatusInfo
     from ._models import MergeRequest
     from ._models import OperationDisplay
     from ._models import OperationResponse
-    from ._models import OperationResultError
     from ._models import Patch
     from ._models import PatchPropertiesRenewProperties
     from ._models import PaymentDetail
     from ._models import Price
     from ._models import PurchaseRequest
     from ._models import PurchaseRequestPropertiesReservedResourceProperties
-    from ._models import QuotaLimitsResponse
-    from ._models import QuotaProperties
-    from ._models import QuotaRequestDetails
-    from ._models import QuotaRequestOneResourceSubmitResponse
-    from ._models import QuotaRequestProperties
-    from ._models import QuotaRequestSubmitResponse
-    from ._models import QuotaRequestSubmitResponse201
     from ._models import RenewPropertiesResponse
     from ._models import RenewPropertiesResponseBillingCurrencyTotal
     from ._models import RenewPropertiesResponsePricingCurrencyTotal
     from ._models import ReservationMergeProperties
     from ._models import ReservationOrderBillingPlanInformation
     from ._models import ReservationOrderResponse
-    from ._models import ReservationProperties
     from ._models import ReservationResponse
     from ._models import ReservationSplitProperties
-    from ._models import ReservationToExchange
-    from ._models import ReservationToPurchaseCalculateExchange
-    from ._models import ReservationToPurchaseExchange
-    from ._models import ReservationToReturn
-    from ._models import ReservationToReturnForExchange
-    from ._models import ResourceName
-    from ._models import ScopeProperties
-    from ._models import ServiceError
-    from ._models import ServiceErrorDetail
+    from ._models import ReservationsProperties
+    from ._models import ReservationsPropertiesUtilization
+    from ._models import ReservationSummary
+    from ._models import ReservationUtilizationAggregates
     from ._models import SkuName
     from ._models import SkuProperty
     from ._models import SkuRestriction
     from ._models import SplitRequest
-    from ._models import SubRequest
-    from ._models import SubscriptionScopeProperties
-from ._paged_models import CurrentQuotaLimitBasePaged
+    from ._models import SystemData
 from ._paged_models import OperationResponsePaged
-from ._paged_models import QuotaRequestDetailsPaged
 from ._paged_models import ReservationOrderResponsePaged
 from ._paged_models import ReservationResponsePaged
 from ._azure_reservation_api_enums import (
+    ErrorResponseCode,
     ReservedResourceType,
-    ReservationTerm,
     ReservationBillingPlan,
-    AppliedScopeType,
-    InstanceFlexibility,
+    ReservationTerm,
+    PaymentStatus,
     ReservationStatusCode,
-    ErrorResponseCode,
-    CalculateExchangeOperationResultStatus,
-    ExchangeOperationResultStatus,
+    InstanceFlexibility,
+    AppliedScopeType,
+    CreatedByType,
     OperationStatus,
-    PaymentStatus,
 )
 
 __all__ = [
     'AppliedReservationList',
     'AppliedReservations',
-    'AvailableScopeProperties',
-    'AvailableScopeRequest',
-    'AvailableScopeRequestProperties',
-    'BillingInformation',
-    'CalculateExchangeOperationResultResponse',
-    'CalculateExchangeRequest',
-    'CalculateExchangeRequestProperties',
-    'CalculateExchangeResponseProperties',
-    'CalculatePriceResponse',
-    'CalculatePriceResponseProperties',
-    'CalculatePriceResponsePropertiesBillingCurrencyTotal',
-    'CalculatePriceResponsePropertiesPricingCurrencyTotal',
     'Catalog',
-    'CreateGenericQuotaRequestParameters',
-    'CurrentQuotaLimit',
-    'CurrentQuotaLimitBase',
     'Error', 'ErrorException',
-    'ExceptionResponse', 'ExceptionResponseException',
-    'ExchangeOperationResultResponse',
-    'ExchangePolicyError',
-    'ExchangePolicyErrors',
-    'ExchangeRequest',
-    'ExchangeRequestProperties',
-    'ExchangeResponseProperties',
+    'ErrorDetails',
+    'ErrorResponse', 'ErrorResponseException',
     'ExtendedErrorInfo',
     'ExtendedStatusInfo',
     'MergeRequest',
     'OperationDisplay',
     'OperationResponse',
-    'OperationResultError',
     'Patch',
     'PatchPropertiesRenewProperties',
     'PaymentDetail',
     'Price',
     'PurchaseRequest',
     'PurchaseRequestPropertiesReservedResourceProperties',
-    'QuotaLimitsResponse',
-    'QuotaProperties',
-    'QuotaRequestDetails',
-    'QuotaRequestOneResourceSubmitResponse',
-    'QuotaRequestProperties',
-    'QuotaRequestSubmitResponse',
-    'QuotaRequestSubmitResponse201',
     'RenewPropertiesResponse',
     'RenewPropertiesResponseBillingCurrencyTotal',
     'RenewPropertiesResponsePricingCurrencyTotal',
     'ReservationMergeProperties',
     'ReservationOrderBillingPlanInformation',
     'ReservationOrderResponse',
-    'ReservationProperties',
     'ReservationResponse',
     'ReservationSplitProperties',
-    'ReservationToExchange',
-    'ReservationToPurchaseCalculateExchange',
-    'ReservationToPurchaseExchange',
-    'ReservationToReturn',
-    'ReservationToReturnForExchange',
-    'ResourceName',
-    'ScopeProperties',
-    'ServiceError',
-    'ServiceErrorDetail',
+    'ReservationsProperties',
+    'ReservationsPropertiesUtilization',
+    'ReservationSummary',
+    'ReservationUtilizationAggregates',
     'SkuName',
     'SkuProperty',
     'SkuRestriction',
     'SplitRequest',
-    'SubRequest',
-    'SubscriptionScopeProperties',
-    'ReservationResponsePaged',
+    'SystemData',
     'ReservationOrderResponsePaged',
+    'ReservationResponsePaged',
     'OperationResponsePaged',
-    'CurrentQuotaLimitBasePaged',
-    'QuotaRequestDetailsPaged',
+    'ErrorResponseCode',
     'ReservedResourceType',
-    'ReservationTerm',
     'ReservationBillingPlan',
-    'AppliedScopeType',
-    'InstanceFlexibility',
+    'ReservationTerm',
+    'PaymentStatus',
     'ReservationStatusCode',
-    'ErrorResponseCode',
-    'CalculateExchangeOperationResultStatus',
-    'ExchangeOperationResultStatus',
+    'InstanceFlexibility',
+    'AppliedScopeType',
+    'CreatedByType',
     'OperationStatus',
-    'PaymentStatus',
 ]