[AutoPR reservations/resource-manager] [Hub Generated] Review request…

… for Microsoft.Capacity to add version preview/2019-04-01 (#6860)

* Generated from ea7847bd3538ded2d30c5c436a3f9f0464637d90

update

* Generated from ecb712b6e6535b86e9283f57a1a65d63c3cbb04a

update

* Generated from a65461546a2e2b7d3391cda3ecbe437938540d32

update

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

@@ -14,8 +14,8 @@
 
 from ._configuration import AzureReservationAPIConfiguration
 from .operations import AzureReservationAPIOperationsMixin
-from .operations import ReservationOrderOperations
 from .operations import ReservationOperations
+from .operations import ReservationOrderOperations
 from .operations import OperationOperations
 from . import models
 
@@ -26,10 +26,10 @@ class AzureReservationAPI(AzureReservationAPIOperationsMixin, SDKClient):
     :ivar config: Configuration for client.
     :vartype config: AzureReservationAPIConfiguration
 
-    :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 reservation_order: ReservationOrder operations
+    :vartype reservation_order: azure.mgmt.reservations.operations.ReservationOrderOperations
     :ivar operation: Operation operations
     :vartype operation: azure.mgmt.reservations.operations.OperationOperations
 
@@ -50,9 +50,9 @@ def __init__(
         self._serialize = Serializer(client_models)
         self._deserialize = Deserializer(client_models)
 
-        self.reservation_order = ReservationOrderOperations(
-            self._client, self.config, self._serialize, self._deserialize)
         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)

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

@@ -25,6 +25,7 @@
     from ._models_py3 import OperationResponse
     from ._models_py3 import Patch
     from ._models_py3 import PatchPropertiesRenewProperties
+    from ._models_py3 import Properties
     from ._models_py3 import PurchaseRequest
     from ._models_py3 import PurchaseRequestPropertiesReservedResourceProperties
     from ._models_py3 import RenewPropertiesResponse
@@ -35,10 +36,12 @@
     from ._models_py3 import ReservationProperties
     from ._models_py3 import ReservationResponse
     from ._models_py3 import ReservationSplitProperties
+    from ._models_py3 import ScopeProperties
     from ._models_py3 import SkuName
     from ._models_py3 import SkuProperty
     from ._models_py3 import SkuRestriction
     from ._models_py3 import SplitRequest
+    from ._models_py3 import SubscriptionScopeProperties
 except (SyntaxError, ImportError):
     from ._models import AppliedReservationList
     from ._models import AppliedReservations
@@ -55,6 +58,7 @@
     from ._models import OperationResponse
     from ._models import Patch
     from ._models import PatchPropertiesRenewProperties
+    from ._models import Properties
     from ._models import PurchaseRequest
     from ._models import PurchaseRequestPropertiesReservedResourceProperties
     from ._models import RenewPropertiesResponse
@@ -65,10 +69,12 @@
     from ._models import ReservationProperties
     from ._models import ReservationResponse
     from ._models import ReservationSplitProperties
+    from ._models import ScopeProperties
     from ._models import SkuName
     from ._models import SkuProperty
     from ._models import SkuRestriction
     from ._models import SplitRequest
+    from ._models import SubscriptionScopeProperties
 from ._paged_models import OperationResponsePaged
 from ._paged_models import ReservationOrderResponsePaged
 from ._paged_models import ReservationResponsePaged
@@ -97,6 +103,7 @@
     'OperationResponse',
     'Patch',
     'PatchPropertiesRenewProperties',
+    'Properties',
     'PurchaseRequest',
     'PurchaseRequestPropertiesReservedResourceProperties',
     'RenewPropertiesResponse',
@@ -107,12 +114,14 @@
     'ReservationProperties',
     'ReservationResponse',
     'ReservationSplitProperties',
+    'ScopeProperties',
     'SkuName',
     'SkuProperty',
     'SkuRestriction',
     'SplitRequest',
-    'ReservationOrderResponsePaged',
+    'SubscriptionScopeProperties',
     'ReservationResponsePaged',
+    'ReservationOrderResponsePaged',
     'OperationResponsePaged',
     'ReservationStatusCode',
     'ErrorResponseCode',

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

@@ -451,6 +451,23 @@ def __init__(self, **kwargs):
         self.purchase_properties = kwargs.get('purchase_properties', None)
 
 
+class Properties(Model):
+    """Properties.
+
+    :param properties:
+    :type properties:
+     ~azure.mgmt.reservations.models.SubscriptionScopeProperties
+    """
+
+    _attribute_map = {
+        'properties': {'key': 'properties', 'type': 'SubscriptionScopeProperties'},
+    }
+
+    def __init__(self, **kwargs):
+        super(Properties, self).__init__(**kwargs)
+        self.properties = kwargs.get('properties', None)
+
+
 class PurchaseRequest(Model):
     """PurchaseRequest.
 
@@ -891,6 +908,26 @@ def __init__(self, **kwargs):
         self.split_source = kwargs.get('split_source', None)
 
 
+class ScopeProperties(Model):
+    """ScopeProperties.
+
+    :param scope:
+    :type scope: str
+    :param valid:
+    :type valid: bool
+    """
+
+    _attribute_map = {
+        'scope': {'key': 'scope', 'type': 'str'},
+        'valid': {'key': 'valid', 'type': 'bool'},
+    }
+
+    def __init__(self, **kwargs):
+        super(ScopeProperties, self).__init__(**kwargs)
+        self.scope = kwargs.get('scope', None)
+        self.valid = kwargs.get('valid', None)
+
+
 class SkuName(Model):
     """SkuName.
 
@@ -974,3 +1011,19 @@ def __init__(self, **kwargs):
         super(SplitRequest, self).__init__(**kwargs)
         self.quantities = kwargs.get('quantities', None)
         self.reservation_id = kwargs.get('reservation_id', None)
+
+
+class SubscriptionScopeProperties(Model):
+    """SubscriptionScopeProperties.
+
+    :param scopes:
+    :type scopes: list[~azure.mgmt.reservations.models.ScopeProperties]
+    """
+
+    _attribute_map = {
+        'scopes': {'key': 'scopes', 'type': '[ScopeProperties]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(SubscriptionScopeProperties, self).__init__(**kwargs)
+        self.scopes = kwargs.get('scopes', None)

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

@@ -451,6 +451,23 @@ def __init__(self, *, purchase_properties=None, **kwargs) -> None:
         self.purchase_properties = purchase_properties
 
 
+class Properties(Model):
+    """Properties.
+
+    :param properties:
+    :type properties:
+     ~azure.mgmt.reservations.models.SubscriptionScopeProperties
+    """
+
+    _attribute_map = {
+        'properties': {'key': 'properties', 'type': 'SubscriptionScopeProperties'},
+    }
+
+    def __init__(self, *, properties=None, **kwargs) -> None:
+        super(Properties, self).__init__(**kwargs)
+        self.properties = properties
+
+
 class PurchaseRequest(Model):
     """PurchaseRequest.
 
@@ -891,6 +908,26 @@ def __init__(self, *, split_destinations=None, split_source: str=None, **kwargs)
         self.split_source = split_source
 
 
+class ScopeProperties(Model):
+    """ScopeProperties.
+
+    :param scope:
+    :type scope: str
+    :param valid:
+    :type valid: bool
+    """
+
+    _attribute_map = {
+        'scope': {'key': 'scope', 'type': 'str'},
+        'valid': {'key': 'valid', 'type': 'bool'},
+    }
+
+    def __init__(self, *, scope: str=None, valid: bool=None, **kwargs) -> None:
+        super(ScopeProperties, self).__init__(**kwargs)
+        self.scope = scope
+        self.valid = valid
+
+
 class SkuName(Model):
     """SkuName.
 
@@ -974,3 +1011,19 @@ def __init__(self, *, quantities=None, reservation_id: str=None, **kwargs) -> No
         super(SplitRequest, self).__init__(**kwargs)
         self.quantities = quantities
         self.reservation_id = reservation_id
+
+
+class SubscriptionScopeProperties(Model):
+    """SubscriptionScopeProperties.
+
+    :param scopes:
+    :type scopes: list[~azure.mgmt.reservations.models.ScopeProperties]
+    """
+
+    _attribute_map = {
+        'scopes': {'key': 'scopes', 'type': '[ScopeProperties]'},
+    }
+
+    def __init__(self, *, scopes=None, **kwargs) -> None:
+        super(SubscriptionScopeProperties, self).__init__(**kwargs)
+        self.scopes = scopes

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

@@ -12,32 +12,32 @@
 from msrest.paging import Paged
 
 
-class ReservationOrderResponsePaged(Paged):
+class ReservationResponsePaged(Paged):
     """
-    A paging container for iterating over a list of :class:`ReservationOrderResponse <azure.mgmt.reservations.models.ReservationOrderResponse>` object
+    A paging container for iterating over a list of :class:`ReservationResponse <azure.mgmt.reservations.models.ReservationResponse>` object
     """
 
     _attribute_map = {
         'next_link': {'key': 'nextLink', 'type': 'str'},
-        'current_page': {'key': 'value', 'type': '[ReservationOrderResponse]'}
+        'current_page': {'key': 'value', 'type': '[ReservationResponse]'}
     }
 
     def __init__(self, *args, **kwargs):
 
-        super(ReservationOrderResponsePaged, self).__init__(*args, **kwargs)
-class ReservationResponsePaged(Paged):
+        super(ReservationResponsePaged, self).__init__(*args, **kwargs)
+class ReservationOrderResponsePaged(Paged):
     """
-    A paging container for iterating over a list of :class:`ReservationResponse <azure.mgmt.reservations.models.ReservationResponse>` object
+    A paging container for iterating over a list of :class:`ReservationOrderResponse <azure.mgmt.reservations.models.ReservationOrderResponse>` object
     """
 
     _attribute_map = {
         'next_link': {'key': 'nextLink', 'type': 'str'},
-        'current_page': {'key': 'value', 'type': '[ReservationResponse]'}
+        'current_page': {'key': 'value', 'type': '[ReservationOrderResponse]'}
     }
 
     def __init__(self, *args, **kwargs):
 
-        super(ReservationResponsePaged, self).__init__(*args, **kwargs)
+        super(ReservationOrderResponsePaged, self).__init__(*args, **kwargs)
 class OperationResponsePaged(Paged):
     """
     A paging container for iterating over a list of :class:`OperationResponse <azure.mgmt.reservations.models.OperationResponse>` object

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

@@ -9,14 +9,14 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from ._reservation_order_operations import ReservationOrderOperations
 from ._reservation_operations import ReservationOperations
+from ._reservation_order_operations import ReservationOrderOperations
 from ._operation_operations import OperationOperations
 from ._azure_reservation_api_operations import AzureReservationAPIOperationsMixin
 
 __all__ = [
-    'ReservationOrderOperations',
     'ReservationOperations',
+    'ReservationOrderOperations',
     'OperationOperations',
     'AzureReservationAPIOperationsMixin',
 ]