Added OF 1.3 Testing in FUNCintent test
Change-Id: I4b61f1160faa098a5894158e8828331aa0d53ab9
diff --git a/TestON/tests/FUNCintent/FUNCintent.params b/TestON/tests/FUNCintent/FUNCintent.params
index 891f572..e34ac26 100644
--- a/TestON/tests/FUNCintent/FUNCintent.params
+++ b/TestON/tests/FUNCintent/FUNCintent.params
@@ -12,10 +12,10 @@
# 3000 - Test single to multi point intents
# 4000 - Test multi to single point intents
- <testcases>1,2,11,12,13,1000,2000,3000,4000</testcases>
+ <testcases>1,[2,10,12,13,1000,2000,3000,4000,14]*2,[2,11,12,13,1000,2000,3000,4000,14]*2</testcases>
<SCALE>
- <size>1,3</size>
+ <size>1,3,1,3</size>
</SCALE>
<DEPENDENCY>
diff --git a/TestON/tests/FUNCintent/FUNCintent.py b/TestON/tests/FUNCintent/FUNCintent.py
index fbf12a5..dd418d9 100644
--- a/TestON/tests/FUNCintent/FUNCintent.py
+++ b/TestON/tests/FUNCintent/FUNCintent.py
@@ -224,7 +224,7 @@
"s" )
#main.ONOSbench.logReport( globalONOSip[1], [ "INFO" ], "d" )
- def CASE11( self, main ):
+ def CASE10( self, main ):
"""
Start mininet
"""
@@ -244,6 +244,28 @@
main.cleanup()
main.exit()
+ def CASE11( self, main ):
+ """
+ Start mininet
+ """
+ main.log.report( "Start Mininet topology with OF 1.3 switches" )
+ main.log.case( "Start Mininet topology with OF 1.3 switches" )
+
+ main.step( "Start Mininet topology with OF 1.3 switches" )
+ args = "--switch ovs,protocols=OpenFlow13"
+ topoResult = main.Mininet1.startNet( topoFile=main.dependencyPath +
+ main.topology,
+ args=args )
+ stepResult = topoResult
+ utilities.assert_equals( expect=main.TRUE,
+ actual=stepResult,
+ onpass="Successfully loaded topology",
+ onfail="Failed to load topology" )
+ # Exit if topology did not load properly
+ if not topoResult:
+ main.cleanup()
+ main.exit()
+
def CASE12( self, main ):
"""
Assign mastership to controllers