Improve Regex in Isolation Library

IPTables are now checked for the string DROP for
isolated controllers. This is so the isolation
keywords will not erroneously match actions
other than DROP on the same controller pair.

Change-Id: I0a55f994c6d19a6aebd30375396ca840da4da61b
Signed-off-by: Phillip Shea <phillip.shea@hp.com>

diff --git a/test/csit/libraries/ClusterKeywords.robot b/test/csit/libraries/ClusterKeywords.robot
index 46c1b979c177e4803a6db448e3e3458ed44adee3..e3846aeaa19563a558844bcc9d957739172317d4 100644 (file)
--- a/test/csit/libraries/ClusterKeywords.robot
+++ b/test/csit/libraries/ClusterKeywords.robot
@@ -304,11 +304,11 @@ Modify IPTables
     ${cmd string}    Set Variable    sudo iptables -L -n
     ${return string}=    Run Command On Remote System    ${isolated controller}    ${cmd string}
     #If inserting rules:
-    Run Keyword If    "${rule type}" == '-I'    Should Match Regexp    ${return string}    [\s\S]*${isolated controller} *${controller}[\s\S]*
-    Run Keyword If    "${rule type}" == '-I'    Should Match Regexp    ${return string}    [\s\S]*${controller} *${isolated controller}[\s\S]*
+    Run Keyword If    "${rule type}" == '-I'    Should Match Regexp    ${return string}    [\s\S]*DROP *all *-- *${isolated controller} *${controller}[\s\S]*
+    Run Keyword If    "${rule type}" == '-I'    Should Match Regexp    ${return string}    [\s\S]*DROP *all *-- *${controller} *${isolated controller}[\s\S]*
     #If deleting rules:
-    Run Keyword If    "${rule type}" == '-D'    Should Match Regexp    ${return string}    (?![\s\S]*${isolated controller} *${controller}[\s\S]*)
-    Run Keyword If    "${rule type}" == '-D'    Should Match Regexp    ${return string}    (?![\s\S]*${controller} *${isolated controller}[\s\S]*)
+    Run Keyword If    "${rule type}" == '-D'    Should Match Regexp    ${return string}    (?![\s\S]*DROP *all *-- *${isolated controller} *${controller}[\s\S]*)
+    Run Keyword If    "${rule type}" == '-D'    Should Match Regexp    ${return string}    (?![\s\S]*DROP *all *-- *${controller} *${isolated controller}[\s\S]*)
 
 Rejoin All Isolated Controllers
     [Arguments]    @{controllers}