Upgrade RF syntax for v3.2 compatibility

[integration/test.git] / csit / suites / openflowplugin / Inventory_Scalability_OF13 / 010__restconf_inventory.robot

diff --git a/csit/suites/openflowplugin/Inventory_Scalability_OF13/010__restconf_inventory.robot b/csit/suites/openflowplugin/Inventory_Scalability_OF13/010__restconf_inventory.robot
index 85a205abcdef97c665d2899a2072209be1f48da6..47ab13cea001a72ba8049f004e78c6d952dd33b4 100644 (file)
--- a/csit/suites/openflowplugin/Inventory_Scalability_OF13/010__restconf_inventory.robot
+++ b/csit/suites/openflowplugin/Inventory_Scalability_OF13/010__restconf_inventory.robot
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for RESTCONF inventory
-Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
+Suite Setup       Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
 Suite Teardown    Delete All Sessions
 Library           Collections
 Library           RequestsLibrary
@@ -21,7 +21,7 @@ Get list of nodes
 Get nodeconnector for the root node
     [Documentation]    Get the inventory for the root node
     ${TOPO_TREE_FANOUT}    Convert To Integer    ${TOPO_TREE_FANOUT}
-    ${resp}    RequestsLibrary.Get    session    ${REST_CONTEXT}/node/openflow:1
+    ${resp}    RequestsLibrary.Get Request    session    ${REST_CONTEXT}/node/openflow:1
     Log    ${resp.content}
     Should Be Equal As Strings    ${resp.status_code}    200
     Wait Until Keyword Succeeds    30s    2s    Check conn loop    ${TOPO_TREE_FANOUT}    1    ${resp.content}
@@ -43,29 +43,33 @@ Get Stats for a node
 *** Keywords ***
 Check Every Nodes
     [Arguments]    ${numnodes}
-    ${resp}    RequestsLibrary.Get    session    ${REST_CONTEXT}
+    ${resp}    RequestsLibrary.Get Request    session    ${REST_CONTEXT}
     Should Be Equal As Strings    ${resp.status_code}    200
-    : FOR    ${IND}    IN RANGE    1    ${numnodes+1}
-    \    Should Contain    ${resp.content}    openflow:${IND}
+    FOR    ${IND}    IN RANGE    1    ${numnodes+1}
+        Should Contain    ${resp.content}    openflow:${IND}
+    END
 
 Check Every Nodes Stats
     [Arguments]    ${numnodes}
-    : FOR    ${IND}    IN RANGE    1    ${numnodes+1}
-    \    ${resp}    RequestsLibrary.Get    session    ${REST_CONTEXT}/node/openflow:${IND}
-    \    Log    ${resp.content}
-    \    Should Be Equal As Strings    ${resp.status_code}    200
-    \    Should Contain    ${resp.content}    flow-capable-node-connector-statistics
-    \    Should Contain    ${resp.content}    flow-table-statistics
+    FOR    ${IND}    IN RANGE    1    ${numnodes+1}
+        ${resp}    RequestsLibrary.Get Request    session    ${REST_CONTEXT}/node/openflow:${IND}
+        Log    ${resp.content}
+        Should Be Equal As Strings    ${resp.status_code}    200
+        Should Contain    ${resp.content}    flow-capable-node-connector-statistics
+        Should Contain    ${resp.content}    flow-table-statistics
+    END
 
 Check Every Nodes Nodeconnector
     [Arguments]    ${numnodes}
-    : FOR    ${IND}    IN RANGE    2    ${numnodes+1}
-    \    ${resp}    RequestsLibrary.Get    session    ${REST_CONTEXT}/node/openflow:${IND}
-    \    Log    ${resp.content}
-    \    Should Be Equal As Strings    ${resp.status_code}    200
-    \    Check conn loop    ${TOPO_TREE_FANOUT+1}    ${IND}    ${resp.content}
+    FOR    ${IND}    IN RANGE    2    ${numnodes+1}
+        ${resp}    RequestsLibrary.Get Request    session    ${REST_CONTEXT}/node/openflow:${IND}
+        Log    ${resp.content}
+        Should Be Equal As Strings    ${resp.status_code}    200
+        Check conn loop    ${TOPO_TREE_FANOUT+1}    ${IND}    ${resp.content}
+    END
 
 Check conn loop
     [Arguments]    ${arg}    ${outerind}    ${content}
-    : FOR    ${var}    IN RANGE    1    ${arg+1}
-    \    Should Contain    ${content}    openflow:${outerind}:${var}
+    FOR    ${var}    IN RANGE    1    ${arg+1}
+        Should Contain    ${content}    openflow:${outerind}:${var}
+    END