summaryrefslogtreecommitdiffstats
path: root/tests/functest/odl-sfc/sfc.py
diff options
context:
space:
mode:
authorManuel Buil <manuelbuil87@gmail.com>2016-12-09 14:29:58 +0000
committerGerrit Code Review <gerrit@opnfv.org>2016-12-09 14:29:58 +0000
commitcf27d8c61ee456fdd05f5e7d558bb8fadbff2fdc (patch)
tree58f97648d368788a75fc1954187d014355b484d1 /tests/functest/odl-sfc/sfc.py
parent4cf88806b7342d6e9674664799a906d18520a06b (diff)
parent04443eaf16effe54eff8eba35d04bfc1a1960d32 (diff)
Merge "remove dependancy of prepare_odl_sfc.py"
Diffstat (limited to 'tests/functest/odl-sfc/sfc.py')
-rwxr-xr-xtests/functest/odl-sfc/sfc.py13
1 files changed, 5 insertions, 8 deletions
diff --git a/tests/functest/odl-sfc/sfc.py b/tests/functest/odl-sfc/sfc.py
index 0cc2d14a..22301a28 100755
--- a/tests/functest/odl-sfc/sfc.py
+++ b/tests/functest/odl-sfc/sfc.py
@@ -29,12 +29,6 @@ COMMON_CONFIG = sfc_config.CommonConfig()
# we rename sfc.py with appropriate name
TESTCASE_CONFIG = sfc_config.TestcaseConfig('sfc')
-PROXY = {
- 'ip': COMMON_CONFIG.fuel_master_ip,
- 'username': COMMON_CONFIG.fuel_master_uname,
- 'password': COMMON_CONFIG.fuel_master_passwd
-}
-
def main():
results = Results(COMMON_CONFIG.line_length)
@@ -56,6 +50,7 @@ def main():
'\033[91mexport INSTALLER_IP=<ip>\033[0m')
sys.exit(1)
+ test_utils.setup_compute_node(TESTCASE_CONFIG.subnet_cidr)
test_utils.configure_iptables()
test_utils.download_image(COMMON_CONFIG.url,
COMMON_CONFIG.image_path)
@@ -70,8 +65,10 @@ def main():
nova_client = os_utils.get_nova_client()
tacker_client = os_tacker.get_tacker_client()
- controller_clients = test_utils.get_ssh_clients("controller", PROXY)
- compute_clients = test_utils.get_ssh_clients("compute", PROXY)
+ controller_clients = test_utils.get_ssh_clients("controller",
+ COMMON_CONFIG.fuel_proxy)
+ compute_clients = test_utils.get_ssh_clients("compute",
+ COMMON_CONFIG.fuel_proxy)
ovs_logger = ovs_utils.OVSLogger(
os.path.join(COMMON_CONFIG.sfc_test_dir, 'ovs-logs'),