CHO test and Params
diff --git a/TestON/tests/OnosCHO/OnosCHO.params b/TestON/tests/OnosCHO/OnosCHO.params
index 1c4af48..ceedc19 100644
--- a/TestON/tests/OnosCHO/OnosCHO.params
+++ b/TestON/tests/OnosCHO/OnosCHO.params
@@ -12,13 +12,13 @@
# 10. Remove all intents on ONOS
# 1,2,3,[4,5,6,5,70,80,5,10,5,9,5,71,81,5,10,5]*100
- <testcases>1,2,3,4,5,6,70,80,10,9,71,81,10</testcases>
+ <testcases>1,2,3,[4,5,6,5,70,80,5,10,5,9,5,71,81,5,10,5]*100</testcases>
<ENV>
<cellName>choTest5</cellName>
</ENV>
<GIT>
#autoPull 'on' or 'off'
- <autoPull>off</autoPull>
+ <autoPull>on</autoPull>
<branch>onos-1.0</branch>
</GIT>
<CTRL>
diff --git a/TestON/tests/OnosCHO/OnosCHO.py b/TestON/tests/OnosCHO/OnosCHO.py
index fc24724..db7bc4e 100644
--- a/TestON/tests/OnosCHO/OnosCHO.py
+++ b/TestON/tests/OnosCHO/OnosCHO.py
@@ -443,6 +443,7 @@
onfail="PING ALL FAIL" )
case4Result = ( intentResult and pingResult )
+ #case4Result = pingResult
utilities.assert_equals(
expect=main.TRUE,
actual=case4Result,
@@ -470,7 +471,7 @@
main.step( "Verify number of Switch links to toggle on each Core Switch are between 1 - 5" )
if ( int( switchLinksToToggle ) ==
0 or int( switchLinksToToggle ) > 5 ):
- main.log.info( "Please check you PARAMS file. Valid range for number of switch links to toggle is between 1 to 5" )
+ main.log.info( "Please check your PARAMS file. Valid range for number of switch links to toggle is between 1 to 5" )
main.cleanup()
main.exit()
else:
@@ -834,7 +835,7 @@
print "Intent IDs: ", intentIdList
for id in range( len( intentIdList ) ):
print "Removing intent id (round 1) :", intentIdList[ id ]
- main.ONOScli1.removeIntent( intent_id=intentIdList[ id ] )
+ main.ONOScli1.removeIntent( intentId=intentIdList[ id ] )
time.sleep( 1 )
main.log.info(
@@ -861,7 +862,7 @@
for id in range( len( intentIdList1 ) ):
print "Removing intent id (round 2):", intentIdList1[ id ]
main.ONOScli1.removeIntent(
- intent_id=intentIdList1[ id ] )
+ intentId=intentIdList1[ id ] )
time.sleep( 2 )
else:
print "There are no more intents that need to be removed"