commit 0d944e26828d21f07f11bc247bfe467fc52cbb2d
author Devin Lim <devin@onlab.us> Fri Jun 23 15:17:53 2017 -0700
committer Thomas Vachuska <tom@onlab.us> Tue Jun 27 23:39:16 2017 +0000
tree d4ac483ba2cc8fa676ef84760f23740588a0acb2
parent cde9e2f0eeb7192155721c32109f2459f4ba3f59

Fixed the path of the onos-netcfg

Change-Id: I60e5cdf6c8863c235395d341c4db21d4c5ba2ef3

tools/test/topos/opticalUtils.py

diff --git a/tools/test/topos/opticalUtils.py b/tools/test/topos/opticalUtils.py
index 6730b80..e8db648 100644
--- a/tools/test/topos/opticalUtils.py
+++ b/tools/test/topos/opticalUtils.py
@@ -264,7 +264,7 @@
     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(sysConfig)
-    
+
     ### ONOS Directory ###
     try:
         onosDir = os.environ[ 'ONOS_ROOT' ]
@@ -274,6 +274,12 @@
             error('Please set ONOS_ROOT environment variable!\n')
         else:
             os.environ[ 'ONOS_ROOT' ] = onosDir
+    ### ONOS-netcfg directory ###
+    try:
+        runPackDir = os.environ[ 'RUN_PACK_PATH' ]
+    except:
+        runPackDir = onosDir+"/tools/package/runtime/bin"
+        os.environ[ 'RUN_PACK_PATH' ] = runPackDir
     ### REST USER/PASS ###
     try:
         restUser = os.environ[ 'ONOS_WEB_USER' ]
@@ -412,8 +418,8 @@
         with open("crossConnect.json", 'w') as fd:
             json.dump(crossConnectJSON, fd, indent=4, separators=(',', ': '))
         info('*** Pushing crossConnect.json to ONOS\n')
-        output = quietRun('%s/tools/test/bin/onos-netcfg %s\
-         Topology.json' % (self.onosDir, self.controllers[ 0 ].ip), shell=True)
+        output = quietRun('%s/onos-netcfg %s\
+         Topology.json' % (self.runPackDir, self.controllers[ 0 ].ip), shell=True)
 
     def stop_oe(self):
         '''
@@ -578,8 +584,8 @@
 
         info('*** Pushing Topology.json to ONOS\n')
         for index in range(len(LINCSwitch.controllers)):
-            output = quietRun('%s/tools/test/bin/onos-netcfg %s Topology.json &'\
-                               % (LINCSwitch.onosDir, LINCSwitch.controllers[ index ].ip), shell=True)
+            output = quietRun('%s/onos-netcfg %s Topology.json &'\
+                               % (LINCSwitch.runPackDir, LINCSwitch.controllers[ index ].ip), shell=True)
             # successful output contains the two characters '{}'
             # if there is more output than this, there is an issue
             if output.strip('{}'):