From 91fc1fc908acf29d3c65058ff8a0570036286fc9 Mon Sep 17 00:00:00 2001 From: Manuel Buil Date: Tue, 26 Jul 2016 18:56:05 +0200 Subject: [PATCH] Bug fix for ODL-SFC testcase The vxlan_tool was sometimes not started properly in the SFs. Now we check that the process is started Change-Id: I8b88b76ba30755a1ed339f9e4c374d43e5e0b422 Signed-off-by: Manuel Buil --- testcases/features/sfc/sfc.py | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/testcases/features/sfc/sfc.py b/testcases/features/sfc/sfc.py index 562d410b8..ad724dcac 100755 --- a/testcases/features/sfc/sfc.py +++ b/testcases/features/sfc/sfc.py @@ -229,6 +229,7 @@ def main(): logger.debug("Problems assigning floating IP to SFs") logger.debug("Floating IPs for SFs: %s..." % ips) + # SSH TO START THE VXLAN_TOOL ON SF1 logger.info("Configuring the SFs") try: @@ -242,6 +243,15 @@ def main(): time.sleep(6) # timeout -= 1 + try: + (stdin, stdout, stderr) = ssh.exec_command("ps lax | grep python") + if "vxlan_tool.py" in stdout.readlines()[0]: + logger.debug("HTTP firewall started") + else: + logger.error("HTTP firewall not started") + except: + logger.error("vxlan_tool not started in SF1") + # SSH TO START THE VXLAN_TOOL ON SF2 try: ssh.connect(ips[1], username="root", @@ -254,6 +264,15 @@ def main(): time.sleep(6) # timeout -= 1 + try: + (stdin, stdout, stderr) = ssh.exec_command("ps lax | grep python") + if "vxlan_tool.py" in stdout.readlines()[0]: + logger.debug("SSH firewall started") + else: + logger.error("SSH firewall not started") + except: + logger.error("vxlan_tool not started in SF2") + # SSH TO EXECUTE cmd_client logger.info("TEST STARTED") -- 2.16.6