diff options
Diffstat (limited to 'testcases/features')
| -rwxr-xr-x | testcases/features/domino.py | 23 | ||||
| -rwxr-xr-x | testcases/features/sfc/correct_classifier.bash | 4 | ||||
| -rwxr-xr-x | testcases/features/sfc/sfc.py | 14 |
3 files changed, 28 insertions, 13 deletions
diff --git a/testcases/features/domino.py b/testcases/features/domino.py index ff14d066c..e4229b4c7 100755 --- a/testcases/features/domino.py +++ b/testcases/features/domino.py @@ -40,9 +40,12 @@ def main(): stop_time = time.time() duration = round(stop_time - start_time, 1) - if ret == 0: + if ret == 0 and duration > 1: logger.info("domino OK") test_status = 'OK' + elif ret == 0 and duration <= 1: + logger.info("domino TEST SKIPPED") + test_status = 'SKIPPED' else: logger.info("domino FAILED") test_status = 'NOK' @@ -60,6 +63,8 @@ def main(): status = "FAIL" if details['status'] == "OK": status = "PASS" + elif details['status'] == "SKIPPED": + status = "SKIP" logger.info("Pushing Domino results: TEST_DB_URL=%(db)s pod_name=%(pod)s " "version=%(v)s scenario=%(s)s criteria=%(c)s details=%(d)s" % { @@ -71,13 +76,15 @@ def main(): 'b': build_tag, 'd': details, }) - functest_utils.push_results_to_db("domino", - "domino-multinode", - logger, - start_time, - stop_time, - status, - details) + + if status is not "SKIP": + functest_utils.push_results_to_db("domino", + "domino-multinode", + logger, + start_time, + stop_time, + status, + details) if __name__ == '__main__': main() 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/sfc.py b/testcases/features/sfc/sfc.py index 0073cc92c..17ab386f6 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: |