Fix for Genius Tests

JIRA: INTTEST-105
Signed-off-by: Venkatrangan Govindarajan <vgovindarajan@luminanetworks.com>
Change-Id: I10e536d74518605c79326509b4245ae4cc87c8e4

diff --git a/csit/libraries/Genius.robot b/csit/libraries/Genius.robot
index 6080bfc800778e08c98d17bf223e92e11af135a1..ccb3fc2db19ea3eba824cb7987cca8ee454c5e25 100644 (file)
--- a/csit/libraries/Genius.robot
+++ b/csit/libraries/Genius.robot
@@ -30,7 +30,7 @@ ${NO_VLAN}        0
 ${DEFAULT_TRANSPORT_ZONE}    default-transport-zone
 ${SET_LOCAL_IP}    sudo ovs-vsctl set O . other_config:local_ip=
 ${REMOVE_LOCAL_IP}    sudo ovs-vsctl remove O . other_config local_ip
-${odl_stream_check }    &{Stream_dict}[${ODL_STREAM}] <= &{Stream_dict}[neon]
+${odl_stream_check }    ${Stream_dict}[${ODL_STREAM}] <= ${Stream_dict}[neon]
 
 *** Keywords ***
 Genius Suite Setup
@@ -233,10 +233,10 @@ Get Tunnel
     BuiltIn.Log    ${resp.content}
     ${respjson} =    RequestsLibrary.To Json    ${resp.content}    pretty_print=True
     ${json} =    Utils.Json Parse From String    ${resp.content}
-    BuiltIn.Should Contain    ${resp.content}    ${dst}
-    BuiltIn.Run Keyword If    '${config_api_type}' == '${EMPTY}'    BuiltIn.Should Contain    ${resp.content}    ${src}
+    BuiltIn.Should Contain    ${resp.text}    ${dst}
+    BuiltIn.Run Keyword If    '${config_api_type}' == '${EMPTY}'    BuiltIn.Should Contain    ${resp.text}    ${src}
     ${tunnel_interface_name} =    BuiltIn.Run Keyword If    "tunnel-interface-names" in "${json}"    Genius.Get Tunnel Interface Name    ${json["internal-tunnel"][0]}    tunnel-interface-names
-    ${tunnel_name_output}    ${tunnel_name} =    BuiltIn.Run Keyword Unless    '${config_api_type}' == '${EMPTY}'    BuiltIn.Should Match Regexp    ${resp.content}    "tunnel-name":"(tun[\\w\\d]+)"
+    ${tunnel_name_output}    ${tunnel_name} =    BuiltIn.Run Keyword Unless    '${config_api_type}' == '${EMPTY}'    BuiltIn.Should Match Regexp    ${resp.text}    "tunnel-name":"(tun[\\w\\d]+)"
     ${tunnel} =    BuiltIn.Set Variable If    '${config_api_type}' == '${EMPTY}'    ${tunnel_interface_name}    ${tunnel_name}
     [Return]    ${tunnel}
 

diff --git a/csit/suites/genius/BFD_monitoring.robot b/csit/suites/genius/BFD_monitoring.robot
index b0a34dba77fecc18a1f158b814c822931e97a24e..ef611273af30a2ea463a52642645ba1103503659 100644 (file)
--- a/csit/suites/genius/BFD_monitoring.robot
+++ b/csit/suites/genius/BFD_monitoring.robot
@@ -145,5 +145,5 @@ Verify ovs-vsctl Output For Each Tunnel
     FOR    ${each_tun}    IN RANGE    ${no of tunnels}
         ${tun}    Collections.Get From List    ${tun_names}    ${each_tun}
         BuiltIn.Wait Until Keyword Succeeds    20    5    OVSDB.Verify Ovs-vsctl Output    list interface ${tun}    5000
-        ...    ovs_system=@{TOOLS_SYSTEM_ALL_IPS}[${tool_system_index}]
+        ...    ovs_system=${TOOLS_SYSTEM_ALL_IPS}[${tool_system_index}]
     END

diff --git a/csit/suites/genius/ID_manager.robot b/csit/suites/genius/ID_manager.robot
index d98cc346f0aab2f7bc1a82a732cbfd60d2bd744c..58b1ea78d9445b6af80e6cdfcfd2bd0d213a55b5 100644 (file)
--- a/csit/suites/genius/ID_manager.robot
+++ b/csit/suites/genius/ID_manager.robot
@@ -61,7 +61,7 @@ Allocate IDs of size 3 from the pool
     ${get_resp} =    RequestsLibrary.Get Request    session    ${CONFIG_API}/id-manager:id-pools/id-pool/${pool-name}/available-ids-holder/
     ${respjson} =    RequestsLibrary.To Json    ${get_resp.content}    pretty_print=True
     BuiltIn.Log    ${respjson}
-    BuiltIn.Should Contain    ${get_resp.content}    17
+    BuiltIn.Should Contain    ${get_resp.text}    17
     BuiltIn.Should Be Equal As Strings    ${get_resp.status_code}    200
 
 Release a block of IDs allocated using releaseIds RPC
@@ -71,16 +71,16 @@ Release a block of IDs allocated using releaseIds RPC
     ${body} =    String.Replace String    ${body}    test-key    ${test_keys[2]}
     Utils.Post Elements To URI    ${OPERATIONS_API}/id-manager:releaseId    ${body}
     ${get_resp} =    RequestsLibrary.Get Request    session    ${CONFIG_API}/id-manager:id-pools/id-pool/${pool-name}/
-    ${respjson} =    RequestsLibrary.To Json    ${get_resp.content}    pretty_print=True
+    ${respjson} =    RequestsLibrary.To Json    ${get_resp.text}    pretty_print=True
     BuiltIn.Log    ${respjson}
     BuiltIn.Should Be Equal As Strings    ${get_resp.status_code}    200
-    ${child-pool-name} =    BuiltIn.Should Match Regexp    ${get_resp.content}    ${pool-name}\.[-]?[0-9]+
+    ${child-pool-name} =    BuiltIn.Should Match Regexp    ${get_resp.text}    ${pool-name}\.[-]?[0-9]+
     BuiltIn.Log    ${child-pool-name}
     ${get_releasedIds} =    RequestsLibrary.Get Request    session    ${CONFIG_API}/id-manager:id-pools/id-pool/${child-pool-name}/released-ids-holder/
-    ${respjson} =    RequestsLibrary.To Json    ${get_releasedIds.content}    pretty_print=True
+    ${respjson} =    RequestsLibrary.To Json    ${get_releasedIds.text}    pretty_print=True
     BuiltIn.Log    ${respjson}
     Should Be Equal As Strings    ${get_releasedIds.status_code}    200
-    @{released_ids} =    re.Findall    <id>[0-9]+    ${get_releasedIds.content}
+    @{released_ids} =    re.Findall    <id>[0-9]+    ${get_releasedIds.text}
     BuiltIn.Log    ${released_ids}
 
 Delete the ID Pool using deleteIdPool RPC
@@ -97,5 +97,5 @@ get Id pool
     ${get_resp} =    RequestsLibrary.Get Request    session    ${CONFIG_API}/id-manager:id-pools/id-pool/${pool-name}/available-ids-holder/
     ${respjson} =    RequestsLibrary.To Json    ${get_resp.content}    pretty_print=True
     BuiltIn.Log    ${respjson}
-    BuiltIn.Should Contain    ${get_resp.content}    14
+    BuiltIn.Should Contain    ${get_resp.text}    14
     BuiltIn.Should Be Equal As Strings    ${get_resp.status_code}    200

diff --git a/csit/suites/genius/Interface_manager.robot b/csit/suites/genius/Interface_manager.robot
index 46037a26cc1f988bab2ce99051b7d2a05e6a86d1..f071a62e1a701221e425df287bd08baea7d3c73f 100644 (file)
--- a/csit/suites/genius/Interface_manager.robot
+++ b/csit/suites/genius/Interface_manager.robot
@@ -94,8 +94,8 @@ get operational interface
     ${respjson} =    RequestsLibrary.To Json    ${get_oper_resp.content}    pretty_print=True
     BuiltIn.Log    ${respjson}
     BuiltIn.Should Be Equal As Strings    ${get_oper_resp.status_code}    200
-    BuiltIn.Should Not Contain    ${get_oper_resp.content}    down
-    BuiltIn.Should Contain    ${get_oper_resp.content}    up    up
+    BuiltIn.Should Not Contain    ${get_oper_resp.text}    down
+    BuiltIn.Should Contain    ${get_oper_resp.text}    up    up
 
 table entry
     [Documentation]    Checks for tables entry wrt the service the Interface is binded.

diff --git a/csit/suites/genius/OF_Tunnels.robot b/csit/suites/genius/OF_Tunnels.robot
index 8508ec054d1968cac3f77b397ed5d48d7b235b29..837ec550930dc7380ab3764a5bc5b54f20c0a1f0 100644 (file)
--- a/csit/suites/genius/OF_Tunnels.robot
+++ b/csit/suites/genius/OF_Tunnels.robot
@@ -48,15 +48,15 @@ Create and Verify single OFT TEPs
     Collections.Remove From List    ${dpn_ids}    -1
     OFT Create Vteps using Auto Tunnels    @{tools_ips}
     OFT Verify Vteps Created    ${dpn_ids}    ${tools_ips}
-    OFT Create Vteps using Auto Tunnels    @{TOOLS_SYSTEM_ALL_IPS}[-1]
+    OFT Create Vteps using Auto Tunnels    ${TOOLS_SYSTEM_ALL_IPS}[-1]
     OFT Verify Vteps Created    ${DPN_ID_LIST}    ${TOOLS_SYSTEM_ALL_IPS}
 
 Delete and Verify single OFT TEPs
     [Documentation]    Delete single TEPs set to use OF based Tunnels and verify.
     CompareStream.Run_Keyword_If_Less_Than_Sodium    BuiltIn.Pass Execution    Test case valid only for versions Sodium and above
-    ${deleted_tools_ip_list} =    BuiltIn.Create List    @{TOOLS_SYSTEM_ALL_IPS}[0]
-    OFT Delete Vteps using Auto Tunnels    @{deleted_tools_ip_list}
-    ${deleted_dpn_id_list} =    BuiltIn.CreateList    @{DPN_ID_LIST}[0]
+    ${deleted_tools_ip_list} =    BuiltIn.Create List    ${TOOLS_SYSTEM_ALL_IPS}[0]
+    OFT Delete Vteps using Auto Tunnels    ${deleted_tools_ip_list}
+    ${deleted_dpn_id_list} =    BuiltIn.CreateList    ${DPN_ID_LIST}[0]
     OFT Verify Vteps Deleted    ${deleted_dpn_id_list}    ${deleted_tools_ip_list}
 
 *** Keywords ***
@@ -83,11 +83,11 @@ OFT Verify Vteps Created
     FOR    ${tools_system_index}    IN RANGE    ${tools_system_len}
         ${tun_ip_list} =    BuiltIn.CreateList    @{tools_ip_list}
         Collections.Remove From List    ${tun_ip_list}    ${tools_system_index}
-        ${ports_output} =    Utils.Run Command On Remote System And Log    @{tools_ip_list}[${tools_system_index}]    sudo ovs-ofctl -Oopenflow13 dump-ports-desc ${Bridge}
+        ${ports_output} =    Utils.Run Command On Remote System And Log    ${tools_ip_list}[${tools_system_index}]    sudo ovs-ofctl -Oopenflow13 dump-ports-desc ${Bridge}
         ${port_numbers} =    String.Get Regexp Matches    ${ports_output}    (\\d+).of.*    ${1}
-        BuiltIn.Wait Until Keyword Succeeds    40    10    OFT OVS Verify Ingress Flows Created per Switch    @{tools_ip_list}[${tools_system_index}]    ${tun_ip_list}
+        BuiltIn.Wait Until Keyword Succeeds    40    10    OFT OVS Verify Ingress Flows Created per Switch    ${tools_ip_list}[${tools_system_index}]    ${tun_ip_list}
         ...    ${port_numbers}
-        BuiltIn.Wait Until Keyword Succeeds    40    10    OFT OVS Verify Egress Flows Created per Switch    @{tools_ip_list}[${tools_system_index}]    ${tun_ip_list}
+        BuiltIn.Wait Until Keyword Succeeds    40    10    OFT OVS Verify Egress Flows Created per Switch    ${tools_ip_list}[${tools_system_index}]    ${tun_ip_list}
         ...    ${port_numbers}
     END
 
@@ -141,16 +141,16 @@ OFT Verify Vteps Deleted
     FOR    ${tools_system_index}    IN RANGE    ${deleted_tep_len}
         ${tep_show_state_output_1} =    KarafKeywords.Issue Command On Karaf Console    ${TEP_SHOW_STATE}
         BuiltIn.Should Not Contain    ${tep_show_output}    @{tools_ip_list}[${tools_system_index}]
-        BuiltIn.Should Not Contain    ${tep_show_state_output}    @{tools_ip_list}[${tools_system_index}]
+        BuiltIn.Should Not Contain    ${tep_show_state_output}    ${tools_ip_list}[${tools_system_index}]
         BuiltIn.Wait Until Keyword Succeeds    60    5    Utils.No Content From URI    session    ${CONFIG_API}/itm-state:dpn-endpoints/DPN-TEPs-info/@{dpn_id_list}[${tools_system_index}]/
         ${dst_dpn_id_list} =    BuiltIn.Create List    @{DPN_ID_LIST}
         Collections.Remove From List    ${dst_dpn_id_list}    ${tools_system_index}
         BuiltIn.Wait Until Keyword Succeeds    60    5    OFT Verify Vteps Deleted at Dpn Teps State per Interface    @{dpn_id_list}[${tools_system_index}]    ${dst_dpn_id_list}
-        ${ovs_vsctl_output} =    BuiltIn.Wait Until Keyword Succeeds    40    10    Utils.Run Command On Remote System And Log    @{tools_ip_list}[${tools_system_index}]
+        ${ovs_vsctl_output} =    BuiltIn.Wait Until Keyword Succeeds    40    10    Utils.Run Command On Remote System And Log    ${tools_ip_list}[${tools_system_index}]
         ...    sudo ovs-vsctl show
         BuiltIn.Should Not Contain    ${ovs_vsctl_output}    remote_ip=flow
-        BuiltIn.Wait Until Keyword Succeeds    40    10    OFT OVS Verify Ingress Flows Deleted per Switch    @{tools_ip_list}[${tools_system_index}]
-        BuiltIn.Wait Until Keyword Succeeds    40    10    OFT OVS Verify Egress Flows Deleted per Switch    @{tools_ip_list}[${tools_system_index}]
+        BuiltIn.Wait Until Keyword Succeeds    40    10    OFT OVS Verify Ingress Flows Deleted per Switch    ${tools_ip_list}[${tools_system_index}]
+        BuiltIn.Wait Until Keyword Succeeds    40    10    OFT OVS Verify Egress Flows Deleted per Switch    ${tools_ip_list}[${tools_system_index}]
     END
 
 OFT Verify Vteps Deleted at Dpn Teps State per Interface