Merge "Clean up ONOS REST driver"
diff --git a/TestON/tests/CHOtest/CHOtest.params b/TestON/tests/CHOtest/CHOtest.params
index 1efb9bd..965e297 100644
--- a/TestON/tests/CHOtest/CHOtest.params
+++ b/TestON/tests/CHOtest/CHOtest.params
@@ -18,7 +18,7 @@
# 19X. IPv6 ping across Point,Multi-single,Single-Multi Intents
<testcases>
-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,[40,5,140,60,160,70,170,80,180,10,5,90,190,71,171,81,181,10,5]*10,21,3,[41,5,141,61,161,72,172,82,182,10,5,91,191,73,173,83,183,10,5]*10,22,3,[42,5,142,62,162,74,174,84,184,10,5,92,192,75,175,85,185,10,5]*10
</testcases>
<GIT>
@@ -90,7 +90,13 @@
<LinkDiscovery>15</LinkDiscovery>
<SwitchDiscovery>10</SwitchDiscovery>
<IntentPurgeDelay>15</IntentPurgeDelay>
- <CheckIntentDelay>5</CheckIntentDelay>
+ <CheckIntentDelay>8</CheckIntentDelay>
</timers>
+ <TEST>
+ <pause_test>on</pause_test>
+ <email>off</email>
+ <intent_check>8</intent_check>
+ </TEST>
+
</PARAMS>
diff --git a/TestON/tests/CHOtest/CHOtest.py b/TestON/tests/CHOtest/CHOtest.py
index ffc67eb..2a0ac6b 100644
--- a/TestON/tests/CHOtest/CHOtest.py
+++ b/TestON/tests/CHOtest/CHOtest.py
@@ -33,9 +33,15 @@
git_branch = main.params[ 'GIT' ][ 'branch' ]
karafTimeout = main.params['CTRL']['karafCliTimeout']
main.checkIntentsDelay = int( main.params['timers']['CheckIntentDelay'] )
+ main.failSwitch = main.params['TEST']['pause_test']
+ main.emailOnStop = main.params['TEST']['email']
+ main.intentCheck = int( main.params['TEST']['intent_check'] )
main.newTopo = ""
main.CLIs = []
+ main.failSwitch = True if main.failSwitch == "on" else False
+ main.emailOnStop = True if main.emailOnStop == "on" else False
+
for i in range( 1, int(main.numCtrls) + 1 ):
main.CLIs.append( getattr( main, 'ONOScli' + str( i ) ) )
@@ -283,11 +289,11 @@
# giving some breathing time for ONOS to complete re-balance
time.sleep( 5 )
- case21Result = switch_mastership
+ caseResult = switch_mastership
time.sleep(30)
utilities.assert_equals(
expect=main.TRUE,
- actual=case21Result,
+ actual=caseResult,
onpass="Starting new Chordal topology test PASS",
onfail="Starting new Chordal topology test FAIL" )
@@ -350,11 +356,11 @@
# giving some breathing time for ONOS to complete re-balance
time.sleep( 3 )
- case22Result = switch_mastership
+ caseResult = switch_mastership
time.sleep(60)
utilities.assert_equals(
expect=main.TRUE,
- actual=case22Result,
+ actual=caseResult,
onpass="Starting new Spine topology test PASS",
onfail="Starting new Spine topology test FAIL" )
@@ -526,8 +532,8 @@
else:
main.log.report( "IPv4 Pingall Test in Reactive mode failed" )
- case40Result = appCheck and pingResult
- utilities.assert_equals( expect=main.TRUE, actual=case40Result,
+ caseResult = appCheck and pingResult
+ utilities.assert_equals( expect=main.TRUE, actual=caseResult,
onpass="Reactive Mode IPv4 Pingall test PASS",
onfail="Reactive Mode IPv4 Pingall test FAIL" )
@@ -585,8 +591,8 @@
else:
main.log.report( "IPv4 Pingall Test in Reactive mode failed" )
- case41Result = appCheck and pingResult
- utilities.assert_equals( expect=main.TRUE, actual=case41Result,
+ caseResult = appCheck and pingResult
+ utilities.assert_equals( expect=main.TRUE, actual=caseResult,
onpass="Reactive Mode IPv4 Pingall test PASS",
onfail="Reactive Mode IPv4 Pingall test FAIL" )
@@ -644,8 +650,8 @@
else:
main.log.report( "IPv4 Pingall Test in Reactive mode failed" )
- case42Result = appCheck and pingResult
- utilities.assert_equals( expect=main.TRUE, actual=case42Result,
+ caseResult = appCheck and pingResult
+ utilities.assert_equals( expect=main.TRUE, actual=caseResult,
onpass="Reactive Mode IPv4 Pingall test PASS",
onfail="Reactive Mode IPv4 Pingall test FAIL" )
@@ -713,8 +719,8 @@
# Waiting for reative flows to be cleared.
time.sleep( 30 )
- case140Result = appCheck and cfgResult and pingResult
- utilities.assert_equals( expect=main.TRUE, actual=case140Result,
+ caseResult = appCheck and cfgResult and pingResult
+ utilities.assert_equals( expect=main.TRUE, actual=caseResult,
onpass="Reactive Mode IPv6 Pingall test PASS",
onfail="Reactive Mode IPv6 Pingall test FAIL" )
@@ -782,8 +788,8 @@
# Waiting for reative flows to be cleared.
time.sleep( 30 )
- case140Result = appCheck and cfgResult and pingResult
- utilities.assert_equals( expect=main.TRUE, actual=case140Result,
+ caseResult = appCheck and cfgResult and pingResult
+ utilities.assert_equals( expect=main.TRUE, actual=caseResult,
onpass="Reactive Mode IPv6 Pingall test PASS",
onfail="Reactive Mode IPv6 Pingall test FAIL" )
@@ -851,8 +857,8 @@
# Waiting for reative flows to be cleared.
time.sleep( 30 )
- case142Result = appCheck and cfgResult and pingResult
- utilities.assert_equals( expect=main.TRUE, actual=case142Result,
+ caseResult = appCheck and cfgResult and pingResult
+ utilities.assert_equals( expect=main.TRUE, actual=caseResult,
onpass="Reactive Mode IPv6 Pingall test PASS",
onfail="Reactive Mode IPv6 Pingall test FAIL" )
@@ -994,8 +1000,8 @@
main.step("Verify intents are installed")
- # Giving onos 3 chances to install intents
- for i in range(3):
+ # Giving onos multiple chances to install intents
+ for i in range( main.intentCheck ):
if i != 0:
main.log.warn( "Verification failed. Retrying..." )
main.log.info("Waiting for onos to install intents...")
@@ -1037,10 +1043,10 @@
onpass="PING ALL PASS",
onfail="PING ALL FAIL" )
- case60Result = ( intentState and pingResult )
+ caseResult = ( intentState and pingResult )
utilities.assert_equals(
expect=main.TRUE,
- actual=case60Result,
+ actual=caseResult,
onpass="Install 300 Host Intents and Ping All test PASS",
onfail="Install 300 Host Intents and Ping All test FAIL" )
@@ -1049,6 +1055,10 @@
if not pingResult:
main.log.debug( "Pingall failed" )
+ if not caseResult and main.failSwitch:
+ main.log.report("Stopping test")
+ main.stop( email=main.emailOnStop )
+
def CASE61( self ):
"""
Install 600 host intents and verify ping all for Chordal Topology
@@ -1089,8 +1099,8 @@
main.step("Verify intents are installed")
- # Giving onos 3 chances to install intents
- for i in range(3):
+ # Giving onos multiple chances to install intents
+ for i in range( main.intentCheck ):
if i != 0:
main.log.warn( "Verification failed. Retrying..." )
main.log.info("Waiting for onos to install intents...")
@@ -1131,11 +1141,11 @@
onpass="PING ALL PASS",
onfail="PING ALL FAIL" )
- case14Result = ( intentState and pingResult )
+ caseResult = ( intentState and pingResult )
utilities.assert_equals(
expect=main.TRUE,
- actual=case14Result,
+ actual=caseResult,
onpass="Install 300 Host Intents and Ping All test PASS",
onfail="Install 300 Host Intents and Ping All test FAIL" )
@@ -1144,6 +1154,10 @@
if not pingResult:
main.log.debug( "Pingall failed" )
+ if not caseResult and main.failSwitch:
+ main.log.report("Stopping test")
+ main.stop( email=main.emailOnStop )
+
def CASE62( self ):
"""
Install 2278 host intents and verify ping all for Spine Topology
@@ -1183,8 +1197,8 @@
main.step("Verify intents are installed")
- # Giving onos 3 chances to install intents
- for i in range(3):
+ # Giving onos multiple chances to install intents
+ for i in range( main.intentCheck ):
if i != 0:
main.log.warn( "Verification failed. Retrying..." )
main.log.info("Waiting for onos to install intents...")
@@ -1225,11 +1239,11 @@
onpass="PING ALL PASS",
onfail="PING ALL FAIL" )
- case15Result = ( intentState and pingResult )
+ caseResult = ( intentState and pingResult )
utilities.assert_equals(
expect=main.TRUE,
- actual=case15Result,
+ actual=caseResult,
onpass="Install 2278 Host Intents and Ping All test PASS",
onfail="Install 2278 Host Intents and Ping All test FAIL" )
@@ -1238,6 +1252,10 @@
if not pingResult:
main.log.debug( "Pingall failed" )
+ if not caseResult and main.failSwitch:
+ main.log.report("Stopping test")
+ main.stop( email=main.emailOnStop )
+
def CASE160( self ):
"""
Verify IPv6 ping across 300 host intents (Att Topology)
@@ -1248,14 +1266,13 @@
import time
main.case( "IPv6 ping all 300 host intents" )
main.step( "Verify IPv6 Ping across all hosts" )
- hostList = [ ('h'+ str(x + 1)) for x in range (main.numMNhosts) ]
pingResult = main.FALSE
time1 = time.time()
- pingResult = main.Mininet1.pingIpv6Hosts( hostList, prefix='1000::' )
+ pingResult = main.Mininet1.pingall( protocol="IPv6", timeout=main.pingTimeout )
if not pingResult:
main.log.warn("First pingall failed. Retrying...")
time1 = time.time()
- pingResult = main.Mininet1.pingIpv6Hosts( hostList, prefix='1000::' )
+ pingResult = main.Mininet1.pingall( protocol="IPv6", timeout=main.pingTimeout )
time2 = time.time()
timeDiff = round( ( time2 - time1 ), 2 )
main.log.report(
@@ -1266,10 +1283,10 @@
onpass="PING ALL PASS",
onfail="PING ALL FAIL" )
- case160Result = pingResult
+ caseResult = pingResult
utilities.assert_equals(
expect=main.TRUE,
- actual=case160Result,
+ actual=caseResult,
onpass="IPv6 Ping across 300 host intents test PASS",
onfail="IPv6 Ping across 300 host intents test FAIL" )
@@ -1283,15 +1300,13 @@
import time
main.case( "IPv6 ping all 600 host intents" )
main.step( "Verify IPv6 Ping across all hosts" )
- hostList = [ ('h'+ str(x + 1)) for x in range (main.numMNhosts) ]
pingResult = main.FALSE
time1 = time.time()
- pingResult = main.Mininet1.pingIpv6Hosts( hostList, prefix='1000::' )
+ pingResult = main.Mininet1.pingall( protocol="IPv6", timeout=main.pingTimeout )
if not pingResult:
main.log.warn("First pingall failed. Retrying...")
time1 = time.time()
- pingResult = main.Mininet1.pingIpv6Hosts( hostList, prefix='1000::' )
-
+ pingResult = main.Mininet1.pingall( protocol="IPv6", timeout=main.pingTimeout )
time2 = time.time()
timeDiff = round( ( time2 - time1 ), 2 )
main.log.report(
@@ -1302,10 +1317,10 @@
onpass="PING ALL PASS",
onfail="PING ALL FAIL" )
- case161Result = pingResult
+ caseResult = pingResult
utilities.assert_equals(
expect=main.TRUE,
- actual=case161Result,
+ actual=caseResult,
onpass="IPv6 Ping across 600 host intents test PASS",
onfail="IPv6 Ping across 600 host intents test FAIL" )
@@ -1319,15 +1334,13 @@
import time
main.case( "IPv6 ping all 600 host intents" )
main.step( "Verify IPv6 Ping across all hosts" )
- hostList = [ ('h'+ str(x + 11)) for x in range (main.numMNhosts) ]
pingResult = main.FALSE
time1 = time.time()
- pingResult = main.Mininet1.pingIpv6Hosts( hostList, prefix='1000::' )
+ pingResult = main.Mininet1.pingall( protocol="IPv6", timeout=main.pingTimeout )
if not pingResult:
main.log.warn("First pingall failed. Retrying...")
time1 = time.time()
- pingResult = main.Mininet1.pingIpv6Hosts( hostList, prefix='1000::' )
-
+ pingResult = main.Mininet1.pingall( protocol="IPv6", timeout=main.pingTimeout )
time2 = time.time()
timeDiff = round( ( time2 - time1 ), 2 )
main.log.report(
@@ -1338,10 +1351,10 @@
onpass="PING ALL PASS",
onfail="PING ALL FAIL" )
- case162Result = pingResult
+ caseResult = pingResult
utilities.assert_equals(
expect=main.TRUE,
- actual=case162Result,
+ actual=caseResult,
onpass="IPv6 Ping across 600 host intents test PASS",
onfail="IPv6 Ping across 600 host intents test FAIL" )
@@ -1408,8 +1421,8 @@
" seconds" )
main.step("Verify intents are installed")
- # Checking a maximum of 3
- for i in range(3):
+ # Giving onos multiple chances to install intents
+ for i in range( main.intentCheck ):
if i != 0:
main.log.warn( "Verification failed. Retrying..." )
main.log.info("Giving onos some time...")
@@ -1452,8 +1465,8 @@
onpass="PING ALL PASS",
onfail="PING ALL FAIL" )
- caseResult70 = linkDown and pingResult and intentState
- utilities.assert_equals( expect=main.TRUE, actual=caseResult70,
+ caseResult = linkDown and pingResult and intentState
+ utilities.assert_equals( expect=main.TRUE, actual=caseResult,
onpass="Random Link cut Test PASS",
onfail="Random Link cut Test FAIL" )
@@ -1465,6 +1478,10 @@
if not intentState:
main.log.debug( "Intents are not all installed" )
+ if not caseResult and main.failSwitch:
+ main.log.report("Stopping test")
+ main.stop( email=main.emailOnStop )
+
def CASE80( self, main ):
"""
Bring the core links up that are down and verify ping all ( Host Intents-Att Topo )
@@ -1514,8 +1531,8 @@
" seconds" )
main.step("Verify intents are installed")
- # Checking a maximum of 3
- for i in range(3):
+ # Giving onos multiple chances to install intents
+ for i in range( main.intentCheck ):
if i != 0:
main.log.warn( "Verification failed. Retrying..." )
main.log.info("Giving onos some time...")
@@ -1558,8 +1575,8 @@
onpass="PING ALL PASS",
onfail="PING ALL FAIL" )
- caseResult80 = linkUp and pingResult
- utilities.assert_equals( expect=main.TRUE, actual=caseResult80,
+ caseResult = linkUp and pingResult
+ utilities.assert_equals( expect=main.TRUE, actual=caseResult,
onpass="Link Up Test PASS",
onfail="Link Up Test FAIL" )
# Printing what exactly failed
@@ -1570,6 +1587,10 @@
if not intentState:
main.log.debug( "Intents are not all installed" )
+ if not caseResult and main.failSwitch:
+ main.log.report("Stopping test")
+ main.stop( email=main.emailOnStop )
+
def CASE71( self, main ):
"""
Randomly bring some core links down and verify ping all ( Point Intents-Att Topo)
@@ -1633,8 +1654,8 @@
" seconds" )
main.step("Verify intents are installed")
- # Checking a maximum of 3
- for i in range(3):
+ # Giving onos multiple chances to install intents
+ for i in range( main.intentCheck ):
if i != 0:
main.log.warn( "Verification failed. Retrying..." )
main.log.info("Giving onos some time...")
@@ -1677,8 +1698,8 @@
onpass="PING ALL PASS",
onfail="PING ALL FAIL" )
- caseResult70 = linkDown and pingResult and intentState
- utilities.assert_equals( expect=main.TRUE, actual=caseResult70,
+ caseResult = linkDown and pingResult and intentState
+ utilities.assert_equals( expect=main.TRUE, actual=caseResult,
onpass="Random Link cut Test PASS",
onfail="Random Link cut Test FAIL" )
@@ -1690,6 +1711,9 @@
if not intentState:
main.log.debug( "Intents are not all installed" )
+ if not caseResult and main.failSwitch:
+ main.log.report("Stopping test")
+ main.stop( email=main.emailOnStop )
def CASE81( self, main ):
"""
@@ -1740,8 +1764,8 @@
" seconds" )
main.step("Verify intents are installed")
- # Checking a maximum of 3
- for i in range(3):
+ # Giving onos multiple chances to install intents
+ for i in range( main.intentCheck ):
if i != 0:
main.log.warn( "Verification failed. Retrying..." )
main.log.info("Giving onos some time...")
@@ -1784,8 +1808,8 @@
onpass="PING ALL PASS",
onfail="PING ALL FAIL" )
- caseResult80 = linkUp and pingResult
- utilities.assert_equals( expect=main.TRUE, actual=caseResult80,
+ caseResult = linkUp and pingResult
+ utilities.assert_equals( expect=main.TRUE, actual=caseResult,
onpass="Link Up Test PASS",
onfail="Link Up Test FAIL" )
# Printing what exactly failed
@@ -1796,6 +1820,10 @@
if not intentState:
main.log.debug( "Intents are not all installed" )
+ if not caseResult and main.failSwitch:
+ main.log.report("Stopping test")
+ main.stop( mail=main.emailOnStop )
+
def CASE72( self, main ):
"""
Randomly bring some links down and verify ping all ( Host Intents-Chordal Topo)
@@ -1836,8 +1864,8 @@
" seconds" )
main.step("Verify intents are installed")
- # Checking a maximum of 3
- for i in range(3):
+ # Giving onos multiple chances to install intents
+ for i in range( main.intentCheck ):
if i != 0:
main.log.warn( "Verification failed. Retrying..." )
main.log.info("Giving onos some time...")
@@ -1880,8 +1908,8 @@
onpass="PING ALL PASS",
onfail="PING ALL FAIL" )
- caseResult70 = linkDown and pingResult and intentState
- utilities.assert_equals( expect=main.TRUE, actual=caseResult70,
+ caseResult = linkDown and pingResult and intentState
+ utilities.assert_equals( expect=main.TRUE, actual=caseResult,
onpass="Random Link cut Test PASS",
onfail="Random Link cut Test FAIL" )
@@ -1893,6 +1921,10 @@
if not intentState:
main.log.debug( "Intents are not all installed" )
+ if not caseResult and main.failSwitch:
+ main.log.report("Stopping test")
+ main.stop( email=main.emailOnStop )
+
def CASE82( self, main ):
"""
Bring the core links up that are down and verify ping all ( Host Intents Chordal Topo )
@@ -1929,8 +1961,8 @@
" seconds" )
main.step("Verify intents are installed")
- # Checking a maximum of 3
- for i in range(3):
+ # Giving onos multiple chances to install intents
+ for i in range( main.intentCheck ):
if i != 0:
main.log.warn( "Verification failed. Retrying..." )
main.log.info("Giving onos some time...")
@@ -1973,8 +2005,8 @@
onpass="PING ALL PASS",
onfail="PING ALL FAIL" )
- caseResult80 = linkUp and pingResult
- utilities.assert_equals( expect=main.TRUE, actual=caseResult80,
+ caseResult = linkUp and pingResult
+ utilities.assert_equals( expect=main.TRUE, actual=caseResult,
onpass="Link Up Test PASS",
onfail="Link Up Test FAIL" )
# Printing what exactly failed
@@ -1985,6 +2017,10 @@
if not intentState:
main.log.debug( "Intents are not all installed" )
+ if not caseResult and main.failSwitch:
+ main.log.report("Stopping test")
+ main.stop( email=main.emailOnStop )
+
def CASE73( self, main ):
"""
Randomly bring some links down and verify ping all ( Point Intents-Chordal Topo)
@@ -2025,8 +2061,8 @@
" seconds" )
main.step("Verify intents are installed")
- # Checking a maximum of 3
- for i in range(3):
+ # Giving onos multiple chances to install intents
+ for i in range( main.intentCheck ):
if i != 0:
main.log.warn( "Verification failed. Retrying..." )
main.log.info("Giving onos some time...")
@@ -2069,8 +2105,8 @@
onpass="PING ALL PASS",
onfail="PING ALL FAIL" )
- caseResult70 = linkDown and pingResult and intentState
- utilities.assert_equals( expect=main.TRUE, actual=caseResult70,
+ caseResult = linkDown and pingResult and intentState
+ utilities.assert_equals( expect=main.TRUE, actual=caseResult,
onpass="Random Link cut Test PASS",
onfail="Random Link cut Test FAIL" )
@@ -2082,6 +2118,10 @@
if not intentState:
main.log.debug( "Intents are not all installed" )
+ if not caseResult and main.failSwitch:
+ main.log.report("Stopping test")
+ main.stop( email=main.emailOnStop )
+
def CASE83( self, main ):
"""
Bring the core links up that are down and verify ping all ( Point Intents Chordal Topo )
@@ -2118,8 +2158,8 @@
" seconds" )
main.step("Verify intents are installed")
- # Checking a maximum of 3
- for i in range(3):
+ # Giving onos multiple chances to install intents
+ for i in range( main.intentCheck ):
if i != 0:
main.log.warn( "Verification failed. Retrying..." )
main.log.info("Giving onos some time...")
@@ -2162,8 +2202,8 @@
onpass="PING ALL PASS",
onfail="PING ALL FAIL" )
- caseResult80 = linkUp and pingResult
- utilities.assert_equals( expect=main.TRUE, actual=caseResult80,
+ caseResult = linkUp and pingResult
+ utilities.assert_equals( expect=main.TRUE, actual=caseResult,
onpass="Link Up Test PASS",
onfail="Link Up Test FAIL" )
# Printing what exactly failed
@@ -2174,6 +2214,10 @@
if not intentState:
main.log.debug( "Intents are not all installed" )
+ if not caseResult and main.failSwitch:
+ main.log.report("Stopping test")
+ main.stop( email=main.emailOnStop )
+
def CASE74( self, main ):
"""
Randomly bring some core links down and verify ping all ( Host Intents-Spine Topo)
@@ -2225,8 +2269,8 @@
" seconds" )
main.step("Verify intents are installed")
- # Checking a maximum of 3
- for i in range(3):
+ # Giving onos multiple chances to install intents
+ for i in range( main.intentCheck ):
if i != 0:
main.log.warn( "Verification failed. Retrying..." )
main.log.info("Giving onos some time...")
@@ -2269,8 +2313,8 @@
onpass="PING ALL PASS",
onfail="PING ALL FAIL" )
- caseResult70 = linkDown and pingResult and intentState
- utilities.assert_equals( expect=main.TRUE, actual=caseResult70,
+ caseResult = linkDown and pingResult and intentState
+ utilities.assert_equals( expect=main.TRUE, actual=caseResult,
onpass="Random Link cut Test PASS",
onfail="Random Link cut Test FAIL" )
@@ -2282,6 +2326,10 @@
if not intentState:
main.log.debug( "Intents are not all installed" )
+ if not caseResult and main.failSwitch:
+ main.log.report("Stopping test")
+ main.stop( email=main.emailOnStop )
+
def CASE84( self, main ):
"""
Bring the core links up that are down and verify ping all ( Host Intents-Spine Topo )
@@ -2319,8 +2367,8 @@
" seconds" )
main.step("Verify intents are installed")
- # Checking a maximum of 3
- for i in range(3):
+ # Giving onos multiple chances to install intents
+ for i in range( main.intentCheck ):
if i != 0:
main.log.warn( "Verification failed. Retrying..." )
main.log.info("Giving onos some time...")
@@ -2363,8 +2411,8 @@
onpass="PING ALL PASS",
onfail="PING ALL FAIL" )
- caseResult80 = linkUp and pingResult
- utilities.assert_equals( expect=main.TRUE, actual=caseResult80,
+ caseResult = linkUp and pingResult
+ utilities.assert_equals( expect=main.TRUE, actual=caseResult,
onpass="Link Up Test PASS",
onfail="Link Up Test FAIL" )
# Printing what exactly failed
@@ -2375,6 +2423,10 @@
if not intentState:
main.log.debug( "Intents are not all installed" )
+ if not caseResult and main.failSwitch:
+ main.log.report("Stopping test")
+ main.stop( email=main.emailOnStop )
+
def CASE75( self, main ):
"""
Randomly bring some core links down and verify ping all ( Point Intents-Spine Topo)
@@ -2426,8 +2478,8 @@
" seconds" )
main.step("Verify intents are installed")
- # Checking a maximum of 3
- for i in range(3):
+ # Giving onos multiple chances to install intents
+ for i in range( main.intentCheck ):
if i != 0:
main.log.warn( "Verification failed. Retrying..." )
main.log.info("Giving onos some time...")
@@ -2470,8 +2522,8 @@
onpass="PING ALL PASS",
onfail="PING ALL FAIL" )
- caseResult70 = linkDown and pingResult and intentState
- utilities.assert_equals( expect=main.TRUE, actual=caseResult70,
+ caseResult = linkDown and pingResult and intentState
+ utilities.assert_equals( expect=main.TRUE, actual=caseResult,
onpass="Random Link cut Test PASS",
onfail="Random Link cut Test FAIL" )
@@ -2483,6 +2535,10 @@
if not intentState:
main.log.debug( "Intents are not all installed" )
+ if not caseResult and main.failSwitch:
+ main.log.report("Stopping test")
+ main.stop( email=main.emailOnStop )
+
def CASE85( self, main ):
"""
Bring the core links up that are down and verify ping all ( Point Intents-Spine Topo )
@@ -2520,8 +2576,8 @@
" seconds" )
main.step("Verify intents are installed")
- # Checking a maximum of 3
- for i in range(3):
+ # Giving onos multiple chances to install intents
+ for i in range( main.intentCheck ):
if i != 0:
main.log.warn( "Verification failed. Retrying..." )
main.log.info("Giving onos some time...")
@@ -2564,8 +2620,8 @@
onpass="PING ALL PASS",
onfail="PING ALL FAIL" )
- caseResult80 = linkUp and pingResult
- utilities.assert_equals( expect=main.TRUE, actual=caseResult80,
+ caseResult = linkUp and pingResult
+ utilities.assert_equals( expect=main.TRUE, actual=caseResult,
onpass="Link Up Test PASS",
onfail="Link Up Test FAIL" )
# Printing what exactly failed
@@ -2576,6 +2632,10 @@
if not intentState:
main.log.debug( "Intents are not all installed" )
+ if not caseResult and main.failSwitch:
+ main.log.report("Stopping test")
+ main.stop( email=main.emailOnStop )
+
def CASE170( self ):
"""
IPv6 ping all with some core links down( Host Intents-Att Topo)
@@ -2586,13 +2646,12 @@
import time
main.case( "IPv6 ping all with some core links down( Host Intents-Att Topo )" )
main.step( "Verify IPv6 Ping across all hosts" )
- hostList = [ ('h'+ str(x + 1)) for x in range (main.numMNhosts) ]
pingResult = main.FALSE
time1 = time.time()
- pingResult = main.Mininet1.pingIpv6Hosts( hostList, prefix='1000::' )
+ pingResult = main.Mininet1.pingall( protocol="IPv6", timeout=main.pingTimeout )
if not pingResult:
main.log.warn("Failed to ping Ipv6 hosts. Retrying...")
- pingResult = main.Mininet1.pingIpv6Hosts( hostList, prefix='1000::' )
+ pingResult = main.Mininet1.pingall( protocol="IPv6", timeout=main.pingTimeout )
time2 = time.time()
timeDiff = round( ( time2 - time1 ), 2 )
main.log.report(
@@ -2603,10 +2662,10 @@
onpass="PING ALL PASS",
onfail="PING ALL FAIL" )
- case170Result = pingResult
+ caseResult = pingResult
utilities.assert_equals(
expect=main.TRUE,
- actual=case170Result,
+ actual=caseResult,
onpass="IPv6 Ping across 300 host intents test PASS",
onfail="IPv6 Ping across 300 host intents test FAIL" )
@@ -2620,15 +2679,13 @@
import time
main.case( "IPv6 ping all with after core links back up( Host Intents-Att Topo )" )
main.step( "Verify IPv6 Ping across all hosts" )
- hostList = [ ('h'+ str(x + 1)) for x in range (main.numMNhosts) ]
pingResult = main.FALSE
time1 = time.time()
- pingResult = main.Mininet1.pingIpv6Hosts( hostList, prefix='1000::' )
+ pingResult = main.Mininet1.pingall( protocol="IPv6", timeout=main.pingTimeout )
if not pingResult:
main.log.warn("First ping failed. Retrying...")
time1 = time.time()
- pingResult = main.Mininet1.pingIpv6Hosts( hostList, prefix='1000::' )
-
+ pingResult = main.Mininet1.pingall( protocol="IPv6", timeout=main.pingTimeout )
time2 = time.time()
timeDiff = round( ( time2 - time1 ), 2 )
main.log.report(
@@ -2639,10 +2696,10 @@
onpass="PING ALL PASS",
onfail="PING ALL FAIL" )
- case180Result = pingResult
+ caseResult = pingResult
utilities.assert_equals(
expect=main.TRUE,
- actual=case180Result,
+ actual=caseResult,
onpass="IPv6 Ping across 300 host intents test PASS",
onfail="IPv6 Ping across 300 host intents test FAIL" )
@@ -2656,15 +2713,13 @@
import time
main.case( "IPv6 ping all with some core links down( Point Intents-Att Topo )" )
main.step( "Verify IPv6 Ping across all hosts" )
- hostList = [ ('h'+ str(x + 1)) for x in range (main.numMNhosts) ]
pingResult = main.FALSE
time1 = time.time()
- pingResult = main.Mininet1.pingIpv6Hosts( hostList, prefix='1000::' )
+ pingResult = main.Mininet1.pingall( protocol="IPv6", timeout=main.pingTimeout )
if not pingResult:
main.log.warn("First ping failed. Retrying...")
time1 = time.time()
- pingResult = main.Mininet1.pingIpv6Hosts( hostList, prefix='1000::' )
-
+ pingResult = main.Mininet1.pingall( protocol="IPv6", timeout=main.pingTimeout )
time2 = time.time()
timeDiff = round( ( time2 - time1 ), 2 )
main.log.report(
@@ -2675,10 +2730,10 @@
onpass="PING ALL PASS",
onfail="PING ALL FAIL" )
- case171Result = pingResult
+ caseResult = pingResult
utilities.assert_equals(
expect=main.TRUE,
- actual=case171Result,
+ actual=caseResult,
onpass="IPv6 Ping across 600 point intents test PASS",
onfail="IPv6 Ping across 600 point intents test FAIL" )
@@ -2692,15 +2747,13 @@
import time
main.case( "IPv6 ping all with after core links back up( Point Intents-Att Topo )" )
main.step( "Verify IPv6 Ping across all hosts" )
- hostList = [ ('h'+ str(x + 1)) for x in range (main.numMNhosts) ]
pingResult = main.FALSE
time1 = time.time()
- pingResult = main.Mininet1.pingIpv6Hosts( hostList, prefix='1000::' )
+ pingResult = main.Mininet1.pingall( protocol="IPv6", timeout=main.pingTimeout )
if not pingResult:
main.log.warn("First ping failed. Retrying...")
time1 = time.time()
- pingResult = main.Mininet1.pingIpv6Hosts( hostList, prefix='1000::' )
-
+ pingResult = main.Mininet1.pingall( protocol="IPv6", timeout=main.pingTimeout )
time2 = time.time()
timeDiff = round( ( time2 - time1 ), 2 )
main.log.report(
@@ -2711,10 +2764,10 @@
onpass="PING ALL PASS",
onfail="PING ALL FAIL" )
- case181Result = pingResult
+ caseResult = pingResult
utilities.assert_equals(
expect=main.TRUE,
- actual=case181Result,
+ actual=caseResult,
onpass="IPv6 Ping across 600 Point intents test PASS",
onfail="IPv6 Ping across 600 Point intents test FAIL" )
@@ -2728,15 +2781,13 @@
import time
main.case( "IPv6 ping all with some core links down( Host Intents-Chordal Topo )" )
main.step( "Verify IPv6 Ping across all hosts" )
- hostList = [ ('h'+ str(x + 1)) for x in range (main.numMNhosts) ]
pingResult = main.FALSE
time1 = time.time()
- pingResult = main.Mininet1.pingIpv6Hosts( hostList, prefix='1000::' )
+ pingResult = main.Mininet1.pingall( protocol="IPv6", timeout=main.pingTimeout )
if not pingResult:
main.log.warn("First ping failed. Retrying...")
time1 = time.time()
- pingResult = main.Mininet1.pingIpv6Hosts( hostList, prefix='1000::' )
-
+ pingResult = main.Mininet1.pingall( protocol="IPv6", timeout=main.pingTimeout )
time2 = time.time()
timeDiff = round( ( time2 - time1 ), 2 )
main.log.report(
@@ -2747,10 +2798,10 @@
onpass="PING ALL PASS",
onfail="PING ALL FAIL" )
- case172Result = pingResult
+ caseResult = pingResult
utilities.assert_equals(
expect=main.TRUE,
- actual=case172Result,
+ actual=caseResult,
onpass="IPv6 Ping across 300 host intents test PASS",
onfail="IPv6 Ping across 300 host intents test FAIL" )
@@ -2764,15 +2815,13 @@
import time
main.case( "IPv6 ping all with after core links back up( Host Intents-Chordal Topo )" )
main.step( "Verify IPv6 Ping across all hosts" )
- hostList = [ ('h'+ str(x + 1)) for x in range (main.numMNhosts) ]
pingResult = main.FALSE
time1 = time.time()
- pingResult = main.Mininet1.pingIpv6Hosts( hostList, prefix='1000::' )
+ pingResult = main.Mininet1.pingall( protocol="IPv6", timeout=main.pingTimeout )
if not pingResult:
main.log.warn("First ping failed. Retrying...")
time1 = time.time()
- pingResult = main.Mininet1.pingIpv6Hosts( hostList, prefix='1000::' )
-
+ pingResult = main.Mininet1.pingall( protocol="IPv6", timeout=main.pingTimeout )
time2 = time.time()
timeDiff = round( ( time2 - time1 ), 2 )
main.log.report(
@@ -2783,10 +2832,10 @@
onpass="PING ALL PASS",
onfail="PING ALL FAIL" )
- case182Result = pingResult
+ caseResult = pingResult
utilities.assert_equals(
expect=main.TRUE,
- actual=case182Result,
+ actual=caseResult,
onpass="IPv6 Ping across 300 host intents test PASS",
onfail="IPv6 Ping across 300 host intents test FAIL" )
@@ -2800,15 +2849,13 @@
import time
main.case( "IPv6 ping all with some core links down( Point Intents-Chordal Topo )" )
main.step( "Verify IPv6 Ping across all hosts" )
- hostList = [ ('h'+ str(x + 1)) for x in range (main.numMNhosts) ]
pingResult = main.FALSE
time1 = time.time()
- pingResult = main.Mininet1.pingIpv6Hosts( hostList, prefix='1000::' )
+ pingResult = main.Mininet1.pingall( protocol="IPv6", timeout=main.pingTimeout )
if not pingResult:
main.log.warn("First ping failed. Retrying...")
time1 = time.time()
- pingResult = main.Mininet1.pingIpv6Hosts( hostList, prefix='1000::' )
-
+ pingResult = main.Mininet1.pingall( protocol="IPv6", timeout=main.pingTimeout )
time2 = time.time()
timeDiff = round( ( time2 - time1 ), 2 )
main.log.report(
@@ -2819,10 +2866,10 @@
onpass="PING ALL PASS",
onfail="PING ALL FAIL" )
- case173Result = pingResult
+ caseResult = pingResult
utilities.assert_equals(
expect=main.TRUE,
- actual=case173Result,
+ actual=caseResult,
onpass="IPv6 Ping across 600 point intents test PASS",
onfail="IPv6 Ping across 600 point intents test FAIL" )
@@ -2836,15 +2883,13 @@
import time
main.case( "IPv6 ping all with after core links back up( Point Intents-Chordal Topo )" )
main.step( "Verify IPv6 Ping across all hosts" )
- hostList = [ ('h'+ str(x + 1)) for x in range (main.numMNhosts) ]
pingResult = main.FALSE
time1 = time.time()
- pingResult = main.Mininet1.pingIpv6Hosts( hostList, prefix='1000::' )
+ pingResult = main.Mininet1.pingall( protocol="IPv6", timeout=main.pingTimeout )
if not pingResult:
main.log.warn("First ping failed. Retrying...")
time1 = time.time()
- pingResult = main.Mininet1.pingIpv6Hosts( hostList, prefix='1000::' )
-
+ pingResult = main.Mininet1.pingall( protocol="IPv6", timeout=main.pingTimeout )
time2 = time.time()
timeDiff = round( ( time2 - time1 ), 2 )
main.log.report(
@@ -2855,10 +2900,10 @@
onpass="PING ALL PASS",
onfail="PING ALL FAIL" )
- case183Result = pingResult
+ caseResult = pingResult
utilities.assert_equals(
expect=main.TRUE,
- actual=case183Result,
+ actual=caseResult,
onpass="IPv6 Ping across 600 Point intents test PASS",
onfail="IPv6 Ping across 600 Point intents test FAIL" )
@@ -2872,15 +2917,13 @@
import time
main.case( "IPv6 ping all with some core links down( Host Intents-Spine Topo )" )
main.step( "Verify IPv6 Ping across all hosts" )
- hostList = [ ('h'+ str(x + 11)) for x in range (main.numMNhosts) ]
pingResult = main.FALSE
time1 = time.time()
- pingResult = main.Mininet1.pingIpv6Hosts( hostList, prefix='1000::' )
+ pingResult = main.Mininet1.pingall( protocol="IPv6", timeout=main.pingTimeout )
if not pingResult:
main.log.warn("First ping failed. Retrying...")
time1 = time.time()
- pingResult = main.Mininet1.pingIpv6Hosts( hostList, prefix='1000::' )
-
+ pingResult = main.Mininet1.pingall( protocol="IPv6", timeout=main.pingTimeout )
time2 = time.time()
timeDiff = round( ( time2 - time1 ), 2 )
main.log.report(
@@ -2891,10 +2934,10 @@
onpass="PING ALL PASS",
onfail="PING ALL FAIL" )
- case174Result = pingResult
+ caseResult = pingResult
utilities.assert_equals(
expect=main.TRUE,
- actual=case174Result,
+ actual=caseResult,
onpass="IPv6 Ping across 2278 host intents test PASS",
onfail="IPv6 Ping across 2278 host intents test FAIL" )
@@ -2908,15 +2951,13 @@
import time
main.case( "IPv6 ping all with after core links back up( Host Intents-Spine Topo )" )
main.step( "Verify IPv6 Ping across all hosts" )
- hostList = [ ('h'+ str(x + 11)) for x in range (main.numMNhosts) ]
pingResult = main.FALSE
time1 = time.time()
- pingResult = main.Mininet1.pingIpv6Hosts( hostList, prefix='1000::' )
+ pingResult = main.Mininet1.pingall( protocol="IPv6", timeout=main.pingTimeout )
if not pingResult:
main.log.warn("First ping failed. Retrying...")
time1 = time.time()
- pingResult = main.Mininet1.pingIpv6Hosts( hostList, prefix='1000::' )
-
+ pingResult = main.Mininet1.pingall( protocol="IPv6", timeout=main.pingTimeout )
time2 = time.time()
timeDiff = round( ( time2 - time1 ), 2 )
main.log.report(
@@ -2927,10 +2968,10 @@
onpass="PING ALL PASS",
onfail="PING ALL FAIL" )
- case184Result = pingResult
+ caseResult = pingResult
utilities.assert_equals(
expect=main.TRUE,
- actual=case184Result,
+ actual=caseResult,
onpass="IPv6 Ping across 2278 host intents test PASS",
onfail="IPv6 Ping across 2278 host intents test FAIL" )
@@ -2944,15 +2985,13 @@
import time
main.case( "IPv6 ping all with some core links down( Point Intents-Spine Topo )" )
main.step( "Verify IPv6 Ping across all hosts" )
- hostList = [ ('h'+ str(x + 11)) for x in range (main.numMNhosts) ]
pingResult = main.FALSE
time1 = time.time()
- pingResult = main.Mininet1.pingIpv6Hosts( hostList, prefix='1000::' )
+ pingResult = main.Mininet1.pingall( protocol="IPv6", timeout=main.pingTimeout )
if not pingResult:
main.log.warn("First ping failed. Retrying...")
time1 = time.time()
- pingResult = main.Mininet1.pingIpv6Hosts( hostList, prefix='1000::' )
-
+ pingResult = main.Mininet1.pingall( protocol="IPv6", timeout=main.pingTimeout )
time2 = time.time()
timeDiff = round( ( time2 - time1 ), 2 )
main.log.report(
@@ -2963,10 +3002,10 @@
onpass="PING ALL PASS",
onfail="PING ALL FAIL" )
- case175Result = pingResult
+ caseResult = pingResult
utilities.assert_equals(
expect=main.TRUE,
- actual=case175Result,
+ actual=caseResult,
onpass="IPv6 Ping across 4556 point intents test PASS",
onfail="IPv6 Ping across 4556 point intents test FAIL" )
@@ -2980,15 +3019,13 @@
import time
main.case( "IPv6 ping all with after core links back up( Point Intents-Spine Topo )" )
main.step( "Verify IPv6 Ping across all hosts" )
- hostList = [ ('h'+ str(x + 11)) for x in range (main.numMNhosts) ]
pingResult = main.FALSE
time1 = time.time()
- pingResult = main.Mininet1.pingIpv6Hosts( hostList, prefix='1000::' )
+ pingResult = main.Mininet1.pingall( protocol="IPv6", timeout=main.pingTimeout )
if not pingResult:
main.log.warn("First ping failed. Retrying...")
time1 = time.time()
- pingResult = main.Mininet1.pingIpv6Hosts( hostList, prefix='1000::' )
-
+ pingResult = main.Mininet1.pingall( protocol="IPv6", timeout=main.pingTimeout )
time2 = time.time()
timeDiff = round( ( time2 - time1 ), 2 )
main.log.report(
@@ -2999,10 +3036,10 @@
onpass="PING ALL PASS",
onfail="PING ALL FAIL" )
- case183Result = pingResult
+ caseResult = pingResult
utilities.assert_equals(
expect=main.TRUE,
- actual=case183Result,
+ actual=caseResult,
onpass="IPv6 Ping across 4556 Point intents test PASS",
onfail="IPv6 Ping across 4556 Point intents test FAIL" )
@@ -3045,8 +3082,8 @@
main.step("Verify intents are installed")
- # Giving onos 3 chances to install intents
- for i in range(3):
+ # Giving onos multiple chances to install intents
+ for i in range( main.intentCheck ):
if i != 0:
main.log.warn( "Verification failed. Retrying..." )
main.log.info("Waiting for onos to install intents...")
@@ -3083,14 +3120,23 @@
onpass="PING tALL PASS",
onfail="PING ALL FAIL" )
- case90Result = ( intentState and pingResult )
+ caseResult = ( intentState and pingResult )
utilities.assert_equals(
expect=main.TRUE,
- actual=case90Result,
+ actual=caseResult,
onpass="Install 600 point Intents and Ping All test PASS",
onfail="Install 600 point Intents and Ping All test FAIL" )
+ if not intentState:
+ main.log.debug( "Intents failed to install completely" )
+ if not pingResult:
+ main.log.debug( "Pingall failed" )
+
+ if not caseResult and main.failSwitch:
+ main.log.report("Stopping test")
+ main.stop( email=main.emailOnStop )
+
def CASE91( self ):
"""
Install 600 point intents and verify ping all (Chordal Topology)
@@ -3131,8 +3177,8 @@
main.step("Verify intents are installed")
- # Giving onos 3 chances to install intents
- for i in range(3):
+ # Giving onos multiple chances to install intents
+ for i in range( main.intentCheck ):
if i != 0:
main.log.warn( "Verification failed. Retrying..." )
main.log.info("Waiting for onos to install intents...")
@@ -3169,14 +3215,23 @@
onpass="PING ALL PASS",
onfail="PING ALL FAIL" )
- case91Result = ( intentState and pingResult )
+ caseResult = ( intentState and pingResult )
utilities.assert_equals(
expect=main.TRUE,
- actual=case91Result,
+ actual=caseResult,
onpass="Install 600 point Intents and Ping All test PASS",
onfail="Install 600 point Intents and Ping All test FAIL" )
+ if not intentState:
+ main.log.debug( "Intents failed to install completely" )
+ if not pingResult:
+ main.log.debug( "Pingall failed" )
+
+ if not caseResult and main.failSwitch:
+ main.log.report("Stopping test")
+ main.stop( email=main.emailOnStop )
+
def CASE92( self ):
"""
Install 4556 point intents and verify ping all (Spine Topology)
@@ -3220,8 +3275,8 @@
main.step("Verify intents are installed")
- # Giving onos 3 chances to install intents
- for i in range(3):
+ # Giving onos multiple chances to install intents
+ for i in range( main.intentCheck ):
if i != 0:
main.log.warn( "Verification failed. Retrying..." )
main.log.info("Waiting for onos to install intents...")
@@ -3258,14 +3313,23 @@
onpass="PING ALL PASS",
onfail="PING ALL FAIL" )
- case92Result = ( intentState and pingResult )
+ caseResult = ( intentState and pingResult )
utilities.assert_equals(
expect=main.TRUE,
- actual=case92Result,
+ actual=caseResult,
onpass="Install 4556 point Intents and Ping All test PASS",
onfail="Install 4556 point Intents and Ping All test FAIL" )
+ if not intentState:
+ main.log.debug( "Intents failed to install completely" )
+ if not pingResult:
+ main.log.debug( "Pingall failed" )
+
+ if not caseResult and main.failSwitch:
+ main.log.report("Stopping test")
+ main.stop( email=main.emailOnStop )
+
def CASE93( self ):
"""
Install multi-single point intents and verify Ping all works
@@ -3306,8 +3370,8 @@
main.step("Verify intents are installed")
- # Giving onos 3 chances to install intents
- for i in range(3):
+ # Giving onos multiple chances to install intents
+ for i in range( main.intentCheck ):
if i != 0:
main.log.warn( "Verification failed. Retrying..." )
main.log.info("Waiting for onos to install intents...")
@@ -3351,10 +3415,10 @@
str( timeDiff ) +
" seconds" )
- case93Result = ( checkFlowsState and pingResult and intentState )
+ caseResult = ( checkFlowsState and pingResult and intentState )
utilities.assert_equals(
expect=main.TRUE,
- actual=case93Result,
+ actual=caseResult,
onpass="Install 25 multi to single point Intents and Ping All test PASS",
onfail="Install 25 multi to single point Intents and Ping All test FAIL" )
@@ -3397,8 +3461,8 @@
main.step("Verify intents are installed")
- # Giving onos 3 chances to install intents
- for i in range(3):
+ # Giving onos multiple chances to install intents
+ for i in range( main.intentCheck ):
if i != 0:
main.log.warn( "Verification failed. Retrying..." )
main.log.info("Waiting for onos to install intents...")
@@ -3438,10 +3502,10 @@
" seconds" )
- case94Result = ( pingResult and intentState )
+ caseResult = ( pingResult and intentState )
utilities.assert_equals(
expect=main.TRUE,
- actual=case94Result,
+ actual=caseResult,
onpass="Install 25 multi to single point Intents and Ping All test PASS",
onfail="Install 25 multi to single point Intents and Ping All test FAIL" )
@@ -3485,8 +3549,8 @@
main.step("Verify intents are installed")
- # Giving onos 3 chances to install intents
- for i in range(3):
+ # Giving onos multiple chances to install intents
+ for i in range( main.intentCheck ):
if i != 0:
main.log.warn( "Verification failed. Retrying..." )
main.log.info("Waiting for onos to install intents...")
@@ -3525,10 +3589,10 @@
str( timeDiff ) +
" seconds" )
- case96Result = ( pingResult and intentState )
+ caseResult = ( pingResult and intentState )
utilities.assert_equals(
expect=main.TRUE,
- actual=case96Result,
+ actual=caseResult,
onpass="Install 25 single to multi point Intents and Ping All test PASS",
onfail="Install 25 single to multi point Intents and Ping All test FAIL" )
@@ -3570,8 +3634,8 @@
main.step("Verify intents are installed")
- # Giving onos 3 chances to install intents
- for i in range(3):
+ # Giving onos multiple chances to install intents
+ for i in range( main.intentCheck ):
if i != 0:
main.log.warn( "Verification failed. Retrying..." )
main.log.info("Waiting for onos to install intents...")
@@ -3610,10 +3674,10 @@
str( timeDiff ) +
" seconds" )
- case97Result = ( pingResult and intentState )
+ caseResult = ( pingResult and intentState )
utilities.assert_equals(
expect=main.TRUE,
- actual=case97Result,
+ actual=caseResult,
onpass="Install 25 single to multi point Intents and Ping All test PASS",
onfail="Install 25 single to multi point Intents and Ping All test FAIL" )
@@ -3662,8 +3726,8 @@
main.step("Verify intents are installed")
- # Giving onos 3 chances to install intents
- for i in range(3):
+ # Giving onos multiple chances to install intents
+ for i in range( main.intentCheck ):
if i != 0:
main.log.warn( "Verification failed. Retrying..." )
main.log.info("Waiting for onos to install intents...")
@@ -3702,10 +3766,10 @@
str( timeDiff ) +
" seconds" )
- case98Result = ( pingResult and intentState )
+ caseResult = ( pingResult and intentState )
utilities.assert_equals(
expect=main.TRUE,
- actual=case98Result,
+ actual=caseResult,
onpass="Install 25 single to multi point Intents and Ping All test PASS",
onfail="Install 25 single to multi point Intents and Ping All test FAIL" )
@@ -3719,15 +3783,13 @@
import time
main.case( "IPv6 ping all 600 Point intents" )
main.step( "Verify IPv6 Ping across all hosts" )
- hostList = [ ('h'+ str(x + 1)) for x in range (main.numMNhosts) ]
pingResult = main.FALSE
time1 = time.time()
- pingResult = main.Mininet1.pingIpv6Hosts( hostList, prefix='1000::' )
+ pingResult = main.Mininet1.pingall( protocol="IPv6", timeout=main.pingTimeout )
if not pingResult:
main.log.warn("First pingall failed. Retrying...")
time1 = time.time()
- pingResult = main.Mininet1.pingIpv6Hosts( hostList, prefix='1000::' )
-
+ pingResult = main.Mininet1.pingall( protocol="IPv6", timeout=main.pingTimeout )
time2 = time.time()
timeDiff = round( ( time2 - time1 ), 2 )
main.log.report(
@@ -3738,10 +3800,10 @@
onpass="PING ALL PASS",
onfail="PING ALL FAIL" )
- case160Result = pingResult
+ caseResult = pingResult
utilities.assert_equals(
expect=main.TRUE,
- actual=case160Result,
+ actual=caseResult,
onpass="IPv6 Ping across 600 Point intents test PASS",
onfail="IPv6 Ping across 600 Point intents test FAIL" )
@@ -3755,15 +3817,13 @@
import time
main.case( "IPv6 ping all 600 Point intents" )
main.step( "Verify IPv6 Ping across all hosts" )
- hostList = [ ('h'+ str(x + 1)) for x in range (main.numMNhosts) ]
pingResult = main.FALSE
time1 = time.time()
- pingResult = main.Mininet1.pingIpv6Hosts( hostList, prefix='1000::' )
+ pingResult = main.Mininet1.pingall( protocol="IPv6", timeout=main.pingTimeout )
if not pingResult:
main.log.warn("First pingall failed. Retrying...")
time1 = time.time()
- pingResult = main.Mininet1.pingIpv6Hosts( hostList, prefix='1000::' )
-
+ pingResult = main.Mininet1.pingall( protocol="IPv6", timeout=main.pingTimeout )
time2 = time.time()
timeDiff = round( ( time2 - time1 ), 2 )
main.log.report(
@@ -3774,10 +3834,10 @@
onpass="PING ALL PASS",
onfail="PING ALL FAIL" )
- case191Result = pingResult
+ caseResult = pingResult
utilities.assert_equals(
expect=main.TRUE,
- actual=case191Result,
+ actual=caseResult,
onpass="IPv6 Ping across 600 Point intents test PASS",
onfail="IPv6 Ping across 600 Point intents test FAIL" )
@@ -3791,15 +3851,13 @@
import time
main.case( "IPv6 ping all 4556 Point intents" )
main.step( "Verify IPv6 Ping across all hosts" )
- hostList = [ ('h'+ str(x + 11)) for x in range (main.numMNhosts) ]
pingResult = main.FALSE
time1 = time.time()
- pingResult = main.Mininet1.pingIpv6Hosts( hostList, prefix='1000::' )
+ pingResult = main.Mininet1.pingall( protocol="IPv6", timeout=main.pingTimeout )
if not pingResult:
main.log.warn("First pingall failed. Retrying...")
time1 = time.time()
- pingResult = main.Mininet1.pingIpv6Hosts( hostList, prefix='1000::' )
-
+ pingResult = main.Mininet1.pingall( protocol="IPv6", timeout=main.pingTimeout )
time2 = time.time()
timeDiff = round( ( time2 - time1 ), 2 )
main.log.report(
@@ -3810,10 +3868,10 @@
onpass="PING ALL PASS",
onfail="PING ALL FAIL" )
- case192Result = pingResult
+ caseResult = pingResult
utilities.assert_equals(
expect=main.TRUE,
- actual=case192Result,
+ actual=caseResult,
onpass="IPv6 Ping across 4556 Point intents test PASS",
onfail="IPv6 Ping across 4556 Point intents test FAIL" )
@@ -3914,8 +3972,8 @@
step1Result = main.FALSE
print main.ONOScli1.intents()
- caseResult10 = step1Result
- utilities.assert_equals( expect=main.TRUE, actual=caseResult10,
+ caseResult = step1Result
+ utilities.assert_equals( expect=main.TRUE, actual=caseResult,
onpass="Intent removal test successful",
onfail="Intent removal test failed" )
@@ -4007,7 +4065,7 @@
# Waiting for reative flows to be cleared.
time.sleep( 10 )
- case11Result = installResult and pingResult and uninstallResult
- utilities.assert_equals( expect=main.TRUE, actual=case11Result,
+ caseResult = installResult and pingResult and uninstallResult
+ utilities.assert_equals( expect=main.TRUE, actual=caseResult,
onpass="Intent based Reactive forwarding Pingall test PASS",
onfail="Intent based Reactive forwarding Pingall test FAIL" )