Introduce @{EMPTY_LIST} variable

- introduce @{EMPTY_LIST} variable to use
in KWs with list parameters

JIRA: SXP-150
Change-Id: I07a3b3c171370cea13d68fecf409e924a6826f1c
Signed-off-by: Ivan Hrasko <ihrasko@cisco.com>

diff --git a/csit/suites/sxp/cluster-routing/010_Route_Switching.robot b/csit/suites/sxp/cluster-routing/010_Route_Switching.robot
index c2717a2a96fa8c9ce0fa5711d384790ff959bca3..eeb68089f441e662edd7bd14fabdeccf77e15a07 100644 (file)
--- a/csit/suites/sxp/cluster-routing/010_Route_Switching.robot
+++ b/csit/suites/sxp/cluster-routing/010_Route_Switching.robot
@@ -71,7 +71,7 @@ Isolate SXP Controller
     ...    afterwards unisolate old leader.
     @{running_members} =    ClusterManagement.Isolate_Member_From_List_Or_All    ${controller_index}
     BuiltIn.Wait_Until_Keyword_Succeeds    60    1    ClusterManagement.Verify_Members_Are_Ready    member_index_list=${running_members}    verify_cluster_sync=True    verify_restconf=True
-    ...    verify_system_status=False    service_list=@{EMPTY}
+    ...    verify_system_status=False    service_list=${EMPTY_LIST}
     BuiltIn.Wait Until Keyword Succeeds    240    1    ClusterManagement.Sync_Status_Should_Be_False    ${controller_index}
     BuiltIn.Wait Until Keyword Succeeds    240    1    SxpClusterLib.Ip Addres Should Not Be Routed To Follower    ${MAC_ADDRESS_TABLE}    ${VIRTUAL_IP}    ${controller_index}
     ${running_member} =    Collections.Get From List    ${running_members}    0
@@ -79,4 +79,4 @@ Isolate SXP Controller
     BuiltIn.Wait Until Keyword Succeeds    240    1    SxpClusterLib.Ip Addres Should Be Routed To Follower    ${MAC_ADDRESS_TABLE}    ${VIRTUAL_IP}    ${active_follower}
     ClusterManagement.Flush_Iptables_From_List_Or_All
     BuiltIn.Wait_Until_Keyword_Succeeds    60    1    ClusterManagement.Verify_Members_Are_Ready    member_index_list=${EMPTY}    verify_cluster_sync=True    verify_restconf=True
-    ...    verify_system_status=False    service_list=@{EMPTY}
+    ...    verify_system_status=False    service_list=${EMPTY_LIST}

diff --git a/csit/suites/sxp/cluster-routing/020_Sxp_Node_Switching.robot b/csit/suites/sxp/cluster-routing/020_Sxp_Node_Switching.robot
index 01e7e347ee30a178a89e7d48f688fa4a49c01900..2f8eb1316730449997bef8ec96e3d61c8c3820d0 100644 (file)
--- a/csit/suites/sxp/cluster-routing/020_Sxp_Node_Switching.robot
+++ b/csit/suites/sxp/cluster-routing/020_Sxp_Node_Switching.robot
@@ -105,7 +105,7 @@ Clean Custom SXP Cluster
     [Documentation]    Disconnect SXP cluster topology
     ClusterManagement.Flush_Iptables_From_List_Or_All
     BuiltIn.Wait_Until_Keyword_Succeeds    60    1    ClusterManagement.Verify_Members_Are_Ready    member_index_list=${EMPTY}    verify_cluster_sync=True    verify_restconf=True
-    ...    verify_system_status=False    service_list=@{EMPTY}
+    ...    verify_system_status=False    service_list=${EMPTY_LIST}
     SxpLib.Delete Node    ${DEVICE_NODE_ID}    session=${DEVICE_SESSION}
     SxpLib.Delete Node    ${CLUSTER_NODE_ID}    session=${CONTROLLER_SESSION}
 
@@ -120,7 +120,7 @@ Isolate SXP Controller
     [Documentation]    Isolate cluster node specified by ${controller_index} and find new owner
     @{running_members} =    ClusterManagement.Isolate_Member_From_List_Or_All    ${controller_index}
     BuiltIn.Wait_Until_Keyword_Succeeds    60    1    ClusterManagement.Verify_Members_Are_Ready    member_index_list=${running_members}    verify_cluster_sync=True    verify_restconf=True
-    ...    verify_system_status=False    service_list=@{EMPTY}
+    ...    verify_system_status=False    service_list=${EMPTY_LIST}
     BuiltIn.Wait Until Keyword Succeeds    240    1    ClusterManagement.Sync_Status_Should_Be_False    ${controller_index}
     BuiltIn.Wait Until Keyword Succeeds    240    1    SxpClusterLib.Ip Addres Should Not Be Routed To Follower    ${MAC_ADDRESS_TABLE}    ${VIRTUAL_IP}    ${controller_index}
     ${running_member} =    Collections.Get From List    ${running_members}    0

diff --git a/csit/suites/sxp/clustering/010_Connection_switchover.robot b/csit/suites/sxp/clustering/010_Connection_switchover.robot
index 54b9017fee37d2e385fd30e66557b0456e4ce3a8..65b9212e68c5df6900f3b34af33c53ca5df5c3b3 100644 (file)
--- a/csit/suites/sxp/clustering/010_Connection_switchover.robot
+++ b/csit/suites/sxp/clustering/010_Connection_switchover.robot
@@ -26,10 +26,10 @@ Isolate SXP Controller
     [Documentation]    Isolate one of cluster nodes and perform check that Device is still connected afterwards reverts isolation
     ${running_members} =    ClusterManagement.Isolate_Member_From_List_Or_All    ${controller_index}
     BuiltIn.Wait_Until_Keyword_Succeeds    60    1    ClusterManagement.Verify_Members_Are_Ready    member_index_list=${running_members}    verify_cluster_sync=True    verify_restconf=True
-    ...    verify_system_status=False    service_list=@{EMPTY}
+    ...    verify_system_status=False    service_list=${EMPTY_LIST}
     BuiltIn.Wait Until Keyword Succeeds    240    1    ClusterManagement.Sync_Status_Should_Be_False    ${controller_index}
     BuiltIn.Wait Until Keyword Succeeds    60    1    SxpClusterLib.Check Device is Connected    ${DEVICE_NODE_ID}    session=${DEVICE_SESSION}
     ClusterManagement.Flush_Iptables_From_List_Or_All
     BuiltIn.Wait_Until_Keyword_Succeeds    60    1    ClusterManagement.Verify_Members_Are_Ready    member_index_list=${EMPTY}    verify_cluster_sync=True    verify_restconf=True
-    ...    verify_system_status=False    service_list=@{EMPTY}
+    ...    verify_system_status=False    service_list=${EMPTY_LIST}
     BuiltIn.Wait Until Keyword Succeeds    60    1    SxpClusterLib.Check Device is Connected    ${DEVICE_NODE_ID}    session=${DEVICE_SESSION}

diff --git a/csit/suites/sxp/clustering/030_RPC_functionality.robot b/csit/suites/sxp/clustering/030_RPC_functionality.robot
index cd89d91b0399042d4b6a7c4f39d8beaa14b32dd1..b249197a4a00081aa911e27101acff64158579d7 100644 (file)
--- a/csit/suites/sxp/clustering/030_RPC_functionality.robot
+++ b/csit/suites/sxp/clustering/030_RPC_functionality.robot
@@ -31,7 +31,7 @@ Isolate SXP Controller
     \    SxpLib.Add Bindings    ${i+1}0    ${i+1}0.${i+1}0.${i+1}0.${i+1}0/32    node=${INADDR_ANY}    session=ClusterManagement__session_${owner_controller}
     @{running_members} =    ClusterManagement.Isolate_Member_From_List_Or_All    ${controller_index}
     BuiltIn.Wait_Until_Keyword_Succeeds    60    1    ClusterManagement.Verify_Members_Are_Ready    member_index_list=${running_members}    verify_cluster_sync=True    verify_restconf=True
-    ...    verify_system_status=False    service_list=@{EMPTY}
+    ...    verify_system_status=False    service_list=${EMPTY_LIST}
     BuiltIn.Wait Until Keyword Succeeds    240    1    ClusterManagement.Sync_Status_Should_Be_False    ${controller_index}
     ${running_member} =    Collections.Get From List    ${running_members}    0
     ${owner_controller} =    SxpClusterLib.Get Owner Controller    ${running_member}
@@ -40,7 +40,7 @@ Isolate SXP Controller
     \    SxpLib.Delete Bindings    ${i+1}0    ${i+1}0.${i+1}0.${i+1}0.${i+1}0/32    node=${INADDR_ANY}    session=ClusterManagement__session_${owner_controller}
     ClusterManagement.Flush_Iptables_From_List_Or_All
     BuiltIn.Wait_Until_Keyword_Succeeds    60    1    ClusterManagement.Verify_Members_Are_Ready    member_index_list=${EMPTY}    verify_cluster_sync=True    verify_restconf=True
-    ...    verify_system_status=False    service_list=@{EMPTY}
+    ...    verify_system_status=False    service_list=${EMPTY_LIST}
     BuiltIn.Wait Until Keyword Succeeds    30    1    Check Bindings Does Not Exist    ${owner_controller}
 
 Check Bindings Exist

diff --git a/csit/suites/sxp/clustering/040_Bindings_consistency.robot b/csit/suites/sxp/clustering/040_Bindings_consistency.robot
index 30d56c16534a39d3f82e1c8b65466f5fcea5af38..d3a57385ef1ba701889a0ec0270e4e2cc10ebc15 100644 (file)
--- a/csit/suites/sxp/clustering/040_Bindings_consistency.robot
+++ b/csit/suites/sxp/clustering/040_Bindings_consistency.robot
@@ -68,7 +68,7 @@ Isolate SXP Controller
     [Documentation]    Isolate one of cluster nodes and perform check that device is connected
     @{running_members} =    ClusterManagement.Isolate_Member_From_List_Or_All    ${controller_index}
     BuiltIn.Wait_Until_Keyword_Succeeds    60    1    ClusterManagement.Verify_Members_Are_Ready    member_index_list=${running_members}    verify_cluster_sync=True    verify_restconf=True
-    ...    verify_system_status=False    service_list=@{EMPTY}
+    ...    verify_system_status=False    service_list=${EMPTY_LIST}
     ${running_member} =    Collections.Get From List    ${running_members}    0
     BuiltIn.Set Test Variable    ${RUNNING_MEMBER}    ${running_member}
     BuiltIn.Wait Until Keyword Succeeds    240    1    ClusterManagement.Sync_Status_Should_Be_False    ${controller_index}
@@ -79,7 +79,7 @@ UnIsolate SXP Controller
     [Documentation]    Un-Isolate one of cluster nodes and perform check that device is connected
     ClusterManagement.Flush_Iptables_From_List_Or_All
     BuiltIn.Wait_Until_Keyword_Succeeds    60    1    ClusterManagement.Verify_Members_Are_Ready    member_index_list=${EMPTY}    verify_cluster_sync=True    verify_restconf=True
-    ...    verify_system_status=False    service_list=@{EMPTY}
+    ...    verify_system_status=False    service_list=${EMPTY_LIST}
     BuiltIn.Wait Until Keyword Succeeds    60    1    SxpClusterLib.Check Device is Connected    ${DEVICE_NODE_ID}    session=${DEVICE_SESSION}
 
 Check Bindings

diff --git a/csit/variables/Variables.robot b/csit/variables/Variables.robot
index 54d1aa8cc3ece36236fb3365a54b1778d94e6576..abb0a263bdfc369cc51a8c165a2bb81443638a83 100644 (file)
--- a/csit/variables/Variables.robot
+++ b/csit/variables/Variables.robot
@@ -67,6 +67,7 @@ ${DEFAULT_TIMEOUT}    30s    # Generic *_SYSTEM SSH.Login timeout. Some systems
 ${DEFAULT_TIMEOUT_HTTP}    5    # Used for HTTP connections
 ${DELETE_DASHBOARDRECORD}    /restconf/operations/dashboardrule:delete-dashboard    # FIXME: Move to a separate Centinel-related Resource and add description.
 ${ELASTICPORT}    9200    # Port to use when interacting with ElasticSearch. FIXME: Hide into a specific Resource.
+@{EMPTY_LIST}     # Empty list for KWs with list parameters, see: https://github.com/robotframework/robotframework/issues/2243
 ${ENABLE_GLOBAL_TEST_DEADLINES}    True    # Some suites need this to avoid getting stuck. FIXME: Move to the Resource which uses this.
 ${ESCAPE_CHARACTER}    \x1b    # A more readable alias to the special escape character.
 ${FAIL_ON_EXCEPTIONS}    False    # global flag (can/should be tweak on pybot command line) which suites can use if they are validating exceptions to pass/fail tests on