shorter peer name for vlan, add fsfw config

Change-Id: I35d1b58f68b19e8c3fa3e45d0a0fbddd9fee49c0
diff --git a/TestON/tests/USECASE_SdnipFunction_fsfw/USECASE_SdnipFunction_fsfw.py b/TestON/tests/USECASE_SdnipFunction_fsfw/USECASE_SdnipFunction_fsfw.py
index 976472c..e7c5f9d 100644
--- a/TestON/tests/USECASE_SdnipFunction_fsfw/USECASE_SdnipFunction_fsfw.py
+++ b/TestON/tests/USECASE_SdnipFunction_fsfw/USECASE_SdnipFunction_fsfw.py
@@ -28,7 +28,7 @@
         if not topoResult:
             main.cleanup()
             main.exit()
-        main.step( "Connect switches to controller" )
+        main.step( "Connect switches to FSFW" )
 
         global ONOS1Ip
         ONOS1Ip = os.getenv( main.params[ 'CTRL' ][ 'ip1' ] )
@@ -45,7 +45,6 @@
             sw = "sw%s" % ( i )
             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,
                              onpass = "Successfully connect all switches to ONOS",