aboutsummaryrefslogtreecommitdiffstats
path: root/functest/utils/functest_utils.py
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2018-06-26 08:23:25 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2018-06-30 10:02:47 +0200
commit43d6672e637a5b5b68ac4c382140996b4b9b17da (patch)
tree78ec362612ff36d063aecaf955c391fcbe9d804e /functest/utils/functest_utils.py
parent780ca99c712cf6c94147bfc72095fba61768e74b (diff)
Inherit rally from VmReady1
It also fixes clean(). Change-Id: I42d1305d5cdb5a717cfa7fce26798ac7102310f7 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'functest/utils/functest_utils.py')
-rw-r--r--functest/utils/functest_utils.py19
1 files changed, 0 insertions, 19 deletions
diff --git a/functest/utils/functest_utils.py b/functest/utils/functest_utils.py
index b860828f1..b614af321 100644
--- a/functest/utils/functest_utils.py
+++ b/functest/utils/functest_utils.py
@@ -15,8 +15,6 @@ import subprocess
import sys
import yaml
-from functest.utils import env
-
LOGGER = logging.getLogger(__name__)
@@ -74,20 +72,3 @@ def get_parameter_from_yaml(parameter, yfile):
raise ValueError("The parameter %s is not defined in"
" %s" % (parameter, yfile))
return value
-
-
-def get_external_network(cloud):
- """
- Returns the configured external network name or
- the first retrieved external network name
- """
- assert cloud
- if env.get("EXTERNAL_NETWORK"):
- network = cloud.get_network(
- env.get("EXTERNAL_NETWORK"), {"router:external": True})
- if network:
- return network
- networks = cloud.list_networks({"router:external": True})
- if networks:
- return networks[0]
- return None