openstack/ironic-python-agent
Code Issues Proposed changes

Remove switch_port_descr and switch_chassis_descr

Browse Source 
Removes two reserved fields ``switch_port_descr`` and
``switch_chassis_descr`` that were deprecated in the Newton cycle.

Change-Id: Icd2251af63a69d60d1e72eddf651a168fdae94fa
This commit is contained in:
Ramamani Yeleswarapu 2017-02-01 14:32:07 -08:00
parent 5b1a217195
commit 73f316d804
3 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/source/index.rst
View File

@ -122,10 +122,6 @@ fields:
If configuration option ``collect_lldp`` is set to True the ``lldp`` If configuration option ``collect_lldp`` is set to True the ``lldp``
field will be populated by a list of type-length-value (TLV) fields field will be populated by a list of type-length-value (TLV) fields
retrieved using the Link Layer Discovery Protocol (LLDP). retrieved using the Link Layer Discovery Protocol (LLDP).
Currently IPA also returns 2 fields ``switch_port_descr``
and ``switch_chassis_descr`` which were reserved for future use, these are
now deprecated to be removed in Ocata in favor of including all LLDP data
in the ``lldp`` field.
``system_vendor`` ``system_vendor``

7
ironic_python_agent/hardware.py
View File

@ -216,8 +216,7 @@ class BlockDevice(encoding.SerializableComparable):
class NetworkInterface(encoding.SerializableComparable): class NetworkInterface(encoding.SerializableComparable):
serializable_fields = ('name', 'mac_address', 'switch_port_descr', serializable_fields = ('name', 'mac_address', 'ipv4_address',
'switch_chassis_descr', 'ipv4_address',
'has_carrier', 'lldp', 'vendor', 'product', 'has_carrier', 'lldp', 'vendor', 'product',
'client_id') 'client_id')
@ -234,10 +233,6 @@ class NetworkInterface(encoding.SerializableComparable):
# client identifier Option to allow DHCP to work over InfiniBand. # client identifier Option to allow DHCP to work over InfiniBand.
# see https://tools.ietf.org/html/rfc4390 # see https://tools.ietf.org/html/rfc4390
self.client_id = client_id self.client_id = client_id
# TODO(sambetts) Remove these fields in Ocata, they have been
# superseded by self.lldp
self.switch_port_descr = None
self.switch_chassis_descr = None
class CPU(encoding.SerializableComparable): class CPU(encoding.SerializableComparable):

6
releasenotes/notes/remove-switch_port_descr-switch_chassis_descr-40f2bb37b5f1fdd1.yaml Normal file
View File

@ -0,0 +1,6 @@
---
upgrade:
- |
Two reserved fields ``switch_port_descr`` and
``switch_chassis_descr`` were deprecated in
Newton cycle and now are removed.