python-openstackclient 7.1.2__py3-none-any.whl → 7.1.4__py3-none-any.whl

openstackclient/common/clientmanager.py

@@ -129,10 +129,15 @@ class ClientManager(clientmanager.ClientManager):
     # TODO(stephenfin): Drop volume_client argument in OSC 8.0 or later.
     def is_volume_endpoint_enabled(self, volume_client=None):
         """Check if volume endpoint is enabled"""
+        # We check against the service type and all aliases defined by the
+        # Service Types Authority
+        # https://service-types.openstack.org/service-types.json
         return (
-            self.is_service_available('volume') is not False
+            self.is_service_available('block-storage') is not False
+            or self.is_service_available('volume') is not False
             or self.is_service_available('volumev3') is not False
             or self.is_service_available('volumev2') is not False
+            or self.is_service_available('block-store') is not False
         )
 
 

openstackclient/common/limits.py

@@ -130,7 +130,7 @@ class ShowLimits(command.Lister):
         if self.app.client_manager.is_volume_endpoint_enabled():
             volume_client = self.app.client_manager.sdk_connection.volume
             volume_limits = volume_client.get_limits(
-                project_id=project_id,
+                project=project_id,
             )
 
         if parsed_args.is_absolute:

openstackclient/common/quota.py

@@ -249,9 +249,14 @@ class ListQuota(command.Lister):
         for project_id in project_ids:
             try:
                 project_data = compute_client.get_quota_set(project_id)
+            # NOTE(stephenfin): Unfortunately, Nova raises a HTTP 400 (Bad
+            # Request) if the project ID is invalid, even though the project
+            # ID is actually the resource's identifier which would normally
+            # lead us to expect a HTTP 404 (Not Found).
             except (
-                sdk_exceptions.NotFoundException,
+                sdk_exceptions.BadRequestException,
                 sdk_exceptions.ForbiddenException,
+                sdk_exceptions.NotFoundException,
             ) as exc:
                 # Project not found, move on to next one
                 LOG.warning(f"Project {project_id} not found: {exc}")
@@ -312,8 +317,8 @@ class ListQuota(command.Lister):
             try:
                 project_data = volume_client.get_quota_set(project_id)
             except (
-                sdk_exceptions.NotFoundException,
                 sdk_exceptions.ForbiddenException,
+                sdk_exceptions.NotFoundException,
             ) as exc:
                 # Project not found, move on to next one
                 LOG.warning(f"Project {project_id} not found: {exc}")

openstackclient/compute/v2/server.py

@@ -2648,7 +2648,7 @@ class ListServer(command.Lister):
             'status': parsed_args.status,
             'flavor': flavor_id,
             'image': image_id,
-            'host': parsed_args.host,
+            'compute_host': parsed_args.host,
             'project_id': project_id,
             'all_projects': parsed_args.all_projects,
             'user_id': user_id,

openstackclient/identity/common.py

@@ -184,13 +184,6 @@ def _get_token_resource(client, resource, parsed_name, parsed_domain=None):
         return parsed_name
 
 
-def _get_domain_id_if_requested(identity_client, domain_name_or_id):
-    if not domain_name_or_id:
-        return None
-    domain = find_domain(identity_client, domain_name_or_id)
-    return domain.id
-
-
 def find_domain(identity_client, name_or_id):
     return _find_identity_resource(
         identity_client.domains, name_or_id, domains.Domain
@@ -198,45 +191,43 @@ def find_domain(identity_client, name_or_id):
 
 
 def find_group(identity_client, name_or_id, domain_name_or_id=None):
-    domain_id = _get_domain_id_if_requested(identity_client, domain_name_or_id)
-    if not domain_id:
+    if domain_name_or_id is None:
         return _find_identity_resource(
             identity_client.groups, name_or_id, groups.Group
         )
-    else:
-        return _find_identity_resource(
-            identity_client.groups,
-            name_or_id,
-            groups.Group,
-            domain_id=domain_id,
-        )
+
+    domain_id = find_domain(identity_client, domain_name_or_id).id
+    return _find_identity_resource(
+        identity_client.groups,
+        name_or_id,
+        groups.Group,
+        domain_id=domain_id,
+    )
 
 
 def find_project(identity_client, name_or_id, domain_name_or_id=None):
-    domain_id = _get_domain_id_if_requested(identity_client, domain_name_or_id)
-    if not domain_id:
+    if domain_name_or_id is None:
         return _find_identity_resource(
             identity_client.projects, name_or_id, projects.Project
         )
-    else:
-        return _find_identity_resource(
-            identity_client.projects,
-            name_or_id,
-            projects.Project,
-            domain_id=domain_id,
-        )
+    domain_id = find_domain(identity_client, domain_name_or_id).id
+    return _find_identity_resource(
+        identity_client.projects,
+        name_or_id,
+        projects.Project,
+        domain_id=domain_id,
+    )
 
 
 def find_user(identity_client, name_or_id, domain_name_or_id=None):
-    domain_id = _get_domain_id_if_requested(identity_client, domain_name_or_id)
-    if not domain_id:
+    if domain_name_or_id is None:
         return _find_identity_resource(
             identity_client.users, name_or_id, users.User
         )
-    else:
-        return _find_identity_resource(
-            identity_client.users, name_or_id, users.User, domain_id=domain_id
-        )
+    domain_id = find_domain(identity_client, domain_name_or_id).id
+    return _find_identity_resource(
+        identity_client.users, name_or_id, users.User, domain_id=domain_id
+    )
 
 
 def _find_identity_resource(

openstackclient/identity/v3/role_assignment.py

@@ -146,12 +146,19 @@ class ListRoleAssignment(command.Lister):
                 domain_id=role_domain_id,
             )
 
+        user_domain_id = None
+        if parsed_args.user_domain:
+            user_domain_id = _find_sdk_id(
+                identity_client.find_domain,
+                name_or_id=parsed_args.user_domain,
+            )
+
         user_id = None
         if parsed_args.user:
             user_id = _find_sdk_id(
                 identity_client.find_user,
                 name_or_id=parsed_args.user,
-                domain_id=parsed_args.user_domain,
+                domain_id=user_domain_id,
             )
         elif parsed_args.authuser:
             if auth_ref:
@@ -171,6 +178,13 @@ class ListRoleAssignment(command.Lister):
                 name_or_id=parsed_args.domain,
             )
 
+        project_domain_id = None
+        if parsed_args.project_domain:
+            project_domain_id = _find_sdk_id(
+                identity_client.find_domain,
+                name_or_id=parsed_args.project_domain,
+            )
+
         project_id = None
         if parsed_args.project:
             project_id = _find_sdk_id(
@@ -178,7 +192,7 @@ class ListRoleAssignment(command.Lister):
                 name_or_id=common._get_token_resource(
                     identity_client, 'project', parsed_args.project
                 ),
-                domain_id=parsed_args.project_domain,
+                domain_id=project_domain_id,
             )
         elif parsed_args.authproject:
             if auth_ref:
@@ -187,12 +201,19 @@ class ListRoleAssignment(command.Lister):
                     name_or_id=auth_ref.project_id,
                 )
 
+        group_domain_id = None
+        if parsed_args.group_domain:
+            group_domain_id = _find_sdk_id(
+                identity_client.find_domain,
+                name_or_id=parsed_args.group_domain,
+            )
+
         group_id = None
         if parsed_args.group:
             group_id = _find_sdk_id(
                 identity_client.find_group,
                 name_or_id=parsed_args.group,
-                domain_id=parsed_args.group_domain,
+                domain_id=group_domain_id,
             )
 
         include_names = True if parsed_args.names else None

openstackclient/identity/v3/service.py

@@ -225,7 +225,8 @@ class SetService(command.Command):
             kwargs['name'] = parsed_args.name
         if parsed_args.description:
             kwargs['description'] = parsed_args.description
-        kwargs['is_enabled'] = parsed_args.is_enabled
+        if parsed_args.is_enabled is not None:
+            kwargs['is_enabled'] = parsed_args.is_enabled
 
         identity_client.update_service(service.id, **kwargs)
 

openstackclient/identity/v3/user.py

@@ -249,26 +249,44 @@ class CreateUser(command.ShowOne):
     def take_action(self, parsed_args):
         identity_client = self.app.client_manager.sdk_connection.identity
 
+        kwargs = {}
+
         domain_id = None
         if parsed_args.domain:
             domain_id = identity_client.find_domain(
-                name_or_id=parsed_args.domain,
+                parsed_args.domain,
                 ignore_missing=False,
             ).id
+            kwargs['domain_id'] = domain_id
 
-        project_id = None
         if parsed_args.project:
-            project_id = identity_client.find_project(
-                name_or_id=parsed_args.project,
+            project_domain_id = None
+            if parsed_args.project_domain:
+                project_domain_id = identity_client.find_domain(
+                    parsed_args.project_domain,
+                    ignore_missing=False,
+                ).id
+            kwargs['default_project_id'] = identity_client.find_project(
+                parsed_args.project,
                 ignore_missing=False,
-                domain_id=domain_id,
+                domain_id=project_domain_id,
             ).id
 
+        if parsed_args.description:
+            kwargs['description'] = parsed_args.description
+
+        if parsed_args.email:
+            kwargs['email'] = parsed_args.email
+
         is_enabled = True
         if parsed_args.disable:
             is_enabled = False
-        if parsed_args.password_prompt:
-            parsed_args.password = utils.get_password(self.app.stdin)
+
+        password = None
+        if parsed_args.password:
+            password = parsed_args.password
+        elif parsed_args.password_prompt:
+            password = utils.get_password(self.app.stdin)
 
         if not parsed_args.password:
             LOG.warning(
@@ -278,24 +296,26 @@ class CreateUser(command.ShowOne):
                 )
             )
         options = _get_options_for_user(identity_client, parsed_args)
+        if options:
+            kwargs['options'] = options
 
         try:
             user = identity_client.create_user(
-                default_project_id=project_id,
-                description=parsed_args.description,
-                domain_id=domain_id,
-                email=parsed_args.email,
                 is_enabled=is_enabled,
                 name=parsed_args.name,
-                password=parsed_args.password,
-                options=options,
+                password=password,
+                **kwargs,
             )
         except sdk_exc.ConflictException:
             if parsed_args.or_show:
+                kwargs = {}
+                if domain_id:
+                    kwargs['domain_id'] = domain_id
+
                 user = identity_client.find_user(
-                    name_or_id=parsed_args.name,
-                    domain_id=domain_id,
+                    parsed_args.name,
                     ignore_missing=False,
+                    **kwargs,
                 )
                 LOG.info(_('Returning existing user %s'), user.name)
             else:

openstackclient/tests/unit/compute/v2/test_server.py

@@ -4581,7 +4581,7 @@ class _TestServerList(TestServer):
             'status': None,
             'flavor': None,
             'image': None,
-            'host': None,
+            'compute_host': None,
             'project_id': None,
             'all_projects': False,
             'user_id': None,

openstackclient/tests/unit/identity/v3/test_role_assignment.py

@@ -165,10 +165,13 @@ class TestRoleAssignmentList(identity_fakes.TestIdentityv3):
         arglist = ['--user', self.user.name]
         verifylist = [
             ('user', self.user.name),
+            ('user_domain', None),
             ('group', None),
+            ('group_domain', None),
             ('system', None),
             ('domain', None),
             ('project', None),
+            ('project_domain', None),
             ('role', None),
             ('effective', None),
             ('inherited', False),
@@ -181,6 +184,79 @@ class TestRoleAssignmentList(identity_fakes.TestIdentityv3):
         # containing the data to be listed.
         columns, data = self.cmd.take_action(parsed_args)
 
+        self.identity_sdk_client.find_user.assert_called_with(
+            name_or_id=self.user.name, ignore_missing=False, domain_id=None
+        )
+        self.identity_sdk_client.role_assignments.assert_called_with(
+            role_id=None,
+            user_id=self.user.id,
+            group_id=None,
+            scope_project_id=None,
+            scope_domain_id=None,
+            scope_system=None,
+            effective=None,
+            include_names=None,
+            inherited_to=None,
+        )
+
+        self.assertEqual(self.columns, columns)
+        datalist = (
+            (
+                self.role.id,
+                self.user.id,
+                '',
+                '',
+                self.domain.id,
+                '',
+                False,
+            ),
+            (
+                self.role.id,
+                self.user.id,
+                '',
+                self.project.id,
+                '',
+                '',
+                False,
+            ),
+        )
+        self.assertEqual(datalist, tuple(data))
+
+    def test_role_assignment_list_user_with_domain(self):
+        self.identity_sdk_client.role_assignments.return_value = [
+            self.assignment_with_domain_id_and_user_id,
+            self.assignment_with_project_id_and_user_id,
+        ]
+
+        arglist = ['--user', self.user.name, '--user-domain', self.domain.name]
+        verifylist = [
+            ('user', self.user.name),
+            ('user_domain', self.domain.name),
+            ('group', None),
+            ('group_domain', None),
+            ('system', None),
+            ('domain', None),
+            ('project', None),
+            ('role', None),
+            ('effective', None),
+            ('inherited', False),
+            ('names', False),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        # In base command class Lister in cliff, abstract method take_action()
+        # returns a tuple containing the column names and an iterable
+        # containing the data to be listed.
+        columns, data = self.cmd.take_action(parsed_args)
+
+        self.identity_sdk_client.find_domain.assert_called_with(
+            name_or_id=self.domain.name, ignore_missing=False
+        )
+        self.identity_sdk_client.find_user.assert_called_with(
+            name_or_id=self.user.name,
+            ignore_missing=False,
+            domain_id=self.domain.id,
+        )
         self.identity_sdk_client.role_assignments.assert_called_with(
             role_id=None,
             user_id=self.user.id,
@@ -230,10 +306,13 @@ class TestRoleAssignmentList(identity_fakes.TestIdentityv3):
         arglist = ['--user', self.user.id]
         verifylist = [
             ('user', self.user.id),
+            ('user_domain', None),
             ('group', None),
+            ('group_domain', None),
             ('system', None),
             ('domain', None),
             ('project', None),
+            ('project_domain', None),
             ('role', None),
             ('effective', None),
             ('inherited', False),
@@ -290,10 +369,13 @@ class TestRoleAssignmentList(identity_fakes.TestIdentityv3):
         arglist = ['--group', self.group.name]
         verifylist = [
             ('user', None),
+            ('user_domain', None),
             ('group', self.group.name),
+            ('group_domain', None),
             ('system', None),
             ('domain', None),
             ('project', None),
+            ('project_domain', None),
             ('role', None),
             ('effective', None),
             ('inherited', False),
@@ -306,6 +388,85 @@ class TestRoleAssignmentList(identity_fakes.TestIdentityv3):
         # containing the data to be listed.
         columns, data = self.cmd.take_action(parsed_args)
 
+        self.identity_sdk_client.find_group.assert_called_with(
+            name_or_id=self.group.name, ignore_missing=False, domain_id=None
+        )
+        self.identity_sdk_client.role_assignments.assert_called_with(
+            role_id=None,
+            user_id=None,
+            group_id=self.group.id,
+            scope_project_id=None,
+            scope_domain_id=None,
+            scope_system=None,
+            effective=None,
+            include_names=None,
+            inherited_to=None,
+        )
+
+        self.assertEqual(self.columns, columns)
+        datalist = (
+            (
+                self.role.id,
+                '',
+                self.group.id,
+                '',
+                self.domain.id,
+                '',
+                False,
+            ),
+            (
+                self.role.id,
+                '',
+                self.group.id,
+                self.project.id,
+                '',
+                '',
+                False,
+            ),
+        )
+        self.assertEqual(datalist, tuple(data))
+
+    def test_role_assignment_list_group_with_domain(self):
+        self.identity_sdk_client.role_assignments.return_value = [
+            self.assignment_with_domain_id_and_group_id,
+            self.assignment_with_project_id_and_group_id,
+        ]
+
+        arglist = [
+            '--group',
+            self.group.name,
+            '--group-domain',
+            self.domain.name,
+        ]
+        verifylist = [
+            ('user', None),
+            ('user_domain', None),
+            ('group', self.group.name),
+            ('group_domain', self.domain.name),
+            ('system', None),
+            ('domain', None),
+            ('project', None),
+            ('project_domain', None),
+            ('role', None),
+            ('effective', None),
+            ('inherited', False),
+            ('names', False),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        # In base command class Lister in cliff, abstract method take_action()
+        # returns a tuple containing the column names and an iterable
+        # containing the data to be listed.
+        columns, data = self.cmd.take_action(parsed_args)
+
+        self.identity_sdk_client.find_domain.assert_called_with(
+            name_or_id=self.domain.name, ignore_missing=False
+        )
+        self.identity_sdk_client.find_group.assert_called_with(
+            name_or_id=self.group.name,
+            ignore_missing=False,
+            domain_id=self.domain.id,
+        )
         self.identity_sdk_client.role_assignments.assert_called_with(
             role_id=None,
             user_id=None,
@@ -350,10 +511,13 @@ class TestRoleAssignmentList(identity_fakes.TestIdentityv3):
         arglist = ['--domain', self.domain.name]
         verifylist = [
             ('user', None),
+            ('user_domain', None),
             ('group', None),
+            ('group_domain', None),
             ('system', None),
             ('domain', self.domain.name),
             ('project', None),
+            ('project_domain', None),
             ('role', None),
             ('effective', None),
             ('inherited', False),
@@ -410,10 +574,13 @@ class TestRoleAssignmentList(identity_fakes.TestIdentityv3):
         arglist = ['--project', self.project.name]
         verifylist = [
             ('user', None),
+            ('user_domain', None),
             ('group', None),
+            ('group_domain', None),
             ('system', None),
             ('domain', None),
             ('project', self.project.name),
+            ('project_domain', None),
             ('role', None),
             ('effective', None),
             ('inherited', False),
@@ -426,6 +593,85 @@ class TestRoleAssignmentList(identity_fakes.TestIdentityv3):
         # containing the data to be listed.
         columns, data = self.cmd.take_action(parsed_args)
 
+        self.identity_sdk_client.find_project.assert_called_with(
+            name_or_id=self.project.name, ignore_missing=False, domain_id=None
+        )
+        self.identity_sdk_client.role_assignments.assert_called_with(
+            role_id=None,
+            user_id=None,
+            group_id=None,
+            scope_project_id=self.project.id,
+            scope_domain_id=None,
+            scope_system=None,
+            effective=None,
+            include_names=None,
+            inherited_to=None,
+        )
+
+        self.assertEqual(self.columns, columns)
+        datalist = (
+            (
+                self.role.id,
+                self.user.id,
+                '',
+                self.project.id,
+                '',
+                '',
+                False,
+            ),
+            (
+                self.role.id,
+                '',
+                self.group.id,
+                self.project.id,
+                '',
+                '',
+                False,
+            ),
+        )
+        self.assertEqual(datalist, tuple(data))
+
+    def test_role_assignment_list_project_with_domain(self):
+        self.identity_sdk_client.role_assignments.return_value = [
+            self.assignment_with_project_id_and_user_id,
+            self.assignment_with_project_id_and_group_id,
+        ]
+
+        arglist = [
+            '--project',
+            self.project.name,
+            '--project-domain',
+            self.domain.name,
+        ]
+        verifylist = [
+            ('user', None),
+            ('user_domain', None),
+            ('group', None),
+            ('group_domain', None),
+            ('system', None),
+            ('domain', None),
+            ('project', self.project.name),
+            ('project_domain', self.domain.name),
+            ('role', None),
+            ('effective', None),
+            ('inherited', False),
+            ('names', False),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        # In base command class Lister in cliff, abstract method take_action()
+        # returns a tuple containing the column names and an iterable
+        # containing the data to be listed.
+        columns, data = self.cmd.take_action(parsed_args)
+
+        self.identity_sdk_client.find_domain.assert_called_with(
+            name_or_id=self.domain.name, ignore_missing=False
+        )
+        self.identity_sdk_client.find_project.assert_called_with(
+            name_or_id=self.project.name,
+            ignore_missing=False,
+            domain_id=self.domain.id,
+        )
         self.identity_sdk_client.role_assignments.assert_called_with(
             role_id=None,
             user_id=None,
@@ -476,10 +722,13 @@ class TestRoleAssignmentList(identity_fakes.TestIdentityv3):
         ]
         verifylist = [
             ('user', None),
+            ('user_domain', None),
             ('group', None),
+            ('group_domain', None),
             ('system', None),
             ('domain', None),
             ('project', None),
+            ('project_domain', None),
             ('role', None),
             ('effective', None),
             ('inherited', False),
@@ -529,10 +778,13 @@ class TestRoleAssignmentList(identity_fakes.TestIdentityv3):
         arglist = ['--effective']
         verifylist = [
             ('user', None),
+            ('user_domain', None),
             ('group', None),
+            ('group_domain', None),
             ('system', None),
             ('domain', None),
             ('project', None),
+            ('project_domain', None),
             ('role', None),
             ('effective', True),
             ('inherited', False),
@@ -611,10 +863,13 @@ class TestRoleAssignmentList(identity_fakes.TestIdentityv3):
         arglist = ['--inherited']
         verifylist = [
             ('user', None),
+            ('user_domain', None),
             ('group', None),
+            ('group_domain', None),
             ('system', None),
             ('domain', None),
             ('project', None),
+            ('project_domain', None),
             ('role', None),
             ('effective', None),
             ('inherited', True),
@@ -707,10 +962,13 @@ class TestRoleAssignmentList(identity_fakes.TestIdentityv3):
         arglist = ['--names']
         verifylist = [
             ('user', None),
+            ('user_domain', None),
             ('group', None),
+            ('group_domain', None),
             ('system', None),
             ('domain', None),
             ('project', None),
+            ('project_domain', None),
             ('role', None),
             ('effective', None),
             ('inherited', False),
@@ -799,10 +1057,13 @@ class TestRoleAssignmentList(identity_fakes.TestIdentityv3):
         ]
         verifylist = [
             ('user', None),
+            ('user_domain', None),
             ('group', None),
+            ('group_domain', None),
             ('system', None),
             ('domain', None),
             ('project', None),
+            ('project_domain', None),
             ('role', role_2.name),
             ('effective', None),
             ('inherited', False),

openstackclient/tests/unit/identity/v3/test_service.py

@@ -311,7 +311,6 @@ class TestServiceSet(identity_fakes.TestIdentityv3):
         # Set expected values
         kwargs = {
             'type': self.service.type,
-            'is_enabled': None,
         }
         self.identity_sdk_client.update_service.assert_called_with(
             self.service.id, **kwargs
@@ -338,7 +337,6 @@ class TestServiceSet(identity_fakes.TestIdentityv3):
         # Set expected values
         kwargs = {
             'name': self.service.name,
-            'is_enabled': None,
         }
         self.identity_sdk_client.update_service.assert_called_with(
             self.service.id, **kwargs
@@ -365,7 +363,6 @@ class TestServiceSet(identity_fakes.TestIdentityv3):
         # Set expected values
         kwargs = {
             'description': self.service.description,
-            'is_enabled': None,
         }
         self.identity_sdk_client.update_service.assert_called_with(
             self.service.id, **kwargs

openstackclient/tests/unit/identity/v3/test_user.py

@@ -91,11 +91,6 @@ class TestUserCreate(identity_fakes.TestIdentityv3):
         # Set expected values
         kwargs = {
             'name': self.user.name,
-            'default_project_id': None,
-            'description': None,
-            'domain_id': None,
-            'email': None,
-            'options': {},
             'is_enabled': True,
             'password': None,
         }
@@ -127,11 +122,6 @@ class TestUserCreate(identity_fakes.TestIdentityv3):
         # Set expected values
         kwargs = {
             'name': self.user.name,
-            'default_project_id': None,
-            'description': None,
-            'domain_id': None,
-            'email': None,
-            'options': {},
             'is_enabled': True,
             'password': 'secret',
         }
@@ -165,11 +155,6 @@ class TestUserCreate(identity_fakes.TestIdentityv3):
         # Set expected values
         kwargs = {
             'name': self.user.name,
-            'default_project_id': None,
-            'description': None,
-            'domain_id': None,
-            'email': None,
-            'options': {},
             'is_enabled': True,
             'password': 'abc123',
         }
@@ -200,12 +185,8 @@ class TestUserCreate(identity_fakes.TestIdentityv3):
         # Set expected values
         kwargs = {
             'name': self.user.name,
-            'default_project_id': None,
-            'description': None,
-            'domain_id': None,
             'email': 'barney@example.com',
             'is_enabled': True,
-            'options': {},
             'password': None,
         }
         self.identity_sdk_client.create_user.assert_called_with(**kwargs)
@@ -236,11 +217,7 @@ class TestUserCreate(identity_fakes.TestIdentityv3):
         kwargs = {
             'name': self.user.name,
             'default_project_id': self.project.id,
-            'description': None,
-            'domain_id': None,
-            'email': None,
             'is_enabled': True,
-            'options': {},
             'password': None,
         }
         self.identity_sdk_client.create_user.assert_called_with(**kwargs)
@@ -284,14 +261,13 @@ class TestUserCreate(identity_fakes.TestIdentityv3):
         kwargs = {
             'name': self.user.name,
             'default_project_id': self.project.id,
-            'description': None,
-            'domain_id': None,
-            'email': None,
-            'options': {},
             'is_enabled': True,
             'password': None,
         }
-        self.identity_sdk_client.create_user.assert_called_with(**kwargs)
+        self.identity_sdk_client.create_user.assert_called_once_with(**kwargs)
+        self.identity_sdk_client.find_domain.assert_called_once_with(
+            self.project.domain_id, ignore_missing=False
+        )
 
         self.assertEqual(self.columns, columns)
         datalist = (
@@ -328,11 +304,7 @@ class TestUserCreate(identity_fakes.TestIdentityv3):
         # Set expected values
         kwargs = {
             'name': self.user.name,
-            'default_project_id': None,
-            'description': None,
             'domain_id': self.domain.id,
-            'email': None,
-            'options': {},
             'is_enabled': True,
             'password': None,
         }
@@ -361,11 +333,6 @@ class TestUserCreate(identity_fakes.TestIdentityv3):
         # Set expected values
         kwargs = {
             'name': self.user.name,
-            'default_project_id': None,
-            'description': None,
-            'domain_id': None,
-            'email': None,
-            'options': {},
             'is_enabled': True,
             'password': None,
         }
@@ -394,11 +361,6 @@ class TestUserCreate(identity_fakes.TestIdentityv3):
         # Set expected values
         kwargs = {
             'name': self.user.name,
-            'default_project_id': None,
-            'description': None,
-            'domain_id': None,
-            'email': None,
-            'options': {},
             'is_enabled': False,
             'password': None,
         }
@@ -428,10 +390,6 @@ class TestUserCreate(identity_fakes.TestIdentityv3):
         # Set expected values
         kwargs = {
             'name': self.user.name,
-            'default_project_id': None,
-            'description': None,
-            'domain_id': None,
-            'email': None,
             'is_enabled': True,
             'options': {'ignore_lockout_failure_attempts': True},
             'password': None,
@@ -462,10 +420,6 @@ class TestUserCreate(identity_fakes.TestIdentityv3):
         # Set expected values
         kwargs = {
             'name': self.user.name,
-            'default_project_id': None,
-            'description': None,
-            'domain_id': None,
-            'email': None,
             'is_enabled': True,
             'options': {'ignore_lockout_failure_attempts': False},
             'password': None,
@@ -496,10 +450,6 @@ class TestUserCreate(identity_fakes.TestIdentityv3):
         # Set expected values
         kwargs = {
             'name': self.user.name,
-            'default_project_id': None,
-            'description': None,
-            'domain_id': None,
-            'email': None,
             'is_enabled': True,
             'options': {'ignore_password_expiry': True},
             'password': None,
@@ -530,10 +480,6 @@ class TestUserCreate(identity_fakes.TestIdentityv3):
         # Set expected values
         kwargs = {
             'name': self.user.name,
-            'default_project_id': None,
-            'description': None,
-            'domain_id': None,
-            'email': None,
             'is_enabled': True,
             'options': {'ignore_password_expiry': False},
             'password': None,
@@ -564,10 +510,6 @@ class TestUserCreate(identity_fakes.TestIdentityv3):
         # Set expected values
         kwargs = {
             'name': self.user.name,
-            'default_project_id': None,
-            'description': None,
-            'domain_id': None,
-            'email': None,
             'is_enabled': True,
             'options': {'ignore_change_password_upon_first_use': True},
             'password': None,
@@ -598,10 +540,6 @@ class TestUserCreate(identity_fakes.TestIdentityv3):
         # Set expected values
         kwargs = {
             'name': self.user.name,
-            'default_project_id': None,
-            'description': None,
-            'domain_id': None,
-            'email': None,
             'is_enabled': True,
             'options': {'ignore_change_password_upon_first_use': False},
             'password': None,
@@ -632,10 +570,6 @@ class TestUserCreate(identity_fakes.TestIdentityv3):
         # Set expected values
         kwargs = {
             'name': self.user.name,
-            'default_project_id': None,
-            'description': None,
-            'domain_id': None,
-            'email': None,
             'is_enabled': True,
             'options': {'lock_password': True},
             'password': None,
@@ -666,10 +600,6 @@ class TestUserCreate(identity_fakes.TestIdentityv3):
         # Set expected values
         kwargs = {
             'name': self.user.name,
-            'default_project_id': None,
-            'description': None,
-            'domain_id': None,
-            'email': None,
             'is_enabled': True,
             'options': {'lock_password': False},
             'password': None,
@@ -700,10 +630,6 @@ class TestUserCreate(identity_fakes.TestIdentityv3):
         # Set expected values
         kwargs = {
             'name': self.user.name,
-            'default_project_id': None,
-            'description': None,
-            'domain_id': None,
-            'email': None,
             'is_enabled': True,
             'options': {'multi_factor_auth_enabled': True},
             'password': None,
@@ -734,10 +660,6 @@ class TestUserCreate(identity_fakes.TestIdentityv3):
         # Set expected values
         kwargs = {
             'name': self.user.name,
-            'default_project_id': None,
-            'description': None,
-            'domain_id': None,
-            'email': None,
             'is_enabled': True,
             'options': {'multi_factor_auth_enabled': False},
             'password': None,
@@ -774,10 +696,6 @@ class TestUserCreate(identity_fakes.TestIdentityv3):
         # Set expected values
         kwargs = {
             'name': self.user.name,
-            'default_project_id': None,
-            'description': None,
-            'domain_id': None,
-            'email': None,
             'is_enabled': True,
             'options': {
                 'multi_factor_auth_rules': [["password", "totp"], ["password"]]
@@ -815,10 +733,6 @@ class TestUserCreate(identity_fakes.TestIdentityv3):
         # Set expected values
         kwargs = {
             'name': self.user.name,
-            'default_project_id': None,
-            'description': None,
-            'domain_id': None,
-            'email': None,
             'is_enabled': True,
             'options': {
                 'ignore_password_expiry': True,

{python_openstackclient-7.1.2.dist-info → python_openstackclient-7.1.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-openstackclient
-Version: 7.1.2
+Version: 7.1.4
 Summary: OpenStack Command-line Client
 Home-page: https://docs.openstack.org/python-openstackclient/latest/
 Author: OpenStack

{python_openstackclient-7.1.2.dist-info → python_openstackclient-7.1.4.dist-info}/RECORD

@@ -9,15 +9,15 @@ openstackclient/api/image_v2.py,sha256=GSM09toS6rcLzbtyhKl_FvQ7UeWJ3EcvSNBdVIk9r
 openstackclient/api/object_store_v1.py,sha256=366WuIuu7iXH4r-vdZTWSiopGj8P4MmMa8NePcvh5qk,18183
 openstackclient/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 openstackclient/common/availability_zone.py,sha256=2TvrpkRQmMHffRZu1x71NFu0tQQNTuo0Voi0er_OvZc,6497
-openstackclient/common/clientmanager.py,sha256=dGkJZwEuDmEFIuLyCesCRfEEUHPX5KqxOYvdwtyq1xk,7124
+openstackclient/common/clientmanager.py,sha256=X_hXK580SLUG3n_HY-2owE32eAzB0jTyLq2DMCufLAs,7438
 openstackclient/common/configuration.py,sha256=kfi4Ph1hEO0z8uJD8d9OuQz2C70Yi7U8pzbc3Tq88lU,2339
 openstackclient/common/extension.py,sha256=4YK8HjwNtd7fIOzcQ-7PDjIwuF331T924vUcSkzK5pI,5332
-openstackclient/common/limits.py,sha256=pCNLq4A1vKxsN27f1G0Qot4gNi-L0z4p7UdGkfx712w,5662
+openstackclient/common/limits.py,sha256=6LSFb7OlaMjN6nfXvnZBSaTwZS09UhpxpBNq7eOs898,5659
 openstackclient/common/module.py,sha256=biNzeW2KWcaagpvidvNvQuj4JNk1wjXxBnW99tu_nNk,4277
 openstackclient/common/pagination.py,sha256=ZmEFXprCbSKDtURJTyp5pfe97JuZYKth0MAkEXxrFFU,2728
 openstackclient/common/progressbar.py,sha256=-Xlth1FbiqZg1j3-zX6DIEp29mD76z2ozxiOybx8K-g,2427
 openstackclient/common/project_cleanup.py,sha256=f77yjCfhMh_XY2C-riwvbvh3jrMPx_4EzgHflkG8efk,5206
-openstackclient/common/quota.py,sha256=w17mvV7YE9V2kBZ-oX47cbh3iKP77g1cu7STD5NpswM,28361
+openstackclient/common/quota.py,sha256=ARlbPzaPR7KIxzvVOSY2RFs5SFHalZ0KpjkzHCmhar4,28697
 openstackclient/common/versions.py,sha256=yiH0xhCFKpFcZrA0tWz99-eXJ44PEAyH4qZy9Fu9uwk,3838
 openstackclient/compute/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 openstackclient/compute/client.py,sha256=xntJEyxt_h5s2cI132cDFCOIxrJCu07WbtFLwp3R5dI,1533
@@ -30,7 +30,7 @@ openstackclient/compute/v2/host.py,sha256=1Ow4eJu9HPz-SC0u_eXJskUXaGoyW7X1O2yZIf
 openstackclient/compute/v2/hypervisor.py,sha256=xkSLqZjaJnVABAKh9ANF9zqy67WaEJeD9NiVL3Frqko,8808
 openstackclient/compute/v2/hypervisor_stats.py,sha256=Y2Jkkleha8PXnM2VQ2MJtjKxHKchGRyEqmILfPj-Wgw,2161
 openstackclient/compute/v2/keypair.py,sha256=yM30AVsMmPP1SAqD8_nKXNkeB9WLyL6sd18AjeYIuhM,15730
-openstackclient/compute/v2/server.py,sha256=nGL-_cyQssS5-TT_BlQMvHVjOLEh0q2meAKJNVfVDsI,187196
+openstackclient/compute/v2/server.py,sha256=qzozAjygKLZUQ4Dtib1R1_10Sc7zm3axBCP3wt9d3Zw,187204
 openstackclient/compute/v2/server_backup.py,sha256=GVf_T5iHt0po1vYDDQgUQ_fN3AisHvKozEXY37voWkc,4119
 openstackclient/compute/v2/server_event.py,sha256=vLtu_LBJ99Fgfj9oRBCVATalRMyqBd3CUjHToVfQB48,10055
 openstackclient/compute/v2/server_group.py,sha256=s9CjDnmjNUk03VUdAkOn5QHMoSCHV8dtvuLe05ER4Rg,8674
@@ -41,7 +41,7 @@ openstackclient/compute/v2/service.py,sha256=3Y-R9wGnk5kSaMvXzuETd8EFLQwTfMUbdmk
 openstackclient/compute/v2/usage.py,sha256=ztIv1ucTWWuVe3pfv1jk7Gkf2c6boTrqGdeFKbbfQ5g,9026
 openstackclient/identity/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 openstackclient/identity/client.py,sha256=Miz2eCWbhS-IXaj87J-5qatZPOwZeOn5_MyZ6YMNZ9w,2433
-openstackclient/identity/common.py,sha256=5J6nlE9TIo5EywdBqkrWd7Roif5E5Gcp5ucg1_EbD-Y,12306
+openstackclient/identity/common.py,sha256=oWSLTECKJeqyvJH7mY1OZWUSSZZtTVyp4jBQGWFclto,12011
 openstackclient/identity/v2_0/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 openstackclient/identity/v2_0/catalog.py,sha256=B0nCW-KrPqBJ6CX4_zn7_p6h3Y4VFfmVhs14MhnJ-oY,3484
 openstackclient/identity/v2_0/ec2creds.py,sha256=QRj4gP54dA-wX27xy55NJwes9PEFRsCSa0bXjB3aZrY,6468
@@ -73,14 +73,14 @@ openstackclient/identity/v3/project.py,sha256=jHpviZg3MYPKCacYs1_jbdafz9EflGHGqu
 openstackclient/identity/v3/region.py,sha256=jcImUh-kZromTAtXd8aF7kfKBqBwfknP2I5ylYYyb0w,6010
 openstackclient/identity/v3/registered_limit.py,sha256=mbV4Ci7kNPMbveHg6QQztYISiXcm3VwBv3xR2D-aKvw,11389
 openstackclient/identity/v3/role.py,sha256=dmuW5j4T9zmNBHuGkIIcolx5aoDmyFGshGSfOZ2swEY,14205
-openstackclient/identity/v3/role_assignment.py,sha256=7caVScsft9Z3kwl3DvWLyXiAD9f9fX_1V6JUTGWe_fs,7366
-openstackclient/identity/v3/service.py,sha256=Ix_FjH2KezZuyiTmkHYzVDVQTzZFEoTtftJ-2HPQvxE,7406
+openstackclient/identity/v3/role_assignment.py,sha256=pg-43fgY2HK4ymfaYypVOuPMsJoYGBRn4XZxicpX6YY,8018
+openstackclient/identity/v3/service.py,sha256=2VuxiOEuEnqjWEPNryKRe4LLe70-MIndkDXYB_jdW1g,7457
 openstackclient/identity/v3/service_provider.py,sha256=g-gs09bFJertKjbfFp2ZKPjXtPfNcecBlHWkArGLkvw,7410
 openstackclient/identity/v3/tag.py,sha256=dcVDheoWxdkwsZYvyJSpzIF2EGpqZtaE0h7x2halscc,3972
 openstackclient/identity/v3/token.py,sha256=dXP7iRYZRROw3k8knao6NteZeP67mVGCc2Y9jMHudnQ,7399
 openstackclient/identity/v3/trust.py,sha256=xKIEd1K2S9NFnyJfa58ezEpsvQLVtO6qe4cREqFgkmA,10522
 openstackclient/identity/v3/unscoped_saml.py,sha256=A-645W2kp0_27NxG03YcEU9EtcCFex6Ojzw4fLApuds,2031
-openstackclient/identity/v3/user.py,sha256=yHsvGEHqquY7rpiwybpbNXdlZmX593-Z2_nooOAeVYo,23532
+openstackclient/identity/v3/user.py,sha256=oDz9nfUeDyFsjHMALmNZxrG5qoGROOZ9CoTmNg7EMls,24051
 openstackclient/image/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 openstackclient/image/client.py,sha256=I088KrjZ9ubuS_8NDX98W6_lHkdaxbBtRHTHt5q_HC8,1508
 openstackclient/image/v1/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -294,7 +294,7 @@ openstackclient/tests/unit/compute/v2/test_host.py,sha256=AAcIxoGpVdy1qOkV3lPFyD
 openstackclient/tests/unit/compute/v2/test_hypervisor.py,sha256=t_Xv7uh4dzv6G-gOG3Eoy7l516cHOwy1xeiBgIyaUKc,17390
 openstackclient/tests/unit/compute/v2/test_hypervisor_stats.py,sha256=1z8Jhx_CBoN-cu4im3MQc-YPAZlRQfu--3c9UAUmMG4,3020
 openstackclient/tests/unit/compute/v2/test_keypair.py,sha256=ASoemn6bN_tEKZlHRbhUpjPNydPaqMA22jn6fyAcwGs,25067
-openstackclient/tests/unit/compute/v2/test_server.py,sha256=LKLw3-_AmnrK2xj3khVl_Te98HPn-Aay25AQY5HW5Cs,310885
+openstackclient/tests/unit/compute/v2/test_server.py,sha256=Lg2sSCAI9Cenb4xz1hoOwheQul7KxiEhJvXKHdg2rzA,310893
 openstackclient/tests/unit/compute/v2/test_server_backup.py,sha256=MW2UQQ32cE403Bmihp7s_MYVhVV4NrkwfDdaZ-y5Wu4,7503
 openstackclient/tests/unit/compute/v2/test_server_event.py,sha256=aZhLD_RgcNDUdCgwVJmpolQlabVWxlrp5edSZBanR_Q,12504
 openstackclient/tests/unit/compute/v2/test_server_group.py,sha256=Ul0SQ_cIq4mW7TIsm6mDRtCOlboNyy6lClP1Oy3NPAE,14934
@@ -335,13 +335,13 @@ openstackclient/tests/unit/identity/v3/test_protocol.py,sha256=SmV_N8v_dU-mcwa7k
 openstackclient/tests/unit/identity/v3/test_region.py,sha256=SN7wLeta1wgFjul3_NGzU-TsQQQaZiFbC7sOEFiRl30,10614
 openstackclient/tests/unit/identity/v3/test_registered_limit.py,sha256=8-Og3hgz2q8i7W1TSFmnRp9MqYzVY1H4SjnOrLVPWKo,17554
 openstackclient/tests/unit/identity/v3/test_role.py,sha256=pYwuSFEg99MHk1mTKQ0l9XzdER0m2T9YjZHMDxfTvFk,51986
-openstackclient/tests/unit/identity/v3/test_role_assignment.py,sha256=mHki0zb-hAB3mbVTa0nr3cmVsHEcoop282IwwbIEtgQ,27161
-openstackclient/tests/unit/identity/v3/test_service.py,sha256=tyi-I26tyoO-WdFHe8zogh-8LsrzSfFJaI2E8ntVGHY,15124
+openstackclient/tests/unit/identity/v3/test_role_assignment.py,sha256=LGwD5EApF6BSiXIHBPwgetcjQsRfCjQ62DmVxGFFcOE,35747
+openstackclient/tests/unit/identity/v3/test_service.py,sha256=eFRjaeuJKd4_G1_gSTzAKmLTN035rQjY4E5RnLzMutY,15028
 openstackclient/tests/unit/identity/v3/test_service_provider.py,sha256=JkO4dBQLGGdJS9etWJzj0wswGmdAAtrCOmfC1hEYzSs,13189
 openstackclient/tests/unit/identity/v3/test_token.py,sha256=k9Ij_BbGTx9KG6Wf7NiO_th-N7cxGWnIWQMWIlDsGXg,4556
 openstackclient/tests/unit/identity/v3/test_trust.py,sha256=ox7NuX5Suxrg7wu_06xsUXsnsASex54-RE-Jj0vtF40,13081
 openstackclient/tests/unit/identity/v3/test_unscoped_saml.py,sha256=gBtouVvKaOTflJ6TMg497ScL4GsVS3lVM_h8XKFExXg,3592
-openstackclient/tests/unit/identity/v3/test_user.py,sha256=8QpH_A3YFgqsV3Pzgv7bvPGh5Wk1dFKLvffTrxdffrM,60959
+openstackclient/tests/unit/identity/v3/test_user.py,sha256=BFNh4waeT_eM5IQkzPaeB6gxtDYh9CW1tuEDWbF8rQc,58245
 openstackclient/tests/unit/image/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 openstackclient/tests/unit/image/v1/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 openstackclient/tests/unit/image/v1/fakes.py,sha256=rwYSQK12WxSaX2p-f15e6D94qC6lg1XIgBFvdiJ5aRc,2271
@@ -493,11 +493,11 @@ openstackclient/volume/v3/volume_message.py,sha256=HBBxPEcYoNqGjEbzGIEnIJ1XTcQ2K
 openstackclient/volume/v3/volume_snapshot.py,sha256=pZ4q_qCwqh4jaGhX28G59wsWDmEc3uXdbpeD176osZg,3186
 openstackclient/volume/v3/volume_transfer_request.py,sha256=PthOJV2m-pTV1njFzwTpaekXZkET1c6alIJrpuN7R6Q,7530
 openstackclient/volume/v3/volume_type.py,sha256=DF2MVoW2mIk0ABDLZD8D2sb8JlR7-rRjA4qCnBHRe6o,34039
-python_openstackclient-7.1.2.dist-info/AUTHORS,sha256=TRFKS0fs1j9d3_KWaIQfYnNH3gfTnDyBHng0RJAUFeM,21384
-python_openstackclient-7.1.2.dist-info/LICENSE,sha256=XfKg2H1sVi8OoRxoisUlMqoo10TKvHmU_wU39ks7MyA,10143
-python_openstackclient-7.1.2.dist-info/METADATA,sha256=jrC3N3viJUbcJ8V1HnLHeX0sRlB6jawZMR0ddikiI08,6581
-python_openstackclient-7.1.2.dist-info/WHEEL,sha256=g4nMs7d-Xl9-xC9XovUrsDHGXt-FT0E17Yqo92DEfvY,92
-python_openstackclient-7.1.2.dist-info/entry_points.txt,sha256=9kVhKTeyLPfkXDMI_ALqXvz0zSJEqibJLHHsOdmtT3c,53261
-python_openstackclient-7.1.2.dist-info/pbr.json,sha256=LGNHuU0gKlZeEB_mLMluAMpuBrt7SCvOG3xywgiECwo,47
-python_openstackclient-7.1.2.dist-info/top_level.txt,sha256=htg7z9oZgysRuVUHn-m1Bk6XLGOeV65nMbZX9H8qhs0,16
-python_openstackclient-7.1.2.dist-info/RECORD,,
+python_openstackclient-7.1.4.dist-info/AUTHORS,sha256=TRFKS0fs1j9d3_KWaIQfYnNH3gfTnDyBHng0RJAUFeM,21384
+python_openstackclient-7.1.4.dist-info/LICENSE,sha256=XfKg2H1sVi8OoRxoisUlMqoo10TKvHmU_wU39ks7MyA,10143
+python_openstackclient-7.1.4.dist-info/METADATA,sha256=kgsnQMio_eekeFp0wbbLQ1k9JiLJmyUnkzCFkhqaLs4,6581
+python_openstackclient-7.1.4.dist-info/WHEEL,sha256=g4nMs7d-Xl9-xC9XovUrsDHGXt-FT0E17Yqo92DEfvY,92
+python_openstackclient-7.1.4.dist-info/entry_points.txt,sha256=9kVhKTeyLPfkXDMI_ALqXvz0zSJEqibJLHHsOdmtT3c,53261
+python_openstackclient-7.1.4.dist-info/pbr.json,sha256=Ath0K2qvjbVogYTdeuTmNoMRajUIwhHfhz_eJUkQVOM,47
+python_openstackclient-7.1.4.dist-info/top_level.txt,sha256=htg7z9oZgysRuVUHn-m1Bk6XLGOeV65nMbZX9H8qhs0,16
+python_openstackclient-7.1.4.dist-info/RECORD,,

python_openstackclient-7.1.4.dist-info/pbr.json

@@ -0,0 +1 @@
+{"git_version": "f42ade43", "is_release": true}

python_openstackclient-7.1.2.dist-info/pbr.json

@@ -1 +0,0 @@
-{"git_version": "08c84454", "is_release": true}