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/bmv2-demo.py

diff --git a/tools/test/topos/bmv2-demo.py b/tools/test/topos/bmv2-demo.py
index d1aa579..646c7353 100644
--- a/tools/test/topos/bmv2-demo.py
+++ b/tools/test/topos/bmv2-demo.py
@@ -10,6 +10,11 @@
 else:
     ONOS_ROOT = os.environ["ONOS_ROOT"]
     sys.path.append(ONOS_ROOT + "/tools/dev/mininet")
+if 'RUN_PACK_PATH' not in os.environ:
+    print "Environment var $RUN_PACK_PATH not set"
+    exit()
+else:
+    RUN_PACK_PATH = os.environ["RUN_PACK_PATH"]
 
 from onos import ONOSCluster, ONOSCLI
 from bmv2 import ONOSBmv2Switch
@@ -161,7 +166,7 @@
     # net.hosts[0].startIperfClient(net.hosts[-1], flowBw="200k", numFlows=100, duration=10)
 
     print "Setting netcfg..."
-    call(("%s/tools/test/bin/onos-netcfg" % ONOS_ROOT, onosIp,
+    call(("%s/onos-netcfg" % RUN_PACK_PATH, onosIp,
           "%s/tools/test/topos/bmv2-demo-cfg.json" % ONOS_ROOT))
 
     if not args.onos_ip: