Adtran ONU/OLT updates for BBWF demo
Change-Id: I282a9136fd136db35dd7ea890dc3899d0aabbaf6
diff --git a/voltha/adapters/adtran_olt/adtran_device_handler.py b/voltha/adapters/adtran_olt/adtran_device_handler.py
index 60522b1..9c2b9fa 100644
--- a/voltha/adapters/adtran_olt/adtran_device_handler.py
+++ b/voltha/adapters/adtran_olt/adtran_device_handler.py
@@ -39,8 +39,8 @@
_ = third_party
DEFAULT_MULTICAST_VLAN = 4000
-DEFAULT_UTILITY_VLAN = 4094
BROADCOM_UNTAGGED_VLAN = 4091 # SEBA - For BBWF demo (BroadCom Default VLAN)
+DEFAULT_UTILITY_VLAN = BROADCOM_UNTAGGED_VLAN
DEFAULT_UNTAGGED_VLAN = BROADCOM_UNTAGGED_VLAN # if RG does not send priority tagged frames
_DEFAULT_RESTCONF_USERNAME = ""
diff --git a/voltha/adapters/adtran_olt/adtran_olt.py b/voltha/adapters/adtran_olt/adtran_olt.py
index 63810b9..eaee130 100644
--- a/voltha/adapters/adtran_olt/adtran_olt.py
+++ b/voltha/adapters/adtran_olt/adtran_olt.py
@@ -52,7 +52,7 @@
self.descriptor = Adapter(
id=self.name,
vendor='Adtran Inc.',
- version='1.23',
+ version='1.24',
config=AdapterConfig(log_level=LogLevel.INFO)
)
log.debug('adtran_olt.__init__', adapter_agent=adapter_agent)
diff --git a/voltha/adapters/adtran_olt/net/pio_zmq.py b/voltha/adapters/adtran_olt/net/pio_zmq.py
index 2fd4048..6b57295 100644
--- a/voltha/adapters/adtran_olt/net/pio_zmq.py
+++ b/voltha/adapters/adtran_olt/net/pio_zmq.py
@@ -17,7 +17,7 @@
from adtran_zmq import AdtranZmqClient
from enum import IntEnum
-DEFAULT_PIO_TCP_PORT = 5657
+DEFAULT_PIO_TCP_PORT = 5555
class PioClient(AdtranZmqClient):
diff --git a/voltha/adapters/adtran_onu/adtran_onu.py b/voltha/adapters/adtran_onu/adtran_onu.py
index ba1384f..539a6b3 100755
--- a/voltha/adapters/adtran_onu/adtran_onu.py
+++ b/voltha/adapters/adtran_onu/adtran_onu.py
@@ -40,7 +40,7 @@
device_handler_class=AdtranOnuHandler,
name='adtran_onu',
vendor='Adtran Inc.',
- version='1.16',
+ version='1.17',
device_type='adtran_onu',
vendor_id='ADTN',
accepts_add_remove_flow_updates=False), # TODO: Support flow-mods
diff --git a/voltha/adapters/adtran_onu/omci/adtn_mib_sync.py b/voltha/adapters/adtran_onu/omci/adtn_mib_sync.py
index 0bd7376..50494e6 100644
--- a/voltha/adapters/adtran_onu/omci/adtn_mib_sync.py
+++ b/voltha/adapters/adtran_onu/omci/adtn_mib_sync.py
@@ -20,10 +20,10 @@
"""
OpenOMCI MIB Synchronizer state machine for Adtran ONUs
"""
- ADTN_RESYNC_DELAY = 60 # Periodically force a resync
+ ADTN_RESYNC_DELAY = 120 # Periodically force a resync (lower for debugging)
+ ADTN_AUDIT_DELAY = 0 # Disabled until after BBWF
- def __init__(self, agent, device_id, mib_sync_tasks, db,
- advertise_events=False):
+ def __init__(self, agent, device_id, mib_sync_tasks, db, advertise_events=False):
"""
Class initialization
@@ -35,11 +35,7 @@
"""
super(AdtnMibSynchronizer, self).__init__(agent, device_id, mib_sync_tasks, db,
advertise_events=advertise_events,
- # states=MibSynchronizer.DEFAULT_STATES,
- # transitions=MibSynchronizer.DEFAULT_TRANSITIONS,
- # initial_state='disabled',
- # timeout_delay=MibSynchronizer.DEFAULT_TIMEOUT_RETRY,
- # audit_delay=MibSynchronizer.DEFAULT_AUDIT_DELAY,
+ audit_delay=AdtnMibSynchronizer.ADTN_AUDIT_DELAY,
resync_delay=AdtnMibSynchronizer.ADTN_RESYNC_DELAY)
self._omci_managed = False # TODO: Look up model number/check handler