diff options
| author |   Vijayendra Radhakrishna <vradhakrishna@mvista.com> | 2016-12-08 21:19:18 +0530 |
|---|---|---|
| committer | Vijayendra Radhakrishna <vradhakrishna@mvista.com> | 2016-12-09 19:02:47 +0530 |
| commit | 04443eaf16effe54eff8eba35d04bfc1a1960d32 (patch) | |
| tree | 755d0272285ccb10a5ad17a4ce7ee63ab1185452 /tests/functest/odl-sfc/sfc.py | |
| parent | d3de20395d79daf9aa6b3c6fd4f9eea80791398e (diff) | |
remove dependancy of prepare_odl_sfc.py
Pre setup files below are not required anymore
prepare_odl_sfc.py
compute_presetup_CI.bash
server_presetup_CI.bash
Files are not removed yet.
Change-Id: I26cc8ba1a7c61f84fa06809217963ebd7f6b4b20
Signed-off-by: Vijayendra Radhakrishna <vradhakrishna@mvista.com>
Diffstat (limited to 'tests/functest/odl-sfc/sfc.py')
| -rwxr-xr-x | tests/functest/odl-sfc/sfc.py | 13 |
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'), |