commit fe74417a62950b87a4b0b0a2d30a954d1c61ad07
author suibin zhang <suibin@onlab.us> Thu Jul 09 21:07:21 2015 +0000
committer Gerrit Code Review <gerrit@onlab.us> Thu Jul 09 21:07:21 2015 +0000
tree eeb4d8ea80c9b83f8e8e499c405e8a6102274041
parent 7f2c9cd755bc0b9106a68a5212f3be94b980a0fd
parent 946d99c4e31bd85db5f38b5200559d621c6cf863

Merge changes from topic 'devl/cam'

* changes:
  initial flow tp test
  added intent reroute test and relevant drivers

TestON/tests/SCPFintentEventTp/SCPFintentEventTp.params

diff --git a/TestON/tests/SCPFintentEventTp/SCPFintentEventTp.params b/TestON/tests/SCPFintentEventTp/SCPFintentEventTp.params
index 0e6bbfb..eefe54b 100644
--- a/TestON/tests/SCPFintentEventTp/SCPFintentEventTp.params
+++ b/TestON/tests/SCPFintentEventTp/SCPFintentEventTp.params
@@ -2,7 +2,7 @@
 
     <testcases>1,2,1,2,1,2,1,2,1,2,1,2,1,2</testcases>
     
-    <isOnBaremetal>True</isOnBaremetal>
+    <isOnBaremetal></isOnBaremetal>
     <debugMode></debugMode>  #nothing means false 
 
     <ENV>

TestON/tests/SCPFintentEventTp/SCPFintentEventTp.py

diff --git a/TestON/tests/SCPFintentEventTp/SCPFintentEventTp.py b/TestON/tests/SCPFintentEventTp/SCPFintentEventTp.py
index fa089d4..6fe4f73 100644
--- a/TestON/tests/SCPFintentEventTp/SCPFintentEventTp.py
+++ b/TestON/tests/SCPFintentEventTp/SCPFintentEventTp.py
@@ -9,7 +9,7 @@
 import time
 
 
-class SCPFintentEventTP:
+class SCPFintentEventTp:
 
     def __init__( self ):
         self.default = ''
@@ -105,7 +105,11 @@
         for i in range(maxNodes):
             main.log.info(" Uninstalling ONOS " + str(i) )
             main.ONOSbench.onosUninstall( ONOSIp[i] )
-       
+        main.log.info("Sleep 10 second for uninstall to settle...")
+        time.sleep(10)
+        main.ONOSbench.handle.sendline(" ")
+        main.ONOSbench.handle.expect(":~")
+        
         #construct the cell file
         main.log.info("Creating cell file")
         cellIp = []