Fix is_ssh_blocked and is_http_blocked

This patch fixes JIRA SFC-79

Previously, those functions used regex matching against the command output.
Now, the return code from netcat is used. It should be easier and more
relieable.

Change-Id: I639c64b3fe0a0e3c0b59f73e5615b8737e676849
Signed-off-by: Juan Vidal <juan.vidal.allende@ericsson.com>

2 files changed, 6 insertions, 6 deletions

diff --git a/sfc/tests/functest/sfc_one_chain_two_service_functions_different_computes.py b/sfc/tests/functest/sfc_one_chain_two_service_functions_different_computes.py
index 71b69dff..e5a9f206 100644
--- a/sfc/tests/functest/sfc_one_chain_two_service_functions_different_computes.py
+++ b/sfc/tests/functest/sfc_one_chain_two_service_functions_different_computes.py
@@ -218,7 +218,7 @@ def main():
     time.sleep(100)
 
     logger.info("Test HTTP")
-    if not test_utils.is_http_blocked(srv_prv_ip, client_ip):
+    if not test_utils.is_http_blocked(client_ip, srv_prv_ip):
         logger.info('\033[92mTEST 1 [PASSED] ==> HTTP WORKS\033[0m')
         update_json_results("Test 1: HTTP works", "Passed")
     else:
@@ -235,7 +235,7 @@ def main():
     test_utils.vxlan_firewall(sf1, port="80")
 
     logger.info("Test HTTP again")
-    if test_utils.is_http_blocked(srv_prv_ip, client_ip):
+    if test_utils.is_http_blocked(client_ip, srv_prv_ip):
         logger.info('\033[92mTEST 2 [PASSED] ==> HTTP Blocked\033[0m')
         update_json_results("Test 2: HTTP Blocked", "Passed")
     else:
diff --git a/sfc/tests/functest/sfc_two_chains_SSH_and_HTTP.py b/sfc/tests/functest/sfc_two_chains_SSH_and_HTTP.py
index 92ef9f16..4117b237 100644
--- a/sfc/tests/functest/sfc_two_chains_SSH_and_HTTP.py
+++ b/sfc/tests/functest/sfc_two_chains_SSH_and_HTTP.py
@@ -190,7 +190,7 @@ def main():
     t1.join()
 
     logger.info("Test SSH")
-    if test_utils.is_ssh_blocked(srv_prv_ip, client_ip):
+    if test_utils.is_ssh_blocked(client_ip, srv_prv_ip):
         results.add_to_summary(2, "PASS", "SSH Blocked")
     else:
         error = ('\033[91mTEST 1 [FAILED] ==> SSH NOT BLOCKED\033[0m')
@@ -200,7 +200,7 @@ def main():
         results.add_to_summary(2, "FAIL", "SSH Blocked")
 
     logger.info("Test HTTP")
-    if not test_utils.is_http_blocked(srv_prv_ip, client_ip):
+    if not test_utils.is_http_blocked(client_ip, srv_prv_ip):
         results.add_to_summary(2, "PASS", "HTTP works")
     else:
         error = ('\033[91mTEST 2 [FAILED] ==> HTTP BLOCKED\033[0m')
@@ -243,7 +243,7 @@ def main():
     t2.join()
 
     logger.info("Test HTTP")
-    if test_utils.is_http_blocked(srv_prv_ip, client_ip):
+    if test_utils.is_http_blocked(client_ip, srv_prv_ip):
         results.add_to_summary(2, "PASS", "HTTP Blocked")
     else:
         error = ('\033[91mTEST 3 [FAILED] ==> HTTP WORKS\033[0m')
@@ -253,7 +253,7 @@ def main():
         results.add_to_summary(2, "FAIL", "HTTP Blocked")
 
     logger.info("Test SSH")
-    if not test_utils.is_ssh_blocked(srv_prv_ip, client_ip):
+    if not test_utils.is_ssh_blocked(client_ip, srv_prv_ip):
         results.add_to_summary(2, "PASS", "SSH works")
     else:
         error = ('\033[91mTEST 4 [FAILED] ==> SSH BLOCKED\033[0m')