Merge "Increased spine and torus params"
diff --git a/TestON/tests/CHOtest/CHOtest.params b/TestON/tests/CHOtest/CHOtest.params
index 875a727..ee1ab26 100644
--- a/TestON/tests/CHOtest/CHOtest.params
+++ b/TestON/tests/CHOtest/CHOtest.params
@@ -1,5 +1,5 @@
<PARAMS>
- # 1,20,3,[40,5,140,60,160,70,170,80,180,10,5,90,190,71,171,81,181,10,5]*50,21,3,[41,5,141,61,161,72,172,82,182,10,5,91,191,73,173,83,183,10,5]*50,22,3,[42,5,142,62,162,73,174,84,184,10,5,92,192,75,175,85,185,10,5]*50
+ # 1,20,3,[40,5,140,60,160,70,170,80,180,10,5,90,190,71,171,81,181,10,5]*50,21,3,[41,5,141,61,161,72,172,82,182,10,5,91,191,73,173,83,183,10,5]*50,22,3,[42,5,142,62,162,74,174,84,184,10,5,92,192,75,175,85,185,10,5]*50
# 1. Starts ONOS cluster with 5 nodes
# 20. Starts Att Topology
# 21. Starts Chordal Topology
@@ -87,8 +87,9 @@
</SPINECORELINKS>
<timers>
- <LinkDiscovery>10</LinkDiscovery>
+ <LinkDiscovery>15</LinkDiscovery>
<SwitchDiscovery>10</SwitchDiscovery>
+ <IntentPurgeDelay>15</IntentPurgeDelay>
</timers>
</PARAMS>
diff --git a/TestON/tests/CHOtest/CHOtest.py b/TestON/tests/CHOtest/CHOtest.py
index cfbef1f..c4713d0 100644
--- a/TestON/tests/CHOtest/CHOtest.py
+++ b/TestON/tests/CHOtest/CHOtest.py
@@ -2961,6 +2961,7 @@
main.log.report( "______________________________________________" )
main.log.info( "Remove all intents" )
main.case( "Removing intents" )
+ purgeDelay = int( main.params[ "timers" ][ "IntentPurgeDelay" ] )
main.step( "Obtain the intent id's first" )
intentsList = main.ONOScli1.getAllIntentIds()
ansi_escape = re.compile( r'\x1b[^m]*m' )
@@ -3030,7 +3031,7 @@
#time.sleep(2)
time2 = time.time()
main.log.info("Time for removing host intents: %2f seconds" %(time2-time1))
- time.sleep(10)
+ time.sleep( purgeDelay )
main.log.info("Purging WITHDRAWN Intents")
purgeResult = main.ONOScli1.purgeWithdrawnIntents()
else:
@@ -3038,7 +3039,7 @@
if len( main.ONOScli1.intents()):
continue
break
- time.sleep(10)
+ time.sleep( purgeDelay )
else:
print "Removed %d intents" %(intentsCount)
step1Result = main.TRUE