Merge "Nova net functional tests round 3"

Author: Jenkins

openstackclient/tests/functional/common/test_extension.py

@@ -18,25 +18,66 @@
 from openstackclient.tests.functional import base
 
 
-class TestExtension(base.TestCase):
-    """Functional tests for extension."""
+class ExtensionTests(base.TestCase):
+    """Functional tests for extension"""
 
-    def test_extension_list(self):
-        """Test extension list."""
+    @classmethod
+    def setUpClass(cls):
+        # super(NetworkTests, cls).setUp()
+        cls.haz_network = base.is_service_enabled('network')
+
+    def test_extension_list_compute(self):
+        """Test compute extension list"""
         json_output = json.loads(self.openstack(
-            'extension list -f json ' + '--network')
+            'extension list -f json ' +
+            '--compute'
+        ))
+        name_list = [item.get('Name') for item in json_output]
+        self.assertIn(
+            'ImageSize',
+            name_list,
         )
-        self.assertEqual(
+
+    def test_extension_list_network(self):
+        """Test network extension list"""
+        if not self.haz_network:
+            self.skipTest("No Network service present")
+
+        json_output = json.loads(self.openstack(
+            'extension list -f json ' +
+            '--network'
+        ))
+        name_list = [item.get('Name') for item in json_output]
+        self.assertIn(
             'Default Subnetpools',
-            json_output[0]['Name'],
+            name_list,
         )
 
-    def test_extension_show(self):
-        """Test extension show."""
+    # NOTE(dtroyer): Only network extensions are currently supported but
+    #                I am going to leave this here anyway as a reminder
+    #                fix that.
+    # def test_extension_show_compute(self):
+    #     """Test compute extension show"""
+    #     json_output = json.loads(self.openstack(
+    #         'extension show -f json ' +
+    #         'ImageSize'
+    #     ))
+    #     self.assertEqual(
+    #         'OS-EXT-IMG-SIZE',
+    #         json_output.get('Alias'),
+    #     )
+
+    def test_extension_show_network(self):
+        """Test network extension show"""
+        if not self.haz_network:
+            self.skipTest("No Network service present")
+
         name = 'agent'
         json_output = json.loads(self.openstack(
-            'extension show -f json ' + name)
-        )
+            'extension show -f json ' +
+            name
+        ))
         self.assertEqual(
             name,
-            json_output.get('Alias'))
+            json_output.get('Alias'),
+        )

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

@@ -15,13 +15,18 @@
 
 from tempest.lib import exceptions
 
+from openstackclient.tests.functional import base
 from openstackclient.tests.functional.compute.v2 import common
 from openstackclient.tests.functional.volume.v2 import test_volume
 
 
 class ServerTests(common.ComputeTestCase):
     """Functional tests for openstack server commands"""
 
+    @classmethod
+    def setUpClass(cls):
+        cls.haz_network = base.is_service_enabled('network')
+
     def test_server_list(self):
         """Test server list, set"""
         cmd_output = self.server_create()
@@ -202,6 +207,15 @@ def test_server_attach_detach_floating_ip(self):
         name = cmd_output['name']
         self.wait_for_status(name, "ACTIVE")
 
+        if not self.haz_network:
+            # nova-net needs a public subnet
+            cmd_output = json.loads(self.openstack(
+                'network create -f json ' +
+                '--subnet 8.6.7.5/28 ' +
+                'public'
+            ))
+            self.addCleanup(self.openstack, 'network delete public')
+
         # attach ip
         cmd_output = json.loads(self.openstack(
             'floating ip create -f json ' +

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

@@ -17,7 +17,7 @@
 
 
 class AddressScopeTests(common.NetworkTests):
-    """Functional tests for address scope. """
+    """Functional tests for address scope"""
 
     # NOTE(dtroyer): Do not normalize the setup and teardown of the resource
     #                creation and deletion.  Little is gained when each test

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

@@ -17,31 +17,46 @@
 
 
 class IPAvailabilityTests(common.NetworkTests):
-    """Functional tests for IP availability. """
+    """Functional tests for IP availability"""
 
     @classmethod
     def setUpClass(cls):
         common.NetworkTests.setUpClass()
-        if not cls.haz_network:
-            common.NetworkTests.skipTest(cls, "No Network service present")
-
-        # Create a network for the subnet.
-        cls.NAME = uuid.uuid4().hex
-        cls.NETWORK_NAME = uuid.uuid4().hex
-        cls.openstack('network create ' + cls.NETWORK_NAME)
-        cmd_output = json.loads(cls.openstack(
-            'subnet create -f json --network ' + cls.NETWORK_NAME +
-            ' --subnet-range 10.10.10.0/24 ' +
-            cls.NAME
-        ))
-        cls.assertOutput(cls.NAME, cmd_output['name'])
+        if cls.haz_network:
+            # Create a network for the subnet.
+            cls.NAME = uuid.uuid4().hex
+            cls.NETWORK_NAME = uuid.uuid4().hex
+            cls.openstack(
+                'network create ' +
+                cls.NETWORK_NAME
+            )
+            cmd_output = json.loads(cls.openstack(
+                'subnet create -f json ' +
+                '--network ' + cls.NETWORK_NAME + ' ' +
+                '--subnet-range 10.10.10.0/24 ' +
+                cls.NAME
+            ))
+            cls.assertOutput(cls.NAME, cmd_output['name'])
 
     @classmethod
     def tearDownClass(cls):
-        raw_subnet = cls.openstack('subnet delete ' + cls.NAME)
-        raw_network = cls.openstack('network delete ' + cls.NETWORK_NAME)
-        cls.assertOutput('', raw_subnet)
-        cls.assertOutput('', raw_network)
+        if cls.haz_network:
+            raw_subnet = cls.openstack(
+                'subnet delete ' +
+                cls.NAME
+            )
+            raw_network = cls.openstack(
+                'network delete ' +
+                cls.NETWORK_NAME
+            )
+            cls.assertOutput('', raw_subnet)
+            cls.assertOutput('', raw_network)
+
+    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")
 
     def test_ip_availability_list(self):
         """Test ip availability list"""

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

@@ -13,17 +13,17 @@
 import json
 import uuid
 
-from openstackclient.tests.functional import base
+from openstackclient.tests.functional.network.v2 import common
 
 
-class NetworkTests(base.TestCase):
+class NetworkTests(common.NetworkTests):
     """Functional tests for network"""
 
-    @classmethod
-    def setUpClass(cls):
-        cls.haz_network = base.is_service_enabled('network')
-        cls.PROJECT_NAME =\
-            cls.get_openstack_configuration_value('auth.project_name')
+    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"""

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

@@ -31,15 +31,19 @@ def setUpClass(cls):
         common.NetworkTests.setUpClass()
         if cls.haz_network:
             json_output = json.loads(cls.openstack(
-                'network meter create -f json ' + cls.METER_NAME
+                'network meter create -f json ' +
+                cls.METER_NAME
             ))
             cls.METER_ID = json_output.get('id')
 
     @classmethod
     def tearDownClass(cls):
         common.NetworkTests.tearDownClass()
         if cls.haz_network:
-            raw_output = cls.openstack('network meter delete ' + cls.METER_ID)
+            raw_output = cls.openstack(
+                'network meter delete ' +
+                cls.METER_ID
+            )
             cls.assertOutput('', raw_output)
 
     def setUp(self):

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

@@ -27,22 +27,30 @@ class NetworkQosPolicyTests(common.NetworkTests):
     @classmethod
     def setUpClass(cls):
         common.NetworkTests.setUpClass()
-        opts = cls.get_opts(cls.FIELDS)
-        raw_output = cls.openstack('network qos policy create ' + cls.NAME +
-                                   opts)
-        cls.assertOutput(cls.NAME + "\n", raw_output)
+        if cls.haz_network:
+            opts = cls.get_opts(cls.FIELDS)
+            raw_output = cls.openstack(
+                'network qos policy create ' +
+                cls.NAME +
+                opts
+            )
+            cls.assertOutput(cls.NAME + "\n", raw_output)
+
+    @classmethod
+    def tearDownClass(cls):
+        if cls.haz_network:
+            raw_output = cls.openstack(
+                'network qos policy delete ' +
+                cls.NAME
+            )
+            cls.assertOutput('', raw_output)
 
     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")
 
-    @classmethod
-    def tearDownClass(cls):
-        raw_output = cls.openstack('network qos policy delete ' + cls.NAME)
-        cls.assertOutput('', raw_output)
-
     def test_qos_policy_list(self):
         opts = self.get_opts(self.HEADERS)
         raw_output = self.openstack('network qos policy list' + opts)