aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xci/exec_test.sh2
-rw-r--r--docker/Dockerfile1
-rwxr-xr-xtestcases/features/sfc/correct_classifier.bash4
-rwxr-xr-xtestcases/features/sfc/sfc.py14
4 files changed, 15 insertions, 6 deletions
diff --git a/ci/exec_test.sh b/ci/exec_test.sh
index 124cb049..97b567af 100755
--- a/ci/exec_test.sh
+++ b/ci/exec_test.sh
@@ -173,7 +173,7 @@ function run_test(){
python ${FUNCTEST_REPO_DIR}/testcases/features/sfc/sfc.py
;;
"parser")
- python ${FUNCTEST_REPO_DIR}/testcases/vnf/RNC/parser.py
+ python ${FUNCTEST_REPO_DIR}/testcases/vnf/vRNC/parser.py
;;
*)
echo "The test case '${test_name}' does not exist."
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 9e469789..6f32b6cf 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -60,6 +60,7 @@ crudini \
ruby1.9.1-dev \
--no-install-recommends
+RUN pip install --upgrade pip
RUN mkdir -p ${repos_dir}
RUN mkdir -p /home/opnfv/functest/results
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: