commit 1d714e4eedde4523820baf66e22a115bc8bc8f75
author Chip Boling <chipboling@gmail.com> Wed Jan 20 14:57:38 2021 -0600
committer Chip Boling <chipboling@gmail.com> Thu Jan 21 14:47:41 2021 +0000
tree 8c6c62d7dcf1b4df82785b1670672153264e25ed
parent a966c9567cda444e4f680fc6c5fa3324d4dd8d1f

VOL-3757: Allow reception of OMCI via interadapter message type OMCI Response

Change-Id: I66f4360871dde21932b437daf4c2bb164148ff08

VERSION

diff --git a/VERSION b/VERSION
index 6886b8a..24ba9a3 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.7.0-dev
+2.7.0

python/adapters/brcm_openomci_onu/brcm_openomci_onu_handler.py

diff --git a/python/adapters/brcm_openomci_onu/brcm_openomci_onu_handler.py b/python/adapters/brcm_openomci_onu/brcm_openomci_onu_handler.py
index 07d967e..d2486fe 100755
--- a/python/adapters/brcm_openomci_onu/brcm_openomci_onu_handler.py
+++ b/python/adapters/brcm_openomci_onu/brcm_openomci_onu_handler.py
@@ -1431,8 +1431,11 @@
         try:
 
             update_onu_state = False
-
-            if request.header.type == InterAdapterMessageType.OMCI_REQUEST:
+            # Note: VOLTHA v2.6 and ealier OLTs would send an OMCI_REQUEST instead of an
+            #       OMCI_RESPONSE.  Both have identical formats outside of type.  So accept
+            #       both.
+            if request.header.type in (InterAdapterMessageType.OMCI_RESPONSE,
+                                       InterAdapterMessageType.OMCI_REQUEST:
                 omci_msg = InterAdapterOmciMessage()
                 request.body.Unpack(omci_msg)
                 self.log.debug('inter-adapter-recv-omci', omci_msg=hexify(omci_msg.message))