commit 0207527244d52d1848a7aef960aa115d548591ff
author Devin Lim <devin@onlab.us> Mon Jul 10 15:33:21 2017 -0700
committer Devin Lim <devin@onlab.us> Mon Jul 10 15:50:52 2017 -0700
tree 0b5ecce96d260236a496dc9177a56b1ae4333cb9
parent 197fd465a217c4942c13f119562bec90d666ce70

[ONOS-6800] onosNetCFG driver function should not append ".json" to the file name

Change-Id: I16eeaa908a99a8e1c8f58bea00dba00d11367e89

TestON/tests/FUNC/FUNCoptical/FUNCoptical.py

diff --git a/TestON/tests/FUNC/FUNCoptical/FUNCoptical.py b/TestON/tests/FUNC/FUNCoptical/FUNCoptical.py
index c7ae463..aae4b15 100644
--- a/TestON/tests/FUNC/FUNCoptical/FUNCoptical.py
+++ b/TestON/tests/FUNC/FUNCoptical/FUNCoptical.py
@@ -222,8 +222,12 @@
         """
         main.case( "Mininet with Linc-OE startup" )
         main.step( "Push TopoDDriver.json to ONOS through onos-netcfg" )
-        topoResult = main.ONOSbench.onosNetCfg( controllerIps=main.activeONOSip, path=main.dependencyPath,
-                                   fileName="TopoDDriver" )
+        topoResult = True
+        for ip in main.activeONOSip:
+            topoResult = topoResult and \
+                         main.ONOSbench.onosNetCfg(controllerIp=ip, path=main.dependencyPath,
+                                                   fileName="TopoDDriver.json")
+
         #Exit if topology did not load properly
         if not topoResult:
             main.cleanup()