Rebuild by #2032

azure-graphrbac/azure/graphrbac/graph_rbac_management_client.py

@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from msrest.service_client import ServiceClient
+from msrest.service_client import SDKClient
 from msrest import Serializer, Deserializer
 from msrestazure import AzureConfiguration
 from .version import VERSION
@@ -55,7 +55,7 @@ def __init__(
         self.tenant_id = tenant_id
 
 
-class GraphRbacManagementClient(object):
+class GraphRbacManagementClient(SDKClient):
     """The Graph RBAC Management Client
 
     :ivar config: Configuration for client.
@@ -88,7 +88,7 @@ def __init__(
             self, credentials, tenant_id, base_url=None):
 
         self.config = GraphRbacManagementClientConfiguration(credentials, tenant_id, base_url)
-        self._client = ServiceClient(self.config.credentials, self.config)
+        super(GraphRbacManagementClient, 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 = '1.6'

azure-graphrbac/azure/graphrbac/models/__init__.py

@@ -9,37 +9,70 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .graph_error import GraphError, GraphErrorException
-from .directory_object import DirectoryObject
-from .key_credential import KeyCredential
-from .password_credential import PasswordCredential
-from .resource_access import ResourceAccess
-from .required_resource_access import RequiredResourceAccess
-from .application_create_parameters import ApplicationCreateParameters
-from .application_update_parameters import ApplicationUpdateParameters
-from .application import Application
-from .application_add_owner_parameters import ApplicationAddOwnerParameters
-from .key_credentials_update_parameters import KeyCredentialsUpdateParameters
-from .password_credentials_update_parameters import PasswordCredentialsUpdateParameters
-from .aad_object import AADObject
-from .group_add_member_parameters import GroupAddMemberParameters
-from .group_create_parameters import GroupCreateParameters
-from .ad_group import ADGroup
-from .group_get_member_groups_parameters import GroupGetMemberGroupsParameters
-from .check_group_membership_parameters import CheckGroupMembershipParameters
-from .check_group_membership_result import CheckGroupMembershipResult
-from .service_principal_create_parameters import ServicePrincipalCreateParameters
-from .service_principal import ServicePrincipal
-from .password_profile import PasswordProfile
-from .user_base import UserBase
-from .user_create_parameters import UserCreateParameters
-from .user_update_parameters import UserUpdateParameters
-from .sign_in_name import SignInName
-from .user import User
-from .user_get_member_groups_parameters import UserGetMemberGroupsParameters
-from .get_objects_parameters import GetObjectsParameters
-from .domain import Domain
-from .permissions import Permissions
+try:
+    from .graph_error_py3 import GraphError, GraphErrorException
+    from .directory_object_py3 import DirectoryObject
+    from .key_credential_py3 import KeyCredential
+    from .password_credential_py3 import PasswordCredential
+    from .resource_access_py3 import ResourceAccess
+    from .required_resource_access_py3 import RequiredResourceAccess
+    from .application_create_parameters_py3 import ApplicationCreateParameters
+    from .application_update_parameters_py3 import ApplicationUpdateParameters
+    from .application_py3 import Application
+    from .application_add_owner_parameters_py3 import ApplicationAddOwnerParameters
+    from .key_credentials_update_parameters_py3 import KeyCredentialsUpdateParameters
+    from .password_credentials_update_parameters_py3 import PasswordCredentialsUpdateParameters
+    from .aad_object_py3 import AADObject
+    from .group_add_member_parameters_py3 import GroupAddMemberParameters
+    from .group_create_parameters_py3 import GroupCreateParameters
+    from .ad_group_py3 import ADGroup
+    from .group_get_member_groups_parameters_py3 import GroupGetMemberGroupsParameters
+    from .check_group_membership_parameters_py3 import CheckGroupMembershipParameters
+    from .check_group_membership_result_py3 import CheckGroupMembershipResult
+    from .service_principal_create_parameters_py3 import ServicePrincipalCreateParameters
+    from .service_principal_py3 import ServicePrincipal
+    from .password_profile_py3 import PasswordProfile
+    from .user_base_py3 import UserBase
+    from .user_create_parameters_py3 import UserCreateParameters
+    from .user_update_parameters_py3 import UserUpdateParameters
+    from .sign_in_name_py3 import SignInName
+    from .user_py3 import User
+    from .user_get_member_groups_parameters_py3 import UserGetMemberGroupsParameters
+    from .get_objects_parameters_py3 import GetObjectsParameters
+    from .domain_py3 import Domain
+    from .permissions_py3 import Permissions
+except (SyntaxError, ImportError):
+    from .graph_error import GraphError, GraphErrorException
+    from .directory_object import DirectoryObject
+    from .key_credential import KeyCredential
+    from .password_credential import PasswordCredential
+    from .resource_access import ResourceAccess
+    from .required_resource_access import RequiredResourceAccess
+    from .application_create_parameters import ApplicationCreateParameters
+    from .application_update_parameters import ApplicationUpdateParameters
+    from .application import Application
+    from .application_add_owner_parameters import ApplicationAddOwnerParameters
+    from .key_credentials_update_parameters import KeyCredentialsUpdateParameters
+    from .password_credentials_update_parameters import PasswordCredentialsUpdateParameters
+    from .aad_object import AADObject
+    from .group_add_member_parameters import GroupAddMemberParameters
+    from .group_create_parameters import GroupCreateParameters
+    from .ad_group import ADGroup
+    from .group_get_member_groups_parameters import GroupGetMemberGroupsParameters
+    from .check_group_membership_parameters import CheckGroupMembershipParameters
+    from .check_group_membership_result import CheckGroupMembershipResult
+    from .service_principal_create_parameters import ServicePrincipalCreateParameters
+    from .service_principal import ServicePrincipal
+    from .password_profile import PasswordProfile
+    from .user_base import UserBase
+    from .user_create_parameters import UserCreateParameters
+    from .user_update_parameters import UserUpdateParameters
+    from .sign_in_name import SignInName
+    from .user import User
+    from .user_get_member_groups_parameters import UserGetMemberGroupsParameters
+    from .get_objects_parameters import GetObjectsParameters
+    from .domain import Domain
+    from .permissions import Permissions
 from .aad_object_paged import AADObjectPaged
 from .application_paged import ApplicationPaged
 from .directory_object_paged import DirectoryObjectPaged

azure-graphrbac/azure/graphrbac/models/aad_object.py

@@ -97,20 +97,20 @@ class AADObject(Model):
         'homepage': {'key': 'homepage', 'type': 'str'},
     }
 
-    def __init__(self, additional_properties=None, object_id=None, object_type=None, display_name=None, user_principal_name=None, mail=None, mail_enabled=None, security_enabled=None, sign_in_name=None, service_principal_names=None, user_type=None):
-        super(AADObject, self).__init__()
-        self.additional_properties = additional_properties
-        self.object_id = object_id
-        self.object_type = object_type
-        self.display_name = display_name
-        self.user_principal_name = user_principal_name
-        self.mail = mail
-        self.mail_enabled = mail_enabled
+    def __init__(self, **kwargs):
+        super(AADObject, self).__init__(**kwargs)
+        self.additional_properties = kwargs.get('additional_properties', None)
+        self.object_id = kwargs.get('object_id', None)
+        self.object_type = kwargs.get('object_type', None)
+        self.display_name = kwargs.get('display_name', None)
+        self.user_principal_name = kwargs.get('user_principal_name', None)
+        self.mail = kwargs.get('mail', None)
+        self.mail_enabled = kwargs.get('mail_enabled', None)
         self.mail_nickname = None
-        self.security_enabled = security_enabled
-        self.sign_in_name = sign_in_name
-        self.service_principal_names = service_principal_names
-        self.user_type = user_type
+        self.security_enabled = kwargs.get('security_enabled', None)
+        self.sign_in_name = kwargs.get('sign_in_name', None)
+        self.service_principal_names = kwargs.get('service_principal_names', None)
+        self.user_type = kwargs.get('user_type', None)
         self.usage_location = None
         self.app_id = None
         self.app_permissions = None

azure-graphrbac/azure/graphrbac/models/aad_object_py3.py

@@ -0,0 +1,120 @@
+# 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 msrest.serialization import Model
+
+
+class AADObject(Model):
+    """The properties of an Active Directory object.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :param additional_properties: Unmatched properties from the message are
+     deserialized this collection
+    :type additional_properties: dict[str, object]
+    :param object_id: The ID of the object.
+    :type object_id: str
+    :param object_type: The type of AAD object.
+    :type object_type: str
+    :param display_name: The display name of the object.
+    :type display_name: str
+    :param user_principal_name: The principal name of the object.
+    :type user_principal_name: str
+    :param mail: The primary email address of the object.
+    :type mail: str
+    :param mail_enabled: Whether the AAD object is mail-enabled.
+    :type mail_enabled: bool
+    :ivar mail_nickname: The mail alias for the user.
+    :vartype mail_nickname: str
+    :param security_enabled: Whether the AAD object is security-enabled.
+    :type security_enabled: bool
+    :param sign_in_name: The sign-in name of the object.
+    :type sign_in_name: str
+    :param service_principal_names: A collection of service principal names
+     associated with the object.
+    :type service_principal_names: list[str]
+    :param user_type: The user type of the object.
+    :type user_type: str
+    :ivar usage_location: A two letter country code (ISO standard 3166).
+     Required for users that will be assigned licenses due to legal requirement
+     to check for availability of services in countries. Examples include:
+     "US", "JP", and "GB".
+    :vartype usage_location: str
+    :ivar app_id: The application ID.
+    :vartype app_id: str
+    :ivar app_permissions: The application permissions.
+    :vartype app_permissions: list[str]
+    :ivar available_to_other_tenants: Whether the application is be available
+     to other tenants.
+    :vartype available_to_other_tenants: bool
+    :ivar identifier_uris: A collection of URIs for the application.
+    :vartype identifier_uris: list[str]
+    :ivar reply_urls: A collection of reply URLs for the application.
+    :vartype reply_urls: list[str]
+    :ivar homepage: The home page of the application.
+    :vartype homepage: str
+    """
+
+    _validation = {
+        'mail_nickname': {'readonly': True},
+        'usage_location': {'readonly': True},
+        'app_id': {'readonly': True},
+        'app_permissions': {'readonly': True},
+        'available_to_other_tenants': {'readonly': True},
+        'identifier_uris': {'readonly': True},
+        'reply_urls': {'readonly': True},
+        'homepage': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'additional_properties': {'key': '', 'type': '{object}'},
+        'object_id': {'key': 'objectId', 'type': 'str'},
+        'object_type': {'key': 'objectType', 'type': 'str'},
+        'display_name': {'key': 'displayName', 'type': 'str'},
+        'user_principal_name': {'key': 'userPrincipalName', 'type': 'str'},
+        'mail': {'key': 'mail', 'type': 'str'},
+        'mail_enabled': {'key': 'mailEnabled', 'type': 'bool'},
+        'mail_nickname': {'key': 'mailNickname', 'type': 'str'},
+        'security_enabled': {'key': 'securityEnabled', 'type': 'bool'},
+        'sign_in_name': {'key': 'signInName', 'type': 'str'},
+        'service_principal_names': {'key': 'servicePrincipalNames', 'type': '[str]'},
+        'user_type': {'key': 'userType', 'type': 'str'},
+        'usage_location': {'key': 'usageLocation', 'type': 'str'},
+        'app_id': {'key': 'appId', 'type': 'str'},
+        'app_permissions': {'key': 'appPermissions', 'type': '[str]'},
+        'available_to_other_tenants': {'key': 'availableToOtherTenants', 'type': 'bool'},
+        'identifier_uris': {'key': 'identifierUris', 'type': '[str]'},
+        'reply_urls': {'key': 'replyUrls', 'type': '[str]'},
+        'homepage': {'key': 'homepage', 'type': 'str'},
+    }
+
+    def __init__(self, *, additional_properties=None, object_id: str=None, object_type: str=None, display_name: str=None, user_principal_name: str=None, mail: str=None, mail_enabled: bool=None, security_enabled: bool=None, sign_in_name: str=None, service_principal_names=None, user_type: str=None, **kwargs) -> None:
+        super(AADObject, self).__init__(**kwargs)
+        self.additional_properties = additional_properties
+        self.object_id = object_id
+        self.object_type = object_type
+        self.display_name = display_name
+        self.user_principal_name = user_principal_name
+        self.mail = mail
+        self.mail_enabled = mail_enabled
+        self.mail_nickname = None
+        self.security_enabled = security_enabled
+        self.sign_in_name = sign_in_name
+        self.service_principal_names = service_principal_names
+        self.user_type = user_type
+        self.usage_location = None
+        self.app_id = None
+        self.app_permissions = None
+        self.available_to_other_tenants = None
+        self.identifier_uris = None
+        self.reply_urls = None
+        self.homepage = None

azure-graphrbac/azure/graphrbac/models/ad_group.py

@@ -18,6 +18,8 @@ class ADGroup(DirectoryObject):
     Variables are only populated by the server, and will be ignored when
     sending a request.
 
+    All required parameters must be populated in order to send to Azure.
+
     :param additional_properties: Unmatched properties from the message are
      deserialized this collection
     :type additional_properties: dict[str, object]
@@ -26,7 +28,7 @@ class ADGroup(DirectoryObject):
     :ivar deletion_timestamp: The time at which the directory object was
      deleted.
     :vartype deletion_timestamp: datetime
-    :param object_type: Constant filled by server.
+    :param object_type: Required. Constant filled by server.
     :type object_type: str
     :param display_name: The display name of the group.
     :type display_name: str
@@ -52,9 +54,9 @@ class ADGroup(DirectoryObject):
         'mail': {'key': 'mail', 'type': 'str'},
     }
 
-    def __init__(self, additional_properties=None, display_name=None, security_enabled=None, mail=None):
-        super(ADGroup, self).__init__(additional_properties=additional_properties)
-        self.display_name = display_name
-        self.security_enabled = security_enabled
-        self.mail = mail
+    def __init__(self, **kwargs):
+        super(ADGroup, self).__init__(**kwargs)
+        self.display_name = kwargs.get('display_name', None)
+        self.security_enabled = kwargs.get('security_enabled', None)
+        self.mail = kwargs.get('mail', None)
         self.object_type = 'Group'

azure-graphrbac/azure/graphrbac/models/ad_group_py3.py

@@ -0,0 +1,62 @@
+# 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 .directory_object_py3 import DirectoryObject
+
+
+class ADGroup(DirectoryObject):
+    """Active Directory group information.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param additional_properties: Unmatched properties from the message are
+     deserialized this collection
+    :type additional_properties: dict[str, object]
+    :ivar object_id: The object ID.
+    :vartype object_id: str
+    :ivar deletion_timestamp: The time at which the directory object was
+     deleted.
+    :vartype deletion_timestamp: datetime
+    :param object_type: Required. Constant filled by server.
+    :type object_type: str
+    :param display_name: The display name of the group.
+    :type display_name: str
+    :param security_enabled: Whether the group is security-enable.
+    :type security_enabled: bool
+    :param mail: The primary email address of the group.
+    :type mail: str
+    """
+
+    _validation = {
+        'object_id': {'readonly': True},
+        'deletion_timestamp': {'readonly': True},
+        'object_type': {'required': True},
+    }
+
+    _attribute_map = {
+        'additional_properties': {'key': '', 'type': '{object}'},
+        'object_id': {'key': 'objectId', 'type': 'str'},
+        'deletion_timestamp': {'key': 'deletionTimestamp', 'type': 'iso-8601'},
+        'object_type': {'key': 'objectType', 'type': 'str'},
+        'display_name': {'key': 'displayName', 'type': 'str'},
+        'security_enabled': {'key': 'securityEnabled', 'type': 'bool'},
+        'mail': {'key': 'mail', 'type': 'str'},
+    }
+
+    def __init__(self, *, additional_properties=None, display_name: str=None, security_enabled: bool=None, mail: str=None, **kwargs) -> None:
+        super(ADGroup, self).__init__(additional_properties=additional_properties, **kwargs)
+        self.display_name = display_name
+        self.security_enabled = security_enabled
+        self.mail = mail
+        self.object_type = 'Group'