X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=csit%2Fsuites%2Fopenflowplugin%2FPerformance_Flow_Config%2F060_Stats_Collection_Basic16kScenario.robot;h=3bd4e15766d7f4a3ac9fd022a98fe75bfb51fe9e;hb=HEAD;hp=0d90064ad234a0ae6e0ba4183f311f867f4f5d98;hpb=00773301bfc678e4139e5690f982735de3405fdc;p=integration%2Ftest.git

diff --git a/csit/suites/openflowplugin/Performance_Flow_Config/060_Stats_Collection_Basic16kScenario.robot b/csit/suites/openflowplugin/Performance_Flow_Config/060_Stats_Collection_Basic16kScenario.robot
index 0d90064ad2..3bd4e15766 100644
--- a/csit/suites/openflowplugin/Performance_Flow_Config/060_Stats_Collection_Basic16kScenario.robot
+++ b/csit/suites/openflowplugin/Performance_Flow_Config/060_Stats_Collection_Basic16kScenario.robot
@@ -1,23 +1,29 @@
 *** Settings ***
-Documentation     Suite checks if StatMngr is able to collect flows correctly
-Suite Setup       Create Http Session
-Suite Teardown    Delete Http Session
-Library           OperatingSystem
-Library           Collections
-Library           XML
-Library           SSHLibrary
-Variables         ../../../variables/Variables.py
-Library           RequestsLibrary
-Library           ../../../libraries/Common.py
-Library           ../../../libraries/ScaleClient.py
+Documentation       Suite checks if StatMngr is able to collect flows correctly
+
+Library             OperatingSystem
+Library             Collections
+Library             XML
+Library             SSHLibrary
+Variables           ../../../variables/Variables.py
+Library             RequestsLibrary
+Library             ../../../libraries/Common.py
+Library             ../../../libraries/ScaleClient.py
+Resource            ../../../variables/openflowplugin/Variables.robot
+
+Suite Setup         Create Http Session
+Suite Teardown      Delete Http Session
+
 
 *** Variables ***
-${swnr}           16
-${flnr}           16000
-${swspread}       linear
-${tabspread}      linear
-@{cntls}          ${ODL_SYSTEM_IP}
-${start_cmd}      sudo mn --controller=remote,ip=${ODL_SYSTEM_IP} --topo linear,${swnr} --switch ovsk,protocols=OpenFlow13
+${swnr}         16
+${flnr}         16000
+${swspread}     linear
+${tabspread}    linear
+@{cntls}        ${ODL_SYSTEM_IP}
+${start_cmd}
+...             sudo mn --controller=remote,ip=${ODL_SYSTEM_IP} --topo linear,${swnr} --switch ovsk,protocols=OpenFlow13
+
 
 *** Test Cases ***
 Connect Mininet
@@ -25,7 +31,11 @@ Connect Mininet
 
 Configure Flows
     [Documentation]    Configuration of 16k flows into config datastore
-    ${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}
@@ -83,11 +93,12 @@ Check No Flows In Operational Last
 Stop Mininet End
     Stop Switches
 
+
 *** 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
     Execute Command    sudo ovs-vsctl set-manager ptcp:6644
     Execute Command    sudo mn -c
@@ -103,7 +114,7 @@ Stop Switches
     Log    Stopping mininet
     Read
     Write    exit
-    Read Until    ${DEFAULT_LINUX_PROMPT}
+    Read Until    ${TOOLS_SYSTEM_PROMPT}
     Close Connection
 
 Delete Http Session
@@ -111,7 +122,7 @@ Delete Http Session
 
 Are Switches Connected Topo
     [Documentation]    Checks wheather switches are connected to controller
-    ${resp}=    Get Request    session    ${OPERATIONAL_TOPO_API}/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}
@@ -122,6 +133,6 @@ Check Flows Inventory
     Should Be True    ${res}
 
 Check No Switches Inventory
-    ${resp}=    Get Request    session    ${OPERATIONAL_NODES_API}
+    ${resp}=    GET On Session    session    ${RFC8040_OPERATIONAL_NODES_API}
     Log    ${resp.content}
     Should Be Equal As Strings    '${resp.content}'    '{"nodes":{}}'