commit bfdfbb567b507d4e7522e245b17019ba41c17fca
author lcui <lcui@cigtech.com> Mon Apr 29 22:47:52 2019 -0700
committer Matt Jeanneret <mj3580@att.com> Fri Dec 06 17:04:05 2019 -0500
tree df8607592c9849561345cefbe23da8ccaa653a55
parent 4ff7e91dfb422c9a0a57568e5517b4c67d66396e

VOL-1472 OpenONU / OpenOlt: Update code to handle new binary OMCI interadapter message format

Also release 2.3.3

Change-Id: I309da8974d960d86587235a1c25c5665305657d5

VERSION

diff --git a/VERSION b/VERSION
index f90b1af..0bee604 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.3.2
+2.3.3

pyvoltha/adapters/extensions/omci/omci_cc.py

diff --git a/pyvoltha/adapters/extensions/omci/omci_cc.py b/pyvoltha/adapters/extensions/omci/omci_cc.py
index 1246ac5..cc989a1 100644
--- a/pyvoltha/adapters/extensions/omci/omci_cc.py
+++ b/pyvoltha/adapters/extensions/omci/omci_cc.py
@@ -22,7 +22,6 @@
 import arrow
 from twisted.internet import reactor, defer
 from twisted.internet.defer import TimeoutError, CancelledError, failure, fail, succeed, inlineCallbacks
-from pyvoltha.adapters.common.frameio.frameio import hexify
 from pyvoltha.adapters.extensions.omci.omci import *
 from pyvoltha.adapters.extensions.omci.omci_me import OntGFrame, OntDataFrame, SoftwareImageFrame
 from pyvoltha.adapters.extensions.omci.me_frame import MEFrame
@@ -337,7 +336,7 @@
 
             try:
                 rx_frame = msg if isinstance(msg, OmciFrame) else OmciFrame(msg)
-                self.log.debug('omci-frame-decoded', omci_msg=hexlify(msg))
+                self.log.debug('recv-omci-msg', omci_msg=hexlify(msg))
             except KeyError as e:
                 # Unknown, Unsupported, or vendor-specific ME. Key is the unknown classID
                 self.log.debug('frame-decode-key-error', omci_msg=hexlify(msg), e=e)
@@ -839,11 +838,11 @@
                                        errbackArgs=(tx_tid, high_priority))
 
                     omci_msg = InterAdapterOmciMessage(
-                        message=hexify(frame),
+                        message=bytes(frame),
                         proxy_address=self._proxy_address,
                         connect_status=self._device.connect_status)
 
-                    self.log.debug('inter-adapter-send-omci', tid=tx_tid, omci_msg=omci_msg.message)
+                    self.log.debug('sent-omci-msg', tid=tx_tid, omci_msg=hexlify(bytes(frame)))
 
                     yield self._adapter_proxy.send_inter_adapter_message(
                         msg=omci_msg,