X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=csit%2Fsuites%2Fopenflowplugin%2FPerformance_Flow_Config%2F040_Stats_Collection_One.robot;h=03b57c6279bc017f1ec65a39fa12e78d78b0e0c4;hb=HEAD;hp=9d309d5b43b431e990470a52c06c0cc716557b00;hpb=2a4da3ea5c8c2474e0c8ee3401187c0b5e0aafe8;p=integration%2Ftest.git

diff --git a/csit/suites/openflowplugin/Performance_Flow_Config/040_Stats_Collection_One.robot b/csit/suites/openflowplugin/Performance_Flow_Config/040_Stats_Collection_One.robot
index 9d309d5b43..03b57c6279 100644
--- a/csit/suites/openflowplugin/Performance_Flow_Config/040_Stats_Collection_One.robot
+++ b/csit/suites/openflowplugin/Performance_Flow_Config/040_Stats_Collection_One.robot
@@ -1,28 +1,35 @@
 *** Settings ***
-Documentation     Suite checks if StatMngr is able to collect flows if all are present on one switch in one table no matter how many switches are connecteded to the controller
-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 if all are present on one switch in one table no matter how many switches are connecteded to the controller
+
+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}       first
-${tabspread}      first
-${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}     first
+${tabspread}    first
+@{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,15 +46,15 @@ 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})
     Log    Starting mininet with ${swnr} switches
-    Open Connection    ${TOOLS_SYSTEM_IP}    prompt=${DEFAULT_LINUX_PROMPT}    timeout=600
+    Open Connection    ${TOOLS_SYSTEM_IP}    prompt=${TOOLS_SYSTEM_PROMPT}    timeout=600
     Login With Public Key    ${TOOLS_SYSTEM_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any
-    Write    sudo ovs-vsctl set-manager ptcp:6644
-    Write    sudo mn -c
-    Read Until    ${DEFAULT_LINUX_PROMPT}
+    Execute Command    sudo ovs-vsctl set-manager ptcp:6644
+    Execute Command    sudo mn -c
     Write    sudo mn --controller=remote,ip=${ODL_SYSTEM_IP} --topo linear,${swnr} --switch ovsk,protocols=OpenFlow13
     Read Until    mininet>
     Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
@@ -59,12 +66,12 @@ Stop Switches
     Delete All Sessions
     Read
     Write    exit
-    Read Until    ${DEFAULT_LINUX_PROMPT}
+    Read Until    ${TOOLS_SYSTEM_PROMPT}
     Close Connection
 
 Are Switches Connected Topo
     [Documentation]    Checks wheather switches are connected to controller
-    ${resp}=    Get    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}