VOL-2395: Defer creation of EVTO and pyvoltha that does not cache
Defer the creation of the EVTO object and also delete if it exists
This prevents lingering vlan configuration that may be left after a
device disable/enable preventing passing traffic.
Also use newer pyvolthat that does not cache old TP values.
Change-Id: Ifa12a5bacb6c0a93e0e70ed6414d74926c7cd866
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 75f71d5..18f7fbf 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
@@ -290,18 +290,12 @@
# - MAC Bridge Service Profile (the bridge)
# - PPTP Ethernet or VEIP UNI
- # TODO: magic. make a static variable for tp_type and association_type
# default to PPTP
- tp_type = None
+ tp_type = 1
if uni_port.type.value == UniType.VEIP.value:
tp_type = 11
- association_type = 10
elif uni_port.type.value == UniType.PPTP.value:
tp_type = 1
- association_type = 2
- else:
- tp_type = 1
- association_type = 2
msg = MacBridgePortConfigurationDataFrame(
self._mac_bridge_port_ani_entity_id + uni_port.entity_id, # Entity ID
@@ -315,39 +309,6 @@
results = yield omci_cc.send(frame)
self.check_status_and_state(results, 'create-mac-bridge-port-configuration-data-uni-port')
- ################################################################################
- # Create Extended VLAN Tagging Operation config (UNI-side)
- #
- # EntityID relates to the VLAN TCIS later used int vlan filter task. This only
- # sets up the inital MIB entry as it relates to port config, it does not set vlan
- # that is saved for the vlan filter task
- #
- # References:
- # - PPTP Ethernet or VEIP UNI
- #
-
- attributes = dict(
- association_type=association_type, # Assoc Type, PPTP/VEIP Ethernet UNI
- associated_me_pointer=uni_port.entity_id, # Assoc ME, PPTP/VEIP Entity Id
-
- # See VOL-1311 - Need to set table during create to avoid exception
- # trying to read back table during post-create-read-missing-attributes
- # But, because this is a R/W attribute. Some ONU may not accept the
- # value during create. It is repeated again in a set below.
- input_tpid=self._input_tpid, # input TPID
- output_tpid=self._output_tpid, # output TPID
- )
-
- msg = ExtendedVlanTaggingOperationConfigurationDataFrame(
- self._mac_bridge_service_profile_entity_id + uni_port.mac_bridge_port_num, # Bridge Entity ID
- attributes=attributes
- )
-
- frame = msg.create()
- self.log.debug('openomci-msg', omci_msg=msg)
- results = yield omci_cc.send(frame)
- self.check_status_and_state(results, 'create-extended-vlan-tagging-operation-configuration-data')
-
except TimeoutError as e:
self.log.warn('rx-timeout-inital-per-uni-setup', e=e)
raise