Moved calls to "RequestLibrary.<action> Request" in suites/openflowplugin/

[integration/test.git] / csit / suites / openflowplugin / Groups_Meters_OF13 / 005__openflow_group.robot

diff --git a/csit/suites/openflowplugin/Groups_Meters_OF13/005__openflow_group.robot b/csit/suites/openflowplugin/Groups_Meters_OF13/005__openflow_group.robot
index 31fce03fe405fa4e68ca4d776dae5a29aa2722a2..ca767746c0b422ac2bf999aea1cefa1f8fac5f60 100644 (file)
--- a/csit/suites/openflowplugin/Groups_Meters_OF13/005__openflow_group.robot
+++ b/csit/suites/openflowplugin/Groups_Meters_OF13/005__openflow_group.robot
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for OpenFlow group
-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           SSHLibrary
 Library           Collections
@@ -30,20 +30,21 @@ Add a group
     [Tags]    Push
     ${body}    OperatingSystem.Get File    ${GROUP}
     Set Suite Variable    ${body}
-    ${resp}    RequestsLibrary.Put    session    ${REST_CONTEXT_CF}/group/1    headers=${HEADERS_XML}    data=${body}
+    ${resp}    RequestsLibrary.Put Request    session    ${REST_CONTEXT_CF}/group/1    headers=${HEADERS_XML}    data=${body}
     Log    ${resp.content}
     Should Be Equal As Strings    ${resp.status_code}    200
 
 Verify after adding group config
     [Documentation]    Get the group stat in config
-    ${resp}    RequestsLibrary.Get    session    ${REST_CONTEXT_CF}/group/1
+    ${resp}    RequestsLibrary.Get Request    session    ${REST_CONTEXT_CF}/group/1
     Log    ${resp.content}
     Should Be Equal As Strings    ${resp.status_code}    200
     Should Contain    ${resp.content}    ${GROUP_NAME}
 
 Verify after adding group operational
     [Documentation]    Get the group stat in operational
-    ${elements}=    Create List    group-statistics    ref-count    packet-count    byte-count    buckets    weight    group-select
+    ${elements}=    Create List    group-statistics    ref-count    packet-count    byte-count    buckets
+    ...    weight    group-select
     Wait Until Keyword Succeeds    6s    2s    Check For Elements At URI    ${REST_CONTEXT_OP}/group/1    ${elements}
 
 Add a flow that includes a group
@@ -51,14 +52,14 @@ Add a flow that includes a group
     [Tags]    Push
     ${body}    OperatingSystem.Get File    ${FLOW}
     Set Suite Variable    ${body}
-    ${resp}    RequestsLibrary.Put    session    ${REST_CONTEXT_CF}/table/0/flow/1    headers=${HEADERS_XML}    data=${body}
+    ${resp}    RequestsLibrary.Put Request    session    ${REST_CONTEXT_CF}/table/0/flow/1    headers=${HEADERS_XML}    data=${body}
     Log    ${resp.content}
     Should Be Equal As Strings    ${resp.status_code}    200
 
 Verify after adding flow config
     [Documentation]    Verify the flow
     [Tags]    Get
-    ${resp}    RequestsLibrary.Get    session    ${REST_CONTEXT_CF}/table/0/flow/1
+    ${resp}    RequestsLibrary.Get Request    session    ${REST_CONTEXT_CF}/table/0/flow/1
     Log    ${resp.content}
     Should Be Equal As Strings    ${resp.status_code}    200
     Should Contain    ${resp.content}    ${FLOW_NAME}
@@ -70,24 +71,24 @@ Verify after adding flow operational
 
 Remove the flow
     [Documentation]    Remove the flow
-    ${resp}    RequestsLibrary.Delete    session    ${REST_CONTEXT_CF}/table/0/flow/1
+    ${resp}    RequestsLibrary.Delete Request    session    ${REST_CONTEXT_CF}/table/0/flow/1
     Should Be Equal As Strings    ${resp.status_code}    200
 
 Verify after deleting flow
     [Documentation]    Verify the flow removal
     [Tags]    Get
-    ${resp}    RequestsLibrary.Get    session    ${REST_CONTEXT_CF}/table/0/flow/1
+    ${resp}    RequestsLibrary.Get Request    session    ${REST_CONTEXT_CF}/table/0/flow/1
     Should Not Contain    ${resp.content}    ${FLOW_NAME}
 
 Delete the group
     [Documentation]    Remove the group
     [Tags]    Delete
-    ${resp}    RequestsLibrary.Delete    session    ${REST_CONTEXT_CF}/group/1
+    ${resp}    RequestsLibrary.Delete Request    session    ${REST_CONTEXT_CF}/group/1
     Log    ${resp.content}
     Should Be Equal As Strings    ${resp.status_code}    200
 
 Verify after deleting group
     [Documentation]    Verify the flow removal
     [Tags]    Get
-    ${resp}    RequestsLibrary.Get    session    ${REST_CONTEXT_CF}/group/1
+    ${resp}    RequestsLibrary.Get Request    session    ${REST_CONTEXT_CF}/group/1
     Should Not Contain    ${resp.content}    ${GROUP_NAME}