openstack/python-openstackclient
Code Issues Proposed changes

tests: Remove use of namedtuple

Browse Source 
Change-Id: I19a272ffd260bab263dd63cb920802b792e192eb
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
This commit is contained in:
Stephen Finucane
2025-08-20 17:41:21 +01:00
parent dbddbf9760
commit 94e447af80
1 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
openstackclient/tests/unit/compute/v2/test_server.py
View File

@@ -13,7 +13,6 @@
# under the License. # under the License.
import base64 import base64
import collections
import getpass import getpass
import json import json
import tempfile import tempfile
@@ -21,9 +20,11 @@ from unittest import mock
import uuid import uuid
import iso8601 import iso8601
from openstack.compute.v2 import flavor as _flavor
from openstack.compute.v2 import server as _server from openstack.compute.v2 import server as _server
from openstack.compute.v2 import server_group as _server_group from openstack.compute.v2 import server_group as _server_group
from openstack import exceptions as sdk_exceptions from openstack import exceptions as sdk_exceptions
from openstack.image.v2 import image as _image
from openstack.test import fakes as sdk_fakes from openstack.test import fakes as sdk_fakes
from osc_lib.cli import format_columns from osc_lib.cli import format_columns
from osc_lib import exceptions from osc_lib import exceptions
@@ -4650,17 +4651,19 @@ class TestServerList(_TestServerList):
def setUp(self): def setUp(self):
super().setUp() super().setUp()
Image = collections.namedtuple('Image', 'id name')
self.image_client.images.return_value = [ self.image_client.images.return_value = [
Image(id=s.image['id'], name=self.image.name) sdk_fakes.generate_fake_resource(
_image.Image, id=s.image['id'], name=self.image.name
)
# Image will be an empty string if boot-from-volume # Image will be an empty string if boot-from-volume
for s in self.servers for s in self.servers
if s.image if s.image
] ]
Flavor = collections.namedtuple('Flavor', 'id name')
self.compute_client.flavors.return_value = [ self.compute_client.flavors.return_value = [
Flavor(id=s.flavor['id'], name=self.flavor.name) sdk_fakes.generate_fake_resource(
_flavor.Flavor, id=s.flavor['id'], name=self.flavor.name
)
for s in self.servers for s in self.servers
] ]
@@ -5273,9 +5276,10 @@ class TestServerList(_TestServerList):
self.compute_client.servers.return_value = servers self.compute_client.servers.return_value = servers
# Make sure the returned image and flavor IDs match the servers. # Make sure the returned image and flavor IDs match the servers.
Image = collections.namedtuple('Image', 'id name')
self.image_client.images.return_value = [ self.image_client.images.return_value = [
Image(id=s.image['id'], name=self.image.name) sdk_fakes.generate_fake_resource(
_image.Image, id=s.image['id'], name=self.image.name
)
# Image will be an empty string if boot-from-volume # Image will be an empty string if boot-from-volume
for s in servers for s in servers
if s.image if s.image
@@ -5358,9 +5362,10 @@ class TestServerListV273(_TestServerList):
self.servers = self.setup_sdk_servers_mock(3) self.servers = self.setup_sdk_servers_mock(3)
self.compute_client.servers.return_value = self.servers self.compute_client.servers.return_value = self.servers
Image = collections.namedtuple('Image', 'id name')
self.image_client.images.return_value = [ self.image_client.images.return_value = [
Image(id=s.image['id'], name=self.image.name) sdk_fakes.generate_fake_resource(
_image.Image, id=s.image['id'], name=self.image.name
)
# Image will be an empty string if boot-from-volume # Image will be an empty string if boot-from-volume
for s in self.servers for s in self.servers
if s.image if s.image
@@ -5561,17 +5566,19 @@ class TestServerListV296(_TestServerList):
super().setUp() super().setUp()
self.set_compute_api_version('2.96') self.set_compute_api_version('2.96')
Image = collections.namedtuple('Image', 'id name')
self.image_client.images.return_value = [ self.image_client.images.return_value = [
Image(id=s.image['id'], name=self.image.name) sdk_fakes.generate_fake_resource(
_image.Image, id=s.image['id'], name=self.image.name
)
# Image will be an empty string if boot-from-volume # Image will be an empty string if boot-from-volume
for s in self.servers for s in self.servers
if s.image if s.image
] ]
Flavor = collections.namedtuple('Flavor', 'id name')
self.compute_client.flavors.return_value = [ self.compute_client.flavors.return_value = [
Flavor(id=s.flavor['id'], name=self.flavor.name) sdk_fakes.generate_fake_resource(
_flavor.Flavor, id=s.flavor['id'], name=self.flavor.name
)
for s in self.servers for s in self.servers
] ]