x/rsd-lib
Code Issues Proposed changes

Remove all "list" adapter for resource field

Browse Source 
Because json will automatically handle list string parsing, no need
to cast to list object again. And this adapter will throw exception
when value is None. So remove them all.

Change-Id: I61b71e9db94e5da2cab5d26afc2b504d2cbdf274
This commit is contained in:
Lin Yang 2018-08-15 16:34:23 -07:00
parent 6b7aedfd06
commit 98d7db9765
13 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rsd_lib/resources/v2_1/ethernet_switch/port.py
View File

@ -77,7 +77,7 @@ class LinksField(base.CompositeField):
switch = base.Field('Switch', adapter=rsd_lib_utils.get_resource_identity)
member_of_port = base.Field('MemberOfPort',
adapter=rsd_lib_utils.get_resource_identity)
port_members = base.Field('PortMembers', adapter=list)
port_members = base.Field('PortMembers')
active_acls = base.Field('ActiveACLs',
adapter=utils.get_members_identities)

6
rsd_lib/resources/v2_1/manager/manager.py
View File

@ -29,21 +29,21 @@ class GraphicalConsoleField(base.CompositeField):
service_enabled = base.Field('ServiceEnabled')
max_concurrent_sessions = base.Field('MaxConcurrentSessions',
adapter=rsd_lib_utils.int_or_none)
connect_types_supported = base.Field('ConnectTypesSupported', adapter=list)
connect_types_supported = base.Field('ConnectTypesSupported')
class SerialConsoleField(base.CompositeField):
service_enabled = base.Field('ServiceEnabled')
max_concurrent_sessions = base.Field('MaxConcurrentSessions',
adapter=rsd_lib_utils.int_or_none)
connect_types_supported = base.Field('ConnectTypesSupported', adapter=list)
connect_types_supported = base.Field('ConnectTypesSupported')
class CommandShellField(base.CompositeField):
service_enabled = base.Field('ServiceEnabled')
max_concurrent_sessions = base.Field('MaxConcurrentSessions',
adapter=rsd_lib_utils.int_or_none)
connect_types_supported = base.Field('ConnectTypesSupported', adapter=list)
connect_types_supported = base.Field('ConnectTypesSupported')
class LinksField(base.CompositeField):

3
rsd_lib/resources/v2_1/node/node.py
View File

@ -74,8 +74,7 @@ class StatusField(base.CompositeField):
class BootField(base.CompositeField):
allowed_values = base.Field(
'BootSourceOverrideTarget@Redfish.AllowableValues',
adapter=list)
'BootSourceOverrideTarget@Redfish.AllowableValues')
enabled = base.MappedField('BootSourceOverrideEnabled',
node_maps.BOOT_SOURCE_ENABLED_MAP)

8
rsd_lib/resources/v2_1/system/memory.py
View File

@ -48,7 +48,7 @@ class Memory(base.ResourceBase):
base_module_type = base.Field('BaseModuleType')
"""The type of base module"""
memory_media = base.Field('MemoryMedia', adapter=list)
memory_media = base.Field('MemoryMedia')
"""The memory media"""
capacity_mib = base.Field('CapacityMiB', adapter=rsd_lib_utils.int_or_none)
@ -71,7 +71,7 @@ class Memory(base.ResourceBase):
part_number = base.Field('PartNumber')
"""The part number of this memory"""
allowed_speeds_mhz = base.Field('AllowedSpeedsMHz', adapter=list)
allowed_speeds_mhz = base.Field('AllowedSpeedsMHz')
"""The allowed speeds of this memory in MHz"""
firmware_revision = base.Field('FirmwareRevision')
@ -80,7 +80,7 @@ class Memory(base.ResourceBase):
frirmware_api_version = base.Field('FirmwareApiVersion')
"""The API revision of this memory firmware"""
function_classes = base.Field('FunctionClasses', adapter=list)
function_classes = base.Field('FunctionClasses')
"""The function_classes of the memory"""
vendor_id = base.Field('VendorID')
@ -103,7 +103,7 @@ class Memory(base.ResourceBase):
adapter=rsd_lib_utils.int_or_none)
"""The operating speed of this memory in MHz"""
operating_memory_modes = base.Field('OperatingMemoryModes', adapter=list)
operating_memory_modes = base.Field('OperatingMemoryModes')
"""The operating memory modes"""
memory_location = MemoryLocationField('MemoryLocation')

2
rsd_lib/resources/v2_1/system/network_interface.py
View File

@ -102,7 +102,7 @@ class NetworkInterface(base.ResourceBase):
configured on this interface
"""
name_servers = base.Field('NameServers', adapter=list)
name_servers = base.Field('NameServers')
"""The network interface nameserver"""
ipv4_addresses = IPv4AddressesField('IPv4Addresses')

4
rsd_lib/resources/v2_1/system/storage_subsystem.py
View File

@ -42,9 +42,9 @@ class StorageControllersField(base.ListField):
speed_gbps = base.Field('SpeedGbps', adapter=rsd_lib_utils.int_or_none)
firmware_version = base.Field('FirmwareVersion')
supported_controller_protocols = base.Field(
'SupportedControllerProtocols', adapter=list)
'SupportedControllerProtocols')
supported_device_protocols = base.Field(
'SupportedDeviceProtocols', adapter=list)
'SupportedDeviceProtocols')
identifiers = IdentifiersField('Identifiers')

2
rsd_lib/resources/v2_2/system/memory.py
View File

@ -23,7 +23,7 @@ from rsd_lib import utils
class Memory(memory.Memory):
max_tdp_milliwatts = base.Field('MaxTDPMilliWatts', adapter=list)
max_tdp_milliwatts = base.Field('MaxTDPMilliWatts')
_metrics = None # ref to System instance

2
rsd_lib/resources/v2_2/system/memory_metrics.py
View File

@ -34,5 +34,5 @@ class MemoryMetrics(base.ResourceBase):
adapter=rsd_lib_utils.int_or_none)
"""The memory temperature celsius"""
health = base.Field(['Oem', 'Intel_RackScale', 'Health'], adapter=list)
health = base.Field(['Oem', 'Intel_RackScale', 'Health'])
"""The detail health information"""

2
rsd_lib/resources/v2_2/system/metrics.py
View File

@ -52,5 +52,5 @@ class Metrics(base.ResourceBase):
adapter=rsd_lib_utils.int_or_none)
"""The io bandwidth GBps"""
health = base.Field('Health', adapter=list)
health = base.Field('Health')
"""The detail health information"""

2
rsd_lib/resources/v2_2/system/processor_metrics.py
View File

@ -44,5 +44,5 @@ class ProcessorMetrics(base.ResourceBase):
adapter=rsd_lib_utils.int_or_none)
"""The processor consumed power watt"""
health = base.Field('Health', adapter=list)
health = base.Field('Health')
"""The detail health information"""

6
rsd_lib/resources/v2_2/telemetry/metric_definitions/metric_definitions.py
View File

@ -48,7 +48,7 @@ class MetricDefinition(base.ResourceBase):
max_reading_range = base.Field('MaxReadingRange')
"""The max reading range of this sensor"""
discrete_values = base.Field('DiscreteValues', adapter=list)
discrete_values = base.Field('DiscreteValues')
"""The allowed discrete values"""
precision = base.Field('Precision')
@ -78,10 +78,10 @@ class MetricDefinition(base.ResourceBase):
calculation_algorithm = base.Field('CalculationAlgorithm')
"""The calculation algorithm of the sensor"""
calculation_parameters = base.Field('CalculationParameters', adapter=list)
calculation_parameters = base.Field('CalculationParameters')
"""The calculation parameters of the sensor"""
wildcards = base.Field('Wildcards', adapter=list)
wildcards = base.Field('Wildcards')
"""The wildcards of the sensor"""

2
rsd_lib/resources/v2_3/ethernet_switch/ethernet_switch.py
View File

@ -33,7 +33,7 @@ class ClassToPriorityMappingField(base.ListField):
class PriorityFlowControlField(base.CompositeField):
enabled = base.Field('Enabled', adapter=bool)
lossless_priorities = base.Field('LosslessPriorities', adapter=list)
lossless_priorities = base.Field('LosslessPriorities')
class PriorityToClassMappingField(base.ListField):

2
rsd_lib/resources/v2_3/storage_service/volume.py
View File

@ -88,7 +88,7 @@ class Volume(base.ResourceBase):
manufacturer = base.Field('Manufacturer')
"""The volume manufacturer"""
access_capabilities = base.Field('AccessCapabilities', adapter=list)
access_capabilities = base.Field('AccessCapabilities')
"""The access capabilities of volume"""
capacity_bytes = base.Field('CapacityBytes',