openstack
/
python-openstackclient
Code Issues Proposed changes

tests: Remove FakeImagev1Client, FakeImagev2Client 

These no longer makes any sense since all image calls use the SDK proxy
API now.

Change-Id: I48e1d90f9c0dfa904fe37caa0de60d20945f1118
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
This commit is contained in:
Stephen Finucane 2023-08-25 12:55:37 +01:00
parent a39bde5c3a
commit a823228527
5 changed files with 6 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openstackclient/tests/unit/compute/v2/fakes.py
View File

@ -38,7 +38,6 @@ from openstack.compute.v2 import volume_attachment as _volume_attachment
from openstackclient.api import compute_v2
from openstackclient.tests.unit import fakes
from openstackclient.tests.unit.identity.v2_0 import fakes as identity_fakes
from openstackclient.tests.unit.image.v2 import fakes as image_fakes
from openstackclient.tests.unit.network.v2 import fakes as network_fakes
from openstackclient.tests.unit import utils
from openstackclient.tests.unit.volume.v2 import fakes as volume_fakes
@ -167,10 +166,7 @@ class TestComputev2(network_fakes.FakeClientMixin, utils.TestCommand):
token=fakes.AUTH_TOKEN,
)
self.app.client_manager.image = image_fakes.FakeImagev2Client(
endpoint=fakes.AUTH_URL,
token=fakes.AUTH_TOKEN,
)
self.app.client_manager.image = mock.Mock()
self.app.client_manager.volume = volume_fakes.FakeVolumeClient(
endpoint=fakes.AUTH_URL,

15
openstackclient/tests/unit/image/v1/fakes.py
View File

@ -22,23 +22,12 @@ from openstackclient.tests.unit import utils
from openstackclient.tests.unit.volume.v1 import fakes as volume_fakes
class FakeImagev1Client:
def __init__(self, **kwargs):
self.images = mock.Mock()
self.auth_token = kwargs['token']
self.management_url = kwargs['endpoint']
self.version = 1.0
class TestImagev1(utils.TestCommand):
def setUp(self):
super().setUp()
self.app.client_manager.image = FakeImagev1Client(
endpoint=fakes.AUTH_URL,
token=fakes.AUTH_TOKEN,
)
self.app.client_manager.image = mock.Mock()
self.app.client_manager.volume = volume_fakes.FakeVolumev1Client(
endpoint=fakes.AUTH_URL,
token=fakes.AUTH_TOKEN,

41
openstackclient/tests/unit/image/v2/fakes.py
View File

@ -28,50 +28,11 @@ from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
from openstackclient.tests.unit import utils
class FakeImagev2Client:
def __init__(self, **kwargs):
self.images = mock.Mock()
self.create_image = mock.Mock()
self.delete_image = mock.Mock()
self.update_image = mock.Mock()
self.find_image = mock.Mock()
self.get_image = mock.Mock()
self.download_image = mock.Mock()
self.reactivate_image = mock.Mock()
self.deactivate_image = mock.Mock()
self.stage_image = mock.Mock()
self.import_image = mock.Mock()
self.get_import_info = mock.Mock()
self.members = mock.Mock()
self.add_member = mock.Mock()
self.remove_member = mock.Mock()
self.update_member = mock.Mock()
self.remove_tag = mock.Mock()
self.metadef_namespaces = mock.Mock()
self.metadef_resource_types = mock.Mock()
self.tasks = mock.Mock()
self.tasks.resource_class = fakes.FakeResource(None, {})
self.get_task = mock.Mock()
self.get_import_info = mock.Mock()
self.stores = mock.Mock()
self.auth_token = kwargs['token']
self.management_url = kwargs['endpoint']
self.version = 2.0
class TestImagev2(utils.TestCommand):
def setUp(self):
super().setUp()
self.app.client_manager.image = FakeImagev2Client(
endpoint=fakes.AUTH_URL,
token=fakes.AUTH_TOKEN,
)
self.app.client_manager.image = mock.Mock()
self.app.client_manager.identity = identity_fakes.FakeIdentityv3Client(
endpoint=fakes.AUTH_URL,

8
openstackclient/tests/unit/volume/v1/fakes.py
View File

@ -65,13 +65,7 @@ class TestVolumev1(utils.TestCommand):
token=fakes.AUTH_TOKEN,
)
# avoid circular imports
from openstackclient.tests.unit.image.v1 import fakes as image_fakes
self.app.client_manager.image = image_fakes.FakeImagev1Client(
endpoint=fakes.AUTH_URL,
token=fakes.AUTH_TOKEN,
)
self.app.client_manager.image = mock.Mock()
def create_one_transfer(attrs=None):

5
openstackclient/tests/unit/volume/v2/fakes.py
View File

@ -23,7 +23,6 @@ from osc_lib.cli import format_columns
from openstackclient.tests.unit import fakes
from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
from openstackclient.tests.unit.image.v2 import fakes as image_fakes
from openstackclient.tests.unit import utils
@ -96,9 +95,7 @@ class TestVolume(utils.TestCommand):
self.app.client_manager.identity = identity_fakes.FakeIdentityv3Client(
endpoint=fakes.AUTH_URL, token=fakes.AUTH_TOKEN
)
self.app.client_manager.image = image_fakes.FakeImagev2Client(
endpoint=fakes.AUTH_URL, token=fakes.AUTH_TOKEN
)
self.app.client_manager.image = mock.Mock()
def create_one_transfer(attrs=None):