Skip to content

Commit 3f87005

Browse files
authored
fix: update Manager struct to match the redfish spec (#69)
fix: update Manager struct to match the redfish spec whre only four fields are required: @odata.id, @odata.type, Id, and Name https://redfish.dmtf.org/schemas/v1/Manager.v1_24_0.yaml
1 parent 2657bde commit 3f87005

2 files changed

Lines changed: 12 additions & 9 deletions

File tree

src/hpe.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1232,7 +1232,10 @@ impl Bmc {
12321232
let ilo_manager = self.get_manager().await;
12331233
match ilo_manager {
12341234
Ok(manager) => {
1235-
let fw_parts: Vec<&str> = manager.firmware_version.split_whitespace().collect();
1235+
let Some(fw_version) = manager.firmware_version else {
1236+
return false;
1237+
};
1238+
let fw_parts: Vec<&str> = fw_version.split_whitespace().collect();
12361239
let fw_major: i32 = fw_parts[1].parse().unwrap_or_default();
12371240
let fw_minor: f32 = fw_parts[2][1..].parse().unwrap_or(0.0);
12381241
fw_major >= 6 && fw_minor >= 1.40

src/model/manager.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,22 +42,22 @@ pub struct Managers {
4242
pub struct Manager {
4343
#[serde(flatten)]
4444
pub odata: ODataLinks,
45-
pub actions: Action,
45+
pub actions: Option<Action>,
4646
pub command_shell: Option<Commandshell>,
4747
pub date_time: Option<DateTime<Utc>>,
4848
pub description: Option<String>,
49-
pub ethernet_interfaces: ODataId,
50-
pub firmware_version: String,
49+
pub ethernet_interfaces: Option<ODataId>,
50+
pub firmware_version: Option<String>,
5151
pub graphical_console: Option<Commandshell>,
5252
pub id: String,
53-
pub log_services: ODataId,
54-
pub manager_type: String,
53+
pub log_services: Option<ODataId>,
54+
pub manager_type: Option<String>,
5555
pub model: Option<String>,
5656
pub name: String,
57-
pub network_protocol: ODataId,
58-
pub status: Status,
57+
pub network_protocol: Option<ODataId>,
58+
pub status: Option<Status>,
5959
#[serde(rename = "UUID")]
60-
pub uuid: String,
60+
pub uuid: Option<String>,
6161
pub oem: Option<ManagerExtensions>,
6262
}
6363

0 commit comments

Comments
 (0)