fix(User Management): re-gen user-mgmt service

Author: padamstx

ibm_platform_services/user_management_v1.py

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# IBM OpenAPI SDK Code Generator Version: 99-SNAPSHOT-7811f8fb-20200813-160653
+# IBM OpenAPI SDK Code Generator Version: 99-SNAPSHOT-ef5e13c2-20200915-144510
 
 """
 Manage the lifecycle of your users using User Management APIs.
@@ -116,8 +116,10 @@ def get_user_settings(self,
             headers.update(kwargs.get('headers'))
         headers['Accept'] = 'application/json'
 
-        url = '/v2/accounts/{0}/users/{1}/settings'.format(
-            *self.encode_path_vars(account_id, iam_id))
+        path_param_keys = ['account_id', 'iam_id']
+        path_param_values = self.encode_path_vars(account_id, iam_id)
+        path_param_dict = dict(zip(path_param_keys, path_param_values))
+        url = '/v2/accounts/{account_id}/users/{iam_id}/settings'.format(**path_param_dict)
         request = self.prepare_request(method='GET',
                                        url=url,
                                        headers=headers)
@@ -185,8 +187,10 @@ def update_user_settings(self,
             headers.update(kwargs.get('headers'))
         headers['Accept'] = 'application/json'
 
-        url = '/v2/accounts/{0}/users/{1}/settings'.format(
-            *self.encode_path_vars(account_id, iam_id))
+        path_param_keys = ['account_id', 'iam_id']
+        path_param_values = self.encode_path_vars(account_id, iam_id)
+        path_param_dict = dict(zip(path_param_keys, path_param_values))
+        url = '/v2/accounts/{account_id}/users/{iam_id}/settings'.format(**path_param_dict)
         request = self.prepare_request(method='PATCH',
                                        url=url,
                                        headers=headers,
@@ -243,8 +247,10 @@ def list_users(self,
             headers.update(kwargs.get('headers'))
         headers['Accept'] = 'application/json'
 
-        url = '/v2/accounts/{0}/users'.format(
-            *self.encode_path_vars(account_id))
+        path_param_keys = ['account_id']
+        path_param_values = self.encode_path_vars(account_id)
+        path_param_dict = dict(zip(path_param_keys, path_param_values))
+        url = '/v2/accounts/{account_id}/users'.format(**path_param_dict)
         request = self.prepare_request(method='GET',
                                        url=url,
                                        headers=headers,
@@ -313,8 +319,10 @@ def invite_users(self,
             headers.update(kwargs.get('headers'))
         headers['Accept'] = 'application/json'
 
-        url = '/v2/accounts/{0}/users'.format(
-            *self.encode_path_vars(account_id))
+        path_param_keys = ['account_id']
+        path_param_values = self.encode_path_vars(account_id)
+        path_param_dict = dict(zip(path_param_keys, path_param_values))
+        url = '/v2/accounts/{account_id}/users'.format(**path_param_dict)
         request = self.prepare_request(method='POST',
                                        url=url,
                                        headers=headers,
@@ -358,8 +366,10 @@ def get_user_profile(self,
             headers.update(kwargs.get('headers'))
         headers['Accept'] = 'application/json'
 
-        url = '/v2/accounts/{0}/users/{1}'.format(
-            *self.encode_path_vars(account_id, iam_id))
+        path_param_keys = ['account_id', 'iam_id']
+        path_param_values = self.encode_path_vars(account_id, iam_id)
+        path_param_dict = dict(zip(path_param_keys, path_param_values))
+        url = '/v2/accounts/{account_id}/users/{iam_id}'.format(**path_param_dict)
         request = self.prepare_request(method='GET',
                                        url=url,
                                        headers=headers)
@@ -436,8 +446,10 @@ def update_user_profiles(self,
         if 'headers' in kwargs:
             headers.update(kwargs.get('headers'))
 
-        url = '/v2/accounts/{0}/users/{1}'.format(
-            *self.encode_path_vars(account_id, iam_id))
+        path_param_keys = ['account_id', 'iam_id']
+        path_param_values = self.encode_path_vars(account_id, iam_id)
+        path_param_dict = dict(zip(path_param_keys, path_param_values))
+        url = '/v2/accounts/{account_id}/users/{iam_id}'.format(**path_param_dict)
         request = self.prepare_request(method='PATCH',
                                        url=url,
                                        headers=headers,
@@ -481,8 +493,10 @@ def remove_users(self,
         if 'headers' in kwargs:
             headers.update(kwargs.get('headers'))
 
-        url = '/v2/accounts/{0}/users/{1}'.format(
-            *self.encode_path_vars(account_id, iam_id))
+        path_param_keys = ['account_id', 'iam_id']
+        path_param_values = self.encode_path_vars(account_id, iam_id)
+        path_param_dict = dict(zip(path_param_keys, path_param_values))
+        url = '/v2/accounts/{account_id}/users/{iam_id}'.format(**path_param_dict)
         request = self.prepare_request(method='DELETE',
                                        url=url,
                                        headers=headers)
@@ -958,27 +972,36 @@ class InviteUserIamPolicy():
     """
     Invite a user to an IAM policy.
 
+    :attr str type: The policy type. This can be either "access" or "authorization".
     :attr List[Role] roles: (optional) A list of IAM roles.
     :attr List[Resource] resources: (optional) A list of resources.
     """
 
     def __init__(self,
+                 type: str,
                  *,
                  roles: List['Role'] = None,
                  resources: List['Resource'] = None) -> None:
         """
         Initialize a InviteUserIamPolicy object.
 
+        :param str type: The policy type. This can be either "access" or
+               "authorization".
         :param List[Role] roles: (optional) A list of IAM roles.
         :param List[Resource] resources: (optional) A list of resources.
         """
+        self.type = type
         self.roles = roles
         self.resources = resources
 
     @classmethod
     def from_dict(cls, _dict: Dict) -> 'InviteUserIamPolicy':
         """Initialize a InviteUserIamPolicy object from a json dictionary."""
         args = {}
+        if 'type' in _dict:
+            args['type'] = _dict.get('type')
+        else:
+            raise ValueError('Required property \'type\' not present in InviteUserIamPolicy JSON')
         if 'roles' in _dict:
             args['roles'] = [Role.from_dict(x) for x in _dict.get('roles')]
         if 'resources' in _dict:
@@ -993,6 +1016,8 @@ def _from_dict(cls, _dict):
     def to_dict(self) -> Dict:
         """Return a json dictionary representing this model."""
         _dict = {}
+        if hasattr(self, 'type') and self.type is not None:
+            _dict['type'] = self.type
         if hasattr(self, 'roles') and self.roles is not None:
             _dict['roles'] = [x.to_dict() for x in self.roles]
         if hasattr(self, 'resources') and self.resources is not None:

test/integration/test_user_management_v1.py

@@ -0,0 +1,168 @@
+# -*- coding: utf-8 -*-
+# (C) Copyright IBM Corp. 2020.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""
+Integration Tests for UserManagementV1
+"""
+
+import os
+import pytest
+from ibm_platform_services.user_management_v1 import *
+
+# Config file name
+config_file = 'user_management.env'
+
+class TestUserManagementV1():
+    """
+    Integration Test Class for UserManagementV1
+    """
+
+    @classmethod
+    def setup_class(cls):
+        if os.path.exists(config_file):
+            os.environ['IBM_CREDENTIALS_FILE'] = config_file
+
+            cls.user_management_service = UserManagementV1.new_instance(
+                )
+            assert cls.user_management_service is not None
+
+        print('Setup complete.')
+
+    needscredentials = pytest.mark.skipif(
+        not os.path.exists(config_file), reason="External configuration not available, skipping..."
+    )
+
+    @needscredentials
+    def test_get_user_settings(self):
+
+        get_user_settings_response = self.user_management_service.get_user_settings(
+            account_id='testString',
+            iam_id='testString'
+        )
+
+        assert get_user_settings_response.get_status_code() == 200
+        user_settings = get_user_settings_response.get_result()
+        assert user_settings is not None
+
+    @needscredentials
+    def test_update_user_settings(self):
+
+        update_user_settings_response = self.user_management_service.update_user_settings(
+            account_id='testString',
+            iam_id='testString',
+            language='testString',
+            notification_language='testString',
+            allowed_ip_addresses='32.96.110.50,172.16.254.1',
+            self_manage=True
+        )
+
+        assert update_user_settings_response.get_status_code() == 200
+        user_settings = update_user_settings_response.get_result()
+        assert user_settings is not None
+
+    @needscredentials
+    def test_list_users(self):
+
+        list_users_response = self.user_management_service.list_users(
+            account_id='testString',
+            state='testString'
+        )
+
+        assert list_users_response.get_status_code() == 200
+        user_list = list_users_response.get_result()
+        assert user_list is not None
+
+    @needscredentials
+    def test_invite_users(self):
+
+        # Construct a dict representation of a InviteUser model
+        invite_user_model = {
+            'email': 'testString',
+            'account_role': 'testString'
+        }
+
+        # Construct a dict representation of a Role model
+        role_model = {
+            'role_id': 'testString'
+        }
+
+        # Construct a dict representation of a Attribute model
+        attribute_model = {
+            'name': 'testString',
+            'value': 'testString'
+        }
+
+        # Construct a dict representation of a Resource model
+        resource_model = {
+            'attributes': [attribute_model]
+        }
+
+        # Construct a dict representation of a InviteUserIamPolicy model
+        invite_user_iam_policy_model = {
+            'type': 'testString',
+            'roles': [role_model],
+            'resources': [resource_model]
+        }
+
+        invite_users_response = self.user_management_service.invite_users(
+            account_id='testString',
+            users=[invite_user_model],
+            iam_policy=[invite_user_iam_policy_model],
+            access_groups=['testString']
+        )
+
+        assert invite_users_response.get_status_code() == 202
+        user_list = invite_users_response.get_result()
+        assert user_list is not None
+
+    @needscredentials
+    def test_get_user_profile(self):
+
+        get_user_profile_response = self.user_management_service.get_user_profile(
+            account_id='testString',
+            iam_id='testString'
+        )
+
+        assert get_user_profile_response.get_status_code() == 200
+        user_profile = get_user_profile_response.get_result()
+        assert user_profile is not None
+
+    @needscredentials
+    def test_update_user_profiles(self):
+
+        update_user_profiles_response = self.user_management_service.update_user_profiles(
+            account_id='testString',
+            iam_id='testString',
+            firstname='testString',
+            lastname='testString',
+            state='testString',
+            email='testString',
+            phonenumber='testString',
+            altphonenumber='testString',
+            photo='testString'
+        )
+
+        assert update_user_profiles_response.get_status_code() == 204
+
+    @needscredentials
+    def test_remove_users(self):
+
+        remove_users_response = self.user_management_service.remove_users(
+            account_id='testString',
+            iam_id='testString'
+        )
+
+        assert remove_users_response.get_status_code() == 204
+