commit 965315838f733febd2b5c7e217074a001e1d8793
author Nathan Knuth <nathan.knuth@tibitcom.com> Mon Feb 13 05:27:37 2017 -0800
committer Nathan Knuth <nathan.knuth@tibitcom.com> Mon Feb 13 05:27:37 2017 -0800
tree 42bbfa0c55623cbc9f3ad03105281fe8ba53562e
parent 6b7b6ff21659ef747446c63c31910ddc9206779a

Tibit: Handling internal three item dictionary

Change-Id: I1b8231384fbbff063bccbe54fad75f6847906cfc

voltha/adapters/tibit_olt/tibit_olt.py

diff --git a/voltha/adapters/tibit_olt/tibit_olt.py b/voltha/adapters/tibit_olt/tibit_olt.py
index feaae25..4ae423f 100644
--- a/voltha/adapters/tibit_olt/tibit_olt.py
+++ b/voltha/adapters/tibit_olt/tibit_olt.py
@@ -125,7 +125,7 @@
         self.io_port = None
         self.incoming_queues = {}  # OLT mac_address -> DeferredQueue()
         self.device_ids = {}  # OLT mac_address -> device_id
-        self.vlan_to_device_ids = {}  # c-vid -> (device_id, logical_device_id)
+        self.vlan_to_device_ids = {}  # c-vid -> (device_id, logical_device_id, mac_address)
 
     def start(self):
         log.debug('starting', interface=self.interface)
@@ -755,7 +755,7 @@
         log.info('packet-out', logical_device_id=logical_device_id,
                  egress_port_no=egress_port_no, msg_len=len(msg))
 
-        dev_id, logical_dev_id = self.vlan_to_device_ids[egress_port_no]
+        _, logical_dev_id, _ = self.vlan_to_device_ids[egress_port_no]
         if logical_dev_id != logical_device_id:
             raise Exception('Internal table mismatch')
 
@@ -780,7 +780,7 @@
             pon_port_metrics = {}
             links = []
             olt_mac = next((mac for mac, device in self.device_ids.iteritems() if device == device_id), None)
-            links   = [v[TIBIT_ONU_LINK_INDEX] for _,v in self.vlan_to_device_ids.iteritems()]
+            links   = [v[TIBIT_ONU_LINK_INDEX] for _,v,_ in self.vlan_to_device_ids.iteritems()]
 
             try:
                 # Step 1: gather metrics from device