commit e9107e4ddca2b6c907bd6b7af6bcc167dcd2caaf
author pingping-lin <pingping@onlab.us> Mon Nov 30 19:19:38 2015 -0800
committer pingping-lin <pingping@onlab.us> Mon Nov 30 19:19:38 2015 -0800
tree 1900c0e731afcd541d581753a3ef1835398a2439
parent 15fa4be86e2d2f7bcd49af2accf2040a02aebcea

make the fsfw ip configurable

Change-Id: I97b3f826c2fc359cb1959d4c23191868c274fc89

TestON/tests/USECASE_SdnipFunction_fsfw/USECASE_SdnipFunction_fsfw.params

diff --git a/TestON/tests/USECASE_SdnipFunction_fsfw/USECASE_SdnipFunction_fsfw.params b/TestON/tests/USECASE_SdnipFunction_fsfw/USECASE_SdnipFunction_fsfw.params
index 7e82818..fca86aa 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>
+        <fsfwIp>10.128.10.12</fsfwIp>
         <fsfwPort>6633</fsfwPort>
         <port1>6653</port1>
     </CTRL>

TestON/tests/USECASE_SdnipFunction_fsfw/USECASE_SdnipFunction_fsfw.py

diff --git a/TestON/tests/USECASE_SdnipFunction_fsfw/USECASE_SdnipFunction_fsfw.py b/TestON/tests/USECASE_SdnipFunction_fsfw/USECASE_SdnipFunction_fsfw.py
index 885a561..68571c7 100644
--- a/TestON/tests/USECASE_SdnipFunction_fsfw/USECASE_SdnipFunction_fsfw.py
+++ b/TestON/tests/USECASE_SdnipFunction_fsfw/USECASE_SdnipFunction_fsfw.py
@@ -33,9 +33,11 @@
         global ONOS1Ip
         ONOS1Ip = os.getenv( main.params[ 'CTRL' ][ 'ip1' ] )
         global fsfwIp
-        fsfwIp = os.getenv( main.params[ 'CTRL' ][ 'ipN' ] )
+        # TDOO: there is some setup sequence issue, will fix it later
+        # fsfwIp = os.getenv( main.params[ 'CTRL' ][ 'ipN' ] )
+        fsfwIp = main.params[ 'CTRL' ][ 'fsfwIp' ]
         global fsfwPort
-        fsfwPort = os.getenv( main.params[ 'CTRL' ][ 'fsfwPort' ] )
+        fsfwPort = main.params[ 'CTRL' ][ 'fsfwPort' ]
 
         # connect all switches to controller
         swResult = main.TRUE