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

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

@@ -20,7 +20,8 @@ class IPAvailabilityTests(common.NetworkTests):
 
     @classmethod
     def setUpClass(cls):
-        common.NetworkTests.setUpClass()
+        super().setUpClass()
+
         if cls.haz_network:
             cls.NAME = uuid.uuid4().hex
             cls.NETWORK_NAME = uuid.uuid4().hex
@@ -49,13 +50,7 @@ class IPAvailabilityTests(common.NetworkTests):
                 cls.assertOutput('', raw_subnet)
                 cls.assertOutput('', raw_network)
         finally:
-            super(IPAvailabilityTests, cls).tearDownClass()
-
-    def setUp(self):
-        super(IPAvailabilityTests, self).setUp()
-        # Nothing in this class works with Nova Network
-        if not self.haz_network:
-            self.skipTest("No Network service present")
+            super().tearDownClass()
 
     def test_ip_availability_list(self):
         """Test ip availability list"""

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

@@ -18,12 +18,11 @@ from openstackclient.tests.functional.network.v2 import common
 
 class L3ConntrackHelperTests(common.NetworkTests):
     def setUp(self):
-        super(L3ConntrackHelperTests, 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('l3-conntrack-helper'):
             self.skipTest("No l3-conntrack-helper extension present")
+
         if not self.is_extension_enabled('expose-l3-conntrack-helper'):
             self.skipTest("No expose-l3-conntrack-helper extension present")
 

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

@@ -21,10 +21,8 @@ class LocalIPTests(common.NetworkTests):
     """Functional tests for local IP"""
 
     def setUp(self):
-        super(LocalIPTests, 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('local-ip'):
             self.skipTest("No local-ip extension present")
 

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

@@ -20,12 +20,6 @@ class NetworkTests(common.NetworkTagTests):
 
     base_command = 'network'
 
-    def setUp(self):
-        super(NetworkTests, self).setUp()
-        # Nothing in this class works with Nova Network
-        if not self.haz_network:
-            self.skipTest("No Network service present")
-
     def test_network_create_compute(self):
         """Test Nova-net create options, delete"""
         if self.haz_network:
@@ -329,11 +323,25 @@ class NetworkTests(common.NetworkTagTests):
     def test_network_dhcp_agent(self):
         if not self.haz_network:
             self.skipTest("No Network service present")
+
+        if not self.is_extension_enabled("agent"):
+            self.skipTest("No dhcp_agent_scheduler extension present")
+
         if not self.is_extension_enabled("dhcp_agent_scheduler"):
             self.skipTest("No dhcp_agent_scheduler extension present")
 
+        # Get DHCP Agent ID
+        cmd_output = self.openstack(
+            'network agent list --agent-type dhcp',
+            parse_output=True,
+        )
+        if not cmd_output:
+            self.skipTest("No agents with type=dhcp available")
+
+        agent_id = cmd_output[0]['ID']
+
         name1 = uuid.uuid4().hex
-        cmd_output1 = self.openstack(
+        cmd_output = self.openstack(
             'network create --description aaaa %s' % name1,
             parse_output=True,
         )
@@ -341,14 +349,7 @@ class NetworkTests(common.NetworkTagTests):
         self.addCleanup(self.openstack, 'network delete %s' % name1)
 
         # Get network ID
-        network_id = cmd_output1['id']
-
-        # Get DHCP Agent ID
-        cmd_output2 = self.openstack(
-            'network agent list --agent-type dhcp',
-            parse_output=True,
-        )
-        agent_id = cmd_output2[0]['ID']
+        network_id = cmd_output['id']
 
         # Add Agent to Network
         self.openstack(
@@ -356,7 +357,7 @@ class NetworkTests(common.NetworkTagTests):
         )
 
         # Test network list --agent
-        cmd_output3 = self.openstack(
+        cmd_output = self.openstack(
             'network list --agent %s' % agent_id,
             parse_output=True,
         )
@@ -369,7 +370,7 @@ class NetworkTests(common.NetworkTagTests):
         )
 
         # Assert
-        col_name = [x["ID"] for x in cmd_output3]
+        col_name = [x["ID"] for x in cmd_output]
         self.assertIn(network_id, col_name)
 
     def test_network_set(self):

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

@@ -15,14 +15,14 @@ import uuid
 from openstackclient.tests.functional.network.v2 import common
 
 
-class NetworkAgentTests(common.NetworkTests):
+class TestAgent(common.NetworkTests):
     """Functional tests for network agent"""
 
     def setUp(self):
-        super(NetworkAgentTests, 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("agent"):
+            self.skipTest("No agent extension present")
 
     def test_network_agent_list_show_set(self):
         """Test network agent list, set, show commands
@@ -85,14 +85,14 @@ class NetworkAgentTests(common.NetworkTests):
         )
 
 
-class NetworkAgentListTests(common.NetworkTests):
+class TestAgentList(common.NetworkTests):
     """Functional test for network agent"""
 
     def setUp(self):
-        super(NetworkAgentListTests, 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("agent"):
+            self.skipTest("No agent extension present")
 
     def test_network_dhcp_agent_list(self):
         """Test network agent list"""
@@ -100,8 +100,18 @@ class NetworkAgentListTests(common.NetworkTests):
         if not self.is_extension_enabled("dhcp_agent_scheduler"):
             self.skipTest("No dhcp_agent_scheduler extension present")
 
+        # Get DHCP Agent ID
+        cmd_output = self.openstack(
+            'network agent list --agent-type dhcp',
+            parse_output=True,
+        )
+        if not cmd_output:
+            self.skipTest("No agents with type=dhcp available")
+
+        agent_id = cmd_output[0]['ID']
+
         name1 = uuid.uuid4().hex
-        cmd_output1 = self.openstack(
+        cmd_output = self.openstack(
             'network create --description aaaa %s' % name1,
             parse_output=True,
         )
@@ -109,14 +119,7 @@ class NetworkAgentListTests(common.NetworkTests):
         self.addCleanup(self.openstack, 'network delete %s' % name1)
 
         # Get network ID
-        network_id = cmd_output1['id']
-
-        # Get DHCP Agent ID
-        cmd_output2 = self.openstack(
-            'network agent list --agent-type dhcp',
-            parse_output=True,
-        )
-        agent_id = cmd_output2[0]['ID']
+        network_id = cmd_output['id']
 
         # Add Agent to Network
         self.openstack(
@@ -124,7 +127,7 @@ class NetworkAgentListTests(common.NetworkTests):
         )
 
         # Test network agent list --network
-        cmd_output3 = self.openstack(
+        cmd_output = self.openstack(
             'network agent list --network %s' % network_id,
             parse_output=True,
         )
@@ -137,7 +140,7 @@ class NetworkAgentListTests(common.NetworkTests):
         )
 
         # Assert
-        col_name = [x["ID"] for x in cmd_output3]
+        col_name = [x["ID"] for x in cmd_output]
         self.assertIn(agent_id, col_name)
 
     def test_network_agent_list_routers(self):

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

@@ -18,12 +18,6 @@ from openstackclient.tests.functional.network.v2 import common
 class NetworkFlavorTests(common.NetworkTests):
     """Functional tests for network flavor"""
 
-    def setUp(self):
-        super(NetworkFlavorTests, self).setUp()
-        # Nothing in this class works with Nova Network
-        if not self.haz_network:
-            self.skipTest("No Network service present")
-
     def test_network_flavor_add_remove_profile(self):
         """Test add and remove network flavor to/from profile"""
         # Create Flavor

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

@@ -19,12 +19,6 @@ class NetworkFlavorProfileTests(common.NetworkTests):
     DESCRIPTION = 'fakedescription'
     METAINFO = 'Extrainfo'
 
-    def setUp(self):
-        super(NetworkFlavorProfileTests, self).setUp()
-        # Nothing in this class works with Nova Network
-        if not self.haz_network:
-            self.skipTest("No Network service present")
-
     def test_network_flavor_profile_create(self):
         json_output = self.openstack(
             'network flavor profile create '

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

@@ -21,17 +21,17 @@ from openstackclient.tests.functional.network.v2 import common
 class TestMeter(common.NetworkTests):
     """Functional tests for network meter"""
 
+    def setUp(self):
+        super().setUp()
+
+        if not self.is_extension_enabled("metering"):
+            self.skipTest("No metering extension present")
+
     # NOTE(dtroyer): Do not normalize the setup and teardown of the resource
     #                creation and deletion.  Little is gained when each test
     #                has its own needs and there are collisions when running
     #                tests in parallel.
 
-    def setUp(self):
-        super(TestMeter, self).setUp()
-        # Nothing in this class works with Nova Network
-        if not self.haz_network:
-            self.skipTest("No Network service present")
-
     def test_meter_delete(self):
         """Test create, delete multiple"""
         name1 = uuid.uuid4().hex

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

@@ -13,6 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import unittest
 import uuid
 
 from openstackclient.tests.functional.network.v2 import common
@@ -26,7 +27,11 @@ class TestMeterRule(common.NetworkTests):
 
     @classmethod
     def setUpClass(cls):
-        common.NetworkTests.setUpClass()
+        super().setUpClass()
+
+        if not cls.is_extension_enabled("metering"):
+            raise unittest.SkipTest("No metering extension present")
+
         if cls.haz_network:
             cls.METER_NAME = uuid.uuid4().hex
 
@@ -45,13 +50,7 @@ class TestMeterRule(common.NetworkTests):
                 )
                 cls.assertOutput('', raw_output)
         finally:
-            common.NetworkTests.tearDownClass()
-
-    def setUp(self):
-        super(TestMeterRule, self).setUp()
-        # Nothing in this class works with Nova Network
-        if not self.haz_network:
-            self.skipTest("No Network service present")
+            super().tearDownClass()
 
     def test_meter_rule_delete(self):
         """test create, delete"""

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

@@ -16,9 +16,7 @@ from openstackclient.tests.functional.network.v2 import common
 class L3NDPProxyTests(common.NetworkTests):
     def setUp(self):
         super().setUp()
-        # Nothing in this class works with Nova Network
-        if not self.haz_network:
-            self.skipTest("No Network service present")
+
         if not self.is_extension_enabled('l3-ndp-proxy'):
             self.skipTest("No l3-ndp-proxy extension present")
 

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

@@ -22,10 +22,10 @@ class NetworkQosPolicyTests(common.NetworkTests):
     """Functional tests for QoS policy"""
 
     def setUp(self):
-        super(NetworkQosPolicyTests, 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("qos"):
+            self.skipTest("No qos extension present")
 
     def test_qos_rule_create_delete(self):
         # This is to check the output of qos policy delete

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

@@ -18,14 +18,19 @@ import uuid
 from openstackclient.tests.functional.network.v2 import common
 
 
-class NetworkQosRuleTestsMinimumBandwidth(common.NetworkTests):
+class NetworkQosTests(common.NetworkTests):
+    def setUp(self):
+        super().setUp()
+
+        if not self.is_extension_enabled("qos"):
+            self.skipTest("No qos extension present")
+
+
+class NetworkQosRuleTestsMinimumBandwidth(NetworkQosTests):
     """Functional tests for QoS minimum bandwidth rule"""
 
     def setUp(self):
-        super(NetworkQosRuleTestsMinimumBandwidth, self).setUp()
-        # Nothing in this class works with Nova Network
-        if not self.haz_network:
-            self.skipTest("No Network service present")
+        super().setUp()
 
         self.QOS_POLICY_NAME = 'qos_policy_%s' % uuid.uuid4().hex
 
@@ -96,14 +101,11 @@ class NetworkQosRuleTestsMinimumBandwidth(common.NetworkTests):
         self.assertEqual(7500, cmd_output['min_kbps'])
 
 
-class NetworkQosRuleTestsMinimumPacketRate(common.NetworkTests):
+class NetworkQosRuleTestsMinimumPacketRate(NetworkQosTests):
     """Functional tests for QoS minimum packet rate rule"""
 
     def setUp(self):
-        super(NetworkQosRuleTestsMinimumPacketRate, self).setUp()
-        # Nothing in this class works with Nova Network
-        if not self.haz_network:
-            self.skipTest("No Network service present")
+        super().setUp()
 
         self.QOS_POLICY_NAME = 'qos_policy_%s' % uuid.uuid4().hex
 
@@ -175,14 +177,11 @@ class NetworkQosRuleTestsMinimumPacketRate(common.NetworkTests):
         self.assertEqual('any', cmd_output['direction'])
 
 
-class NetworkQosRuleTestsDSCPMarking(common.NetworkTests):
+class NetworkQosRuleTestsDSCPMarking(NetworkQosTests):
     """Functional tests for QoS DSCP marking rule"""
 
     def setUp(self):
-        super(NetworkQosRuleTestsDSCPMarking, self).setUp()
-        # Nothing in this class works with Nova Network
-        if not self.haz_network:
-            self.skipTest("No Network service present")
+        super().setUp()
 
         self.QOS_POLICY_NAME = 'qos_policy_%s' % uuid.uuid4().hex
         self.openstack('network qos policy create %s' % self.QOS_POLICY_NAME)
@@ -250,14 +249,11 @@ class NetworkQosRuleTestsDSCPMarking(common.NetworkTests):
         self.assertEqual(32, cmd_output['dscp_mark'])
 
 
-class NetworkQosRuleTestsBandwidthLimit(common.NetworkTests):
+class NetworkQosRuleTestsBandwidthLimit(NetworkQosTests):
     """Functional tests for QoS bandwidth limit rule"""
 
     def setUp(self):
-        super(NetworkQosRuleTestsBandwidthLimit, self).setUp()
-        # Nothing in this class works with Nova Network
-        if not self.haz_network:
-            self.skipTest("No Network service present")
+        super().setUp()
 
         self.QOS_POLICY_NAME = 'qos_policy_%s' % uuid.uuid4().hex
         self.openstack('network qos policy create %s' % self.QOS_POLICY_NAME)

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

@@ -30,10 +30,10 @@ class NetworkQosRuleTypeTests(common.NetworkTests):
     ]
 
     def setUp(self):
-        super(NetworkQosRuleTypeTests, 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("qos"):
+            self.skipTest("No qos extension present")
 
     def test_qos_rule_type_list(self):
         cmd_output = self.openstack(

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

@@ -24,10 +24,7 @@ class NetworkRBACTests(common.NetworkTests):
     FIELDS = ['id']
 
     def setUp(self):
-        super(NetworkRBACTests, self).setUp()
-        # Nothing in this class works with Nova Network
-        if not self.haz_network:
-            self.skipTest("No Network service present")
+        super().setUp()
 
         self.NET_NAME = uuid.uuid4().hex
         self.PROJECT_NAME = uuid.uuid4().hex

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

@@ -20,7 +20,7 @@ class NetworkSegmentTests(common.NetworkTests):
 
     @classmethod
     def setUpClass(cls):
-        common.NetworkTests.setUpClass()
+        super().setUpClass()
         if cls.haz_network:
             cls.NETWORK_NAME = uuid.uuid4().hex
             cls.PHYSICAL_NETWORK_NAME = uuid.uuid4().hex
@@ -42,13 +42,13 @@ class NetworkSegmentTests(common.NetworkTests):
                 )
                 cls.assertOutput('', raw_output)
         finally:
-            super(NetworkSegmentTests, cls).tearDownClass()
+            super().tearDownClass()
 
     def setUp(self):
-        super(NetworkSegmentTests, 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("segment"):
+            self.skipTest("No segment extension present")
 
     def test_network_segment_create_delete(self):
         name = uuid.uuid4().hex
@@ -116,12 +116,7 @@ class NetworkSegmentTests(common.NetworkTests):
         )
         self.addCleanup(self.openstack, 'network segment delete ' + name)
 
-        extension_output = self.openstack(
-            "extension list ",
-            parse_output=True,
-        )
-        ext_alias = [x["Alias"] for x in extension_output]
-        if "standard-attr-segment" in ext_alias:
+        if self.is_extension_enabled('standard-attr-segment'):
             self.assertEqual(
                 '',
                 json_output["description"],

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

@@ -23,12 +23,11 @@ class NetworkSegmentRangeTests(common.NetworkTests):
     """Functional tests for network segment range"""
 
     def setUp(self):
-        super(NetworkSegmentRangeTests, 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('network-segment-range'):
             self.skipTest("No network-segment-range extension present")
+
         self.PROJECT_NAME = uuid.uuid4().hex
 
     def test_network_segment_range_create_delete(self):

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

@@ -20,10 +20,8 @@ class TestNetworkServiceProvider(common.NetworkTests):
     """Functional tests for network service provider"""
 
     def setUp(self):
-        super(TestNetworkServiceProvider, self).setUp()
-        # Nothing in this class works with Nova Network
-        if not self.haz_network:
-            self.skipTest("No Network service present")
+        super().setUp()
+
         # NOTE(slaweq):
         # that tests should works only when "standard" Neutron L3 agent is
         # used, as e.g. OVN L3 plugin don't supports that.

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

@@ -23,9 +23,9 @@ class NetworkTrunkTests(common.NetworkTests):
 
     def setUp(self):
         super().setUp()
-        # Nothing in this class works with Nova Network
-        if not self.haz_network:
-            self.skipTest("No Network service present")
+
+        if not self.is_extension_enabled("trunk"):
+            self.skipTest("No trunk extension present")
 
         network_name = uuid.uuid4().hex
         subnet_name = uuid.uuid4().hex

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

@@ -25,7 +25,7 @@ class PortTests(common.NetworkTagTests):
 
     @classmethod
     def setUpClass(cls):
-        common.NetworkTests.setUpClass()
+        super().setUpClass()
         if cls.haz_network:
             cls.NAME = uuid.uuid4().hex
             cls.NETWORK_NAME = uuid.uuid4().hex
@@ -42,13 +42,7 @@ class PortTests(common.NetworkTagTests):
                 )
                 cls.assertOutput('', raw_output)
         finally:
-            super(PortTests, cls).tearDownClass()
-
-    def setUp(self):
-        super(PortTests, self).setUp()
-        # Nothing in this class works with Nova Network
-        if not self.haz_network:
-            self.skipTest("No Network service present")
+            super().tearDownClass()
 
     def test_port_delete(self):
         """Test create, delete multiple"""

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

@@ -20,12 +20,6 @@ class RouterTests(common.NetworkTagTests):
 
     base_command = 'router'
 
-    def setUp(self):
-        super(RouterTests, self).setUp()
-        # Nothing in this class works with Nova Network
-        if not self.haz_network:
-            self.skipTest("No Network service present")
-
     def test_router_create_and_delete(self):
         """Test create options, delete multiple"""
         name1 = uuid.uuid4().hex

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

@@ -19,10 +19,7 @@ class SecurityGroupTests(common.NetworkTests):
     """Functional tests for security group"""
 
     def setUp(self):
-        super(SecurityGroupTests, self).setUp()
-        # Nothing in this class works with Nova Network
-        if not self.haz_network:
-            self.skipTest("No Network service present")
+        super().setUp()
 
         self.NAME = uuid.uuid4().hex
         self.OTHER_NAME = uuid.uuid4().hex

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

@@ -19,10 +19,7 @@ class SecurityGroupRuleTests(common.NetworkTests):
     """Functional tests for security group rule"""
 
     def setUp(self):
-        super(SecurityGroupRuleTests, self).setUp()
-        # Nothing in this class works with Nova Network
-        if not self.haz_network:
-            self.skipTest("No Network service present")
+        super().setUp()
 
         self.SECURITY_GROUP_NAME = uuid.uuid4().hex
 

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

@@ -23,7 +23,7 @@ class SubnetTests(common.NetworkTagTests):
 
     @classmethod
     def setUpClass(cls):
-        common.NetworkTests.setUpClass()
+        super().setUpClass()
         if cls.haz_network:
             cls.NETWORK_NAME = uuid.uuid4().hex
 
@@ -44,13 +44,7 @@ class SubnetTests(common.NetworkTagTests):
                 )
                 cls.assertOutput('', raw_output)
         finally:
-            super(SubnetTests, cls).tearDownClass()
-
-    def setUp(self):
-        super(SubnetTests, self).setUp()
-        # Nothing in this class works with Nova Network
-        if not self.haz_network:
-            self.skipTest("No Network service present")
+            super().tearDownClass()
 
     def test_subnet_create_and_delete(self):
         """Test create, delete multiple"""
@@ -217,7 +211,6 @@ class SubnetTests(common.NetworkTagTests):
             + ' --description bbbb '
             + '--no-dhcp '
             + '--gateway 10.10.11.1 '
-            + '--service-type network:floatingip_agent_gateway '
             + name
         )
         self.assertOutput('', cmd_output)
@@ -242,27 +235,16 @@ class SubnetTests(common.NetworkTagTests):
             '10.10.11.1',
             cmd_output["gateway_ip"],
         )
-        self.assertEqual(
-            ['network:floatingip_agent_gateway'],
-            cmd_output["service_types"],
-        )
 
         # Test unset
-        cmd_output = self.openstack(
-            'subnet unset '
-            + '--service-type network:floatingip_agent_gateway '
-            + new_name
-        )
+        cmd_output = self.openstack('subnet unset --gateway ' + new_name)
         self.assertOutput('', cmd_output)
 
         cmd_output = self.openstack(
             'subnet show ' + new_name,
             parse_output=True,
         )
-        self.assertEqual(
-            [],
-            cmd_output["service_types"],
-        )
+        self.assertIsNone(cmd_output["gateway_ip"])
 
     def _subnet_create(self, cmd, name, is_type_ipv4=True):
         # Try random subnet range for subnet creating