Set logical device manufacturer in the core to "VOLTHA Project".
This means ONOS can automatically assign a driver to VOLTHA devices.
Change-Id: I5466848dd837d0a3f9ac0303c530490d0506fef5
diff --git a/voltha/adapters/asfvolt16_olt/asfvolt16_device_handler.py b/voltha/adapters/asfvolt16_olt/asfvolt16_device_handler.py
index 2d65164..ee1a45f 100644
--- a/voltha/adapters/asfvolt16_olt/asfvolt16_device_handler.py
+++ b/voltha/adapters/asfvolt16_olt/asfvolt16_device_handler.py
@@ -869,7 +869,6 @@
# not setting id and datapth_id will let the adapter
# agent pick id
desc=ofp_desc(
- mfr_desc='cord project',
hw_desc='n/a',
sw_desc='logical device for Edgecore ASFvOLT16 OLT',
#serial_num=uuid4().hex,
diff --git a/voltha/adapters/microsemi_olt/DeviceManager.py b/voltha/adapters/microsemi_olt/DeviceManager.py
index af3058b..d9499d5 100644
--- a/voltha/adapters/microsemi_olt/DeviceManager.py
+++ b/voltha/adapters/microsemi_olt/DeviceManager.py
@@ -76,7 +76,6 @@
# that will correspond to the NNI port
ld = LogicalDevice(
desc=ofp_desc(
- mfr_desc=self.device.vendor,
hw_desc=self.device.hardware_version,
sw_desc=self.device.firmware_version,
serial_num=uuid4().hex,
diff --git a/voltha/adapters/openolt/openolt_device.py b/voltha/adapters/openolt/openolt_device.py
index d12c953..e738ccf 100644
--- a/voltha/adapters/openolt/openolt_device.py
+++ b/voltha/adapters/openolt/openolt_device.py
@@ -104,7 +104,7 @@
# Create logical device
ld = LogicalDevice(
desc=ofp_desc(
- mfr_desc='FIXME', hw_desc='FIXME',
+ hw_desc='FIXME',
sw_desc='FIXME', serial_num='FIXME',
dp_desc='n/a'),
switch_features=ofp_switch_features(
diff --git a/voltha/adapters/ponsim_olt/ponsim_olt.py b/voltha/adapters/ponsim_olt/ponsim_olt.py
index 82c6602..1e0c464 100644
--- a/voltha/adapters/ponsim_olt/ponsim_olt.py
+++ b/voltha/adapters/ponsim_olt/ponsim_olt.py
@@ -458,7 +458,6 @@
# not setting id and datapath_id. Adapter agent will pick the id
# and will pick the datapath_id is it is not provided
desc=ofp_desc(
- mfr_desc='cord porject',
hw_desc='simualted pon',
sw_desc='simualted pon',
serial_num=uuid4().hex,
@@ -810,7 +809,6 @@
ld = LogicalDevice(
# not setting id and datapth_id will let the adapter agent pick id
desc=ofp_desc(
- mfr_desc='cord porject',
hw_desc='simulated pon',
sw_desc='simulated pon',
serial_num=uuid4().hex,
diff --git a/voltha/adapters/simulated_olt/simulated_olt.py b/voltha/adapters/simulated_olt/simulated_olt.py
index 18da5f3..8f2de25 100644
--- a/voltha/adapters/simulated_olt/simulated_olt.py
+++ b/voltha/adapters/simulated_olt/simulated_olt.py
@@ -408,9 +408,8 @@
id='simulated1',
datapath_id=1,
desc=ofp_desc(
- mfr_desc='cord project',
- hw_desc='simualted pon',
- sw_desc='simualted pon',
+ hw_desc='simulated pon',
+ sw_desc='simulated pon',
serial_num=uuid4().hex,
dp_desc='n/a'
),
@@ -521,9 +520,8 @@
ld = LogicalDevice(
# not setting id and datapth_id will let the adapter agent pick id
desc=ofp_desc(
- mfr_desc='cord porject',
- hw_desc='simualted pon',
- sw_desc='simualted pon',
+ hw_desc='simulated pon',
+ sw_desc='simulated pon',
serial_num=uuid4().hex,
dp_desc='n/a'
),
@@ -964,5 +962,3 @@
logical_port_no=1,
packet=eapol_start)
return '{"status": "sent"}'
-
-
diff --git a/voltha/core/adapter_agent.py b/voltha/core/adapter_agent.py
index 1c3db69..f67d9eb 100644
--- a/voltha/core/adapter_agent.py
+++ b/voltha/core/adapter_agent.py
@@ -572,6 +572,9 @@
logical_device.id = ld_id
logical_device.datapath_id = dp_id
+ if not logical_device.desc.mfr_desc:
+ logical_device.desc.mfr_desc = "VOLTHA Project"
+
self._make_up_to_date('/logical_devices',
logical_device.id, logical_device)
@@ -586,10 +589,10 @@
def reconcile_logical_device(self, logical_device_id):
"""
- This is called by the adapter to reconcile the physical device with
+ This is called by the adapter to reconcile the physical device with
the logical device. For now, we only set the packet-out subscription
- :param logical_device_id:
- :return:
+ :param logical_device_id:
+ :return:
"""
# Keep a reference to the packet out subscription as it will be
# referred during removal