python-openstackclient 6.1.0__py3-none-any.whl → 6.2.1__py3-none-any.whl

openstackclient/network/v2/floating_ip_port_forwarding.py

@@ -25,6 +25,61 @@ from openstackclient.network import common
 LOG = logging.getLogger(__name__)
 
 
+def validate_ports_diff(ports):
+    if len(ports) == 0:
+        return 0
+
+    ports_diff = ports[-1] - ports[0]
+    if ports_diff < 0:
+        msg = _("The last number in port range must be"
+                " greater or equal to the first")
+        raise exceptions.CommandError(msg)
+    return ports_diff
+
+
+def validate_ports_match(internal_ports, external_ports):
+    internal_ports_diff = validate_ports_diff(internal_ports)
+    external_ports_diff = validate_ports_diff(external_ports)
+
+    if internal_ports_diff != 0 and internal_ports_diff != external_ports_diff:
+        msg = _("The relation between internal and external ports does not "
+                "match the pattern 1:N and N:N")
+        raise exceptions.CommandError(msg)
+
+
+def validate_and_assign_port_ranges(parsed_args, attrs):
+    internal_port_range = parsed_args.internal_protocol_port
+    external_port_range = parsed_args.external_protocol_port
+    external_ports = internal_ports = []
+    if external_port_range:
+        external_ports = list(map(int, str(external_port_range).split(':')))
+    if internal_port_range:
+        internal_ports = list(map(int, str(internal_port_range).split(':')))
+
+    validate_ports_match(internal_ports, external_ports)
+
+    for port in external_ports + internal_ports:
+        validate_port(port)
+
+    if internal_port_range:
+        if ':' in internal_port_range:
+            attrs['internal_port_range'] = internal_port_range
+        else:
+            attrs['internal_port'] = int(internal_port_range)
+
+    if external_port_range:
+        if ':' in external_port_range:
+            attrs['external_port_range'] = external_port_range
+        else:
+            attrs['external_port'] = int(external_port_range)
+
+
+def validate_port(port):
+    if port <= 0 or port > 65535:
+        msg = _("The port number range is <1-65535>")
+        raise exceptions.CommandError(msg)
+
+
 def _get_columns(item):
     column_map = {}
     hidden_columns = ['location', 'tenant_id']
@@ -58,7 +113,6 @@ class CreateFloatingIPPortForwarding(command.ShowOne,
         )
         parser.add_argument(
             '--internal-protocol-port',
-            type=int,
             metavar='<port-number>',
             required=True,
             help=_("The protocol port number "
@@ -67,7 +121,6 @@ class CreateFloatingIPPortForwarding(command.ShowOne,
         )
         parser.add_argument(
             '--external-protocol-port',
-            type=int,
             metavar='<port-number>',
             required=True,
             help=_("The protocol port number of "
@@ -92,6 +145,7 @@ class CreateFloatingIPPortForwarding(command.ShowOne,
             help=_("Floating IP that the port forwarding belongs to "
                    "(IP address or ID)")
         )
+
         return parser
 
     def take_action(self, parsed_args):
@@ -102,19 +156,7 @@ class CreateFloatingIPPortForwarding(command.ShowOne,
             ignore_missing=False,
         )
 
-        if parsed_args.internal_protocol_port is not None:
-            if (parsed_args.internal_protocol_port <= 0 or
-                    parsed_args.internal_protocol_port > 65535):
-                msg = _("The port number range is <1-65535>")
-                raise exceptions.CommandError(msg)
-            attrs['internal_port'] = parsed_args.internal_protocol_port
-
-        if parsed_args.external_protocol_port is not None:
-            if (parsed_args.external_protocol_port <= 0 or
-                    parsed_args.external_protocol_port > 65535):
-                msg = _("The port number range is <1-65535>")
-                raise exceptions.CommandError(msg)
-            attrs['external_port'] = parsed_args.external_protocol_port
+        validate_and_assign_port_ranges(parsed_args, attrs)
 
         if parsed_args.port:
             port = client.find_port(parsed_args.port,
@@ -226,7 +268,9 @@ class ListFloatingIPPortForwarding(command.Lister):
             'internal_port_id',
             'internal_ip_address',
             'internal_port',
+            'internal_port_range',
             'external_port',
+            'external_port_range',
             'protocol',
             'description',
         )
@@ -235,7 +279,9 @@ class ListFloatingIPPortForwarding(command.Lister):
             'Internal Port ID',
             'Internal IP Address',
             'Internal Port',
+            'Internal Port Range',
             'External Port',
+            'External Port Range',
             'Protocol',
             'Description',
         )
@@ -246,8 +292,13 @@ class ListFloatingIPPortForwarding(command.Lister):
             port = client.find_port(parsed_args.port,
                                     ignore_missing=False)
             query['internal_port_id'] = port.id
-        if parsed_args.external_protocol_port is not None:
-            query['external_port'] = parsed_args.external_protocol_port
+        external_port = parsed_args.external_protocol_port
+        if external_port:
+            if ':' in external_port:
+                query['external_port_range'] = external_port
+            else:
+                query['external_port'] = int(
+                    parsed_args.external_protocol_port)
         if parsed_args.protocol is not None:
             query['protocol'] = parsed_args.protocol
 
@@ -297,14 +348,12 @@ class SetFloatingIPPortForwarding(common.NeutronCommandWithExtraArgs):
         parser.add_argument(
             '--internal-protocol-port',
             metavar='<port-number>',
-            type=int,
             help=_("The TCP/UDP/other protocol port number of the "
                    "network port fixed IPv4 address associated to "
                    "the floating IP port forwarding")
         )
         parser.add_argument(
             '--external-protocol-port',
-            type=int,
             metavar='<port-number>',
             help=_("The TCP/UDP/other protocol port number of the "
                    "port forwarding's floating IP address")
@@ -339,19 +388,8 @@ class SetFloatingIPPortForwarding(common.NeutronCommandWithExtraArgs):
 
         if parsed_args.internal_ip_address:
             attrs['internal_ip_address'] = parsed_args.internal_ip_address
-        if parsed_args.internal_protocol_port is not None:
-            if (parsed_args.internal_protocol_port <= 0 or
-               parsed_args.internal_protocol_port > 65535):
-                msg = _("The port number range is <1-65535>")
-                raise exceptions.CommandError(msg)
-            attrs['internal_port'] = parsed_args.internal_protocol_port
-
-        if parsed_args.external_protocol_port is not None:
-            if (parsed_args.external_protocol_port <= 0 or
-               parsed_args.external_protocol_port > 65535):
-                msg = _("The port number range is <1-65535>")
-                raise exceptions.CommandError(msg)
-            attrs['external_port'] = parsed_args.external_protocol_port
+
+        validate_and_assign_port_ranges(parsed_args, attrs)
 
         if parsed_args.protocol:
             attrs['protocol'] = parsed_args.protocol

openstackclient/network/v2/network_service_provider.py

@@ -26,18 +26,24 @@ class ListNetworkServiceProvider(command.Lister):
         client = self.app.client_manager.network
 
         columns = (
-            'service_type',
-            'name',
-            'is_default',
+            "service_type",
+            "name",
+            "is_default",
         )
         column_headers = (
-            'Service Type',
-            'Name',
-            'Default',
+            "Service Type",
+            "Name",
+            "Default",
         )
 
         data = client.service_providers()
-        return(column_headers,
-               (utils.get_item_properties(
-                   s, columns,
-               ) for s in data))
+        return (
+            column_headers,
+            (
+                utils.get_item_properties(
+                    s,
+                    columns,
+                )
+                for s in data
+            ),
+        )

openstackclient/tests/functional/compute/v2/test_server.py

@@ -1375,10 +1375,8 @@ class ServerTests(common.ComputeTestCase):
             parse_output=True,
         )
 
-        self.assertIsNotNone(cmd_output['ID'])
         self.assertEqual(server_id, cmd_output['Server ID'])
         self.assertEqual(volume_id, cmd_output['Volume ID'])
-        volume_attachment_id = cmd_output['ID']
 
         cmd_output = self.openstack(
             'server volume list ' +
@@ -1386,7 +1384,6 @@ class ServerTests(common.ComputeTestCase):
             parse_output=True,
         )
 
-        self.assertEqual(volume_attachment_id, cmd_output[0]['ID'])
         self.assertEqual(server_id, cmd_output[0]['Server ID'])
         self.assertEqual(volume_id, cmd_output[0]['Volume ID'])
 

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

@@ -21,9 +21,11 @@ import uuid
 from novaclient import api_versions
 from openstack.compute.v2 import flavor as _flavor
 from openstack.compute.v2 import hypervisor as _hypervisor
+from openstack.compute.v2 import migration as _migration
 from openstack.compute.v2 import server as _server
 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
 from openstack.compute.v2 import volume_attachment
 
@@ -1433,242 +1435,155 @@ class FakeRateLimit(object):
         self.next_available = next_available
 
 
-class FakeMigration(object):
-    """Fake one or more migrations."""
+def create_one_migration(attrs=None):
+    """Create a fake migration.
 
-    @staticmethod
-    def create_one_migration(attrs=None, methods=None):
-        """Create a fake migration.
-
-        :param dict attrs:
-            A dictionary with all attributes
-        :param dict methods:
-            A dictionary with all methods
-        :return:
-            A FakeResource object, with id, type, and so on
-        """
-        attrs = attrs or {}
-        methods = methods or {}
+    :param dict attrs: A dictionary with all attributes
+    :return: A fake openstack.compute.v2.migration.Migration object
+    """
+    attrs = attrs or {}
 
-        # Set default attributes.
-        migration_info = {
-            "dest_host": "10.0.2.15",
-            "status": "migrating",
-            "migration_type": "migration",
-            "updated_at": "2017-01-31T08:03:25.000000",
-            "created_at": "2017-01-31T08:03:21.000000",
-            "dest_compute": "compute-" + uuid.uuid4().hex,
-            "id": random.randint(1, 999),
-            "source_node": "node-" + uuid.uuid4().hex,
-            "instance_uuid": uuid.uuid4().hex,
-            "dest_node": "node-" + uuid.uuid4().hex,
-            "source_compute": "compute-" + uuid.uuid4().hex,
-            "uuid": uuid.uuid4().hex,
-            "old_instance_type_id": uuid.uuid4().hex,
-            "new_instance_type_id": uuid.uuid4().hex,
-            "project_id": uuid.uuid4().hex,
-            "user_id": uuid.uuid4().hex
-        }
+    # Set default attributes.
+    migration_info = {
+        "created_at": "2017-01-31T08:03:21.000000",
+        "dest_compute": "compute-" + uuid.uuid4().hex,
+        "dest_host": "10.0.2.15",
+        "dest_node": "node-" + uuid.uuid4().hex,
+        "id": random.randint(1, 999),
+        "migration_type": "migration",
+        "new_flavor_id": uuid.uuid4().hex,
+        "old_flavor_id": uuid.uuid4().hex,
+        "project_id": uuid.uuid4().hex,
+        "server_id": uuid.uuid4().hex,
+        "source_compute": "compute-" + uuid.uuid4().hex,
+        "source_node": "node-" + uuid.uuid4().hex,
+        "status": "migrating",
+        "updated_at": "2017-01-31T08:03:25.000000",
+        "user_id": uuid.uuid4().hex,
+        "uuid": uuid.uuid4().hex,
+    }
 
-        # Overwrite default attributes.
-        migration_info.update(attrs)
+    # Overwrite default attributes.
+    migration_info.update(attrs)
 
-        migration = fakes.FakeResource(info=copy.deepcopy(migration_info),
-                                       methods=methods,
-                                       loaded=True)
-        return migration
+    migration = _migration.Migration(**migration_info)
+    return migration
 
-    @staticmethod
-    def create_migrations(attrs=None, methods=None, count=2):
-        """Create multiple fake migrations.
 
-        :param dict attrs:
-            A dictionary with all attributes
-        :param dict methods:
-            A dictionary with all methods
-        :param int count:
-            The number of migrations to fake
-        :return:
-            A list of FakeResource objects faking the migrations
-        """
-        migrations = []
-        for i in range(0, count):
-            migrations.append(
-                FakeMigration.create_one_migration(
-                    attrs, methods))
+def create_migrations(attrs=None, count=2):
+    """Create multiple fake migrations.
 
-        return migrations
+    :param dict attrs: A dictionary with all attributes
+    :param int count: The number of migrations to fake
+    :return: A list of fake openstack.compute.v2.migration.Migration objects
+    """
+    migrations = []
+    for i in range(0, count):
+        migrations.append(create_one_migration(attrs))
 
+    return migrations
 
-class FakeServerMigration(object):
-    """Fake one or more server migrations."""
 
-    @staticmethod
-    def create_one_server_migration(attrs=None, methods=None):
-        """Create a fake server migration.
-
-        :param dict attrs:
-            A dictionary with all attributes
-        :param dict methods:
-            A dictionary with all methods
-        :return:
-            A FakeResource object, with id, type, and so on
-        """
-        attrs = attrs or {}
-        methods = methods or {}
+def create_one_server_migration(attrs=None):
+    """Create a fake server migration.
 
-        # Set default attributes.
+    :param dict attrs: A dictionary with all attributes
+    :return A fake openstack.compute.v2.server_migration.ServerMigration object
+    """
+    attrs = attrs or {}
 
-        migration_info = {
-            "created_at": "2016-01-29T13:42:02.000000",
-            "dest_compute": "compute2",
-            "dest_host": "1.2.3.4",
-            "dest_node": "node2",
-            "id": random.randint(1, 999),
-            "server_uuid": uuid.uuid4().hex,
-            "source_compute": "compute1",
-            "source_node": "node1",
-            "status": "running",
-            "memory_total_bytes": random.randint(1, 99999),
-            "memory_processed_bytes": random.randint(1, 99999),
-            "memory_remaining_bytes": random.randint(1, 99999),
-            "disk_total_bytes": random.randint(1, 99999),
-            "disk_processed_bytes": random.randint(1, 99999),
-            "disk_remaining_bytes": random.randint(1, 99999),
-            "updated_at": "2016-01-29T13:42:02.000000",
-            # added in 2.59
-            "uuid": uuid.uuid4().hex,
-            # added in 2.80
-            "user_id": uuid.uuid4().hex,
-            "project_id": uuid.uuid4().hex,
-        }
+    # Set default attributes.
 
-        # Overwrite default attributes.
-        migration_info.update(attrs)
+    migration_info = {
+        "created_at": "2016-01-29T13:42:02.000000",
+        "dest_compute": "compute2",
+        "dest_host": "1.2.3.4",
+        "dest_node": "node2",
+        "id": random.randint(1, 999),
+        "server_uuid": uuid.uuid4().hex,
+        "source_compute": "compute1",
+        "source_node": "node1",
+        "status": "running",
+        "memory_total_bytes": random.randint(1, 99999),
+        "memory_processed_bytes": random.randint(1, 99999),
+        "memory_remaining_bytes": random.randint(1, 99999),
+        "disk_total_bytes": random.randint(1, 99999),
+        "disk_processed_bytes": random.randint(1, 99999),
+        "disk_remaining_bytes": random.randint(1, 99999),
+        "updated_at": "2016-01-29T13:42:02.000000",
+        # added in 2.59
+        "uuid": uuid.uuid4().hex,
+        # added in 2.80
+        "user_id": uuid.uuid4().hex,
+        "project_id": uuid.uuid4().hex,
+    }
 
-        migration = fakes.FakeResource(
-            info=copy.deepcopy(migration_info),
-            methods=methods,
-            loaded=True)
-        return migration
+    # Overwrite default attributes.
+    migration_info.update(attrs)
 
+    migration = _server_migration.ServerMigration(**migration_info)
+    return migration
 
-class FakeVolumeAttachment(object):
-    """Fake one or more volume attachments (BDMs)."""
 
-    @staticmethod
-    def create_one_volume_attachment(attrs=None, methods=None):
-        """Create a fake volume attachment.
+def create_server_migrations(attrs=None, methods=None, count=2):
+    """Create multiple server migrations.
 
-        :param dict attrs:
-            A dictionary with all attributes
-        :param dict methods:
-            A dictionary with all methods
-        :return:
-            A FakeResource object, with id, device, and so on
-        """
-        attrs = attrs or {}
-        methods = methods or {}
-
-        # Set default attributes.
-        volume_attachment_info = {
-            "id": uuid.uuid4().hex,
-            "device": "/dev/sdb",
-            "serverId": uuid.uuid4().hex,
-            "volumeId": uuid.uuid4().hex,
-            # introduced in API microversion 2.70
-            "tag": "foo",
-            # introduced in API microversion 2.79
-            "delete_on_termination": True,
-            # introduced in API microversion 2.89
-            "attachment_id": uuid.uuid4().hex,
-            "bdm_uuid": uuid.uuid4().hex
-        }
-
-        # Overwrite default attributes.
-        volume_attachment_info.update(attrs)
-
-        volume_attachment = fakes.FakeResource(
-            info=copy.deepcopy(volume_attachment_info),
-            methods=methods,
-            loaded=True)
-        return volume_attachment
+    :param dict attrs: A dictionary with all attributes
+    :param int count: The number of server migrations to fake
+    :return A list of fake
+        openstack.compute.v2.server_migration.ServerMigration objects
+    """
+    migrations = []
+    for i in range(0, count):
+        migrations.append(
+            create_one_server_migration(attrs, methods))
 
-    @staticmethod
-    def create_volume_attachments(attrs=None, methods=None, count=2):
-        """Create multiple fake volume attachments (BDMs).
+    return migrations
 
-        :param dict attrs:
-            A dictionary with all attributes
-        :param dict methods:
-            A dictionary with all methods
-        :param int count:
-            The number of volume attachments to fake
-        :return:
-            A list of FakeResource objects faking the volume attachments.
-        """
-        volume_attachments = []
-        for i in range(0, count):
-            volume_attachments.append(
-                FakeVolumeAttachment.create_one_volume_attachment(
-                    attrs, methods))
 
-        return volume_attachments
+def create_one_volume_attachment(attrs=None):
+    """Create a fake volume attachment.
 
-    @staticmethod
-    def create_one_sdk_volume_attachment(attrs=None, methods=None):
-        """Create a fake sdk VolumeAttachment.
+    :param dict attrs: A dictionary with all attributes
+    :return: A fake openstack.compute.v2.volume_attachment.VolumeAttachment
+        object
+    """
+    attrs = attrs or {}
 
-        :param dict attrs:
-            A dictionary with all attributes
-        :param dict methods:
-            A dictionary with all methods
-        :return:
-            A fake VolumeAttachment object, with id, device, and so on
-        """
-        attrs = attrs or {}
-        methods = methods or {}
+    # Set default attributes.
+    volume_attachment_info = {
+        "id": uuid.uuid4().hex,
+        "device": "/dev/sdb",
+        "server_id": uuid.uuid4().hex,
+        "volume_id": uuid.uuid4().hex,
+        # introduced in API microversion 2.70
+        "tag": "foo",
+        # introduced in API microversion 2.79
+        "delete_on_termination": True,
+        # introduced in API microversion 2.89
+        "attachment_id": uuid.uuid4().hex,
+        "bdm_id": uuid.uuid4().hex,
+    }
 
-        # Set default attributes.
-        volume_attachment_info = {
-            "id": uuid.uuid4().hex,
-            "device": "/dev/sdb",
-            "server_id": uuid.uuid4().hex,
-            "volume_id": uuid.uuid4().hex,
-            # introduced in API microversion 2.70
-            "tag": "foo",
-            # introduced in API microversion 2.79
-            "delete_on_termination": True,
-            # introduced in API microversion 2.89
-            "attachment_id": uuid.uuid4().hex,
-            "bdm_uuid": uuid.uuid4().hex
-        }
+    # Overwrite default attributes.
+    volume_attachment_info.update(attrs)
 
-        # Overwrite default attributes.
-        volume_attachment_info.update(attrs)
+    return volume_attachment.VolumeAttachment(**volume_attachment_info)
 
-        return volume_attachment.VolumeAttachment(**volume_attachment_info)
 
-    @staticmethod
-    def create_sdk_volume_attachments(attrs=None, methods=None, count=2):
-        """Create multiple fake VolumeAttachment objects (BDMs).
+def create_volume_attachments(attrs=None, count=2):
+    """Create multiple fake volume attachments.
 
-        :param dict attrs:
-            A dictionary with all attributes
-        :param dict methods:
-            A dictionary with all methods
-        :param int count:
-            The number of volume attachments to fake
-        :return:
-            A list of VolumeAttachment objects faking the volume attachments.
-        """
-        volume_attachments = []
-        for i in range(0, count):
-            volume_attachments.append(
-                FakeVolumeAttachment.create_one_sdk_volume_attachment(
-                    attrs, methods))
+    :param dict attrs: A dictionary with all attributes
+    :param int count: The number of volume attachments to fake
+    :return: A list of fake
+        openstack.compute.v2.volume_attachment.VolumeAttachment objects
+    """
+    volume_attachments = []
+    for i in range(0, count):
+        volume_attachments.append(create_one_volume_attachment(attrs))
 
-        return volume_attachments
+    return volume_attachments
 
 
 def create_one_hypervisor(attrs=None):