From 1274116ebecf15739d225bd27e107fe04bd7b710 Mon Sep 17 00:00:00 2001 From: Manuel Buil Date: Tue, 9 Aug 2016 14:05:47 +0200 Subject: Bug fix in functest ODL-SFC Change-Id: I496ade3ea5888967e933231f515a340369bffe8f Signed-off-by: Manuel Buil --- testcases/features/sfc/correct_classifier.bash | 4 ++-- testcases/features/sfc/sfc.py | 14 +++++++++++--- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/testcases/features/sfc/correct_classifier.bash b/testcases/features/sfc/correct_classifier.bash index ba34d7fe..fb08af5c 100755 --- a/testcases/features/sfc/correct_classifier.bash +++ b/testcases/features/sfc/correct_classifier.bash @@ -4,8 +4,8 @@ #when SFF and classifier are in the same swtich nsp=`ovs-ofctl -O Openflow13 dump-flows br-int table=11 | \ -grep "nsp=" | awk '{print $6}' | awk -F ',' '{print $2}' | \ -awk -F '=' '{print $2}'` +grep "NXM_NX_NSP" | head -1 | cut -d',' -f13 | cut -d':' -f2 \ +| cut -d'-' -f1` ip=`ovs-ofctl -O Openflow13 dump-flows br-int table=11 | \ grep NXM_NX_NSH_C1 | head -1 | cut -d':' -f5 | cut -d'-' -f1` diff --git a/testcases/features/sfc/sfc.py b/testcases/features/sfc/sfc.py index 0073cc92..17ab386f 100755 --- a/testcases/features/sfc/sfc.py +++ b/testcases/features/sfc/sfc.py @@ -8,7 +8,6 @@ import functest.utils.functest_utils as ft_utils import functest.utils.openstack_utils as os_utils import paramiko - parser = argparse.ArgumentParser() parser.add_argument("-r", "--report", @@ -247,7 +246,7 @@ def main(): ssh.connect(ips[0], username="root", password="opnfv", timeout=2) command = ("nohup python vxlan_tool.py -i eth0 " - "-d forward -v off -f -b 80 &") + "-d forward -v off -b 80 > /dev/null 2>&1 &") (stdin, stdout, stderr) = ssh.exec_command(command) except: logger.debug("Waiting for %s..." % ips[0]) @@ -271,7 +270,7 @@ def main(): ssh.connect(ips[1], username="root", password="opnfv", timeout=2) command = ("nohup python vxlan_tool.py -i eth0 " - "-d forward -v off -f -b 22 &") + "-d forward -v off -b 22 > /dev/null 2>&1 &") (stdin, stdout, stderr) = ssh.exec_command(command) except: logger.debug("Waiting for %s..." % ips[1]) @@ -350,6 +349,15 @@ def main(): TACKER_CHANGECLASSI subprocess.call(tacker_classi, shell=True) + # SSH to modify the classification flows in compute + + contr_cmd4 = ("sshpass -p r00tme ssh " + ssh_options + " root@10.20.0.2" + " 'ssh " + ip_compute + " 'bash correct_classifier.bash''") + logger.info("Executing script to modify the classi: '%s'" % contr_cmd4) + process = subprocess.Popen(contr_cmd4, + shell=True, + stdout=subprocess.PIPE) + # SSH TO EXECUTE cmd_client try: -- cgit 1.2.3-korg