Moved calls to "RequestLibrary.<action> Request" in csit/suites/ (2)

[integration/test.git] / csit / suites / lacp / Lacp_Feature_OF13 / 020__lacp_lag_resiliency.robot

diff --git a/csit/suites/lacp/Lacp_Feature_OF13/020__lacp_lag_resiliency.robot b/csit/suites/lacp/Lacp_Feature_OF13/020__lacp_lag_resiliency.robot
index 259c9d1d3bd73c139750c444ce5a6bfa605f29ed..cbc062d221ddc78480d465af25d033d85e66d2f0 100644 (file)
--- a/csit/suites/lacp/Lacp_Feature_OF13/020__lacp_lag_resiliency.robot
+++ b/csit/suites/lacp/Lacp_Feature_OF13/020__lacp_lag_resiliency.robot
@@ -51,6 +51,7 @@ Verify Switch(S1) Flow and Group tables data after H2 link up scenario
 
 *** Keywords ***
 Verify LACP RESTAPI Response Code for node
+    [Arguments]    ${resp}
     [Documentation]    Will check for the response code of the REST query
     Should Be Equal As Strings    ${resp.status_code}    200
     Should Contain    ${resp.content}    ${node1}
@@ -67,24 +68,24 @@ Verify LACP RESTAPI connector associated for aggregator
 
 Verify LACP aggregator data is updated post link down scenario
     [Documentation]    Functionality will verify the node conenctor data on the lacp-agg api after link down scenario
-    ${resp}    RequestsLibrary.Get    session    ${OPERATIONAL_NODES_API}/node/${node1}/lacp-aggregators/${agg-id2}
-    Verify LACP RESTAPI Response Code for node
+    ${resp}    RequestsLibrary.Get Request    session    ${OPERATIONAL_NODES_API}/node/${node1}/lacp-aggregators/${agg-id2}
+    Verify LACP RESTAPI Response Code for node    ${resp}
     Verify LACP RESTAPI connector associated for aggregator    ${resp.content}    ${node1}    ${agg2-connector-id1}
     Should not Contain    ${resp.content}    ${node1}:${agg2-connector-id2}
     Verify LACP RESTAPI Aggregator and Tag Contents    ${resp.content}    lag-groupid
 
 Verify LACP aggregator data is updated post link up scenario
     [Documentation]    Functionality will verify the node connector data on the lacp-agg api after link up scenario
-    ${resp}    RequestsLibrary.Get    session    ${OPERATIONAL_NODES_API}/node/${node1}/lacp-aggregators/${agg-id2}
-    Verify LACP RESTAPI Response Code for node
+    ${resp}    RequestsLibrary.Get Request    session    ${OPERATIONAL_NODES_API}/node/${node1}/lacp-aggregators/${agg-id2}
+    Verify LACP RESTAPI Response Code for node    ${resp}
     Verify LACP RESTAPI connector associated for aggregator    ${resp.content}    ${node1}    ${agg2-connector-id1}
     Verify LACP RESTAPI connector associated for aggregator    ${resp.content}    ${node1}    ${agg2-connector-id2}
     Verify LACP RESTAPI Aggregator and Tag Contents    ${resp.content}    lag-groupid
 
 Verify LACP Tags Are Formed
     [Documentation]    Fundamental Check That LACP is working
-    ${resp}    RequestsLibrary.Get    session    ${OPERATIONAL_NODES_API}
-    Verify LACP RESTAPI Response Code for node
+    ${resp}    RequestsLibrary.Get Request    session    ${OPERATIONAL_NODES_API}
+    Verify LACP RESTAPI Response Code for node    ${resp}
     Verify LACP RESTAPI Aggregator and Tag Contents    ${resp.content}    non-lag-groupid
     Verify LACP RESTAPI Aggregator and Tag Contents    ${resp.content}    lacp-aggregators
 
@@ -98,9 +99,9 @@ Set Host interface state
     [Documentation]    Will configure the port state of the Host to either up or down
     Open Connection    ${MININET}    prompt=${DEFAULT_LINUX_PROMPT}
     Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any
-    Execute Command    sudo ./m h2
-    Execute Command    sudo ifconfig ${port-id} ${port-state}
-    Execute Command    sudo ifconfig ${port-id}
+    Write    sudo ./m h2
+    Write    sudo ifconfig ${port-id}
+    Write    sudo ifconfig ${port-id} ${port-state}
 
 Verify Switch S1 Group Table
     [Arguments]    ${group-type}    ${port-id1}    ${port-id2}    ${port-id2-state}
@@ -111,5 +112,5 @@ Verify Switch S1 Group Table
     ${result}=    Get Lines Containing String    ${group_output}    output:${port-id1}
     Should Contain    ${result}    type=${group-type}
     Should Contain    ${result}    output:${port-id1}
-    Run Keyword If    "${port-id2-state}" == "up"    Should Contain    ${result}    output:${port-id2}    ELSE    Should not Contain
-    ...    ${result}    output:${port-id2}
+    Run Keyword If    "${port-id2-state}" == "up"    Should Contain    ${result}    output:${port-id2}
+    ...    ELSE    Should not Contain    ${result}    output:${port-id2}