commit a820d24f9242e4524d9740f6c04537c37db219fd
author alshabib <alshabibi.ali@gmail.com> Tue Nov 29 14:49:34 2016 -0800
committer Ali Al-Shabibi <ali@onlab.us> Tue Dec 06 15:27:21 2016 -0800
tree 504ebdfb5cdb630e89ac40e461f5ac0db60d2429
parent 05fb71f7c46d5cd358ce475a73934f852e1e9eeb

Returning an appropriate descriptor

Change-Id: Iaf42375ed4b58a4be28e1a9faec9854e4595b977

voltha/adapters/microsemi/RubyAdapter.py

diff --git a/voltha/adapters/microsemi/RubyAdapter.py b/voltha/adapters/microsemi/RubyAdapter.py
index 1083265..4e23f61 100644
--- a/voltha/adapters/microsemi/RubyAdapter.py
+++ b/voltha/adapters/microsemi/RubyAdapter.py
@@ -17,10 +17,10 @@
 """
 Microsemi/Celestica Ruby vOLTHA adapter.
 """
-import time
 import structlog
 from twisted.internet import reactor
 from voltha.adapters.interface import IAdapterInterface
+from voltha.adapters.microsemi.PAS5211 import PAS5211MsgGetOltVersion, PAS5211MsgGetOltVersionResponse
 from voltha.adapters.microsemi.PAS5211_comm import PAS5211Communication
 from voltha.adapters.microsemi.StateMachine import Disconnected, States
 
@@ -42,18 +42,15 @@
     def __init__(self, args, config):
         self.args = args
         self.config = config
-        self.descriptor = Adapter(
-            id='ruby',
-            config=AdapterConfig()
-            # TODO
-        )
+        self.descriptor = None
         self.comm = comm = PAS5211Communication(dst_mac=olt_conf['olts']['mac'],
                                                 iface=olt_conf['iface'])
         self.olt = Disconnected(comm)
 
     def start(self):
         log.info('starting')
-        reactor.callLater(0, self.init_olt)
+        reactor.callLater(0, self.__init_olt)
+        reactor.callLater(2, self.adapter_descriptor)
         log.info('started')
         return self
 
@@ -64,6 +61,9 @@
         return self
 
     def adapter_descriptor(self):
+        if self.descriptor is None:
+            self.descriptor = self.__obtain_descriptor()
+        print self.descriptor
         return self.descriptor
 
     def device_types(self):
@@ -86,7 +86,11 @@
     def deactivate_device(self, device):
         raise NotImplementedError()
 
-    def init_olt(self):
+    ##
+    # Private methods
+    ##
+
+    def __init_olt(self):
         olt = self.olt
         while not olt.abandon():
             if olt.state() == States.DISCONNECTED or olt.state() == States.FETCH_VERSION:
@@ -100,3 +104,15 @@
             log.info('Disconnecting this OLT')
             self.stop()
         self.olt = olt
+
+
+    def __obtain_descriptor(self):
+        layer = PAS5211MsgGetOltVersionResponse.name
+        pkt = self.olt.send_msg(PAS5211MsgGetOltVersion())
+        return Adapter(
+            id='ruby-{}'.format(olt_conf['olts']['id']),
+            vendor='Celestica',
+            version='{}.{}.{}'.format(pkt[layer].major_firmware_version,
+                                      pkt[layer].minor_firmware_version,
+                                      pkt[layer].build_firmware_version))
+

voltha/adapters/microsemi/StateMachine.py

diff --git a/voltha/adapters/microsemi/StateMachine.py b/voltha/adapters/microsemi/StateMachine.py
index d2f4a50..12f6224 100644
--- a/voltha/adapters/microsemi/StateMachine.py
+++ b/voltha/adapters/microsemi/StateMachine.py
@@ -201,8 +201,6 @@
         self.packet = self.comm.communicate(PAS5211MsgGetOltVersion())
         if self.packet is None:
             self.completed = True
-        else:
-            self.packet.show()
 
     def disconnect(self):
         print "Disconnecting OLT"

voltha/adapters/microsemi/main.py

diff --git a/voltha/adapters/microsemi/main.py b/voltha/adapters/microsemi/main.py
index ca7afe0..464f7af 100644
--- a/voltha/adapters/microsemi/main.py
+++ b/voltha/adapters/microsemi/main.py
@@ -15,6 +15,7 @@
 #
 
 import argparse
+import time
 from common.structlog_setup import setup_logging
 from common.utils.dockerhelpers import get_my_containers_name
 import os