commit 5bc7b5a1e534ad12f2d896d7f5734b9d4c7696fb
author A R Karthick <kramanar@ciena.com> Wed Jul 27 14:12:58 2016 -0700
committer A R Karthick <kramanar@ciena.com> Wed Jul 27 14:12:58 2016 -0700
tree 0659b9461f846c46405cda816a5cb83dee6bb915
parent d49ca4b655bcb273da52c6f0150164bae88022f2

Fix: Make sure in simulation or non-olt case, device id get doesn't break

Change-Id: I2d6aa027cc5818165f4964bb9c1e5e9f9c093c8a

src/test/utils/OnosCtrl.py

diff --git a/src/test/utils/OnosCtrl.py b/src/test/utils/OnosCtrl.py
index 9c73b4a..09cbeee 100644
--- a/src/test/utils/OnosCtrl.py
+++ b/src/test/utils/OnosCtrl.py
@@ -78,6 +78,7 @@
     def get_device_id(cls):
         '''If running under olt, we get the first switch connected to onos'''
         olt = OltConfig()
+        did = 'of:' + get_mac('ovsbr0')
         if olt.on_olt():
             devices = cls.get_devices()
             if devices:
@@ -87,8 +88,6 @@
                 else:
                     ###If we have more than 1, then check for env before using first one
                     did = os.getenv('OLT_DEVICE_ID', dids[0])
-            else:
-                  did = 'of:' + get_mac('ovsbr0')
 
         return did