commit 991caf92eff42915e51324aa31a7d5e54511f2fd
author Yuta HIGUCHI <y-higuchi@ak.jp.nec.com> Fri Jun 02 11:12:03 2017 -0700
committer Yuta HIGUCHI <y-higuchi@onlab.us> Tue Jun 06 18:58:35 2017 +0000
tree b6ec3af64b232451f284304e30c78c80bc5d5f57
parent 7e8f8320c88e319f1f1d4ffb9128a9f29590fdb5

Fixing opticalUtils.py

- Added ectest.py used by test scenario
  originally from https://github.com/akoshibe/ecord-topos/blob/master/ectest.py
- Fixed issues found in opticalUtils.py

Change-Id: I100f5d6bab467fe60af24cf88817dba0911a9916

tools/test/topos/opticalUtils.py

diff --git a/tools/test/topos/opticalUtils.py b/tools/test/topos/opticalUtils.py
index a4b0696..6730b80 100644
--- a/tools/test/topos/opticalUtils.py
+++ b/tools/test/topos/opticalUtils.py
@@ -263,7 +263,7 @@
     ### sys.config path ###
     sysConfig = "/home/{}/linc-oe/rel/linc/releases/1.0/sys.config".format(user)
     ### dict of containing dpids as key and corresponding LINC switchId as values ###
-    dpidsToLINCSwitchId = dpids_to_ids.__func__(sysConfig)
+    dpidsToLINCSwitchId = dpids_to_ids(sysConfig)
     
     ### ONOS Directory ###
     try:
@@ -286,11 +286,11 @@
         os.environ[ 'ONOS_WEB_USER' ] = restUser
         os.environ[ 'ONOS_WEB_PASS' ] = restPass
     ### LINC-directory
-    lincDir = findDir.__func__('linc-oe', user)
+    lincDir = findDir('linc-oe', user)
     if not lincDir:
         error("***ERROR: Could not find linc-oe in user's home directory\n")
     ### LINC config generator directory###
-    configGen = findDir.__func__('LINC-config-generator', user)
+    configGen = findDir('LINC-config-generator', user)
     if not configGen:
         error("***ERROR: Could not find LINC-config-generator in user's home directory\n")
     # list of all the controllers
@@ -490,7 +490,7 @@
 
         topoConfigJson = {}
 
-        topoConfigJson["switchConfig"] = LINCSwitch.getSwitchConfig(net.switches)
+        topoConfigJson["switchConfig"] = getSwitchConfig(net.switches)
         topoConfigJson["linkConfig"] = getLinkConfig(net.links)
 
         #Writing to TopoConfig.json