From 43d6672e637a5b5b68ac4c382140996b4b9b17da Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Tue, 26 Jun 2018 08:23:25 +0200 Subject: Inherit rally from VmReady1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It also fixes clean(). Change-Id: I42d1305d5cdb5a717cfa7fce26798ac7102310f7 Signed-off-by: Cédric Ollivier --- functest/utils/functest_utils.py | 19 ------------------- 1 file changed, 19 deletions(-) (limited to 'functest/utils/functest_utils.py') 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 -- cgit 1.2.3-korg