openstack/ironic-python-agent
Code Issues Proposed changes

Merge "Documentation follow-up to the LLDP patch"

Browse Source
This commit is contained in:
Jenkins 2016-06-27 16:17:01 +00:00 committed by Gerrit Code Review
commit 56eea51564
2 changed files with 8 additions and 7 deletions
doc/source
index.rst
ironic_python_agent
hardware.py

11
doc/source/index.rst

@ -111,11 +111,12 @@ fields:
``interfaces`` ``interfaces``
list of network interfaces with fields: ``name``, ``mac_address``, list of network interfaces with fields: ``name``, ``mac_address``,
``ipv4_address``, ``lldp``. If configuration option ``collect_lldp`` is ``ipv4_address``, ``lldp``. If configuration option ``collect_lldp`` is
set to True the ``lldp`` field will be populated by a list of TLVs pulled set to True the ``lldp`` field will be populated by a list of
from LLDP. Currently IPA also returns 2 fields ``switch_port_descr`` and type-length-value (TLV) fields retrieved using the Link Layer Discovery
``switch_chassis_descr`` which were reserved for future use, these are now Protocol (LLDP). Currently IPA also returns 2 fields ``switch_port_descr``
deprecated to be removed in Ocata in favor of including all LLDP data in and ``switch_chassis_descr`` which were reserved for future use, these are
the ``lddp`` field. now deprecated to be removed in Ocata in favor of including all LLDP data
in the ``lddp`` field.
``system_vendor`` ``system_vendor``
system vendor information from SMBIOS as reported by ``dmidecode``: system vendor information from SMBIOS as reported by ``dmidecode``:

4
ironic_python_agent/hardware.py

@ -457,8 +457,8 @@ class GenericHardwareManager(HardwareManager):
# to get data to replace it so just return. # to get data to replace it so just return.
return return
for ifname, tlvs in raw_lldp_data.items(): for ifname, tlvs in raw_lldp_data.items():
# NOTE(sambetts) Convert each tlv value to hex so that it can be # NOTE(sambetts) Convert each type-length-value (TLV) value to hex
# serialised safely # so that it can be serialised safely
processed_tlvs = [] processed_tlvs = []
for typ, data in tlvs: for typ, data in tlvs:
try: try: