From a823228527853092d28067b0944dfc4623ac16aa Mon Sep 17 00:00:00 2001
From: Stephen Finucane <stephenfin@redhat.com>
Date: Fri, 25 Aug 2023 12:55:37 +0100
Subject: [PATCH] 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>
---
.../tests/unit/compute/v2/fakes.py | 6 +--
openstackclient/tests/unit/image/v1/fakes.py | 15 +------
openstackclient/tests/unit/image/v2/fakes.py | 41 +------------------
openstackclient/tests/unit/volume/v1/fakes.py | 8 +---
openstackclient/tests/unit/volume/v2/fakes.py | 5 +--
5 files changed, 6 insertions(+), 69 deletions(-)
diff --git a/openstackclient/tests/unit/compute/v2/fakes.py b/openstackclient/tests/unit/compute/v2/fakes.py
index 6d5f82d6a2..496be25287 100644
--- a/openstackclient/tests/unit/compute/v2/fakes.py
+++ b/openstackclient/tests/unit/compute/v2/fakes.py
@@ -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,
diff --git a/openstackclient/tests/unit/image/v1/fakes.py b/openstackclient/tests/unit/image/v1/fakes.py
index 64348ef9e5..09c14cdc07 100644
--- a/openstackclient/tests/unit/image/v1/fakes.py
+++ b/openstackclient/tests/unit/image/v1/fakes.py
@@ -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,
diff --git a/openstackclient/tests/unit/image/v2/fakes.py b/openstackclient/tests/unit/image/v2/fakes.py
index 81c8b5076a..571e7f3098 100644
--- a/openstackclient/tests/unit/image/v2/fakes.py
+++ b/openstackclient/tests/unit/image/v2/fakes.py
@@ -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,
diff --git a/openstackclient/tests/unit/volume/v1/fakes.py b/openstackclient/tests/unit/volume/v1/fakes.py
index 76b208b2f1..e149e2d411 100644
--- a/openstackclient/tests/unit/volume/v1/fakes.py
+++ b/openstackclient/tests/unit/volume/v1/fakes.py
@@ -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):
diff --git a/openstackclient/tests/unit/volume/v2/fakes.py b/openstackclient/tests/unit/volume/v2/fakes.py
index 6799a82b21..ed04cf9c38 100644
--- a/openstackclient/tests/unit/volume/v2/fakes.py
+++ b/openstackclient/tests/unit/volume/v2/fakes.py
@@ -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):