summaryrefslogtreecommitdiffstats
path: root/testcases/features/sfc
diff options
context:
space:
mode:
Diffstat (limited to 'testcases/features/sfc')
-rwxr-xr-xtestcases/features/sfc/correct_classifier.bash4
-rwxr-xr-xtestcases/features/sfc/set-up-tacker.sh6
-rwxr-xr-xtestcases/features/sfc/sfc.py17
3 files changed, 19 insertions, 8 deletions
diff --git a/testcases/features/sfc/correct_classifier.bash b/testcases/features/sfc/correct_classifier.bash
index ba34d7fe9..fb08af5c1 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/set-up-tacker.sh b/testcases/features/sfc/set-up-tacker.sh
index 577b7d94e..da2cb922e 100755
--- a/testcases/features/sfc/set-up-tacker.sh
+++ b/testcases/features/sfc/set-up-tacker.sh
@@ -1,8 +1,8 @@
-curl "https://gerrit.opnfv.org/gerrit/gitweb?p=fuel.git;a=blob_plain;f=prototypes/sfc_tacker/poc.tacker-up.sh;hb=ddd4e11bb8bc62b7e8b06d4b44a308293c2c3362" > poc.tacker-up.sh
+git_commit=ee3046f24df0bfca7ee15501f6c06ad86dd462c2
+curl "https://gerrit.opnfv.org/gerrit/gitweb?p=fuel.git;a=blob_plain;\
+f=prototypes/sfc_tacker/poc.tacker-up.sh;hb=${git_commit}" > poc.tacker-up.sh
bash poc.tacker-up.sh
-touch delete.sh
-
cat <<EOF > delete.sh
tacker sfc-classifier-delete red_http
tacker sfc-classifier-delete blue_ssh
diff --git a/testcases/features/sfc/sfc.py b/testcases/features/sfc/sfc.py
index 0073cc92c..bdd279051 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,18 @@ def main():
TACKER_CHANGECLASSI
subprocess.call(tacker_classi, shell=True)
+ logger.info("Wait for ODL to update the classification rules in OVS")
+ time.sleep(10)
+
+ # 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: