X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=csit%2Fsuites%2Fopenflowplugin%2FGroups_Meters_OF13%2F010__openflow_meter.robot;h=9b21516ffd0e4992adcec529306a687ae626ff47;hb=HEAD;hp=0726eac85d0f0945223b6b33017ea65e3e1d6199;hpb=3a464941f84541fb3193c92cff6b8c5fcf80808f;p=integration%2Ftest.git

diff --git a/csit/suites/openflowplugin/Groups_Meters_OF13/010__openflow_meter.robot b/csit/suites/openflowplugin/Groups_Meters_OF13/010__openflow_meter.robot
index 0726eac85d..9b21516ffd 100644
--- a/csit/suites/openflowplugin/Groups_Meters_OF13/010__openflow_meter.robot
+++ b/csit/suites/openflowplugin/Groups_Meters_OF13/010__openflow_meter.robot
@@ -1,94 +1,125 @@
 *** Settings ***
-Documentation     Test suite for OpenFlow meter
-Suite Setup       Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
-Suite Teardown    Delete All Sessions
-Library           SSHLibrary
-Library           Collections
-Library           OperatingSystem
-Library           RequestsLibrary
-Library           ../../../libraries/Common.py
-Variables         ../../../variables/Variables.py
-Resource          ../../../libraries/Utils.robot
+Documentation       Test suite for OpenFlow meter
+
+Library             SSHLibrary
+Library             Collections
+Library             OperatingSystem
+Library             RequestsLibrary
+Library             ../../../libraries/Common.py
+Variables           ../../../variables/Variables.py
+Resource            ../../../variables/openflowplugin/Variables.robot
+Resource            ../../../libraries/Utils.robot
+
+Suite Setup         Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
+Suite Teardown      Delete All Sessions
+
 
 *** 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
-${METER}          ${CURDIR}/../../../variables/xmls/m4.xml
-${FLOW}           ${CURDIR}/../../../variables/xmls/f51.xml
-${METER_NAME}     Foo
-${FLOW_NAME}      forward
+${REST_CONTEXT}     ${RFC8040_NODES_API}/node=openflow%3A1
+${METER}            ${CURDIR}/../../../variables/xmls/m4.xml
+${FLOW}             ${CURDIR}/../../../variables/xmls/f51.xml
+${METER_NAME}       Foo
+${FLOW_NAME}        forward
+
 
 *** Test Cases ***
 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    3s    1s    Check For Elements At URI    ${REST_CONTEXT_OP}    ${node_list}
+    ${node_list}    Create List    openflow:1
+    Wait Until Keyword Succeeds
+    ...    3s
+    ...    1s
+    ...    Check For Elements At URI
+    ...    ${REST_CONTEXT}?${RFC8040_OPERATIONAL_CONTENT}
+    ...    ${node_list}
 
 Add a meter
     [Documentation]    Add a meter using RESTCONF
-    [Tags]    Push
+    [Tags]    push
     ${body}    OperatingSystem.Get File    ${METER}
     Set Suite Variable    ${body}
-    ${resp}    RequestsLibrary.Put Request    session    ${REST_CONTEXT_CF}/meter/1    headers=${HEADERS_XML}    data=${body}
+    ${resp}    RequestsLibrary.PUT On Session
+    ...    session
+    ...    url=${REST_CONTEXT}/meter=1
+    ...    headers=${HEADERS_XML}
+    ...    data=${body}
     Log    ${resp.content}
-    BuiltIn.Should_Match    "${resp.status_code}"    "20?"
 
 Verify after adding meter config
     [Documentation]    Get the meter stat in config
-    ${resp}    RequestsLibrary.Get Request    session    ${REST_CONTEXT_CF}/meter/1
+    ${resp}    RequestsLibrary.GET On Session
+    ...    session
+    ...    url=${REST_CONTEXT}/meter=1?${RFC8040_CONFIG_CONTENT}
+    ...    expected_status=200
     Log    ${resp.content}
-    Should Be Equal As Strings    ${resp.status_code}    200
     Should Contain    ${resp.content}    ${METER_NAME}
 
 Verify after adding meter operational
     [Documentation]    Get the meter stat in operational
-    ${elements}=    Create List    meter-statistics    meter-kbps    flow-count    packet-in-count    byte-in-count
+    ${elements}    Create List    meter-statistics    meter-kbps    flow-count    packet-in-count    byte-in-count
     ...    meter-band-stats    meter-band-headers
-    Wait Until Keyword Succeeds    6s    2s    Check For Elements At URI    ${REST_CONTEXT_OP}/meter/1    ${elements}
+    Wait Until Keyword Succeeds
+    ...    6s
+    ...    2s
+    ...    Check For Elements At URI
+    ...    ${REST_CONTEXT}/meter=1?${RFC8040_OPERATIONAL_CONTENT}
+    ...    ${elements}
 
 Add a flow that includes a meter
     [Documentation]    Push a flow through RESTCONF
-    [Tags]    Push
+    [Tags]    push
     ${body}    OperatingSystem.Get File    ${FLOW}
     Set Suite Variable    ${body}
-    ${resp}    RequestsLibrary.Put Request    session    ${REST_CONTEXT_CF}/table/0/flow/2    headers=${HEADERS_XML}    data=${body}
+    ${resp}    RequestsLibrary.PUT On Session
+    ...    session
+    ...    url=${REST_CONTEXT}/flow-node-inventory:table=0/flow=2
+    ...    headers=${HEADERS_XML}
+    ...    data=${body}
     Log    ${resp.content}
-    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/2
+    [Tags]    get
+    ${resp}    RequestsLibrary.GET On Session
+    ...    session
+    ...    url=${REST_CONTEXT}/flow-node-inventory:table=0/flow=2?${RFC8040_CONFIG_CONTENT}
+    ...    expected_status=200
     Log    ${resp.content}
-    Should Be Equal As Strings    ${resp.status_code}    200
     Should Contain    ${resp.content}    ${FLOW_NAME}
 
 Verify after adding flow operational
     [Documentation]    Verify the flow
-    ${elements}=    Create List    meter-id    flow
-    Wait Until Keyword Succeeds    6s    2s    Check For Elements At URI    ${REST_CONTEXT_OP}/table/0/flow/2    ${elements}
+    ${elements}    Create List    meter-id    flow
+    Wait Until Keyword Succeeds
+    ...    6s
+    ...    2s
+    ...    Check For Elements At URI
+    ...    ${REST_CONTEXT}/flow-node-inventory:table=0/flow=2?${RFC8040_OPERATIONAL_CONTENT}
+    ...    ${elements}
 
 Remove the flow
     [Documentation]    Remove the flow
-    ${resp}    RequestsLibrary.Delete Request    session    ${REST_CONTEXT_CF}/table/0/flow/2
-    Should Be Equal As Strings    ${resp.status_code}    200
+    ${resp}    RequestsLibrary.DELETE On Session
+    ...    session
+    ...    url=${REST_CONTEXT}/flow-node-inventory:table=0/flow=2
+    ...    expected_status=200
 
 Verify after deleting flow
     [Documentation]    Verify the flow removal
-    [Tags]    Get
-    ${resp}    RequestsLibrary.Get Request    session    ${REST_CONTEXT_CF}/table/0/flow/2
+    [Tags]    get
+    ${resp}    RequestsLibrary.GET On Session
+    ...    session
+    ...    url=${REST_CONTEXT}/flow-node-inventory:table=0/flow=2?${RFC8040_CONFIG_CONTENT}
     Should Not Contain    ${resp.content}    ${FLOW_NAME}
 
 Delete the meter
     [Documentation]    Remove the meter
-    [Tags]    Delete
-    ${resp}    RequestsLibrary.Delete Request    session    ${REST_CONTEXT_CF}/meter/1
+    [Tags]    delete
+    ${resp}    RequestsLibrary.DELETE On Session    session    url=${REST_CONTEXT}/meter=1    expected_status=200
     Log    ${resp.content}
-    Should Be Equal As Strings    ${resp.status_code}    200
 
 Verify after deleting meter
     [Documentation]    Verify the flow removal
-    [Tags]    Get
-    ${resp}    RequestsLibrary.Get Request    session    ${REST_CONTEXT_CF}/meter/1
+    [Tags]    get
+    ${resp}    RequestsLibrary.GET On Session    session    url=${REST_CONTEXT}/meter=1?${RFC8040_CONFIG_CONTENT}
     Should Not Contain    ${resp.content}    ${METER_NAME}