diff --git a/rsd_lib/resources/v2_1/ethernet_switch/port.py b/rsd_lib/resources/v2_1/ethernet_switch/port.py
index 9b9e35b..8b03dec 100644
--- a/rsd_lib/resources/v2_1/ethernet_switch/port.py
+++ b/rsd_lib/resources/v2_1/ethernet_switch/port.py
@@ -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)
diff --git a/rsd_lib/resources/v2_3/ethernet_switch/ethernet_switch.py b/rsd_lib/resources/v2_3/ethernet_switch/ethernet_switch.py
index db816ea..1126cd7 100644
--- a/rsd_lib/resources/v2_3/ethernet_switch/ethernet_switch.py
+++ b/rsd_lib/resources/v2_3/ethernet_switch/ethernet_switch.py
@@ -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):