X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=csit%2Fsuites%2Fopenflowplugin%2FPerformance_Flow_Config%2F030_Stats_Collection_Linear.robot;h=b8947ed0805799abf49d1bf34db2d137a9d2e885;hb=HEAD;hp=48d052720924964b5a8bbe41550e0b5d9f6654b9;hpb=46f6e49aebf8d769a61cc825aebe2593a46144f7;p=integration%2Ftest.git

diff --git a/csit/suites/openflowplugin/Performance_Flow_Config/030_Stats_Collection_Linear.robot b/csit/suites/openflowplugin/Performance_Flow_Config/030_Stats_Collection_Linear.robot
index 48d0527209..b8947ed080 100644
--- a/csit/suites/openflowplugin/Performance_Flow_Config/030_Stats_Collection_Linear.robot
+++ b/csit/suites/openflowplugin/Performance_Flow_Config/030_Stats_Collection_Linear.robot
@@ -1,28 +1,35 @@
 *** Settings ***
-Documentation     Suite checks if StatMngr is able to collect flows with linear spread over the switches and linear spread over tables within the switch
-Suite Setup       Connect Switches
-Suite Teardown    Stop Switches
-Library           OperatingSystem
-Library           Collections
-Library           XML
-Library           SSHLibrary
-Variables         ../../../../csit/variables/Variables.py
-Library           RequestsLibrary
-Library           ../../../../csit/libraries/Common.py
-Library           ../../../../csit/libraries/ScaleClient.py
+Documentation       Suite checks if StatMngr is able to collect flows with linear spread over the switches and linear spread over tables within the switch
+
+Library             OperatingSystem
+Library             Collections
+Library             XML
+Library             SSHLibrary
+Library             RequestsLibrary
+Library             ../../../../csit/libraries/Common.py
+Library             ../../../../csit/libraries/ScaleClient.py
+Variables           ../../../../csit/variables/Variables.py
+Resource            ../../../../csit/variables/openflowplugin/Variables.robot
+
+Suite Setup         Connect Switches
+Suite Teardown      Stop Switches
+
 
 *** Variables ***
-${swnr}           17
-${flnr}           17000
-${swspread}       linear
-${tabspread}      linear
-${topourl}        /restconf/operational/network-topology:network-topology/topology/flow:1
-${invurl}         /restconf/operational/opendaylight-inventory:nodes
-@{cntls}          ${ODL_SYSTEM_IP}
+${swnr}         17
+${flnr}         17000
+${swspread}     linear
+${tabspread}    linear
+@{cntls}        ${ODL_SYSTEM_IP}
+
 
 *** Test Cases ***
 Configure Flows
-    ${flows}    ${notes}=    Generate New Flow Details    flows=${flnr}    switches=${swnr}    swspread=${swspread}    tabspread=${tabspread}
+    ${flows}    ${notes}=    Generate New Flow Details
+    ...    flows=${flnr}
+    ...    switches=${swnr}
+    ...    swspread=${swspread}
+    ...    tabspread=${tabspread}
     Log    ${notes}
     ${res}=    Configure Flows    flow_details=${flows}    controllers=@{cntls}    nrthreads=5
     Log    ${res}
@@ -39,6 +46,7 @@ Check No Flows In Operational
     ${noflows}=    Create List
     Wait Until Keyword Succeeds    110s    20s    Check Flows Inventory    ${noflows}    ${ODL_SYSTEM_IP}
 
+
 *** Keywords ***
 Connect Switches
     [Documentation]    Starts mininet with requested number of switches (${swnr})
@@ -63,7 +71,7 @@ Stop Switches
 
 Are Switches Connected Topo
     [Documentation]    Checks wheather switches are connected to controller
-    ${resp}=    Get Request    session    /restconf/operational/network-topology:network-topology/topology/flow:1    headers=${ACCEPT_XML}
+    ${resp}=    GET On Session    session    url=${RFC8040_OPERATIONAL_TOPO_FLOW1_API}    headers=${ACCEPT_XML}
     Log    ${resp.content}
     ${count}=    Get Element Count    ${resp.content}    xpath=node
     Should Be Equal As Numbers    ${count}    ${swnr}