python-openstackclient 7.2.1__py3-none-any.whl → 7.3.1__py3-none-any.whl

openstackclient/tests/unit/compute/v2/fakes.py

@@ -21,21 +21,15 @@ import uuid
 
 from keystoneauth1 import discover
 from openstack.compute.v2 import _proxy
-from openstack.compute.v2 import aggregate as _aggregate
 from openstack.compute.v2 import availability_zone as _availability_zone
 from openstack.compute.v2 import extension as _extension
 from openstack.compute.v2 import flavor as _flavor
-from openstack.compute.v2 import hypervisor as _hypervisor
-from openstack.compute.v2 import keypair as _keypair
 from openstack.compute.v2 import limits as _limits
 from openstack.compute.v2 import migration as _migration
 from openstack.compute.v2 import server as _server
 from openstack.compute.v2 import server_action as _server_action
-from openstack.compute.v2 import server_group as _server_group
 from openstack.compute.v2 import server_interface as _server_interface
 from openstack.compute.v2 import server_migration as _server_migration
-from openstack.compute.v2 import service as _service
-from openstack.compute.v2 import usage as _usage
 from openstack.compute.v2 import volume_attachment as _volume_attachment
 
 from openstackclient.tests.unit import fakes
@@ -142,63 +136,6 @@ class TestComputev2(
 ): ...
 
 
-def create_one_aggregate(attrs=None):
-    """Create a fake aggregate.
-
-    :param dict attrs: A dictionary with all attributes
-    :return: A fake openstack.compute.v2.aggregate.Aggregate object
-    """
-    attrs = attrs or {}
-
-    # Set default attribute
-    aggregate_info = {
-        "name": "aggregate-name-" + uuid.uuid4().hex,
-        "availability_zone": "ag_zone",
-        "hosts": [],
-        "id": "aggregate-id-" + uuid.uuid4().hex,
-        "metadata": {
-            "availability_zone": "ag_zone",
-            "key1": "value1",
-        },
-    }
-
-    # Overwrite default attributes.
-    aggregate_info.update(attrs)
-
-    aggregate = _aggregate.Aggregate(**aggregate_info)
-    return aggregate
-
-
-def create_aggregates(attrs=None, count=2):
-    """Create multiple fake aggregates.
-
-    :param dict attrs: A dictionary with all attributes
-    :param int count: The number of aggregates to fake
-    :return: A list of fake openstack.compute.v2.aggregate.Aggregate objects
-    """
-    aggregates = []
-    for i in range(0, count):
-        aggregates.append(create_one_aggregate(attrs))
-
-    return aggregates
-
-
-def get_aggregates(aggregates=None, count=2):
-    """Get an iterable MagicMock object with a list of faked aggregates.
-
-    If aggregates list is provided, then initialize the Mock object
-    with the list. Otherwise create one.
-
-    :return: A list of fake openstack.compute.v2.aggregate.Aggregate objects
-    :param int count: The number of aggregates to fake
-    :return: An iterable Mock object with side_effect set to a list of faked
-        aggregates
-    """
-    if aggregates is None:
-        aggregates = create_aggregates(count)
-    return mock.Mock(side_effect=aggregates)
-
-
 def create_one_agent(attrs=None):
     """Create a fake agent.
 
@@ -544,51 +481,6 @@ def create_one_server_action(attrs=None):
     return server_action
 
 
-def create_one_service(attrs=None):
-    """Create a fake service.
-
-    :param dict attrs: A dictionary with all attributes
-    :return: A fake openstack.compute.v2.service.Service object
-    """
-    attrs = attrs or {}
-
-    # Set default attributes.
-    service_info = {
-        'id': 'id-' + uuid.uuid4().hex,
-        'host': 'host-' + uuid.uuid4().hex,
-        'binary': 'binary-' + uuid.uuid4().hex,
-        'status': 'enabled',
-        'availability_zone': 'zone-' + uuid.uuid4().hex,
-        'state': 'state-' + uuid.uuid4().hex,
-        'updated_at': 'time-' + uuid.uuid4().hex,
-        'disabled_reason': 'earthquake',
-        # Introduced in API microversion 2.11
-        'is_forced_down': False,
-    }
-
-    # Overwrite default attributes.
-    service_info.update(attrs)
-
-    return _service.Service(**service_info)
-
-
-def create_services(attrs=None, count=2):
-    """Create multiple fake services.
-
-    :param dict attrs:
-        A dictionary with all attributes
-    :param int count:
-        The number of services to fake
-    :return:
-        A list of FakeResource objects faking the services
-    """
-    services = []
-    for i in range(0, count):
-        services.append(create_one_service(attrs))
-
-    return services
-
-
 def create_one_flavor(attrs=None):
     """Create a fake flavor.
 
@@ -678,61 +570,6 @@ def create_one_flavor_access(attrs=None):
     return flavor_access
 
 
-def create_one_keypair(attrs=None):
-    """Create a fake keypair
-
-    :param dict attrs: A dictionary with all attributes
-    :return: A fake openstack.compute.v2.keypair.Keypair object
-    """
-    attrs = attrs or {}
-
-    # Set default attributes.
-    keypair_info = {
-        'name': 'keypair-name-' + uuid.uuid4().hex,
-        'type': 'ssh',
-        'fingerprint': 'dummy',
-        'public_key': 'dummy',
-        'user_id': 'user',
-    }
-
-    # Overwrite default attributes.
-    keypair_info.update(attrs)
-
-    return _keypair.Keypair(**keypair_info)
-
-
-def create_keypairs(attrs=None, count=2):
-    """Create multiple fake keypairs.
-
-    :param dict attrs: A dictionary with all attributes
-    :param int count: The number of keypairs to fake
-    :return: A list of fake openstack.compute.v2.keypair.Keypair objects
-    """
-
-    keypairs = []
-    for i in range(0, count):
-        keypairs.append(create_one_keypair(attrs))
-
-    return keypairs
-
-
-def get_keypairs(keypairs=None, count=2):
-    """Get an iterable MagicMock object with a list of faked keypairs.
-
-    If keypairs list is provided, then initialize the Mock object with the
-    list. Otherwise create one.
-
-    :param list keypairs: A list of fake openstack.compute.v2.keypair.Keypair
-        objects
-    :param int count: The number of keypairs to fake
-    :return: An iterable Mock object with side_effect set to a list of faked
-        keypairs
-    """
-    if keypairs is None:
-        keypairs = create_keypairs(count)
-    return mock.Mock(side_effect=keypairs)
-
-
 def create_one_availability_zone(attrs=None):
     """Create a fake AZ.
 
@@ -970,62 +807,6 @@ def get_networks(networks=None, count=2):
     return mock.Mock(side_effect=networks)
 
 
-def create_one_usage(attrs=None):
-    """Create a fake usage.
-
-    :param dict attrs:
-        A dictionary with all attributes
-    :return:
-        A FakeResource object, with tenant_id and other attributes
-    """
-    if attrs is None:
-        attrs = {}
-
-    # Set default attributes.
-    usage_info = {
-        'project_id': 'usage-tenant-id-' + uuid.uuid4().hex,
-        'total_memory_mb_usage': 512.0,
-        'total_vcpus_usage': 1.0,
-        'total_local_gb_usage': 1.0,
-        'server_usages': [
-            {
-                'ended_at': None,
-                'flavor': 'usage-flavor-' + uuid.uuid4().hex,
-                'hours': 1.0,
-                'local_gb': 1,
-                'memory_mb': 512,
-                'name': 'usage-name-' + uuid.uuid4().hex,
-                'instance_id': uuid.uuid4().hex,
-                'state': 'active',
-                'uptime': 3600,
-                'vcpus': 1,
-            }
-        ],
-    }
-
-    # Overwrite default attributes.
-    usage_info.update(attrs)
-
-    return _usage.Usage(**usage_info)
-
-
-def create_usages(attrs=None, count=2):
-    """Create multiple fake services.
-
-    :param dict attrs:
-        A dictionary with all attributes
-    :param int count:
-        The number of services to fake
-    :return:
-        A list of FakeResource objects faking the services
-    """
-    usages = []
-    for i in range(0, count):
-        usages.append(create_one_usage(attrs))
-
-    return usages
-
-
 def create_limits(attrs=None):
     """Create a fake limits object."""
     attrs = attrs or {}
@@ -1237,91 +1018,6 @@ def create_volume_attachments(attrs=None, count=2):
     return volume_attachments
 
 
-def create_one_hypervisor(attrs=None):
-    """Create a fake hypervisor.
-
-    :param dict attrs: A dictionary with all attributes
-    :return: A fake openstack.compute.v2.hypervisor.Hypervisor object
-    """
-    attrs = attrs or {}
-
-    # Set default attributes.
-    hypervisor_info = {
-        'id': 'hypervisor-id-' + uuid.uuid4().hex,
-        'hypervisor_hostname': 'hypervisor-hostname-' + uuid.uuid4().hex,
-        'status': 'enabled',
-        'host_ip': '192.168.0.10',
-        'cpu_info': {
-            'aaa': 'aaa',
-        },
-        'free_disk_gb': 50,
-        'hypervisor_version': 2004001,
-        'disk_available_least': 50,
-        'local_gb': 50,
-        'free_ram_mb': 1024,
-        'service': {
-            'host': 'aaa',
-            'disabled_reason': None,
-            'id': 1,
-        },
-        'vcpus_used': 0,
-        'hypervisor_type': 'QEMU',
-        'local_gb_used': 0,
-        'vcpus': 4,
-        'memory_mb_used': 512,
-        'memory_mb': 1024,
-        'current_workload': 0,
-        'state': 'up',
-        'running_vms': 0,
-    }
-
-    # Overwrite default attributes.
-    hypervisor_info.update(attrs)
-
-    hypervisor = _hypervisor.Hypervisor(**hypervisor_info, loaded=True)
-    return hypervisor
-
-
-def create_hypervisors(attrs=None, count=2):
-    """Create multiple fake hypervisors.
-
-    :param dict attrs: A dictionary with all attributes
-    :param int count: The number of hypervisors to fake
-    :return: A list of fake openstack.compute.v2.hypervisor.Hypervisor objects
-    """
-    hypervisors = []
-    for i in range(0, count):
-        hypervisors.append(create_one_hypervisor(attrs))
-
-    return hypervisors
-
-
-def create_one_server_group(attrs=None):
-    """Create a fake server group
-
-    :param dict attrs: A dictionary with all attributes
-    :return: A fake openstack.compute.v2.server_group.ServerGroup object
-    """
-    if attrs is None:
-        attrs = {}
-
-    # Set default attributes.
-    server_group_info = {
-        'id': 'server-group-id-' + uuid.uuid4().hex,
-        'member_ids': '',
-        'metadata': {},
-        'name': 'server-group-name-' + uuid.uuid4().hex,
-        'project_id': 'server-group-project-id-' + uuid.uuid4().hex,
-        'user_id': 'server-group-user-id-' + uuid.uuid4().hex,
-    }
-
-    # Overwrite default attributes.
-    server_group_info.update(attrs)
-
-    server_group = _server_group.ServerGroup(**server_group_info)
-    return server_group
-
-
 def create_one_server_interface(attrs=None):
     """Create a fake SDK ServerInterface.
 

openstackclient/tests/unit/compute/v2/test_aggregate.py

@@ -16,7 +16,9 @@
 from unittest import mock
 from unittest.mock import call
 
+from openstack.compute.v2 import aggregate as _aggregate
 from openstack import exceptions as sdk_exceptions
+from openstack.test import fakes as sdk_fakes
 from osc_lib.cli import format_columns
 from osc_lib import exceptions
 
@@ -26,8 +28,6 @@ from openstackclient.tests.unit.image.v2 import fakes as image_fakes
 
 
 class TestAggregate(compute_fakes.TestComputev2):
-    fake_ag = compute_fakes.create_one_aggregate()
-
     columns = (
         'availability_zone',
         'created_at',
@@ -41,18 +41,25 @@ class TestAggregate(compute_fakes.TestComputev2):
         'uuid',
     )
 
-    data = (
-        fake_ag.availability_zone,
-        fake_ag.created_at,
-        fake_ag.deleted_at,
-        format_columns.ListColumn(fake_ag.hosts),
-        fake_ag.id,
-        fake_ag.is_deleted,
-        fake_ag.name,
-        format_columns.DictColumn(fake_ag.metadata),
-        fake_ag.updated_at,
-        fake_ag.uuid,
-    )
+    def setUp(self):
+        super().setUp()
+
+        self.fake_ag = sdk_fakes.generate_fake_resource(
+            _aggregate.Aggregate,
+            metadata={'availability_zone': 'ag_zone', 'key1': 'value1'},
+        )
+        self.data = (
+            self.fake_ag.availability_zone,
+            self.fake_ag.created_at,
+            self.fake_ag.deleted_at,
+            format_columns.ListColumn(self.fake_ag.hosts),
+            self.fake_ag.id,
+            self.fake_ag.is_deleted,
+            self.fake_ag.name,
+            format_columns.DictColumn(self.fake_ag.metadata),
+            self.fake_ag.updated_at,
+            self.fake_ag.uuid,
+        )
 
 
 class TestAggregateAddHost(TestAggregate):
@@ -155,13 +162,15 @@ class TestAggregateCreate(TestAggregate):
 
 
 class TestAggregateDelete(TestAggregate):
-    fake_ags = compute_fakes.create_aggregates(count=2)
-
     def setUp(self):
         super().setUp()
 
-        self.compute_sdk_client.find_aggregate = compute_fakes.get_aggregates(
-            self.fake_ags
+        self.fake_ags = list(
+            sdk_fakes.generate_fake_resources(_aggregate.Aggregate, 2)
+        )
+
+        self.compute_sdk_client.find_aggregate = mock.Mock(
+            side_effect=[self.fake_ags[0], self.fake_ags[1]]
         )
         self.cmd = aggregate.DeleteAggregate(self.app, None)
 
@@ -526,25 +535,25 @@ class TestAggregateShow(TestAggregate):
         'uuid',
     )
 
-    data = (
-        TestAggregate.fake_ag.availability_zone,
-        TestAggregate.fake_ag.created_at,
-        TestAggregate.fake_ag.deleted_at,
-        format_columns.ListColumn(TestAggregate.fake_ag.hosts),
-        TestAggregate.fake_ag.id,
-        TestAggregate.fake_ag.is_deleted,
-        TestAggregate.fake_ag.name,
-        format_columns.DictColumn(TestAggregate.fake_ag.metadata),
-        TestAggregate.fake_ag.updated_at,
-        TestAggregate.fake_ag.uuid,
-    )
-
     def setUp(self):
         super().setUp()
 
         self.compute_sdk_client.find_aggregate.return_value = self.fake_ag
         self.cmd = aggregate.ShowAggregate(self.app, None)
 
+        self.data = (
+            self.fake_ag.availability_zone,
+            self.fake_ag.created_at,
+            self.fake_ag.deleted_at,
+            format_columns.ListColumn(self.fake_ag.hosts),
+            self.fake_ag.id,
+            self.fake_ag.is_deleted,
+            self.fake_ag.name,
+            format_columns.DictColumn(self.fake_ag.metadata),
+            self.fake_ag.updated_at,
+            self.fake_ag.uuid,
+        )
+
     def test_aggregate_show(self):
         arglist = [
             'ag1',

openstackclient/tests/unit/compute/v2/test_console.py

@@ -15,6 +15,9 @@
 
 from unittest import mock
 
+from openstack.compute.v2 import server as _server
+from openstack.test import fakes as sdk_fakes
+
 from openstackclient.compute.v2 import console
 from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
 from openstackclient.tests.unit import utils
@@ -24,7 +27,7 @@ class TestConsoleLog(compute_fakes.TestComputev2):
     def setUp(self):
         super().setUp()
 
-        self._server = compute_fakes.create_one_sdk_server()
+        self._server = sdk_fakes.generate_fake_resource(_server.Server)
         self.compute_sdk_client.find_server.return_value = self._server
 
         self.cmd = console.ShowConsoleLog(self.app, None)
@@ -76,11 +79,12 @@ class TestConsoleLog(compute_fakes.TestComputev2):
 
 
 class TestConsoleUrlShow(compute_fakes.TestComputev2):
-    _server = compute_fakes.create_one_sdk_server()
-
     def setUp(self):
         super().setUp()
+
+        self._server = sdk_fakes.generate_fake_resource(_server.Server)
         self.compute_sdk_client.find_server.return_value = self._server
+
         fake_console_data = {
             'url': 'http://localhost',
             'protocol': 'fake_protocol',

openstackclient/tests/unit/compute/v2/test_hypervisor.py

@@ -14,7 +14,9 @@
 
 import json
 
+from openstack.compute.v2 import hypervisor as _hypervisor
 from openstack import exceptions as sdk_exceptions
+from openstack.test import fakes as sdk_fakes
 from osc_lib.cli import format_columns
 from osc_lib import exceptions
 
@@ -27,8 +29,12 @@ class TestHypervisorList(compute_fakes.TestComputev2):
         super().setUp()
 
         # Fake hypervisors to be listed up
-        self.hypervisors = compute_fakes.create_hypervisors()
-        self.compute_sdk_client.hypervisors.return_value = self.hypervisors
+        self.hypervisors = list(
+            sdk_fakes.generate_fake_resources(_hypervisor.Hypervisor, count=2)
+        )
+        self.compute_sdk_client.hypervisors.return_value = iter(
+            self.hypervisors
+        )
 
         self.columns = (
             "ID",
@@ -125,9 +131,9 @@ class TestHypervisorList(compute_fakes.TestComputev2):
             (
                 self.hypervisors[0].id,
                 self.hypervisors[0].name,
-                self.hypervisors[1].hypervisor_type,
-                self.hypervisors[1].host_ip,
-                self.hypervisors[1].state,
+                self.hypervisors[0].hypervisor_type,
+                self.hypervisors[0].host_ip,
+                self.hypervisors[0].state,
             ),
         )
 
@@ -290,10 +296,11 @@ class TestHypervisorShow(compute_fakes.TestComputev2):
         )
 
         # Fake hypervisors to be listed up
-        self.hypervisor = compute_fakes.create_one_hypervisor(
-            attrs={
-                'uptime': uptime_string,
-            }
+        self.hypervisor = sdk_fakes.generate_fake_resource(
+            _hypervisor.Hypervisor,
+            uptime=uptime_string,
+            service={"id": 1, "host": "aaa"},
+            cpu_info={"aaa": "aaa"},
         )
 
         self.compute_sdk_client.find_hypervisor.return_value = self.hypervisor
@@ -332,18 +339,18 @@ class TestHypervisorShow(compute_fakes.TestComputev2):
 
         self.data_v288 = (
             [],
-            format_columns.DictColumn({'aaa': 'aaa'}),
-            '192.168.0.10',
+            format_columns.DictColumn(self.hypervisor.cpu_info),
+            self.hypervisor.host_ip,
             '01:28:24',
             self.hypervisor.name,
-            'QEMU',
-            2004001,
+            self.hypervisor.hypervisor_type,
+            self.hypervisor.hypervisor_version,
             self.hypervisor.id,
             '0.94, 0.62, 0.50',
-            'aaa',
-            1,
-            'up',
-            'enabled',
+            self.hypervisor.service_details["host"],
+            self.hypervisor.service_details["id"],
+            self.hypervisor.state,
+            self.hypervisor.status,
             '3 days, 11:15',
             '1',
         )
@@ -378,31 +385,31 @@ class TestHypervisorShow(compute_fakes.TestComputev2):
         )
         self.data = (
             [],
-            format_columns.DictColumn({'aaa': 'aaa'}),
-            0,
-            50,
-            50,
-            1024,
-            '192.168.0.10',
+            format_columns.DictColumn(self.hypervisor.cpu_info),
+            self.hypervisor.current_workload,
+            self.hypervisor.disk_available,
+            self.hypervisor.local_disk_free,
+            self.hypervisor.memory_free,
+            self.hypervisor.host_ip,
             '01:28:24',
             self.hypervisor.name,
-            'QEMU',
-            2004001,
+            self.hypervisor.hypervisor_type,
+            self.hypervisor.hypervisor_version,
             self.hypervisor.id,
             '0.94, 0.62, 0.50',
-            50,
-            0,
-            1024,
-            512,
-            0,
-            'aaa',
+            self.hypervisor.local_disk_size,
+            self.hypervisor.local_disk_used,
+            self.hypervisor.memory_size,
+            self.hypervisor.memory_used,
+            self.hypervisor.running_vms,
+            self.hypervisor.service_details["host"],
             1,
-            'up',
-            'enabled',
+            self.hypervisor.state,
+            self.hypervisor.status,
             '3 days, 11:15',
             '1',
-            4,
-            0,
+            self.hypervisor.vcpus,
+            self.hypervisor.vcpus_used,
         )
 
         # Get the command object to test
@@ -537,27 +544,27 @@ class TestHypervisorShow(compute_fakes.TestComputev2):
         )
         expected_data = (
             [],
-            format_columns.DictColumn({'aaa': 'aaa'}),
-            0,
-            50,
-            50,
-            1024,
-            '192.168.0.10',
+            format_columns.DictColumn(self.hypervisor.cpu_info),
+            self.hypervisor.current_workload,
+            self.hypervisor.disk_available,
+            self.hypervisor.local_disk_free,
+            self.hypervisor.memory_free,
+            self.hypervisor.host_ip,
             self.hypervisor.name,
-            'QEMU',
-            2004001,
+            self.hypervisor.hypervisor_type,
+            self.hypervisor.hypervisor_version,
             self.hypervisor.id,
-            50,
-            0,
-            1024,
-            512,
-            0,
-            'aaa',
+            self.hypervisor.local_disk_size,
+            self.hypervisor.local_disk_used,
+            self.hypervisor.memory_size,
+            self.hypervisor.memory_used,
+            self.hypervisor.running_vms,
+            self.hypervisor.service_details["host"],
             1,
-            'up',
-            'enabled',
-            4,
-            0,
+            self.hypervisor.state,
+            self.hypervisor.status,
+            self.hypervisor.vcpus,
+            self.hypervisor.vcpus_used,
         )
 
         self.assertEqual(expected_columns, columns)