commit 5209fe88efa9adb71280b73722a98f57ce8a1ac0
author Chetan Gaonker <chetang@calsoftlabs.com> Tue Apr 19 10:09:53 2016 -0700
committer Chetan Gaonker <chetang@calsoftlabs.com> Tue Apr 19 10:09:53 2016 -0700
tree f754925b5c4138ac6a5e83f60d32e0d46159250b
parent a9b6fcbbae86c515914b5c4d182314322607e7cb

Changes with modified olt configuration to start test controller/onos/switch on another system.

src/test/utils/OltConfig.py

diff --git a/src/test/utils/OltConfig.py b/src/test/utils/OltConfig.py
index 69aa8d8..958e0bd 100644
--- a/src/test/utils/OltConfig.py
+++ b/src/test/utils/OltConfig.py
@@ -21,11 +21,20 @@
         return self.olt_conf['olt'] is True
 
     def olt_port_map(self):
-        if self.on_olt() and self.olt_conf.has_key('ports'):
+        if self.on_olt() and self.olt_conf.has_key('port_map'):
             port_map = {}
+            port_map['ports'] = self.olt_conf['port_map']['ports']
+            port_map['start_vlan'] = 0
+            if self.olt_conf['port_map'].has_key('host'):
+                port_map['host'] = self.olt_conf['port_map']['host']
+            else:
+                port_map['host'] = 'ovsbr0'
+            if self.olt_conf['port_map'].has_key('start_vlan'):
+                port_map['start_vlan'] = int(self.olt_conf['port_map']['start_vlan'])
+                
             ##Build a rx/tx port number to interface map
-            port_map[1] = self.olt_conf['ports']['rx']
-            port_map[2] = self.olt_conf['ports']['tx']
+            port_map[1] = self.olt_conf['port_map']['rx']
+            port_map[2] = self.olt_conf['port_map']['tx']
             port_map[port_map[1]] = 1
             port_map[port_map[2]] = 2
             return port_map