X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=csit%2Fsuites%2Fopenflowplugin%2FGroups_Meters_OF13%2F005__openflow_group.robot;h=4aa018909677c07e0f3beea01906cf67018baeed;hb=a24488972a386c12e4c49ec883ef60974a019ed3;hp=3f20fd1b603d1aa652a9302ac9c66eddbea1385a;hpb=e49e98166315944e6e39d28bd9596f8627d3787c;p=integration%2Ftest.git

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 3f20fd1b60..4aa0189096 100644
--- a/csit/suites/openflowplugin/Groups_Meters_OF13/005__openflow_group.robot
+++ b/csit/suites/openflowplugin/Groups_Meters_OF13/005__openflow_group.robot
@@ -8,12 +8,11 @@ Library           OperatingSystem
 Library           RequestsLibrary
 Library           ../../../libraries/Common.py
 Variables         ../../../variables/Variables.py
+Resource          ../../../variables/openflowplugin/Variables.robot
 Resource          ../../../libraries/Utils.robot
 
 *** Variables ***
-${REST_CONTEXT}    /restconf/operational/opendaylight-inventory:nodes/
-${REST_CONTEXT_CF}    /restconf/config/opendaylight-inventory:nodes/node/openflow:1
-${REST_CONTEXT_OP}    /restconf/operational/opendaylight-inventory:nodes/node/openflow:1
+${REST_CONTEXT}    ${RFC8040_NODES_API}/node=openflow%3A1
 ${GROUP}          ${CURDIR}/../../../variables/xmls/g4.xml
 ${FLOW}           ${CURDIR}/../../../variables/xmls/f50.xml
 ${GROUP_NAME}     Foo
@@ -23,20 +22,20 @@ ${FLOW_NAME}      forward
 Get list of nodes
     [Documentation]    Get the inventory to make sure openflow:1 comes up
     ${node_list}=    Create List    openflow:1
-    Wait Until Keyword Succeeds    60s    1s    Check For Elements At URI    ${REST_CONTEXT_OP}    ${node_list}
+    Wait Until Keyword Succeeds    90s    1s    Check For Elements At URI    ${REST_CONTEXT}?${RFC8040_OPERATIONAL_CONTENT}    ${node_list}
 
 Add a group
     [Documentation]    Add a group using RESTCONF
     [Tags]    Push
     ${body}    OperatingSystem.Get File    ${GROUP}
     Set Suite Variable    ${body}
-    ${resp}    RequestsLibrary.Put Request    session    ${REST_CONTEXT_CF}/group/1    headers=${HEADERS_XML}    data=${body}
+    ${resp}    RequestsLibrary.Put Request    session    ${REST_CONTEXT}/group=1    headers=${HEADERS_XML}    data=${body}
     Log    ${resp.content}
-    Should Be Equal As Strings    ${resp.status_code}    200
+    BuiltIn.Should_Match    "${resp.status_code}"    "20?"
 
 Verify after adding group config
     [Documentation]    Get the group stat in config
-    ${resp}    RequestsLibrary.Get Request    session    ${REST_CONTEXT_CF}/group/1
+    ${resp}    RequestsLibrary.Get Request    session    ${REST_CONTEXT}/group=1?${RFC8040_CONFIG_CONTENT}
     Log    ${resp.content}
     Should Be Equal As Strings    ${resp.status_code}    200
     Should Contain    ${resp.content}    ${GROUP_NAME}
@@ -45,21 +44,21 @@ 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
-    Wait Until Keyword Succeeds    6s    2s    Check For Elements At URI    ${REST_CONTEXT_OP}/group/1    ${elements}
+    Wait Until Keyword Succeeds    6s    2s    Check For Elements At URI    ${REST_CONTEXT}/group=1?${RFC8040_OPERATIONAL_CONTENT}    ${elements}
 
 Add a flow that includes a group
     [Documentation]    Push a flow through RESTCONF
     [Tags]    Push
     ${body}    OperatingSystem.Get File    ${FLOW}
     Set Suite Variable    ${body}
-    ${resp}    RequestsLibrary.Put Request    session    ${REST_CONTEXT_CF}/table/0/flow/1    headers=${HEADERS_XML}    data=${body}
+    ${resp}    RequestsLibrary.Put Request    session    ${REST_CONTEXT}/table=0/flow=1    headers=${HEADERS_XML}    data=${body}
     Log    ${resp.content}
-    Should Be Equal As Strings    ${resp.status_code}    200
+    BuiltIn.Should_Match    "${resp.status_code}"    "20?"
 
 Verify after adding flow config
     [Documentation]    Verify the flow
     [Tags]    Get
-    ${resp}    RequestsLibrary.Get Request    session    ${REST_CONTEXT_CF}/table/0/flow/1
+    ${resp}    RequestsLibrary.Get Request    session    ${REST_CONTEXT}/table=0/flow=1?${RFC8040_CONFIG_CONTENT}
     Log    ${resp.content}
     Should Be Equal As Strings    ${resp.status_code}    200
     Should Contain    ${resp.content}    ${FLOW_NAME}
@@ -67,28 +66,28 @@ Verify after adding flow config
 Verify after adding flow operational
     [Documentation]    Verify the flow
     ${elements}=    Create List    group-action    group-id
-    Wait Until Keyword Succeeds    6s    2s    Check For Elements At URI    ${REST_CONTEXT_OP}/table/0/flow/1    ${elements}
+    Wait Until Keyword Succeeds    6s    2s    Check For Elements At URI    ${REST_CONTEXT}/table=0/flow=1?${RFC8040_OPERATIONAL_CONTENT}    ${elements}
 
 Remove the flow
     [Documentation]    Remove the flow
-    ${resp}    RequestsLibrary.Delete Request    session    ${REST_CONTEXT_CF}/table/0/flow/1
+    ${resp}    RequestsLibrary.Delete Request    session    ${REST_CONTEXT}/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 Request    session    ${REST_CONTEXT_CF}/table/0/flow/1
+    ${resp}    RequestsLibrary.Get Request    session    ${REST_CONTEXT}/table=0/flow=1?${RFC8040_CONFIG_CONTENT}
     Should Not Contain    ${resp.content}    ${FLOW_NAME}
 
 Delete the group
     [Documentation]    Remove the group
     [Tags]    Delete
-    ${resp}    RequestsLibrary.Delete Request    session    ${REST_CONTEXT_CF}/group/1
+    ${resp}    RequestsLibrary.Delete Request    session    ${REST_CONTEXT}/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 Request    session    ${REST_CONTEXT_CF}/group/1
+    ${resp}    RequestsLibrary.Get Request    session    ${REST_CONTEXT}/group=1?${RFC8040_CONFIG_CONTENT}
     Should Not Contain    ${resp.content}    ${GROUP_NAME}