Use int_or_none adapter instead of int

This will cover exception case when input is None.

Change-Id: I0116f45f784305e3436de2ff673a22e15e69cf42
This commit is contained in:
Lin Yang 2018-08-15 16:48:25 -07:00
parent 98d7db9765
commit b67a9505e4
2 changed files with 19 additions and 11 deletions

View File

@ -61,7 +61,8 @@ class IPv6AddressesField(base.ListField):
address = base.Field('Address')
"""The port ipv6 address"""
prefix_length = base.Field('PrefixLength', adapter=int)
prefix_length = base.Field(
'PrefixLength', adapter=rsd_lib_utils.int_or_none)
"""The port ipv6 address prefix length"""
address_origin = base.Field('AddressOrigin')
@ -108,7 +109,8 @@ class Port(base.ResourceBase):
administrative_state = base.Field('AdministrativeState')
"""The port administrative state"""
link_speed_mbps = base.Field('LinkSpeedMbps', adapter=int)
link_speed_mbps = base.Field(
'LinkSpeedMbps', adapter=rsd_lib_utils.int_or_none)
"""The port link speed(mbps)"""
neighbor_info = NeighborInfoField('NeighborInfo')
@ -117,7 +119,8 @@ class Port(base.ResourceBase):
neighbor_mac = base.Field('NeighborMAC')
"""The port neighbor mac"""
frame_size = base.Field('FrameSize', adapter=int)
frame_size = base.Field(
'FrameSize', adapter=rsd_lib_utils.int_or_none)
"""The port frame size"""
autosense = base.Field('Autosense', adapter=bool)

View File

@ -25,9 +25,10 @@ LOG = logging.getLogger(__name__)
class ClassToPriorityMappingField(base.ListField):
priority = base.Field('Priority', adapter=int)
priority = base.Field('Priority', adapter=rsd_lib_utils.int_or_none)
traffic_class = base.Field('TrafficClass', adapter=int)
traffic_class = base.Field(
'TrafficClass', adapter=rsd_lib_utils.int_or_none)
class PriorityFlowControlField(base.CompositeField):
@ -37,23 +38,27 @@ class PriorityFlowControlField(base.CompositeField):
class PriorityToClassMappingField(base.ListField):
priority = base.Field('Priority', adapter=int)
priority = base.Field('Priority', adapter=rsd_lib_utils.int_or_none)
traffic_class = base.Field('TrafficClass', adapter=int)
traffic_class = base.Field(
'TrafficClass', adapter=rsd_lib_utils.int_or_none)
class TrafficClassficationField(base.ListField):
port = base.Field('Port', adapter=int)
port = base.Field('Port', adapter=rsd_lib_utils.int_or_none)
protocol = base.Field('Protocol')
traffic_class = base.Field('TrafficClass', adapter=int)
traffic_class = base.Field(
'TrafficClass', adapter=rsd_lib_utils.int_or_none)
class TransmissionSelectionField(base.ListField):
bandwidth_percent = base.Field('BandwidthPercent', adapter=int)
bandwidth_percent = base.Field(
'BandwidthPercent', adapter=rsd_lib_utils.int_or_none)
traffic_class = base.Field('TrafficClass', adapter=int)
traffic_class = base.Field(
'TrafficClass', adapter=rsd_lib_utils.int_or_none)
class EthernetSwitch(v2_1_ethernet_switch.EthernetSwitch):