Improve host discovery (IPv6) and link events verification methods in CHO test
- Add a less stressful ping method to replace IPv6 pingall when
discovering hosts
- Add retries when verifying link down/up events
- Fix some typos
Change-Id: I25f974b9b7c490282b4a822e5fddc7e167bb75a0
diff --git a/TestON/tests/CHOtest/CHOtest.params b/TestON/tests/CHOtest/CHOtest.params
index 1d15bf3..2062a4a 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,74,174,84,184,10,5,92,192,75,175,85,185,10,5]*50
+ # 1,20,3,47,147,[5,60,160,70,170,80,180,10,5,90,190,71,171,81,181,10]*20,200,21,3,48,148,[5,61,161,72,172,82,182,10,5,91,191,73,173,83,183,10]*20,200,22,3,49,149,[5,62,162,74,174,84,184,10,5,92,192,75,175,85,185,10]*20
# 1. Starts ONOS cluster with 5 nodes
# 20. Starts Att Topology
# 21. Starts Chordal Topology
@@ -18,7 +18,7 @@
# 19X. IPv6 ping across Point,Multi-single,Single-Multi Intents
<testcases>
-1,20,3,[48,5,60,70,80,10,5,90,71,81,10,5]*10,200,21,3,[47,5,61,72,82,10,5,91,73,83,10,5]*10,200,22,3,[42,5,62,74,84,10,5,92,75,85,10,5]*10
+1,20,3,47,147,[5,60,160,70,170,80,180,10,5,90,190,71,171,81,181,10]*10,200,21,3,48,148,[5,61,161,72,172,82,182,10,5,91,191,73,173,83,183,10]*10,200,22,3,49,149,[5,62,162,74,174,84,184,10,5,92,192,75,175,85,185,10]*10
</testcases>
<GIT>
@@ -36,7 +36,7 @@
<topo>topoAttIpv6.py</topo>
<numSwitches>25</numSwitches>
<numHosts>25</numHosts>
- <numLinks>114</numLinks>
+ <numLinks>112</numLinks>
<numPaths>1</numPaths>
</TOPO1>
@@ -90,10 +90,10 @@
<LinkDiscovery>15</LinkDiscovery>
<SwitchDiscovery>10</SwitchDiscovery>
<IntentPurgeDelay>15</IntentPurgeDelay>
- <CheckIntentDelay>8</CheckIntentDelay>
+ <CheckIntentDelay>15</CheckIntentDelay>
<topoCheckDelay>15</topoCheckDelay>
<pingSleep>3</pingSleep>
- <pingTimeout>1200</pingTimeout>
+ <pingTimeout>300</pingTimeout>
<remHostDelay>5</remHostDelay>
<remDevDelay>10</remDevDelay>
</timers>
@@ -102,6 +102,7 @@
<pauseTest>off</pauseTest>
<email>off</email>
<intentChecks>8</intentChecks>
+ <linkChecks>3</linkChecks>
<topoChecks>3</topoChecks>
<numPings>5</numPings>
</TEST>