python-openstackclient 6.3.0__py3-none-any.whl → 6.5.0__py3-none-any.whl

openstackclient/network/v2/port.py

@@ -55,18 +55,49 @@ _formatters = {
 
 
 def _get_columns(item):
-    column_map = {
-        'binding:host_id': 'binding_host_id',
-        'binding:profile': 'binding_profile',
-        'binding:vif_details': 'binding_vif_details',
-        'binding:vif_type': 'binding_vif_type',
-        'binding:vnic_type': 'binding_vnic_type',
-        'is_admin_state_up': 'admin_state_up',
-        'is_port_security_enabled': 'port_security_enabled',
+    column_data_mapping = {
+        'admin_state_up': 'is_admin_state_up',
+        'allowed_address_pairs': 'allowed_address_pairs',
+        'binding_host_id': 'binding_host_id',
+        'binding_profile': 'binding_profile',
+        'binding_vif_details': 'binding_vif_details',
+        'binding_vif_type': 'binding_vif_type',
+        'binding_vnic_type': 'binding_vnic_type',
+        'created_at': 'created_at',
+        'data_plane_status': 'data_plane_status',
+        'description': 'description',
+        'device_id': 'device_id',
+        'device_owner': 'device_owner',
+        'device_profile': 'device_profile',
+        'dns_assignment': 'dns_assignment',
+        'dns_domain': 'dns_domain',
+        'dns_name': 'dns_name',
+        'extra_dhcp_opts': 'extra_dhcp_opts',
+        'fixed_ips': 'fixed_ips',
+        'hardware_offload_type': 'hardware_offload_type',
+        'hints': 'hints',
+        'id': 'id',
+        'ip_allocation': 'ip_allocation',
+        'mac_address': 'mac_address',
+        'name': 'name',
+        'network_id': 'network_id',
+        'numa_affinity_policy': 'numa_affinity_policy',
+        'port_security_enabled': 'is_port_security_enabled',
+        'project_id': 'project_id',
+        'propagate_uplink_status': 'propagate_uplink_status',
+        'resource_request': 'resource_request',
+        'revision_number': 'revision_number',
+        'qos_network_policy_id': 'qos_network_policy_id',
+        'qos_policy_id': 'qos_policy_id',
+        'security_group_ids': 'security_group_ids',
+        'status': 'status',
+        'tags': 'tags',
+        'trunk_details': 'trunk_details',
+        'updated_at': 'updated_at',
     }
-    hidden_columns = ['location', 'tenant_id']
-    return utils.get_osc_show_columns_for_sdk_resource(
-        item, column_map, hidden_columns
+    return (
+        tuple(column_data_mapping.keys()),
+        tuple(column_data_mapping.values()),
     )
 
 
@@ -94,7 +125,7 @@ class JSONKeyValueAction(argparse.Action):
                     "%(option)s, but encountered JSON parsing error: "
                     "%(error)s"
                 ) % {"option": option_string, "error": e}
-                raise argparse.ArgumentTypeError(msg)
+                raise argparse.ArgumentError(self, msg)
 
 
 def _get_attrs(client_manager, parsed_args):
@@ -182,6 +213,12 @@ def _get_attrs(client_manager, parsed_args):
     if 'device_profile' in parsed_args and parsed_args.device_profile:
         attrs['device_profile'] = parsed_args.device_profile
 
+    if (
+        'hardware_offload_type' in parsed_args
+        and parsed_args.hardware_offload_type
+    ):
+        attrs['hardware_offload_type'] = parsed_args.hardware_offload_type
+
     return attrs
 
 
@@ -379,7 +416,7 @@ def _validate_port_hints(hints):
         {'openvswitch': {'other_config': {'tx-steering': 'hash'}}},
     ):
         msg = _("Invalid value to --hints, see --help for valid values.")
-        raise argparse.ArgumentTypeError(msg)
+        raise exceptions.CommandError(msg)
 
 
 # When we have multiple hints, we'll need to refactor this to expand aliases
@@ -530,6 +567,15 @@ class CreatePort(command.ShowOne, common.NeutronCommandWithExtraArgs):
             metavar='<device-profile>',
             help=_('Cyborg port device profile'),
         )
+        parser.add_argument(
+            '--hardware-offload-type',
+            metavar='<hardware-offload-type>',
+            dest='hardware_offload_type',
+            help=_(
+                'Hardware offload type this port will request when '
+                'attached to the network backend'
+            ),
+        )
         _tag.add_tag_option_to_parser_for_create(parser, _('port'))
         return parser
 
@@ -813,7 +859,7 @@ class ListPort(command.Lister):
                 self.app.client_manager, parsed_args
             )
         if parsed_args.security_groups:
-            filters['security_groups'] = parsed_args.security_groups
+            filters['security_group_ids'] = parsed_args.security_groups
 
         _tag.get_tag_filtering_args(parsed_args, filters)
 
@@ -1133,10 +1179,6 @@ class UnsetPort(common.NeutronUnsetCommandWithExtraArgs):
                 "or ID) (repeat option to unset multiple security groups)"
             ),
         )
-
-        parser.add_argument(
-            'port', metavar="<port>", help=_("Port to modify (name or ID)")
-        )
         parser.add_argument(
             '--allowed-address',
             metavar='ip-address=<ip-address>[,mac-address=<mac-address>]',
@@ -1179,8 +1221,12 @@ class UnsetPort(common.NeutronUnsetCommandWithExtraArgs):
             default=False,
             help=_("Clear hints for the port."),
         )
-
         _tag.add_tag_option_to_parser_for_unset(parser, _('port'))
+        parser.add_argument(
+            'port',
+            metavar="<port>",
+            help=_("Port to modify (name or ID)"),
+        )
 
         return parser
 

openstackclient/network/v2/security_group_rule.py

@@ -28,48 +28,6 @@ from openstackclient.network import utils as network_utils
 LOG = logging.getLogger(__name__)
 
 
-def _format_security_group_rule_show(obj):
-    data = network_utils.transform_compute_security_group_rule(obj)
-    return zip(*sorted(data.items()))
-
-
-def _format_network_port_range(rule):
-    # Display port range or ICMP type and code. For example:
-    # - ICMP type: 'type=3'
-    # - ICMP type and code: 'type=3:code=0'
-    # - ICMP code: Not supported
-    # - Matching port range: '443:443'
-    # - Different port range: '22:24'
-    # - Single port: '80:80'
-    # - No port range: ''
-    port_range = ''
-    if _is_icmp_protocol(rule['protocol']):
-        if rule['port_range_min']:
-            port_range += 'type=' + str(rule['port_range_min'])
-        if rule['port_range_max']:
-            port_range += ':code=' + str(rule['port_range_max'])
-    elif rule['port_range_min'] or rule['port_range_max']:
-        port_range_min = str(rule['port_range_min'])
-        port_range_max = str(rule['port_range_max'])
-        if rule['port_range_min'] is None:
-            port_range_min = port_range_max
-        if rule['port_range_max'] is None:
-            port_range_max = port_range_min
-        port_range = port_range_min + ':' + port_range_max
-    return port_range
-
-
-def _format_remote_ip_prefix(rule):
-    remote_ip_prefix = rule['remote_ip_prefix']
-    if remote_ip_prefix is None:
-        ethertype = rule['ether_type']
-        if ethertype == 'IPv4':
-            remote_ip_prefix = '0.0.0.0/0'
-        elif ethertype == 'IPv6':
-            remote_ip_prefix = '::/0'
-    return remote_ip_prefix
-
-
 def _get_columns(item):
     column_map = {}
     hidden_columns = ['location', 'tenant_id']
@@ -78,29 +36,6 @@ def _get_columns(item):
     )
 
 
-def _convert_to_lowercase(string):
-    return string.lower()
-
-
-def _convert_ipvx_case(string):
-    if string.lower() == 'ipv4':
-        return 'IPv4'
-    if string.lower() == 'ipv6':
-        return 'IPv6'
-    return string
-
-
-def _is_icmp_protocol(protocol):
-    # NOTE(rtheis): Neutron has deprecated protocol icmpv6.
-    # However, while the OSC CLI doesn't document the protocol,
-    # the code must still handle it. In addition, handle both
-    # protocol names and numbers.
-    if protocol in ['icmp', 'icmpv6', 'ipv6-icmp', '1', '58']:
-        return True
-    else:
-        return False
-
-
 # TODO(abhiraut): Use the SDK resource mapped attribute names once the
 # OSC minimum requirements include SDK 1.0.
 class CreateSecurityGroupRule(
@@ -188,7 +123,7 @@ class CreateSecurityGroupRule(
         protocol_group.add_argument(
             '--protocol',
             metavar='<protocol>',
-            type=_convert_to_lowercase,
+            type=network_utils.convert_to_lowercase,
             help=protocol_help,
             **proto_choices
         )
@@ -196,7 +131,7 @@ class CreateSecurityGroupRule(
             protocol_group.add_argument(
                 '--proto',
                 metavar='<proto>',
-                type=_convert_to_lowercase,
+                type=network_utils.convert_to_lowercase,
                 help=argparse.SUPPRESS,
                 **proto_choices
             )
@@ -246,7 +181,7 @@ class CreateSecurityGroupRule(
             '--ethertype',
             metavar='<ethertype>',
             choices=['IPv4', 'IPv6'],
-            type=_convert_ipvx_case,
+            type=network_utils.convert_ipvx_case,
             help=self.enhance_help_neutron(
                 _(
                     "Ethertype of network traffic "
@@ -264,38 +199,6 @@ class CreateSecurityGroupRule(
         )
         return parser
 
-    def _get_protocol(self, parsed_args, default_protocol='any'):
-        protocol = default_protocol
-        if parsed_args.protocol is not None:
-            protocol = parsed_args.protocol
-        if parsed_args.proto is not None:
-            protocol = parsed_args.proto
-        if protocol == 'any':
-            protocol = None
-        return protocol
-
-    def _get_ethertype(self, parsed_args, protocol):
-        ethertype = 'IPv4'
-        if parsed_args.ethertype is not None:
-            ethertype = parsed_args.ethertype
-        elif self._is_ipv6_protocol(protocol):
-            ethertype = 'IPv6'
-        return ethertype
-
-    def _is_ipv6_protocol(self, protocol):
-        # NOTE(rtheis): Neutron has deprecated protocol icmpv6.
-        # However, while the OSC CLI doesn't document the protocol,
-        # the code must still handle it. In addition, handle both
-        # protocol names and numbers.
-        if (
-            protocol is not None
-            and protocol.startswith('ipv6-')
-            or protocol in ['icmpv6', '41', '43', '44', '58', '59', '60']
-        ):
-            return True
-        else:
-            return False
-
     def take_action_network(self, client, parsed_args):
         # Get the security group ID to hold the rule.
         security_group_id = client.find_security_group(
@@ -304,7 +207,7 @@ class CreateSecurityGroupRule(
 
         # Build the create attributes.
         attrs = {}
-        attrs['protocol'] = self._get_protocol(parsed_args)
+        attrs['protocol'] = network_utils.get_protocol(parsed_args)
 
         if parsed_args.description is not None:
             attrs['description'] = parsed_args.description
@@ -318,7 +221,7 @@ class CreateSecurityGroupRule(
 
         # NOTE(rtheis): Use ethertype specified else default based
         # on IP protocol.
-        attrs['ethertype'] = self._get_ethertype(
+        attrs['ethertype'] = network_utils.get_ethertype(
             parsed_args, attrs['protocol']
         )
 
@@ -335,7 +238,7 @@ class CreateSecurityGroupRule(
         if parsed_args.icmp_type is None and parsed_args.icmp_code is not None:
             msg = _('Argument --icmp-type required with argument --icmp-code')
             raise exceptions.CommandError(msg)
-        is_icmp_protocol = _is_icmp_protocol(attrs['protocol'])
+        is_icmp_protocol = network_utils.is_icmp_protocol(attrs['protocol'])
         if not is_icmp_protocol and (
             parsed_args.icmp_type or parsed_args.icmp_code
         ):
@@ -390,7 +293,9 @@ class CreateSecurityGroupRule(
 
     def take_action_compute(self, client, parsed_args):
         group = client.api.security_group_find(parsed_args.group)
-        protocol = self._get_protocol(parsed_args, default_protocol='tcp')
+        protocol = network_utils.get_protocol(
+            parsed_args, default_protocol='tcp'
+        )
         if protocol == 'icmp':
             from_port, to_port = -1, -1
         else:
@@ -414,7 +319,7 @@ class CreateSecurityGroupRule(
             remote_ip=remote_ip,
             remote_group=parsed_args.remote_group,
         )
-        return _format_security_group_rule_show(obj)
+        return network_utils.format_security_group_rule_show(obj)
 
 
 class DeleteSecurityGroupRule(common.NetworkAndComputeDelete):
@@ -451,8 +356,8 @@ class ListSecurityGroupRule(common.NetworkAndComputeLister):
         Create port_range column from port_range_min and port_range_max
         """
         rule = rule.to_dict()
-        rule['port_range'] = _format_network_port_range(rule)
-        rule['remote_ip_prefix'] = _format_remote_ip_prefix(rule)
+        rule['port_range'] = network_utils.format_network_port_range(rule)
+        rule['remote_ip_prefix'] = network_utils.format_remote_ip_prefix(rule)
         return rule
 
     def update_parser_common(self, parser):
@@ -478,7 +383,7 @@ class ListSecurityGroupRule(common.NetworkAndComputeLister):
         parser.add_argument(
             '--protocol',
             metavar='<protocol>',
-            type=_convert_to_lowercase,
+            type=network_utils.convert_to_lowercase,
             help=self.enhance_help_neutron(
                 _(
                     "List rules by the IP protocol (ah, dhcp, egp, esp, gre, "
@@ -493,7 +398,7 @@ class ListSecurityGroupRule(common.NetworkAndComputeLister):
         parser.add_argument(
             '--ethertype',
             metavar='<ethertype>',
-            type=_convert_to_lowercase,
+            type=network_utils.convert_to_lowercase,
             help=self.enhance_help_neutron(
                 _("List rules by the Ethertype (IPv4 or IPv6)")
             ),
@@ -677,7 +582,9 @@ class ShowSecurityGroupRule(common.NetworkAndComputeShowOne):
         )
         # necessary for old rules that have None in this field
         if not obj['remote_ip_prefix']:
-            obj['remote_ip_prefix'] = _format_remote_ip_prefix(obj)
+            obj['remote_ip_prefix'] = network_utils.format_remote_ip_prefix(
+                obj
+            )
         display_columns, columns = _get_columns(obj)
         data = utils.get_item_properties(obj, columns)
         return (display_columns, data)
@@ -704,4 +611,4 @@ class ShowSecurityGroupRule(common.NetworkAndComputeShowOne):
             raise exceptions.CommandError(msg)
 
         # NOTE(rtheis): Format security group rule
-        return _format_security_group_rule_show(obj)
+        return network_utils.format_security_group_rule_show(obj)

openstackclient/network/v2/subnet.py

@@ -306,6 +306,7 @@ class CreateSubnet(command.ShowOne, common.NeutronCommandWithExtraArgs):
         )
         subnet_pool_group.add_argument(
             '--use-prefix-delegation',
+            action='store_true',
             help=_(
                 "Use 'prefix-delegation' if IP is IPv6 format "
                 "and IP would be delegated externally"

openstackclient/object/v1/container.py

@@ -22,9 +22,9 @@ from osc_lib.cli import parseractions
 from osc_lib.command import command
 from osc_lib import utils
 
+from openstackclient.common import pagination
 from openstackclient.i18n import _
 
-
 LOG = logging.getLogger(__name__)
 
 
@@ -127,22 +127,12 @@ class ListContainer(command.Lister):
             metavar="<prefix>",
             help=_("Filter list using <prefix>"),
         )
-        parser.add_argument(
-            "--marker",
-            metavar="<marker>",
-            help=_("Anchor for paging"),
-        )
+        pagination.add_marker_pagination_option_to_parser(parser)
         parser.add_argument(
             "--end-marker",
             metavar="<end-marker>",
             help=_("End anchor for paging"),
         )
-        parser.add_argument(
-            "--limit",
-            metavar="<num-containers>",
-            type=int,
-            help=_("Limit the number of containers returned"),
-        )
         parser.add_argument(
             '--long',
             action='store_true',

openstackclient/object/v1/object.py

@@ -23,6 +23,7 @@ from osc_lib.command import command
 from osc_lib import exceptions
 from osc_lib import utils
 
+from openstackclient.common import pagination
 from openstackclient.i18n import _
 
 
@@ -140,22 +141,12 @@ class ListObject(command.Lister):
             metavar="<delimiter>",
             help=_("Roll up items with <delimiter>"),
         )
-        parser.add_argument(
-            "--marker",
-            metavar="<marker>",
-            help=_("Anchor for paging"),
-        )
+        pagination.add_marker_pagination_option_to_parser(parser)
         parser.add_argument(
             "--end-marker",
             metavar="<end-marker>",
             help=_("End anchor for paging"),
         )
-        parser.add_argument(
-            "--limit",
-            metavar="<num-objects>",
-            type=int,
-            help=_("Limit the number of objects returned"),
-        )
         parser.add_argument(
             '--long',
             action='store_true',

openstackclient/tests/functional/base.py

@@ -24,14 +24,17 @@ ADMIN_CLOUD = os.environ.get('OS_ADMIN_CLOUD', 'devstack-admin')
 LOG = logging.getLogger(__name__)
 
 
-def execute(cmd, fail_ok=False, merge_stderr=False):
+def execute(cmd, *, fail_ok=False):
     """Executes specified command for the given action."""
     LOG.debug('Executing: %s', cmd)
     cmdlist = shlex.split(cmd)
     stdout = subprocess.PIPE
-    stderr = subprocess.STDOUT if merge_stderr else subprocess.PIPE
+    stderr = subprocess.PIPE
+    env = {
+        k: v for k, v in os.environ.copy().items() if not k.startswith('OS_')
+    }
 
-    proc = subprocess.Popen(cmdlist, stdout=stdout, stderr=stderr)
+    proc = subprocess.Popen(cmdlist, stdout=stdout, stderr=stderr, env=env)
 
     result_out, result_err = proc.communicate()
     result_out = result_out.decode('utf-8')
@@ -65,7 +68,7 @@ class TestCase(testtools.TestCase):
         :param cloud: The cloud to execute against. This can be a string, empty
             string, or None. A string results in '--os-auth-type $cloud', an
             empty string results in the '--os-auth-type' option being
-            omitted, and None resuts in '--os-auth-type none' for legacy
+            omitted, and None results in '--os-auth-type none' for legacy
             reasons.
         :param fail_ok: If failure is permitted. If False (default), a command
             failure will result in `~tempest.lib.exceptions.CommandFailed`
@@ -119,9 +122,13 @@ class TestCase(testtools.TestCase):
         return bool(ret)
 
     @classmethod
-    def is_extension_enabled(cls, alias):
+    def is_extension_enabled(cls, alias, *, service='network'):
         """Ask client cloud if extension is enabled"""
-        return alias in cls.openstack('extension list -f value -c Alias')
+        extensions = cls.openstack(
+            f'extension list --{service}',
+            parse_output=True,
+        )
+        return alias in [x['Alias'] for x in extensions]
 
     @classmethod
     def get_openstack_configuration_value(cls, configuration):

openstackclient/tests/functional/identity/v3/test_role.py

@@ -146,11 +146,19 @@ class RoleTests(common.IdentityTests):
         self.assertEqual(0, len(remove_raw_output))
 
     def test_implied_role_list(self):
+        raw_output = self.openstack('implied role list')
+        default_roles = self.parse_listing(raw_output)
+        self.assert_table_structure(
+            default_roles, self.IMPLIED_ROLE_LIST_HEADERS
+        )
+
         self._create_dummy_implied_role()
         raw_output = self.openstack('implied role list')
-        items = self.parse_listing(raw_output)
-        self.assert_table_structure(items, self.IMPLIED_ROLE_LIST_HEADERS)
-        self.assertEqual(3, len(items))
+        current_roles = self.parse_listing(raw_output)
+        self.assert_table_structure(
+            current_roles, self.IMPLIED_ROLE_LIST_HEADERS
+        )
+        self.assertEqual(len(default_roles) + 1, len(current_roles))
 
     def test_implied_role_create(self):
         role_name = self._create_dummy_role()

openstackclient/tests/functional/network/v2/common.py

@@ -20,9 +20,15 @@ class NetworkTests(base.TestCase):
 
     @classmethod
     def setUpClass(cls):
-        super(NetworkTests, cls).setUpClass()
+        super().setUpClass()
         cls.haz_network = cls.is_service_enabled('network')
 
+    def setUp(self):
+        super().setUp()
+
+        if not self.haz_network:
+            self.skipTest("No Network service present")
+
 
 class NetworkTagTests(NetworkTests):
     """Functional tests with tag operation"""

openstackclient/tests/functional/network/v2/test_address_group.py

@@ -19,10 +19,8 @@ class AddressGroupTests(common.NetworkTests):
     """Functional tests for address group"""
 
     def setUp(self):
-        super(AddressGroupTests, self).setUp()
-        # Nothing in this class works with Nova Network
-        if not self.haz_network:
-            self.skipTest("No Network service present")
+        super().setUp()
+
         if not self.is_extension_enabled('address-group'):
             self.skipTest("No address-group extension present")
 

openstackclient/tests/functional/network/v2/test_address_scope.py

@@ -23,12 +23,6 @@ class AddressScopeTests(common.NetworkTests):
     #                has its own needs and there are collisions when running
     #                tests in parallel.
 
-    def setUp(self):
-        super(AddressScopeTests, self).setUp()
-        # Nothing in this class works with Nova Network
-        if not self.haz_network:
-            self.skipTest("No Network service present")
-
     def test_address_scope_delete(self):
         """Test create, delete multiple"""
         name1 = uuid.uuid4().hex

openstackclient/tests/functional/network/v2/test_default_security_group_rule.py

@@ -0,0 +1,67 @@
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+import random
+
+from openstackclient.tests.functional.network.v2 import common
+
+
+class SecurityGroupRuleTests(common.NetworkTests):
+    """Functional tests for security group rule"""
+
+    def setUp(self):
+        super().setUp()
+
+        if not self.is_extension_enabled("security-groups-default-rules"):
+            self.skipTest("No security-groups-default-rules extension present")
+
+        self.port = random.randint(1, 65535)
+        self.protocol = random.choice(["tcp", "udp"])
+        self.direction = random.choice(["ingress", "egress"])
+        # Create the default security group rule.
+        cmd_output = self.openstack(
+            'default security group rule create '
+            '--protocol %(protocol)s '
+            '--dst-port %(port)s:%(port)s '
+            '--%(direction)s --ethertype IPv4 '
+            % {
+                'protocol': self.protocol,
+                'port': self.port,
+                'direction': self.direction,
+            },
+            parse_output=True,
+        )
+        self.addCleanup(
+            self.openstack,
+            'default security group rule delete ' + cmd_output['id'],
+        )
+        self.DEFAULT_SG_RULE_ID = cmd_output['id']
+
+    def test_security_group_rule_list(self):
+        cmd_output = self.openstack(
+            'default security group rule list ',
+            parse_output=True,
+        )
+        self.assertIn(
+            self.DEFAULT_SG_RULE_ID, [rule['ID'] for rule in cmd_output]
+        )
+
+    def test_security_group_rule_show(self):
+        cmd_output = self.openstack(
+            'default security group rule show ' + self.DEFAULT_SG_RULE_ID,
+            parse_output=True,
+        )
+        self.assertEqual(self.DEFAULT_SG_RULE_ID, cmd_output['id'])
+        self.assertEqual(self.protocol, cmd_output['protocol'])
+        self.assertEqual(self.port, cmd_output['port_range_min'])
+        self.assertEqual(self.port, cmd_output['port_range_max'])
+        self.assertEqual(self.direction, cmd_output['direction'])

openstackclient/tests/functional/network/v2/test_floating_ip.py

@@ -21,7 +21,7 @@ class FloatingIpTests(common.NetworkTests):
 
     @classmethod
     def setUpClass(cls):
-        common.NetworkTests.setUpClass()
+        super().setUpClass()
         if cls.haz_network:
             # Create common networks that all tests share
             cls.EXTERNAL_NETWORK_NAME = uuid.uuid4().hex
@@ -53,13 +53,10 @@ class FloatingIpTests(common.NetworkTests):
                 )
                 cls.assertOutput('', del_output)
         finally:
-            super(FloatingIpTests, cls).tearDownClass()
+            super().tearDownClass()
 
     def setUp(self):
-        super(FloatingIpTests, self).setUp()
-        # Nothing in this class works with Nova Network
-        if not self.haz_network:
-            self.skipTest("No Network service present")
+        super().setUp()
 
         # Verify setup
         self.assertIsNotNone(self.external_network_id)