diff options
| author |   Morgan Richomme <morgan.richomme@orange.com> | 2017-01-23 13:19:05 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-01-23 13:19:05 +0000 |
| commit | 7e7f9c8ef5393d4dc0812cbca82f4358cd93e583 (patch) | |
| tree | dec452cebf73f84f23660b14e30a5f0f06b6338b /functest/opnfv_tests/sdn/onos/teston | |
| parent | 1015e2f16285c24fb510c9b937bcef593c940ae8 (diff) | |
| parent | 64b199fd56e914a8511a8c59f3e08d012f627ec5 (diff) | |
Merge "Fix for opnfv onos-sfc scripts"
Diffstat (limited to 'functest/opnfv_tests/sdn/onos/teston')
| -rwxr-xr-x | functest/opnfv_tests/sdn/onos/teston/onos.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/functest/opnfv_tests/sdn/onos/teston/onos.py b/functest/opnfv_tests/sdn/onos/teston/onos.py index 213bdb7d..2537e18d 100755 --- a/functest/opnfv_tests/sdn/onos/teston/onos.py +++ b/functest/opnfv_tests/sdn/onos/teston/onos.py @@ -175,7 +175,7 @@ def CreateImage(): def SfcTest(): - cmd = "python " + ONOS_SFC_PATH + "/Sfc.py" + cmd = "python " + ONOS_SFC_PATH + "/sfc.py" logger.debug("Run sfc tests") os.system(cmd) @@ -187,7 +187,7 @@ def GetIp(type): def Replace(before, after): - file = "/Sfc_fun.py" + file = "/sfc_onos.py" cmd = "sed -i 's/" + before + "/" + after + "/g' " + ONOS_SFC_PATH + file os.system(cmd) @@ -199,7 +199,7 @@ def SetSfcConf(): Replace("glance_ip", GetIp("glance")) pwd = ft_constants.OS_PASSWORD Replace("console", pwd) - creds_neutron = openstack_utils.get_credentials("neutron") + creds_neutron = openstack_utils.get_credentials() neutron_client = neutronclient.Client(**creds_neutron) ext_net = openstack_utils.get_external_net(neutron_client) Replace("admin_floating_net", ext_net) |