diff options
author | Gunnar Mills <gmills@us.ibm.com> | 2024-01-31 23:25:11 +0300 |
---|---|---|
committer | Gunnar Mills <gmills@us.ibm.com> | 2024-02-01 01:12:11 +0300 |
commit | 2ae81db99a155febe45d27e3834cfa5471b3ecdf (patch) | |
tree | 44e7fdeb7148147cdef933e331b017309faf264b /redfish-core | |
parent | 4c8c12d2a699641ec24a2605583686a03a8484cb (diff) | |
download | bmcweb-2ae81db99a155febe45d27e3834cfa5471b3ecdf.tar.xz |
Bump Redfish schemas to 2023.3
Redfish released 2023.3 1/25/2024.
https://www.dmtf.org/content/redfish-release-20233-now-available
It is several new schemas and added properties to a pile of schemas.
One use case is: ComputerSystem v1.22.0
Added EfficiencyFavorPower and EfficiencyFavorPerformance to PowerMode
https://gerrit.openbmc.org/c/openbmc/phosphor-dbus-interfaces/+/69122
This is a one line change to scripts/update_schemas.py and then ran the
script.
Tested: See the new schema versions (e.g. System 1.22.0).
No new Validator errors on p10bmc.
Change-Id: I5c10d78e891da71fd14187f63aa6ac682cf15598
Signed-off-by: Gunnar Mills <gmills@us.ibm.com>
Diffstat (limited to 'redfish-core')
16 files changed, 177 insertions, 48 deletions
diff --git a/redfish-core/include/generated/enums/account_service.hpp b/redfish-core/include/generated/enums/account_service.hpp index 1bbbd65291..e06b5f288d 100644 --- a/redfish-core/include/generated/enums/account_service.hpp +++ b/redfish-core/include/generated/enums/account_service.hpp @@ -64,6 +64,13 @@ enum class CertificateMappingAttribute{ UserPrincipalName, }; +enum class BasicAuthState{ + Invalid, + Enabled, + Unadvertised, + Disabled, +}; + NLOHMANN_JSON_SERIALIZE_ENUM(MFABypassType, { {MFABypassType::Invalid, "Invalid"}, {MFABypassType::All, "All"}, @@ -123,5 +130,12 @@ NLOHMANN_JSON_SERIALIZE_ENUM(CertificateMappingAttribute, { {CertificateMappingAttribute::UserPrincipalName, "UserPrincipalName"}, }); +NLOHMANN_JSON_SERIALIZE_ENUM(BasicAuthState, { + {BasicAuthState::Invalid, "Invalid"}, + {BasicAuthState::Enabled, "Enabled"}, + {BasicAuthState::Unadvertised, "Unadvertised"}, + {BasicAuthState::Disabled, "Disabled"}, +}); + } // clang-format on diff --git a/redfish-core/include/generated/enums/aggregation_source.hpp b/redfish-core/include/generated/enums/aggregation_source.hpp index 7242effd08..c087e77123 100644 --- a/redfish-core/include/generated/enums/aggregation_source.hpp +++ b/redfish-core/include/generated/enums/aggregation_source.hpp @@ -22,6 +22,8 @@ enum class SNMPEncryptionProtocols{ None, CBC_DES, CFB128_AES128, + CFB128_AES192, + CFB128_AES256, }; enum class AggregationType{ @@ -36,30 +38,6 @@ enum class UserAuthenticationMethod{ Password, }; -enum class SSHKeyType{ - Invalid, - RSA, - DSA, - ECDSA, - Ed25519, -}; - -enum class ECDSACurveType{ - Invalid, - NISTP256, - NISTP384, - NISTP521, - NISTK163, - NISTP192, - NISTP224, - NISTK233, - NISTB233, - NISTK283, - NISTK409, - NISTB409, - NISTT571, -}; - NLOHMANN_JSON_SERIALIZE_ENUM(SNMPAuthenticationProtocols, { {SNMPAuthenticationProtocols::Invalid, "Invalid"}, {SNMPAuthenticationProtocols::None, "None"}, @@ -77,6 +55,8 @@ NLOHMANN_JSON_SERIALIZE_ENUM(SNMPEncryptionProtocols, { {SNMPEncryptionProtocols::None, "None"}, {SNMPEncryptionProtocols::CBC_DES, "CBC_DES"}, {SNMPEncryptionProtocols::CFB128_AES128, "CFB128_AES128"}, + {SNMPEncryptionProtocols::CFB128_AES192, "CFB128_AES192"}, + {SNMPEncryptionProtocols::CFB128_AES256, "CFB128_AES256"}, }); NLOHMANN_JSON_SERIALIZE_ENUM(AggregationType, { @@ -91,29 +71,5 @@ NLOHMANN_JSON_SERIALIZE_ENUM(UserAuthenticationMethod, { {UserAuthenticationMethod::Password, "Password"}, }); -NLOHMANN_JSON_SERIALIZE_ENUM(SSHKeyType, { - {SSHKeyType::Invalid, "Invalid"}, - {SSHKeyType::RSA, "RSA"}, - {SSHKeyType::DSA, "DSA"}, - {SSHKeyType::ECDSA, "ECDSA"}, - {SSHKeyType::Ed25519, "Ed25519"}, -}); - -NLOHMANN_JSON_SERIALIZE_ENUM(ECDSACurveType, { - {ECDSACurveType::Invalid, "Invalid"}, - {ECDSACurveType::NISTP256, "NISTP256"}, - {ECDSACurveType::NISTP384, "NISTP384"}, - {ECDSACurveType::NISTP521, "NISTP521"}, - {ECDSACurveType::NISTK163, "NISTK163"}, - {ECDSACurveType::NISTP192, "NISTP192"}, - {ECDSACurveType::NISTP224, "NISTP224"}, - {ECDSACurveType::NISTK233, "NISTK233"}, - {ECDSACurveType::NISTB233, "NISTB233"}, - {ECDSACurveType::NISTK283, "NISTK283"}, - {ECDSACurveType::NISTK409, "NISTK409"}, - {ECDSACurveType::NISTB409, "NISTB409"}, - {ECDSACurveType::NISTT571, "NISTT571"}, -}); - } // clang-format on diff --git a/redfish-core/include/generated/enums/chassis.hpp b/redfish-core/include/generated/enums/chassis.hpp index 9c3464956c..34e45c94ba 100644 --- a/redfish-core/include/generated/enums/chassis.hpp +++ b/redfish-core/include/generated/enums/chassis.hpp @@ -29,6 +29,7 @@ enum class ChassisType{ StorageEnclosure, ImmersionTank, HeatExchanger, + PowerStrip, Other, }; @@ -101,6 +102,7 @@ NLOHMANN_JSON_SERIALIZE_ENUM(ChassisType, { {ChassisType::StorageEnclosure, "StorageEnclosure"}, {ChassisType::ImmersionTank, "ImmersionTank"}, {ChassisType::HeatExchanger, "HeatExchanger"}, + {ChassisType::PowerStrip, "PowerStrip"}, {ChassisType::Other, "Other"}, }); diff --git a/redfish-core/include/generated/enums/computer_system.hpp b/redfish-core/include/generated/enums/computer_system.hpp index 04ed6b3634..cb053af979 100644 --- a/redfish-core/include/generated/enums/computer_system.hpp +++ b/redfish-core/include/generated/enums/computer_system.hpp @@ -171,6 +171,8 @@ enum class PowerMode{ Static, OSControlled, OEM, + EfficiencyFavorPower, + EfficiencyFavorPerformance, }; enum class CompositionUseCase{ @@ -362,6 +364,8 @@ NLOHMANN_JSON_SERIALIZE_ENUM(PowerMode, { {PowerMode::Static, "Static"}, {PowerMode::OSControlled, "OSControlled"}, {PowerMode::OEM, "OEM"}, + {PowerMode::EfficiencyFavorPower, "EfficiencyFavorPower"}, + {PowerMode::EfficiencyFavorPerformance, "EfficiencyFavorPerformance"}, }); NLOHMANN_JSON_SERIALIZE_ENUM(CompositionUseCase, { diff --git a/redfish-core/include/generated/enums/control.hpp b/redfish-core/include/generated/enums/control.hpp index 98f2e246ba..46e6c3690a 100644 --- a/redfish-core/include/generated/enums/control.hpp +++ b/redfish-core/include/generated/enums/control.hpp @@ -14,6 +14,8 @@ enum class ControlType{ Pressure, PressurekPa, Valve, + Percent, + DutyCycle, }; enum class SetPointType{ @@ -46,6 +48,8 @@ NLOHMANN_JSON_SERIALIZE_ENUM(ControlType, { {ControlType::Pressure, "Pressure"}, {ControlType::PressurekPa, "PressurekPa"}, {ControlType::Valve, "Valve"}, + {ControlType::Percent, "Percent"}, + {ControlType::DutyCycle, "DutyCycle"}, }); NLOHMANN_JSON_SERIALIZE_ENUM(SetPointType, { diff --git a/redfish-core/include/generated/enums/drive.hpp b/redfish-core/include/generated/enums/drive.hpp index 6a32163cb8..0b1adec9ce 100644 --- a/redfish-core/include/generated/enums/drive.hpp +++ b/redfish-core/include/generated/enums/drive.hpp @@ -64,10 +64,12 @@ enum class FormFactor{ Invalid, Drive3_5, Drive2_5, + EDSFF, EDSFF_1U_Long, EDSFF_1U_Short, EDSFF_E3_Short, EDSFF_E3_Long, + M2, M2_2230, M2_2242, M2_2260, @@ -139,10 +141,12 @@ NLOHMANN_JSON_SERIALIZE_ENUM(FormFactor, { {FormFactor::Invalid, "Invalid"}, {FormFactor::Drive3_5, "Drive3_5"}, {FormFactor::Drive2_5, "Drive2_5"}, + {FormFactor::EDSFF, "EDSFF"}, {FormFactor::EDSFF_1U_Long, "EDSFF_1U_Long"}, {FormFactor::EDSFF_1U_Short, "EDSFF_1U_Short"}, {FormFactor::EDSFF_E3_Short, "EDSFF_E3_Short"}, {FormFactor::EDSFF_E3_Long, "EDSFF_E3_Long"}, + {FormFactor::M2, "M2"}, {FormFactor::M2_2230, "M2_2230"}, {FormFactor::M2_2242, "M2_2242"}, {FormFactor::M2_2260, "M2_2260"}, diff --git a/redfish-core/include/generated/enums/event_destination.hpp b/redfish-core/include/generated/enums/event_destination.hpp index 3fd17bc1fe..10553c7934 100644 --- a/redfish-core/include/generated/enums/event_destination.hpp +++ b/redfish-core/include/generated/enums/event_destination.hpp @@ -61,6 +61,8 @@ enum class SNMPEncryptionProtocols{ None, CBC_DES, CFB128_AES128, + CFB128_AES192, + CFB128_AES256, }; enum class SyslogSeverity{ @@ -160,6 +162,8 @@ NLOHMANN_JSON_SERIALIZE_ENUM(SNMPEncryptionProtocols, { {SNMPEncryptionProtocols::None, "None"}, {SNMPEncryptionProtocols::CBC_DES, "CBC_DES"}, {SNMPEncryptionProtocols::CFB128_AES128, "CFB128_AES128"}, + {SNMPEncryptionProtocols::CFB128_AES192, "CFB128_AES192"}, + {SNMPEncryptionProtocols::CFB128_AES256, "CFB128_AES256"}, }); NLOHMANN_JSON_SERIALIZE_ENUM(SyslogSeverity, { diff --git a/redfish-core/include/generated/enums/key.hpp b/redfish-core/include/generated/enums/key.hpp index b7cb31e1da..58c71f59e9 100644 --- a/redfish-core/include/generated/enums/key.hpp +++ b/redfish-core/include/generated/enums/key.hpp @@ -5,6 +5,30 @@ namespace key { // clang-format off +enum class SSHKeyType{ + Invalid, + RSA, + DSA, + ECDSA, + Ed25519, +}; + +enum class ECDSACurveType{ + Invalid, + NISTP256, + NISTP384, + NISTP521, + NISTK163, + NISTP192, + NISTP224, + NISTK233, + NISTB233, + NISTK283, + NISTK409, + NISTB409, + NISTT571, +}; + enum class KeyType{ Invalid, NVMeoF, @@ -25,6 +49,30 @@ enum class NVMeoFSecureHashType{ SHA512, }; +NLOHMANN_JSON_SERIALIZE_ENUM(SSHKeyType, { + {SSHKeyType::Invalid, "Invalid"}, + {SSHKeyType::RSA, "RSA"}, + {SSHKeyType::DSA, "DSA"}, + {SSHKeyType::ECDSA, "ECDSA"}, + {SSHKeyType::Ed25519, "Ed25519"}, +}); + +NLOHMANN_JSON_SERIALIZE_ENUM(ECDSACurveType, { + {ECDSACurveType::Invalid, "Invalid"}, + {ECDSACurveType::NISTP256, "NISTP256"}, + {ECDSACurveType::NISTP384, "NISTP384"}, + {ECDSACurveType::NISTP521, "NISTP521"}, + {ECDSACurveType::NISTK163, "NISTK163"}, + {ECDSACurveType::NISTP192, "NISTP192"}, + {ECDSACurveType::NISTP224, "NISTP224"}, + {ECDSACurveType::NISTK233, "NISTK233"}, + {ECDSACurveType::NISTB233, "NISTB233"}, + {ECDSACurveType::NISTK283, "NISTK283"}, + {ECDSACurveType::NISTK409, "NISTK409"}, + {ECDSACurveType::NISTB409, "NISTB409"}, + {ECDSACurveType::NISTT571, "NISTT571"}, +}); + NLOHMANN_JSON_SERIALIZE_ENUM(KeyType, { {KeyType::Invalid, "Invalid"}, {KeyType::NVMeoF, "NVMeoF"}, diff --git a/redfish-core/include/generated/enums/log_service.hpp b/redfish-core/include/generated/enums/log_service.hpp index d7dcfc8f7c..2e3d799444 100644 --- a/redfish-core/include/generated/enums/log_service.hpp +++ b/redfish-core/include/generated/enums/log_service.hpp @@ -80,6 +80,19 @@ enum class LogPurpose{ OEM, }; +enum class TransferProtocolType{ + Invalid, + CIFS, + FTP, + SFTP, + HTTP, + HTTPS, + NFS, + SCP, + TFTP, + OEM, +}; + NLOHMANN_JSON_SERIALIZE_ENUM(OverWritePolicy, { {OverWritePolicy::Invalid, "Invalid"}, {OverWritePolicy::Unknown, "Unknown"}, @@ -155,5 +168,18 @@ NLOHMANN_JSON_SERIALIZE_ENUM(LogPurpose, { {LogPurpose::OEM, "OEM"}, }); +NLOHMANN_JSON_SERIALIZE_ENUM(TransferProtocolType, { + {TransferProtocolType::Invalid, "Invalid"}, + {TransferProtocolType::CIFS, "CIFS"}, + {TransferProtocolType::FTP, "FTP"}, + {TransferProtocolType::SFTP, "SFTP"}, + {TransferProtocolType::HTTP, "HTTP"}, + {TransferProtocolType::HTTPS, "HTTPS"}, + {TransferProtocolType::NFS, "NFS"}, + {TransferProtocolType::SCP, "SCP"}, + {TransferProtocolType::TFTP, "TFTP"}, + {TransferProtocolType::OEM, "OEM"}, +}); + } // clang-format on diff --git a/redfish-core/include/generated/enums/manager_account.hpp b/redfish-core/include/generated/enums/manager_account.hpp index 94bce3221f..a3b43da895 100644 --- a/redfish-core/include/generated/enums/manager_account.hpp +++ b/redfish-core/include/generated/enums/manager_account.hpp @@ -34,6 +34,8 @@ enum class SNMPEncryptionProtocols{ None, CBC_DES, CFB128_AES128, + CFB128_AES192, + CFB128_AES256, }; NLOHMANN_JSON_SERIALIZE_ENUM(AccountTypes, { @@ -65,6 +67,8 @@ NLOHMANN_JSON_SERIALIZE_ENUM(SNMPEncryptionProtocols, { {SNMPEncryptionProtocols::None, "None"}, {SNMPEncryptionProtocols::CBC_DES, "CBC_DES"}, {SNMPEncryptionProtocols::CFB128_AES128, "CFB128_AES128"}, + {SNMPEncryptionProtocols::CFB128_AES192, "CFB128_AES192"}, + {SNMPEncryptionProtocols::CFB128_AES256, "CFB128_AES256"}, }); } diff --git a/redfish-core/include/generated/enums/manager_network_protocol.hpp b/redfish-core/include/generated/enums/manager_network_protocol.hpp index aa203c988c..c3b6aedab0 100644 --- a/redfish-core/include/generated/enums/manager_network_protocol.hpp +++ b/redfish-core/include/generated/enums/manager_network_protocol.hpp @@ -36,6 +36,8 @@ enum class SNMPEncryptionProtocols{ Account, CBC_DES, CFB128_AES128, + CFB128_AES192, + CFB128_AES256, }; NLOHMANN_JSON_SERIALIZE_ENUM(NotifyIPv6Scope, { @@ -69,6 +71,8 @@ NLOHMANN_JSON_SERIALIZE_ENUM(SNMPEncryptionProtocols, { {SNMPEncryptionProtocols::Account, "Account"}, {SNMPEncryptionProtocols::CBC_DES, "CBC_DES"}, {SNMPEncryptionProtocols::CFB128_AES128, "CFB128_AES128"}, + {SNMPEncryptionProtocols::CFB128_AES192, "CFB128_AES192"}, + {SNMPEncryptionProtocols::CFB128_AES256, "CFB128_AES256"}, }); } diff --git a/redfish-core/include/generated/enums/memory.hpp b/redfish-core/include/generated/enums/memory.hpp index 4b6bb33029..fef3fe653b 100644 --- a/redfish-core/include/generated/enums/memory.hpp +++ b/redfish-core/include/generated/enums/memory.hpp @@ -49,6 +49,7 @@ enum class MemoryDeviceType{ GDDR6, DDR5, OEM, + LPDDR5_SDRAM, }; enum class BaseModuleType{ @@ -150,6 +151,7 @@ NLOHMANN_JSON_SERIALIZE_ENUM(MemoryDeviceType, { {MemoryDeviceType::GDDR6, "GDDR6"}, {MemoryDeviceType::DDR5, "DDR5"}, {MemoryDeviceType::OEM, "OEM"}, + {MemoryDeviceType::LPDDR5_SDRAM, "LPDDR5_SDRAM"}, }); NLOHMANN_JSON_SERIALIZE_ENUM(BaseModuleType, { diff --git a/redfish-core/include/generated/enums/port.hpp b/redfish-core/include/generated/enums/port.hpp index 28a9e49eb9..b2ac328b58 100644 --- a/redfish-core/include/generated/enums/port.hpp +++ b/redfish-core/include/generated/enums/port.hpp @@ -143,6 +143,7 @@ enum class CurrentPortConfigurationState{ DSP, USP, Reserved, + FabricLink, }; enum class ConnectedDeviceMode{ @@ -303,6 +304,7 @@ NLOHMANN_JSON_SERIALIZE_ENUM(CurrentPortConfigurationState, { {CurrentPortConfigurationState::DSP, "DSP"}, {CurrentPortConfigurationState::USP, "USP"}, {CurrentPortConfigurationState::Reserved, "Reserved"}, + {CurrentPortConfigurationState::FabricLink, "FabricLink"}, }); NLOHMANN_JSON_SERIALIZE_ENUM(ConnectedDeviceMode, { diff --git a/redfish-core/include/generated/enums/processor.hpp b/redfish-core/include/generated/enums/processor.hpp index 2d7c8f7d59..7c4ffb4a24 100644 --- a/redfish-core/include/generated/enums/processor.hpp +++ b/redfish-core/include/generated/enums/processor.hpp @@ -14,6 +14,7 @@ enum class ProcessorType{ Accelerator, Core, Thread, + Partition, OEM, }; @@ -99,6 +100,7 @@ NLOHMANN_JSON_SERIALIZE_ENUM(ProcessorType, { {ProcessorType::Accelerator, "Accelerator"}, {ProcessorType::Core, "Core"}, {ProcessorType::Thread, "Thread"}, + {ProcessorType::Partition, "Partition"}, {ProcessorType::OEM, "OEM"}, }); diff --git a/redfish-core/include/generated/enums/resolution_step.hpp b/redfish-core/include/generated/enums/resolution_step.hpp new file mode 100644 index 0000000000..866bc1c008 --- /dev/null +++ b/redfish-core/include/generated/enums/resolution_step.hpp @@ -0,0 +1,33 @@ +#pragma once +#include <nlohmann/json.hpp> + +namespace resolution_step +{ +// clang-format off + +enum class ResolutionType{ + Invalid, + ContactVendor, + ReplaceComponent, + FirmwareUpdate, + Reset, + PowerCycle, + ResetToDefaults, + CollectDiagnosticData, + OEM, +}; + +NLOHMANN_JSON_SERIALIZE_ENUM(ResolutionType, { + {ResolutionType::Invalid, "Invalid"}, + {ResolutionType::ContactVendor, "ContactVendor"}, + {ResolutionType::ReplaceComponent, "ReplaceComponent"}, + {ResolutionType::FirmwareUpdate, "FirmwareUpdate"}, + {ResolutionType::Reset, "Reset"}, + {ResolutionType::PowerCycle, "PowerCycle"}, + {ResolutionType::ResetToDefaults, "ResetToDefaults"}, + {ResolutionType::CollectDiagnosticData, "CollectDiagnosticData"}, + {ResolutionType::OEM, "OEM"}, +}); + +} +// clang-format on diff --git a/redfish-core/include/generated/enums/update_service.hpp b/redfish-core/include/generated/enums/update_service.hpp index 0a1e4773fc..97ed1ecf3f 100644 --- a/redfish-core/include/generated/enums/update_service.hpp +++ b/redfish-core/include/generated/enums/update_service.hpp @@ -28,6 +28,16 @@ enum class ApplyTime{ OnStartUpdateRequest, }; +enum class SupportedUpdateImageFormatType{ + Invalid, + PLDMv1_0, + PLDMv1_1, + PLDMv1_2, + PLDMv1_3, + UEFICapsule, + VendorDefined, +}; + NLOHMANN_JSON_SERIALIZE_ENUM(TransferProtocolType, { {TransferProtocolType::Invalid, "Invalid"}, {TransferProtocolType::CIFS, "CIFS"}, @@ -51,5 +61,15 @@ NLOHMANN_JSON_SERIALIZE_ENUM(ApplyTime, { {ApplyTime::OnStartUpdateRequest, "OnStartUpdateRequest"}, }); +NLOHMANN_JSON_SERIALIZE_ENUM(SupportedUpdateImageFormatType, { + {SupportedUpdateImageFormatType::Invalid, "Invalid"}, + {SupportedUpdateImageFormatType::PLDMv1_0, "PLDMv1_0"}, + {SupportedUpdateImageFormatType::PLDMv1_1, "PLDMv1_1"}, + {SupportedUpdateImageFormatType::PLDMv1_2, "PLDMv1_2"}, + {SupportedUpdateImageFormatType::PLDMv1_3, "PLDMv1_3"}, + {SupportedUpdateImageFormatType::UEFICapsule, "UEFICapsule"}, + {SupportedUpdateImageFormatType::VendorDefined, "VendorDefined"}, +}); + } // clang-format on |