make the fsfw port configurable
Change-Id: Ib4157449a71161d15734b3993bb5ce14a7ee9a35
diff --git a/TestON/tests/USECASE_SdnipFunction_fsfw/USECASE_SdnipFunction_fsfw.params b/TestON/tests/USECASE_SdnipFunction_fsfw/USECASE_SdnipFunction_fsfw.params
index 074b558..7e82818 100644
--- a/TestON/tests/USECASE_SdnipFunction_fsfw/USECASE_SdnipFunction_fsfw.params
+++ b/TestON/tests/USECASE_SdnipFunction_fsfw/USECASE_SdnipFunction_fsfw.params
@@ -11,6 +11,7 @@
<numCtrl>1</numCtrl>
<ip1>OC1</ip1>
<ipN>OCN</ipN>
+ <fsfwPort>6633</fsfwPort>
<port1>6653</port1>
</CTRL>
diff --git a/TestON/tests/USECASE_SdnipFunction_fsfw/USECASE_SdnipFunction_fsfw.py b/TestON/tests/USECASE_SdnipFunction_fsfw/USECASE_SdnipFunction_fsfw.py
index ac5f67d..885a561 100644
--- a/TestON/tests/USECASE_SdnipFunction_fsfw/USECASE_SdnipFunction_fsfw.py
+++ b/TestON/tests/USECASE_SdnipFunction_fsfw/USECASE_SdnipFunction_fsfw.py
@@ -34,12 +34,15 @@
ONOS1Ip = os.getenv( main.params[ 'CTRL' ][ 'ip1' ] )
global fsfwIp
fsfwIp = os.getenv( main.params[ 'CTRL' ][ 'ipN' ] )
+ global fsfwPort
+ fsfwPort = os.getenv( main.params[ 'CTRL' ][ 'fsfwPort' ] )
# connect all switches to controller
swResult = main.TRUE
for i in range ( 1, int( main.params['config']['switchNum'] ) + 1 ):
sw = "sw%s" % ( i )
- swResult = swResult and main.Mininet.assignSwController( sw, fsfwIp )
+ swResult = swResult and main.Mininet.assignSwController( sw, fsfwIp,
+ port = fsfwPort )
# swResult = swResult and main.Mininet.assignSwController( sw, ONOS1Ip, port = "6633" )
utilities.assert_equals( expect = main.TRUE,
actual = swResult,