cleaning up system variables

[integration/test.git] / csit / suites / tsdr / H2 / 050_GroupMetrics.robot

diff --git a/csit/suites/tsdr/H2/050_GroupMetrics.robot b/csit/suites/tsdr/H2/050_GroupMetrics.robot
index 6b62714821d4790f8c30498ba5373b7aa9fae1e3..a04322496e7bd654b174891ec66f13945297e85b 100644 (file)
--- a/csit/suites/tsdr/H2/050_GroupMetrics.robot
+++ b/csit/suites/tsdr/H2/050_GroupMetrics.robot
@@ -19,14 +19,14 @@ ${TSDR_FLOWGROUPSTATS}    tsdr:list FlowGroupStats
 Verify the FlowGroup Stats attributes exist thru Karaf console
     [Documentation]    Verify the FlowGroupStats attributes exist on Karaf Console
     Wait Until Keyword Succeeds    120s    1s    Verify the Metric is Collected?    ${TSDR_FLOWGROUPSTATS}    ByteCount
-    ${output}=    Issue Command On Karaf Console    ${TSDR_FLOWGROUPSTATS}    ${CONTROLLER}    ${KARAF_SHELL_PORT}    30
+    ${output}=    Issue Command On Karaf Console    ${TSDR_FLOWGROUPSTATS}    ${ODL_SYSTEM_IP}    ${KARAF_SHELL_PORT}    30
     : FOR    ${list}    IN    @{FLOWGROUP_METRICS}
     \    Should Contain    ${output}    ${list}
 
 Verification of FlowGroupStats-ByteCount on Karaf Console
     [Documentation]    Verify the FlowGroupStats has been updated thru tsdr:list command on karaf console
     ${tsdr_cmd}=    Concatenate the String    ${TSDR_FLOWGROUPSTATS}    | grep ByteCount | head
-    ${output}=    Issue Command On Karaf Console    ${tsdr_cmd}    ${CONTROLLER}    ${KARAF_SHELL_PORT}    90
+    ${output}=    Issue Command On Karaf Console    ${tsdr_cmd}    ${ODL_SYSTEM_IP}    ${KARAF_SHELL_PORT}    90
     Should Contain    ${output}    ByteCount
     Should Contain    ${output}    FLOWGROUPSTATS
     Should not Contain    ${output}    null
@@ -45,7 +45,7 @@ Start TSDR suite with CPqD Switch
 
 Configuration of FlowGroup on Switch
     [Documentation]    FlowGroup configuration on CPqD
-    Run Command On Remote System    ${MININET}    sudo dpctl unix:/tmp/s1 group-mod cmd=add,group=1,type=all
-    Run Command On Remote System    ${MININET}    sudo dpctl unix:/tmp/s1 flow-mod table=0,cmd=add eth_type=0x800,eth_src=00:01:02:03:04:05 apply:group=1
-    Run Command On Remote System    ${MININET}    sudo dpctl unix:/tmp/s1 ping 10
-    Run Command On Remote System    ${MININET}    sudo dpctl unix:/tmp/s2 ping 10
+    Run Command On Remote System    ${TOOLS_SYSTEM_IP}    sudo dpctl unix:/tmp/s1 group-mod cmd=add,group=1,type=all
+    Run Command On Remote System    ${TOOLS_SYSTEM_IP}    sudo dpctl unix:/tmp/s1 flow-mod table=0,cmd=add eth_type=0x800,eth_src=00:01:02:03:04:05 apply:group=1
+    Run Command On Remote System    ${TOOLS_SYSTEM_IP}    sudo dpctl unix:/tmp/s1 ping 10
+    Run Command On Remote System    ${TOOLS_SYSTEM_IP}    sudo dpctl unix:/tmp/s2 ping 10