ADTRAN OLT & ONU: SEBA port number changes for BBWF demo
Change-Id: I93285fc6f804905d22046b424d7abbe554c8f02b
diff --git a/voltha/adapters/adtran_olt/adtran_device_handler.py b/voltha/adapters/adtran_olt/adtran_device_handler.py
index 9c2b9fa..4d471b3 100644
--- a/voltha/adapters/adtran_olt/adtran_device_handler.py
+++ b/voltha/adapters/adtran_olt/adtran_device_handler.py
@@ -40,7 +40,7 @@
DEFAULT_MULTICAST_VLAN = 4000
BROADCOM_UNTAGGED_VLAN = 4091 # SEBA - For BBWF demo (BroadCom Default VLAN)
-DEFAULT_UTILITY_VLAN = BROADCOM_UNTAGGED_VLAN
+DEFAULT_UTILITY_VLAN = 4094
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 eaee130..804ee56 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.24',
+ version='1.25',
config=AdapterConfig(log_level=LogLevel.INFO)
)
log.debug('adtran_olt.__init__', adapter_agent=adapter_agent)
diff --git a/voltha/adapters/adtran_olt/nni_port.py b/voltha/adapters/adtran_olt/nni_port.py
index b0a704e..3ac974d 100644
--- a/voltha/adapters/adtran_olt/nni_port.py
+++ b/voltha/adapters/adtran_olt/nni_port.py
@@ -42,7 +42,9 @@
self.log = structlog.get_logger(port_no=kwargs.get('port_no'))
self.log.info('creating')
- self._name = kwargs.get('name', 'nni-{}'.format(self._port_no))
+ # self._name = kwargs.get('name', 'nni-{}'.format(self._port_no))
+ # SEBA wants 'nni-#', not 'hundred-gigabit-ethernet 0/1
+ self._name = 'nni-{}'.format(self._port_no)
self._logical_port = None
@@ -62,7 +64,8 @@
self._admin_state = AdminState.ENABLED
self._oper_status = OperStatus.ACTIVE
- self._label = kwargs.pop('label', 'NNI port {}'.format(self._port_no))
+ # self._label = kwargs.pop('label', 'NNI port {}'.format(self._port_no))
+ self._label = 'nni-{}'.format(self._port_no)
self._mac_address = kwargs.pop('mac_address', '00:00:00:00:00:00')
# TODO: Get with JOT and find out how to pull out MAC Address via NETCONF
# TODO: May need to refine capabilities into current, advertised, and peer
diff --git a/voltha/adapters/adtran_onu/adtran_onu.py b/voltha/adapters/adtran_onu/adtran_onu.py
index 539a6b3..58f635e 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.17',
+ version='1.18',
device_type='adtran_onu',
vendor_id='ADTN',
accepts_add_remove_flow_updates=False), # TODO: Support flow-mods
diff --git a/voltha/adapters/adtran_onu/uni_port.py b/voltha/adapters/adtran_onu/uni_port.py
index 2259058..dc7baa5 100644
--- a/voltha/adapters/adtran_onu/uni_port.py
+++ b/voltha/adapters/adtran_onu/uni_port.py
@@ -264,7 +264,7 @@
device.parent_port_no & 0xff,
(port_no >> 8) & 0xff,
port_no & 0xff)),
- name=self.port_id_name(),
+ name=device.serial_number,
config=0,
state=OFPPS_LIVE,
curr=capabilities,