Merge "Config physical network when creating tempest net"

[functest.git] / functest / opnfv_tests / openstack / tempest / tempest.py

diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py
index bede02f..5481b13 100644 (file)
--- a/functest/opnfv_tests/openstack/tempest/tempest.py
+++ b/functest/opnfv_tests/openstack/tempest/tempest.py
@@ -318,9 +318,7 @@ class TempestResourcesManager(object):
             self.os_creds = openstack_tests.get_credentials(
                 os_env_file=CONST.__getattribute__('openstack_creds'))
 
-        self.guid = ''
-        if CONST.__getattribute__('tempest_unique_names'):
-            self.guid = '-' + str(uuid.uuid4())
+        self.guid = '-' + str(uuid.uuid4())
 
         self.creators = list()
 
@@ -365,11 +363,29 @@ class TempestResourcesManager(object):
             user_id = None
 
         logger.debug("Creating private network for Tempest suite")
+
+        tempest_network_type = None
+        tempest_physical_network = None
+        tempest_segmentation_id = None
+
+        if hasattr(CONST, 'tempest_network_type'):
+            tempest_network_type = CONST.__getattribute__(
+                'tempest_network_type')
+        if hasattr(CONST, 'tempest_physical_network'):
+            tempest_physical_network = CONST.__getattribute__(
+                'tempest_physical_network')
+        if hasattr(CONST, 'tempest_segmentation_id'):
+            tempest_segmentation_id = CONST.__getattribute__(
+                'tempest_segmentation_id')
+
         network_creator = deploy_utils.create_network(
             self.os_creds, NetworkConfig(
                 name=CONST.__getattribute__(
                     'tempest_private_net_name') + self.guid,
                 project_name=project_name,
+                network_type=tempest_network_type,
+                physical_network=tempest_physical_network,
+                segmentation_id=tempest_segmentation_id,
                 subnet_settings=[SubnetConfig(
                     name=CONST.__getattribute__(
                         'tempest_private_subnet_name') + self.guid,
@@ -384,21 +400,19 @@ class TempestResourcesManager(object):
         flavor_id = None
         flavor_id_alt = None
 
-        if (CONST.__getattribute__('tempest_use_custom_images') or
-           use_custom_images):
-            logger.debug("Creating image for Tempest suite")
-            image_base_name = CONST.__getattribute__(
-                'openstack_image_name') + self.guid
-            os_image_settings = openstack_tests.cirros_image_settings(
-                image_base_name, public=True,
-                image_metadata=self.cirros_image_config)
-            logger.debug("Creating image for Tempest suite")
-            image_creator = deploy_utils.create_image(
-                self.os_creds, os_image_settings)
-            if image_creator is None:
-                raise Exception('Failed to create image')
-            self.creators.append(image_creator)
-            image_id = image_creator.get_image().id
+        logger.debug("Creating image for Tempest suite")
+        image_base_name = CONST.__getattribute__(
+            'openstack_image_name') + self.guid
+        os_image_settings = openstack_tests.cirros_image_settings(
+            image_base_name, public=True,
+            image_metadata=self.cirros_image_config)
+        logger.debug("Creating image for Tempest suite")
+        image_creator = deploy_utils.create_image(
+            self.os_creds, os_image_settings)
+        if image_creator is None:
+            raise Exception('Failed to create image')
+        self.creators.append(image_creator)
+        image_id = image_creator.get_image().id
 
         if use_custom_images:
             logger.debug("Creating 2nd image for Tempest suite")
@@ -415,7 +429,7 @@ class TempestResourcesManager(object):
             self.creators.append(image_creator_alt)
             image_id_alt = image_creator_alt.get_image().id
 
-        if (CONST.__getattribute__('tempest_use_custom_flavors') or
+        if (CONST.__getattribute__('tempest_use_custom_flavors') == 'True' or
            use_custom_flavors):
             logger.info("Creating flavor for Tempest suite")
             scenario = CONST.__getattribute__('DEPLOY_SCENARIO')
@@ -442,6 +456,7 @@ class TempestResourcesManager(object):
             flavor_metadata_alt = None
             if 'ovs' in scenario or 'fdio' in scenario:
                 flavor_metadata_alt = create_flavor.MEM_PAGE_SIZE_LARGE
+                CONST.__setattr__('openstack_flavor_ram', 1024)
             flavor_creator_alt = OpenStackFlavor(
                 self.os_creds, FlavorConfig(
                     name=CONST.__getattribute__(