python-openstackclient 7.1.1__tar.gz → 7.1.3__tar.gz

{python-openstackclient-7.1.1 → python-openstackclient-7.1.3}/AUTHORS

@@ -385,6 +385,7 @@ Stuart McLaren <stuart.mclaren@hp.com>
 Surya Seetharaman <suryaseetharaman.9@gmail.com>
 Sven Wegener <sven.wegener@inovex.de>
 Swapnil Kulkarni (coolsvap) <me@coolsvap.net>
+Sylvain Bauza <sbauza@redhat.com>
 Sławek Kapłoński <slawek@kaplonski.pl>
 Takashi Kajinami <kajinamit@oss.nttdata.com>
 Takashi Kajinami <tkajinam@redhat.com>

{python-openstackclient-7.1.1 → python-openstackclient-7.1.3}/ChangeLog

@@ -1,6 +1,19 @@
 CHANGES
 =======
 
+7.1.3
+-----
+
+* compute: Fix --host in server list for new openstacksdk
+* Always resolve domain id
+* identity: in \`service set\` command, don't pass the enable option when it is None
+* identity: Don't pass unset options when creating user
+
+7.1.2
+-----
+
+* evacuate SDK actually uses admin\_pass param
+
 7.1.1
 -----
 

{python-openstackclient-7.1.1/python_openstackclient.egg-info → python-openstackclient-7.1.3}/PKG-INFO

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

{python-openstackclient-7.1.1 → python-openstackclient-7.1.3}/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,
@@ -3840,7 +3840,7 @@ host."""
 
         kwargs = {
             'host': parsed_args.host,
-            'admin_password': parsed_args.password,
+            'admin_pass': parsed_args.password,
         }
 
         if not sdk_utils.supports_microversion(compute_client, '2.14'):

{python-openstackclient-7.1.1 → python-openstackclient-7.1.3}/openstackclient/identity/common.py

@@ -204,6 +204,7 @@ def find_group(identity_client, name_or_id, domain_name_or_id=None):
             identity_client.groups, name_or_id, groups.Group
         )
     else:
+        domain_id = find_domain(identity_client, domain_id).id
         return _find_identity_resource(
             identity_client.groups,
             name_or_id,
@@ -219,6 +220,7 @@ def find_project(identity_client, name_or_id, domain_name_or_id=None):
             identity_client.projects, name_or_id, projects.Project
         )
     else:
+        domain_id = find_domain(identity_client, domain_id).id
         return _find_identity_resource(
             identity_client.projects,
             name_or_id,
@@ -234,6 +236,7 @@ def find_user(identity_client, name_or_id, domain_name_or_id=None):
             identity_client.users, name_or_id, users.User
         )
     else:
+        domain_id = find_domain(identity_client, domain_id).id
         return _find_identity_resource(
             identity_client.users, name_or_id, users.User, domain_id=domain_id
         )

{python-openstackclient-7.1.1 → python-openstackclient-7.1.3}/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:
+            project_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

{python-openstackclient-7.1.1 → python-openstackclient-7.1.3}/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)
 

{python-openstackclient-7.1.1 → python-openstackclient-7.1.3}/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:

{python-openstackclient-7.1.1 → python-openstackclient-7.1.3}/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,
@@ -6974,7 +6974,7 @@ class TestServerEvacuate(TestServer):
         evac_args = {
             'host': None,
             'on_shared_storage': False,
-            'admin_password': None,
+            'admin_pass': None,
         }
         self._test_evacuate(args, verify_args, evac_args)
 
@@ -6991,7 +6991,7 @@ class TestServerEvacuate(TestServer):
         evac_args = {
             'host': None,
             'on_shared_storage': False,
-            'admin_password': 'password',
+            'admin_pass': 'password',
         }
         self._test_evacuate(args, verify_args, evac_args)
 
@@ -7008,7 +7008,7 @@ class TestServerEvacuate(TestServer):
             ('server', self.server.id),
             ('host', 'target-host'),
         ]
-        evac_args = {'host': host, 'admin_password': None}
+        evac_args = {'host': host, 'admin_pass': None}
 
         self._test_evacuate(args, verify_args, evac_args)
 
@@ -7041,7 +7041,7 @@ class TestServerEvacuate(TestServer):
         evac_args = {
             'host': None,
             'on_shared_storage': True,
-            'admin_password': None,
+            'admin_pass': None,
         }
         self._test_evacuate(args, verify_args, evac_args)
 
@@ -7072,7 +7072,7 @@ class TestServerEvacuate(TestServer):
         evac_args = {
             'host': None,
             'on_shared_storage': False,
-            'admin_password': None,
+            'admin_pass': None,
         }
         self._test_evacuate(args, verify_args, evac_args)
         mock_wait_for_status.assert_called_once_with(

{python-openstackclient-7.1.1 → python-openstackclient-7.1.3}/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

{python-openstackclient-7.1.1 → python-openstackclient-7.1.3}/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.1 → python-openstackclient-7.1.3/python_openstackclient.egg-info}/PKG-INFO

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

python-openstackclient-7.1.3/python_openstackclient.egg-info/pbr.json

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

python-openstackclient-7.1.1/python_openstackclient.egg-info/pbr.json

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