Use proper syntax for list passing to *contain* kw

more details here:
https://git.opendaylight.org/gerrit/#/c/79287/1//COMMIT_MSG

Change-Id: I65f688ac32a568f7bfa9f318eb270fc6135911d5
Signed-off-by: Jamo Luhrsen <jluhrsen@redhat.com>

diff --git a/csit/suites/netvirt/l2l3_gatewaymac_arp.robot b/csit/suites/netvirt/l2l3_gatewaymac_arp.robot
index 83245ef594645a2dfbf5815841bf8a2789f6eaef..2829a26d6a958a42895a4d880ce53e05d93fc98e 100644 (file)
--- a/csit/suites/netvirt/l2l3_gatewaymac_arp.robot
+++ b/csit/suites/netvirt/l2l3_gatewaymac_arp.robot
@@ -167,8 +167,8 @@ Create Nova VMs
     @{NET_2_VM_IPS}    ${NET_2_DHCP_IP} =    OpenStackOperations.Get VM IPs    @{NET_2_VMS}
     BuiltIn.Set Suite Variable    @{NET_1_VM_IPS}
     BuiltIn.Set Suite Variable    @{NET_2_VM_IPS}
-    BuiltIn.Should Not Contain    @{NET_1_VM_IPS}    None
-    BuiltIn.Should Not Contain    @{NET_2_VM_IPS}    None
+    BuiltIn.Should Not Contain    ${NET_1_VM_IPS}    None
+    BuiltIn.Should Not Contain    ${NET_2_VM_IPS}    None
     BuiltIn.Should Not Contain    ${NET_1_DHCP_IP}    None
     BuiltIn.Should Not Contain    ${NET_2_DHCP_IP}    None
 

diff --git a/csit/suites/netvirt/multibgpvpn/multi_vpn_bgp.robot b/csit/suites/netvirt/multibgpvpn/multi_vpn_bgp.robot
index 6d526b21dce71ea6851b8d67c7eaf2279e461d6e..634c658de8e196e8acde4de5df085db87d01aec8 100644 (file)
--- a/csit/suites/netvirt/multibgpvpn/multi_vpn_bgp.robot
+++ b/csit/suites/netvirt/multibgpvpn/multi_vpn_bgp.robot
@@ -222,9 +222,9 @@ Create Nova VMs
     BuiltIn.Set Suite Variable    @{NET_1_VM_IPS}
     BuiltIn.Set Suite Variable    @{NET_2_VM_IPS}
     BuiltIn.Set Suite Variable    @{NET_3_VM_IPS}
-    BuiltIn.Should Not Contain    @{NET_1_VM_IPS}    None
-    BuiltIn.Should Not Contain    @{NET_2_VM_IPS}    None
-    BuiltIn.Should Not Contain    @{NET_3_VM_IPS}    None
+    BuiltIn.Should Not Contain    ${NET_1_VM_IPS}    None
+    BuiltIn.Should Not Contain    ${NET_2_VM_IPS}    None
+    BuiltIn.Should Not Contain    ${NET_3_VM_IPS}    None
     BuiltIn.Should Not Contain    ${NET_1_DHCP_IP}    None
     BuiltIn.Should Not Contain    ${NET_2_DHCP_IP}    None
     BuiltIn.Should Not Contain    ${NET_3_DHCP_IP}    None

diff --git a/csit/suites/netvirt/snatdnat/snat_dnat.robot b/csit/suites/netvirt/snatdnat/snat_dnat.robot
index 8650dc8006501ec672c99e4c93fc1a43fcac5812..4df20e3afc6317fa89078d07b031f76937265444 100644 (file)
--- a/csit/suites/netvirt/snatdnat/snat_dnat.robot
+++ b/csit/suites/netvirt/snatdnat/snat_dnat.robot
@@ -102,5 +102,5 @@ Create Nova VMs
     OpenStackOperations.Create Vm Instance With Port On Compute Node    @{PORTS}[3]    @{NET_1_VMS}[3]    ${OS_CMP2_HOSTNAME}    sg=${SECURITY_GROUP}
     @{NET_1_VM_IPS}    ${NET_1_DHCP_IP} =    OpenStackOperations.Get VM IPs    @{NET_1_VMS}
     BuiltIn.Set Suite Variable    @{NET_1_VM_IPS}
-    BuiltIn.Should Not Contain    @{NET_1_VM_IPS}    None
+    BuiltIn.Should Not Contain    ${NET_1_VM_IPS}    None
     BuiltIn.Should Not Contain    ${NET_1_DHCP_IP}    None

diff --git a/csit/suites/netvirt/vpnservice/vpn_basic_dualstack_one_router.robot b/csit/suites/netvirt/vpnservice/vpn_basic_dualstack_one_router.robot
index e311e00faeb514513d0ce1564b603d3a73a560b2..c3c6f089580f28e15841222236c1d8827b838fde 100644 (file)
--- a/csit/suites/netvirt/vpnservice/vpn_basic_dualstack_one_router.robot
+++ b/csit/suites/netvirt/vpnservice/vpn_basic_dualstack_one_router.robot
@@ -365,9 +365,9 @@ Suite Setup
     ${NET_2_VM_IPV6} =    OpenStackOperations.Collect VM IPv6 SLAAC Addresses    false    ${NET_2_VM_INSTANCES}    @{NETWORKS}[1]    ${prefix_net20}
     ${LOOP_COUNT}    Get Length    ${NET_1_VM_INSTANCES}
     : FOR    ${index}    IN RANGE    0    ${LOOP_COUNT}
-    \    ${status}    ${message}    Run Keyword And Ignore Error    BuiltIn.Should Not Contain    @{NET_1_VM_IPV6}[${index}]    None
+    \    ${status}    ${message}    Run Keyword And Ignore Error    BuiltIn.Should Not Contain    ${NET_1_VM_IPV6}[${index}]    None
     \    Run Keyword If    '${status}' == 'FAIL'    Write Commands Until Prompt    nova console-log @{NET_1_VM_INSTANCES}[${index}]    30s
-    \    ${status}    ${message}    Run Keyword And Ignore Error    BuiltIn.Should Not Contain    @{NET_2_VM_IPV6}[${index}]    None
+    \    ${status}    ${message}    Run Keyword And Ignore Error    BuiltIn.Should Not Contain    ${NET_2_VM_IPV6}[${index}]    None
     \    Run Keyword If    '${status}' == 'FAIL'    Write Commands Until Prompt    nova console-log @{NET_2_VM_INSTANCES}[${index}]    30s
     BuiltIn.Set Suite Variable    ${NET_1_VM_IPV4}
     BuiltIn.Set Suite Variable    ${NET_2_VM_IPV4}

diff --git a/csit/suites/netvirt/vpnservice/vpn_basic_dualstack_subnet_routing.robot b/csit/suites/netvirt/vpnservice/vpn_basic_dualstack_subnet_routing.robot
index 6d719b62a21a962f9c0d391837440e57341671cc..a75d8c8120228b166fa05bf7ff93f56969d25cc7 100644 (file)
--- a/csit/suites/netvirt/vpnservice/vpn_basic_dualstack_subnet_routing.robot
+++ b/csit/suites/netvirt/vpnservice/vpn_basic_dualstack_subnet_routing.robot
@@ -222,9 +222,9 @@ Suite Setup
     ${net_2_vm_ipv6} =    OpenStackOperations.Collect VM IPv6 SLAAC Addresses    false    ${NET_2_VMS}    @{NETWORKS}[1]    ${prefix_net20}
     ${loop_count}    Get Length    ${NET_1_VMS}
     : FOR    ${index}    IN RANGE    0    ${loop_count}
-    \    ${status}    ${message}    Run Keyword And Ignore Error    BuiltIn.Should Not Contain    @{net_1_vm_ipv6}[${index}]    None
+    \    ${status}    ${message}    Run Keyword And Ignore Error    BuiltIn.Should Not Contain    ${net_1_vm_ipv6}[${index}]    None
     \    Run Keyword If    '${status}' == 'FAIL'    Write Commands Until Prompt    nova console-log @{NET_1_VMS}[${index}]    30s
-    \    ${status}    ${message}    Run Keyword And Ignore Error    BuiltIn.Should Not Contain    @{net_2_vm_ipv6}[${index}]    None
+    \    ${status}    ${message}    Run Keyword And Ignore Error    BuiltIn.Should Not Contain    ${net_2_vm_ipv6}[${index}]    None
     \    Run Keyword If    '${status}' == 'FAIL'    Write Commands Until Prompt    nova console-log @{NET_2_VMS}[${index}]    30s
     BuiltIn.Set Suite Variable    ${net_1_vm_ipv4}
     BuiltIn.Set Suite Variable    ${net_2_vm_ipv4}

diff --git a/csit/suites/netvirt/vpnservice/vpn_basic_ipv6.robot b/csit/suites/netvirt/vpnservice/vpn_basic_ipv6.robot
index 588ba0bee9ff9c68e241d29798a9d2e6e702a8ed..18da4b48a520724f882d4e035503e67b74846109 100644 (file)
--- a/csit/suites/netvirt/vpnservice/vpn_basic_ipv6.robot
+++ b/csit/suites/netvirt/vpnservice/vpn_basic_ipv6.robot
@@ -256,7 +256,7 @@ Suite Setup
     ${VM_IPS}=    Collections.Combine Lists    ${VM_IP_NET10}    ${VM_IP_NET20}
     ${LOOP_COUNT}    BuiltIn.Get Length    ${NET_1_VMS}
     : FOR    ${index}    IN RANGE    0    ${LOOP_COUNT}
-    \    ${status}    ${message}    Run Keyword And Ignore Error    BuiltIn.Should Not Contain    @{VM_IPS}[${index}]    None
+    \    ${status}    ${message}    Run Keyword And Ignore Error    BuiltIn.Should Not Contain    ${VM_IPS}[${index}]    None
     \    Run Keyword If    '${status}' == 'FAIL'    OpenStack CLI    openstack console log show @{VM_INSTANCES}[${index}]    30s
     OpenStackOperations.Copy DHCP Files From Control Node
     BuiltIn.Set Suite Variable    ${VM_IP_NET10}

diff --git a/csit/suites/tsdr/Cassandra/050_SyslogTable.robot b/csit/suites/tsdr/Cassandra/050_SyslogTable.robot
index a82b120fb62b7c5094c5ee2c15deba32d28a7184..f9fa59d88e9dd193d22b1e7b636cb9ab50b790b1 100644 (file)
--- a/csit/suites/tsdr/Cassandra/050_SyslogTable.robot
+++ b/csit/suites/tsdr/Cassandra/050_SyslogTable.robot
@@ -32,6 +32,6 @@ Verifying TSDR Data Store For Syslog Entries
     : FOR    ${key}    IN ZIP    &{syslog_facility}
     \    ${value}=    Get From Dictionary    ${syslog_facility}    ${key}
     \    ${f_value}=    Evaluate    ${value} * 8
-    \    Should Contain    @{syslogs}[${iterator}]    ${MESSAGE}
-    \    Should Contain    @{syslogs}[${iterator}]    <${f_value}>
+    \    Should Contain    ${syslogs}[${iterator}]    ${MESSAGE}
+    \    Should Contain    ${syslogs}[${iterator}]    <${f_value}>
     \    ${iterator}=    Evaluate    ${iterator} + 1