Generated from 497f37d011e45d90e7a5f190b1326ec89e2719c8

Merge pull request #6 from Khushboo-Baheti/master

merge

sdk/resources/azure-mgmt-msi/azure/mgmt/msi/__init__.py

@@ -9,10 +9,11 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .managed_service_identity_client import ManagedServiceIdentityClient
-from .version import VERSION
+from ._configuration import ManagedServiceIdentityClientConfiguration
+from ._managed_service_identity_client import ManagedServiceIdentityClient
+__all__ = ['ManagedServiceIdentityClient', 'ManagedServiceIdentityClientConfiguration']
 
-__all__ = ['ManagedServiceIdentityClient']
+from .version import VERSION
 
 __version__ = VERSION
 

sdk/resources/azure-mgmt-msi/azure/mgmt/msi/_configuration.py

@@ -0,0 +1,49 @@
+# 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.
+# --------------------------------------------------------------------------
+from msrestazure import AzureConfiguration
+
+from .version import VERSION
+
+
+class ManagedServiceIdentityClientConfiguration(AzureConfiguration):
+    """Configuration for ManagedServiceIdentityClient
+    Note that all parameters used to create this instance are saved as instance
+    attributes.
+
+    :param credentials: Credentials needed for the client to connect to Azure.
+    :type credentials: :mod:`A msrestazure Credentials
+     object<msrestazure.azure_active_directory>`
+    :param subscription_id: The Id of the Subscription to which the identity
+     belongs.
+    :type subscription_id: str
+    :param str base_url: Service URL
+    """
+
+    def __init__(
+            self, credentials, subscription_id, base_url=None):
+
+        if credentials is None:
+            raise ValueError("Parameter 'credentials' must not be None.")
+        if subscription_id is None:
+            raise ValueError("Parameter 'subscription_id' must not be None.")
+        if not base_url:
+            base_url = 'https://management.azure.com'
+
+        super(ManagedServiceIdentityClientConfiguration, self).__init__(base_url)
+
+        # Starting Autorest.Python 4.0.64, make connection pool activated by default
+        self.keep_alive = True
+
+        self.add_user_agent('azure-mgmt-msi/{}'.format(VERSION))
+        self.add_user_agent('Azure-SDK-For-Python')
+
+        self.credentials = credentials
+        self.subscription_id = subscription_id

sdk/resources/azure-mgmt-msi/azure/mgmt/msi/managed_service_identity_client.py → sdk/resources/azure-mgmt-msi/azure/mgmt/msi/_managed_service_identity_client.py

@@ -11,44 +11,12 @@
 
 from msrest.service_client import SDKClient
 from msrest import Serializer, Deserializer
-from msrestazure import AzureConfiguration
-from .version import VERSION
-from .operations.operations import Operations
-from .operations.user_assigned_identities_operations import UserAssignedIdentitiesOperations
-from . import models
-
-
-class ManagedServiceIdentityClientConfiguration(AzureConfiguration):
-    """Configuration for ManagedServiceIdentityClient
-    Note that all parameters used to create this instance are saved as instance
-    attributes.
-
-    :param credentials: Credentials needed for the client to connect to Azure.
-    :type credentials: :mod:`A msrestazure Credentials
-     object<msrestazure.azure_active_directory>`
-    :param subscription_id: The Id of the Subscription to which the identity
-     belongs.
-    :type subscription_id: str
-    :param str base_url: Service URL
-    """
-
-    def __init__(
-            self, credentials, subscription_id, base_url=None):
 
-        if credentials is None:
-            raise ValueError("Parameter 'credentials' must not be None.")
-        if subscription_id is None:
-            raise ValueError("Parameter 'subscription_id' must not be None.")
-        if not base_url:
-            base_url = 'https://management.azure.com'
-
-        super(ManagedServiceIdentityClientConfiguration, self).__init__(base_url)
-
-        self.add_user_agent('azure-mgmt-msi/{}'.format(VERSION))
-        self.add_user_agent('Azure-SDK-For-Python')
-
-        self.credentials = credentials
-        self.subscription_id = subscription_id
+from ._configuration import ManagedServiceIdentityClientConfiguration
+from .operations import SystemAssignedIdentitiesOperations
+from .operations import Operations
+from .operations import UserAssignedIdentitiesOperations
+from . import models
 
 
 class ManagedServiceIdentityClient(SDKClient):
@@ -57,6 +25,8 @@ class ManagedServiceIdentityClient(SDKClient):
     :ivar config: Configuration for client.
     :vartype config: ManagedServiceIdentityClientConfiguration
 
+    :ivar system_assigned_identities: SystemAssignedIdentities operations
+    :vartype system_assigned_identities: azure.mgmt.msi.operations.SystemAssignedIdentitiesOperations
     :ivar operations: Operations operations
     :vartype operations: azure.mgmt.msi.operations.Operations
     :ivar user_assigned_identities: UserAssignedIdentities operations
@@ -82,6 +52,8 @@ def __init__(
         self._serialize = Serializer(client_models)
         self._deserialize = Deserializer(client_models)
 
+        self.system_assigned_identities = SystemAssignedIdentitiesOperations(
+            self._client, self.config, self._serialize, self._deserialize)
         self.operations = Operations(
             self._client, self.config, self._serialize, self._deserialize)
         self.user_assigned_identities = UserAssignedIdentitiesOperations(

sdk/resources/azure-mgmt-msi/azure/mgmt/msi/models/__init__.py

@@ -10,23 +10,32 @@
 # --------------------------------------------------------------------------
 
 try:
-    from .identity_py3 import Identity
-    from .operation_display_py3 import OperationDisplay
-    from .operation_py3 import Operation
+    from ._models_py3 import Identity
+    from ._models_py3 import IdentityPatch
+    from ._models_py3 import Operation
+    from ._models_py3 import OperationDisplay
+    from ._models_py3 import Resource
+    from ._models_py3 import SystemAssignedIdentity
 except (SyntaxError, ImportError):
-    from .identity import Identity
-    from .operation_display import OperationDisplay
-    from .operation import Operation
-from .operation_paged import OperationPaged
-from .identity_paged import IdentityPaged
-from .managed_service_identity_client_enums import (
+    from ._models import Identity
+    from ._models import IdentityPatch
+    from ._models import Operation
+    from ._models import OperationDisplay
+    from ._models import Resource
+    from ._models import SystemAssignedIdentity
+from ._paged_models import IdentityPaged
+from ._paged_models import OperationPaged
+from ._managed_service_identity_client_enums import (
     UserAssignedIdentities,
 )
 
 __all__ = [
     'Identity',
-    'OperationDisplay',
+    'IdentityPatch',
     'Operation',
+    'OperationDisplay',
+    'Resource',
+    'SystemAssignedIdentity',
     'OperationPaged',
     'IdentityPaged',
     'UserAssignedIdentities',