summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--functest/opnfv_tests/openstack/tempest/conf_utils.py3
-rw-r--r--functest/opnfv_tests/openstack/tempest/tempest.py6
2 files changed, 5 insertions, 4 deletions
diff --git a/functest/opnfv_tests/openstack/tempest/conf_utils.py b/functest/opnfv_tests/openstack/tempest/conf_utils.py
index 8ba3cca3e..6dd6b2bc0 100644
--- a/functest/opnfv_tests/openstack/tempest/conf_utils.py
+++ b/functest/opnfv_tests/openstack/tempest/conf_utils.py
@@ -175,7 +175,7 @@ def update_tempest_conf_file(conf_file, rconfig):
def configure_tempest_update_params(
- tempest_conf_file, network_name=None, image_id=None, flavor_id=None,
+ tempest_conf_file, image_id=None, flavor_id=None,
compute_cnt=1, image_alt_id=None, flavor_alt_id=None,
domain_name="Default"):
# pylint: disable=too-many-branches, too-many-arguments
@@ -185,7 +185,6 @@ def configure_tempest_update_params(
LOGGER.debug("Updating selected tempest.conf parameters...")
rconfig = configparser.RawConfigParser()
rconfig.read(tempest_conf_file)
- rconfig.set('compute', 'fixed_network_name', network_name)
rconfig.set('compute', 'volume_device_name', env.get('VOLUME_DEVICE_NAME'))
if image_id is not None:
rconfig.set('compute', 'image_ref', image_id)
diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py
index 6692a6e10..02114feb2 100644
--- a/functest/opnfv_tests/openstack/tempest/tempest.py
+++ b/functest/opnfv_tests/openstack/tempest/tempest.py
@@ -36,7 +36,6 @@ class TempestCommon(singlevm.VmReady2):
"""TempestCommon testcases implementation class."""
visibility = 'public'
- shared_network = True
filename_alt = '/home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.img'
def __init__(self, **kwargs):
@@ -79,6 +78,9 @@ class TempestCommon(singlevm.VmReady2):
self.image_alt = None
self.flavor_alt = None
+ def _create_network_resources(self):
+ pass
+
@staticmethod
def read_file(filename):
"""Read file and return content as a stripped list."""
@@ -337,7 +339,7 @@ class TempestCommon(singlevm.VmReady2):
self.conf_file = conf_utils.configure_verifier(self.deployment_dir)
conf_utils.configure_tempest_update_params(
- self.conf_file, network_name=self.network.name,
+ self.conf_file,
image_id=self.image.id,
flavor_id=self.flavor.id,
compute_cnt=compute_cnt,