VOL-1494: Compare UniType needed for proper omci messaging
Seems the 1.x core python could compare enum types easier
than here. Work around for now by comparing the actual
value of the enum
Also fix typo in Makefile regarding venv and local
protos
Change-Id: I33e9108d7975c8e6ed72bfc7597471fbf671b83b
diff --git a/python/Makefile b/python/Makefile
index a78ecda..f5a3e4c 100644
--- a/python/Makefile
+++ b/python/Makefile
@@ -150,6 +150,6 @@
mkdir -p local_imports/voltha-protos/dist
cp ../../voltha-protos/dist/*.tar.gz local_imports/voltha-protos/dist/
. ${VENVDIR}/bin/activate && \
- pip install local_protos/voltha-protos/dist/*.tar.gz
+ pip install local_imports/voltha-protos/dist/*.tar.gz
endif
# end file
diff --git a/python/adapters/brcm_openomci_onu/omci/brcm_mib_download_task.py b/python/adapters/brcm_openomci_onu/omci/brcm_mib_download_task.py
index 00616d7..68d8d14 100644
--- a/python/adapters/brcm_openomci_onu/omci/brcm_mib_download_task.py
+++ b/python/adapters/brcm_openomci_onu/omci/brcm_mib_download_task.py
@@ -370,9 +370,9 @@
# default to PPTP
tp_type = None
- if uni_port.type is UniType.VEIP:
+ if uni_port.type.value == UniType.VEIP.value:
tp_type = 11
- elif uni_port.type is UniType.PPTP:
+ elif uni_port.type.value == UniType.PPTP.value:
tp_type = 1
else:
tp_type = 1
@@ -422,10 +422,10 @@
try:
state = 1 if force_lock or not uni_port.enabled else 0
msg = None
- if uni_port.type is UniType.PPTP:
+ if uni_port.type.value == UniType.PPTP.value:
msg = PptpEthernetUniFrame(uni_port.entity_id,
attributes=dict(administrative_state=state))
- elif uni_port.type is UniType.VEIP:
+ elif uni_port.type.value == UniType.VEIP.value:
msg = VeipUniFrame(uni_port.entity_id,
attributes=dict(administrative_state=state))
else:
diff --git a/python/adapters/brcm_openomci_onu/omci/brcm_tp_service_specific_task.py b/python/adapters/brcm_openomci_onu/omci/brcm_tp_service_specific_task.py
index 1a9eb1e..d6fafda 100644
--- a/python/adapters/brcm_openomci_onu/omci/brcm_tp_service_specific_task.py
+++ b/python/adapters/brcm_openomci_onu/omci/brcm_tp_service_specific_task.py
@@ -382,9 +382,9 @@
# TODO: magic. static variable for assoc_type
# default to PPTP
- if self._uni_port.type is UniType.VEIP:
+ if self._uni_port.type.value == UniType.VEIP.value:
association_type = 10
- elif self._uni_port.type is UniType.PPTP:
+ elif self._uni_port.type.value == UniType.PPTP.value:
association_type = 2
else:
association_type = 2