Merge "Nova net functional tests round 3"

1 files changed, 14 insertions, 0 deletions

diff --git a/openstackclient/tests/functional/compute/v2/test_server.py b/openstackclient/tests/functional/compute/v2/test_server.py
index 76255c69..a86c0c67 100644
--- a/openstackclient/tests/functional/compute/v2/test_server.py
+++ b/openstackclient/tests/functional/compute/v2/test_server.py
@@ -15,6 +15,7 @@ import uuid
 
 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
 
@@ -22,6 +23,10 @@ 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 @@ class ServerTests(common.ComputeTestCase):
         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 ' +