Replace keystoneclient with openstacksdk

stephenfin · stephenfin · commit 45a4ab5eb506 · 2025-06-23T22:43:46.000+01:00
Change-Id: If48e1b26f712b6336d77a4c56176cde79626935d
Signed-off-by: Stephen Finucane &lt;stephenfin@redhat.com&gt;
diff --git a/novaclient/tests/functional/base.py b/novaclient/tests/functional/base.py
@@ -16,7 +16,6 @@
 import fixtures
 from keystoneauth1 import identity
 from keystoneauth1 import session as ksession
-from keystoneclient import client as keystoneclient
 import openstack.config
 import openstack.config.exceptions
 import openstack.connection
@@ -251,10 +250,6 @@ def setUp(self):
             cli_dir=cli_dir,
             insecure=self.insecure)
 
-        self.keystone = keystoneclient.Client(session=session,
-                                              username=user,
-                                              password=passwd)
-
     def _get_novaclient(self, session):
         nc = novaclient.client.Client("2", session=session)
 
@@ -489,8 +484,9 @@ def _wait_for_state_change(self, server_id, status):
 
     def _get_project_id(self, name):
         """Obtain project id by project name."""
-        project = self.keystone.projects.find(name=name)
-        return project.id
+        return self.openstack.identity.find_project(
+            name, ignore_missing=False
+        ).id
 
     def _cleanup_server(self, server_id):
         """Deletes a server and waits for it to be gone."""
@@ -540,22 +536,28 @@ def setUp(self):
         project_name = uuidutils.generate_uuid()
         password = 'password'
 
-        project = self.keystone.projects.create(project_name,
-                                                self.project_domain_id)
+        project = self.openstack.identity.create_project(
+            name=project_name,
+            domain_id=self.project_domain_id)
         self.project_id = project.id
-        self.addCleanup(self.keystone.projects.delete, self.project_id)
+        self.addCleanup(
+            self.openstack.identity.delete_project, self.project_id)
 
-        self.user_id = self.keystone.users.create(
+        self.user_id = self.openstack.identity.create_user(
             name=user_name, password=password,
             default_project=self.project_id).id
 
-        for role in self.keystone.roles.list():
+        for role in self.openstack.identity.roles():
             if "member" in role.name.lower():
-                self.keystone.roles.grant(role.id, user=self.user_id,
-                                          project=self.project_id)
+                self.openstack.identity.assign_project_role_to_user(
+                    project=self.project_id,
+                    user=self.user_id,
+                    role=role.id)
                 break
 
-        self.addCleanup(self.keystone.users.delete, self.user_id)
+        self.addCleanup(
+            self.openstack.identity.delete_user, self.user_id)
+
         self.cli_clients_2 = tempest.lib.cli.base.CLIClient(
             username=user_name,
             password=password,
diff --git a/test-requirements.txt b/test-requirements.txt
@@ -3,7 +3,6 @@ bandit>=1.1.0 # Apache-2.0
 coverage>=4.4.1 # Apache-2.0
 ddt>=1.0.1 # MIT
 fixtures>=3.0.0 # Apache-2.0/BSD
-python-keystoneclient>=3.8.0 # Apache-2.0
 requests-mock>=1.2.0 # Apache-2.0
 openstacksdk>=0.11.2 # Apache-2.0
 osprofiler>=1.4.0 # Apache-2.0
