diff options
| author | Ramamani Yeleswarapu <ramamani.yeleswarapu@intel.com> | 2017-02-01 14:32:07 -0800 |
|---|---|---|
| committer | Ramamani Yeleswarapu <ramamani.yeleswarapu@intel.com> | 2017-02-02 07:01:04 -0800 |
| commit | 73f316d804abff4cfbe45bf01aa4c81c2450ff2f (patch) | |
| tree | 5addbfbb71c6fd8ce68137333a7169bfd36f8d8f | |
| parent | 5b1a217195e2b282ccbf7989b6ff4213a7dca478 (diff) | |
| download | ironic-python-agent-73f316d804abff4cfbe45bf01aa4c81c2450ff2f.tar.gz | |
Remove switch_port_descr and switch_chassis_descr
Removes two reserved fields ``switch_port_descr`` and
``switch_chassis_descr`` that were deprecated in the Newton cycle.
Change-Id: Icd2251af63a69d60d1e72eddf651a168fdae94fa
| -rw-r--r-- | doc/source/index.rst | 4 | ||||
| -rw-r--r-- | ironic_python_agent/hardware.py | 7 | ||||
| -rw-r--r-- | releasenotes/notes/remove-switch_port_descr-switch_chassis_descr-40f2bb37b5f1fdd1.yaml | 6 |
3 files changed, 7 insertions, 10 deletions
diff --git a/doc/source/index.rst b/doc/source/index.rst index c6b7a2a3..ee6b6f8d 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -122,10 +122,6 @@ fields: If configuration option ``collect_lldp`` is set to True the ``lldp`` field will be populated by a list of type-length-value (TLV) fields 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`` diff --git a/ironic_python_agent/hardware.py b/ironic_python_agent/hardware.py index 781179b6..ae245e7c 100644 --- a/ironic_python_agent/hardware.py +++ b/ironic_python_agent/hardware.py @@ -216,8 +216,7 @@ class BlockDevice(encoding.SerializableComparable): class NetworkInterface(encoding.SerializableComparable): - serializable_fields = ('name', 'mac_address', 'switch_port_descr', - 'switch_chassis_descr', 'ipv4_address', + serializable_fields = ('name', 'mac_address', 'ipv4_address', 'has_carrier', 'lldp', 'vendor', 'product', 'client_id') @@ -234,10 +233,6 @@ class NetworkInterface(encoding.SerializableComparable): # client identifier Option to allow DHCP to work over InfiniBand. # see https://tools.ietf.org/html/rfc4390 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): diff --git a/releasenotes/notes/remove-switch_port_descr-switch_chassis_descr-40f2bb37b5f1fdd1.yaml b/releasenotes/notes/remove-switch_port_descr-switch_chassis_descr-40f2bb37b5f1fdd1.yaml new file mode 100644 index 00000000..e8eb58d3 --- /dev/null +++ b/releasenotes/notes/remove-switch_port_descr-switch_chassis_descr-40f2bb37b5f1fdd1.yaml @@ -0,0 +1,6 @@ +--- +upgrade: + - | + Two reserved fields ``switch_port_descr`` and + ``switch_chassis_descr`` were deprecated in + Newton cycle and now are removed. |