commit 5a841cbdf1f1aee56b8a73e2f0bad3ea39b8e5d9
author YPZhang <yunpeng@onlab.us> Tue Mar 08 18:50:18 2016 +0000
committer Gerrit Code Review <gerrit@onlab.us> Tue Mar 08 18:50:18 2016 +0000
tree 161c8be8a9a70d85b4e1bc0ef096d075d53d9fb8
parent db645ed1505d1b0bc88ca192cbb9cba9149d4ce0
parent 47779c268a11fe7ddfc01055b4ec738d4adad9c8

Merge "Fix the flows number problem"

TestON/tests/HAclusterRestart/HAclusterRestart.py

diff --git a/TestON/tests/HAclusterRestart/HAclusterRestart.py b/TestON/tests/HAclusterRestart/HAclusterRestart.py
index 835633e..4e7ac23 100644
--- a/TestON/tests/HAclusterRestart/HAclusterRestart.py
+++ b/TestON/tests/HAclusterRestart/HAclusterRestart.py
@@ -1739,10 +1739,6 @@
         utilities.assert_equals( expect=main.TRUE, actual=killResults,
                                  onpass="ONOS nodes killed",
                                  onfail="ONOS kill unsuccessful" )
-        # FIXME: Remove once ONOS-4117 is fixed
-        time.sleep(1)
-        for node in main.nodes:
-            main.ONOSbench.onosStart( node.ip_address )
 
         main.step( "Checking if ONOS is up yet" )
         for i in range( 2 ):

TestON/tests/HAsingleInstanceRestart/HAsingleInstanceRestart.py

diff --git a/TestON/tests/HAsingleInstanceRestart/HAsingleInstanceRestart.py b/TestON/tests/HAsingleInstanceRestart/HAsingleInstanceRestart.py
index dda9b26..3ab5072 100644
--- a/TestON/tests/HAsingleInstanceRestart/HAsingleInstanceRestart.py
+++ b/TestON/tests/HAsingleInstanceRestart/HAsingleInstanceRestart.py
@@ -1200,9 +1200,6 @@
 
         main.step( "Killing ONOS processes" )
         killResult = main.ONOSbench.onosKill( main.nodes[0].ip_address )
-        # FIXME: Remove once ONOS-4117 is fixed
-        time.sleep(1)
-        main.ONOSbench.onosStart( main.nodes[0].ip_address )
         start = time.time()
         utilities.assert_equals( expect=main.TRUE, actual=killResult,
                                  onpass="ONOS Killed",

TestON/tests/USECASE_SegmentRouting/USECASE_SegmentRouting.params

diff --git a/TestON/tests/USECASE_SegmentRouting/USECASE_SegmentRouting.params b/TestON/tests/USECASE_SegmentRouting/USECASE_SegmentRouting.params
index 4803d8e..93c957f 100755
--- a/TestON/tests/USECASE_SegmentRouting/USECASE_SegmentRouting.params
+++ b/TestON/tests/USECASE_SegmentRouting/USECASE_SegmentRouting.params
@@ -16,6 +16,7 @@
     <ENV>
         <cellName>productionCell</cellName>
         <cellApps>drivers,openflow-base,netcfghostprovider,netcfglinksprovider,segmentrouting,vrouter,hostprovider</cellApps>
+        <cellUser>sdn</cellUser>
     </ENV>
 
     <GIT>

TestON/tests/USECASE_SegmentRouting/USECASE_SegmentRouting.py

diff --git a/TestON/tests/USECASE_SegmentRouting/USECASE_SegmentRouting.py b/TestON/tests/USECASE_SegmentRouting/USECASE_SegmentRouting.py
index 45ed07d..7ba0b30 100644
--- a/TestON/tests/USECASE_SegmentRouting/USECASE_SegmentRouting.py
+++ b/TestON/tests/USECASE_SegmentRouting/USECASE_SegmentRouting.py
@@ -119,12 +119,13 @@
         for i in range( main.numCtrls ):
             tempOnosIp.append( main.ONOSip[i] )
 
+        onosUser = main.params[ 'ENV' ][ 'cellUser' ]
         main.ONOSbench.createCellFile( main.ONOSbench.ip_address,
                                        "temp",
                                        main.Mininet1.ip_address,
                                        main.apps,
                                        tempOnosIp,
-                                       main.ONOSbench.user_name)
+                                       onosUser)
 
         main.step( "Apply cell to environment" )
         cellResult = main.ONOSbench.setCell( "temp" )