openstack/python-novaclient
Code Issues Proposed changes

Replace cinderclient with openstacksdk

Browse Source 
Change-Id: I0f8dad338953bb0c325f228cefa00c27f51cbb9f
Signed-off-by: Takashi Natsume <takanattie@gmail.com>
This commit is contained in:
Takashi Natsume
2024-10-09 13:46:10 +00:00
parent 42d499dc25
commit 06da36e565
5 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
novaclient/tests/functional/base.py
View File

@@ -13,7 +13,6 @@
import os import os
import time import time
from cinderclient.v3 import client as cinderclient
import fixtures import fixtures
from keystoneauth1.exceptions import discovery as discovery_exc from keystoneauth1.exceptions import discovery as discovery_exc
from keystoneauth1 import identity from keystoneauth1 import identity
@@ -271,7 +270,6 @@ class ClientTestBase(testtools.TestCase):
self.keystone = keystoneclient.Client(session=session, self.keystone = keystoneclient.Client(session=session,
username=user, username=user,
password=passwd) password=passwd)
self.cinder = cinderclient.Client(auth=auth, session=session)
def _get_novaclient(self, session): def _get_novaclient(self, session):
nc = novaclient.client.Client("2", session=session) nc = novaclient.client.Client("2", session=session)
@@ -332,7 +330,7 @@ class ClientTestBase(testtools.TestCase):
""" """
start_time = time.time() start_time = time.time()
while time.time() - start_time < timeout: while time.time() - start_time < timeout:
volume = self.cinder.volumes.get(volume.id) volume = self.openstack.block_storage.get_volume(volume)
if volume.status == status: if volume.status == status:
break break
time.sleep(poll_interval) time.sleep(poll_interval)

4
novaclient/tests/functional/v2/legacy/test_extended_attributes.py
View File

@@ -22,8 +22,8 @@ class TestExtAttrNovaClient(base.ClientTestBase):
def _create_server_and_attach_volume(self): def _create_server_and_attach_volume(self):
server = self._create_server() server = self._create_server()
volume = self.cinder.volumes.create(1) volume = self.openstack.block_storage.create_volume(size=1)
self.addCleanup(volume.delete) self.addCleanup(self.openstack.block_storage.delete_volume, volume)
self.wait_for_volume_status(volume, 'available') self.wait_for_volume_status(volume, 'available')
self.nova('volume-attach', params="%s %s" % (server.name, volume.id)) self.nova('volume-attach', params="%s %s" % (server.name, volume.id))
self.addCleanup(self._release_volume, server, volume) self.addCleanup(self._release_volume, server, volume)

4
novaclient/tests/functional/v2/legacy/test_instances.py
View File

@@ -53,8 +53,8 @@ class TestInstanceCLI(base.ClientTestBase):
self.addCleanup(server.delete) self.addCleanup(server.delete)
# create a volume for attachment # create a volume for attachment
volume = self.cinder.volumes.create(1) volume = self.openstack.block_storage.create_volume(size=1)
self.addCleanup(volume.delete) self.addCleanup(self.openstack.block_storage.delete_volume, volume)
# allow volume to become available # allow volume to become available
self.wait_for_volume_status(volume, 'available') self.wait_for_volume_status(volume, 'available')

9
novaclient/tests/functional/v2/legacy/test_servers.py
View File

@@ -25,9 +25,8 @@ class TestServersBootNovaClient(base.ClientTestBase):
def _boot_server_with_legacy_bdm(self, bdm_params=()): def _boot_server_with_legacy_bdm(self, bdm_params=()):
volume_size = 1 volume_size = 1
volume_name = self.name_generate() volume_name = self.name_generate()
volume = self.cinder.volumes.create(size=volume_size, volume = self.openstack.block_storage.create_volume(
name=volume_name, size=volume_size, name=volume_name, image_id=self.image.id)
imageRef=self.image.id)
self.wait_for_volume_status(volume, "available") self.wait_for_volume_status(volume, "available")
if (len(bdm_params) >= 3 and bdm_params[2] == '1'): if (len(bdm_params) >= 3 and bdm_params[2] == '1'):
@@ -56,8 +55,8 @@ class TestServersBootNovaClient(base.ClientTestBase):
self.wait_for_resource_delete(server_id, self.client.servers) self.wait_for_resource_delete(server_id, self.client.servers)
if delete_volume: if delete_volume:
self.cinder.volumes.delete(volume.id) self.openstack.block_storage.delete_volume(volume)
self.wait_for_resource_delete(volume.id, self.cinder.volumes) self.openstack.block_storage.wait_for_delete(volume)
def test_boot_server_with_legacy_bdm(self): def test_boot_server_with_legacy_bdm(self):
# bdm v1 format # bdm v1 format

1
test-requirements.txt
View File

@@ -4,7 +4,6 @@ coverage>=4.4.1 # Apache-2.0
ddt>=1.0.1 # MIT ddt>=1.0.1 # MIT
fixtures>=3.0.0 # Apache-2.0/BSD fixtures>=3.0.0 # Apache-2.0/BSD
python-keystoneclient>=3.8.0 # Apache-2.0 python-keystoneclient>=3.8.0 # Apache-2.0
python-cinderclient>=4.0.1 # Apache-2.0
python-neutronclient>=6.7.0 # Apache-2.0 python-neutronclient>=6.7.0 # Apache-2.0
requests-mock>=1.2.0 # Apache-2.0 requests-mock>=1.2.0 # Apache-2.0
openstacksdk>=0.11.2 # Apache-2.0 openstacksdk>=0.11.2 # Apache-2.0