From 73f316d804abff4cfbe45bf01aa4c81c2450ff2f Mon Sep 17 00:00:00 2001 From: Ramamani Yeleswarapu Date: Wed, 1 Feb 2017 14:32:07 -0800 Subject: 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 --- ironic_python_agent/hardware.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'ironic_python_agent') 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): -- cgit v1.2.1