models: Update to v2024.2

Update all of the infrastructure and examples to use the v2024.2 models.

Author: AmateurECE

examples/simple/src/main.rs

@@ -14,15 +14,15 @@ use seuss::{
     core::{error, privilege, convert::IntoRedfishMessage},
     middleware::ResourceLocator,
     models::{
-        computer_system::v1_20_1::{
+        computer_system::v1_22_2::{
             Actions, ComputerSystem as ComputerSystemModel, Reset, ResetRequestBody,
         },
         computer_system_collection::ComputerSystemCollection as ComputerSystemCollectionModel,
         odata_v4,
         resource::{self, ResetType},
-        service_root::v1_16_0::{Links, ServiceRoot as ServiceRootModel},
+        service_root::v1_17_0::{Links, ServiceRoot as ServiceRootModel},
     },
-    registries::base::v1_16_0::Base,
+    registries::base::v1_18_1::Base,
     service::{AccountService, RedfishService, SessionService},
 };
 use std::{

redfish-axum/src/lib.rs

@@ -12,6 +12,8 @@ pub mod aggregation_source;
 pub mod aggregation_source_collection;
 pub mod allow_deny;
 pub mod allow_deny_collection;
+pub mod application;
+pub mod application_collection;
 pub mod assembly;
 pub mod battery;
 pub mod battery_collection;
@@ -40,6 +42,10 @@ pub mod connection;
 pub mod connection_collection;
 pub mod connection_method;
 pub mod connection_method_collection;
+pub mod container;
+pub mod container_collection;
+pub mod container_image;
+pub mod container_image_collection;
 pub mod control;
 pub mod control_collection;
 pub mod coolant_connector;
@@ -117,6 +123,8 @@ pub mod memory_collection;
 pub mod memory_domain;
 pub mod memory_domain_collection;
 pub mod memory_metrics;
+pub mod memory_region;
+pub mod memory_region_collection;
 pub mod message_registry_file;
 pub mod message_registry_file_collection;
 pub mod metadata;
@@ -139,6 +147,9 @@ pub mod network_port_collection;
 pub mod odata;
 pub mod operating_config;
 pub mod operating_config_collection;
+pub mod operating_system;
+pub mod outbound_connection;
+pub mod outbound_connection_collection;
 pub mod outlet;
 pub mod outlet_collection;
 pub mod outlet_group;
@@ -233,4 +244,4 @@ pub mod zone;
 pub mod zone_collection;
 
 /// The version of the Redfish Schema Specification provided by this crate.
-pub const REDFISH_VERSION: &str = "2023.1";
+pub const REDFISH_VERSION: &str = "2024.2";

redfish-core/src/auth.rs

@@ -3,7 +3,7 @@ use axum::{
     response::{AppendHeaders, IntoResponse, Response},
     Json,
 };
-use redfish_models::{models::redfish, registries::base::v1_16_0::Base};
+use redfish_models::{models::redfish, registries::base::v1_18_1::Base};
 
 use crate::privilege::Role;
 use crate::{convert::IntoRedfishMessage, error};

redfish-core/src/convert.rs

@@ -1,4 +1,7 @@
-use redfish_models::{models::{message::v1_1_2::Message, event::v1_8_0::EventRecord}, Registry};
+use redfish_models::{
+    models::{event::v1_10_1::EventRecord, message::v1_2_1::Message},
+    Registry,
+};
 
 pub trait IntoRedfishMessage {
     fn into_redfish_message(self) -> Message;

redfish-core/src/error.rs

@@ -1,4 +1,4 @@
-use redfish_models::models::message::v1_1_2::Message;
+use redfish_models::models::message::v1_2_1::Message;
 use redfish_models::models::redfish::{Error, RedfishError};
 
 pub fn one_message(error: Message) -> Error {

redfish-models/src/lib.rs

@@ -4,7 +4,7 @@ pub mod models;
 pub mod registries;
 
 /// The version of the Redfish Schema Specification provided by this crate.
-pub const REDFISH_VERSION: &str = "2023.1";
+pub const REDFISH_VERSION: &str = "2024.2";
 
 /// The OData Version supported by this version of the redfish data model.
 pub const ODATA_VERSION: &str = "4.0";

redfish-models/src/models.rs

@@ -13,6 +13,8 @@ pub mod aggregation_source;
 pub mod aggregation_source_collection;
 pub mod allow_deny;
 pub mod allow_deny_collection;
+pub mod application;
+pub mod application_collection;
 pub mod assembly;
 pub mod attribute_registry;
 pub mod battery;
@@ -49,6 +51,10 @@ pub mod connection_method;
 pub mod connection_method_collection;
 pub mod consistency_group;
 pub mod consistency_group_collection;
+pub mod container;
+pub mod container_collection;
+pub mod container_image;
+pub mod container_image_collection;
 pub mod control;
 pub mod control_collection;
 pub mod coolant_connector;
@@ -94,6 +100,7 @@ pub mod file_share;
 pub mod file_share_collection;
 pub mod file_system;
 pub mod file_system_collection;
+pub mod file_system_metrics;
 pub mod filter;
 pub mod filter_collection;
 pub mod graphics_controller;
@@ -148,6 +155,8 @@ pub mod memory_collection;
 pub mod memory_domain;
 pub mod memory_domain_collection;
 pub mod memory_metrics;
+pub mod memory_region;
+pub mod memory_region_collection;
 pub mod message;
 pub mod message_registry;
 pub mod message_registry_collection;
@@ -175,6 +184,9 @@ pub mod nvme_firmware_image;
 pub mod odata_v4;
 pub mod operating_config;
 pub mod operating_config_collection;
+pub mod operating_system;
+pub mod outbound_connection;
+pub mod outbound_connection_collection;
 pub mod outlet;
 pub mod outlet_collection;
 pub mod outlet_group;
@@ -213,6 +225,7 @@ pub mod registered_client;
 pub mod registered_client_collection;
 pub mod reservoir;
 pub mod reservoir_collection;
+pub mod resolution_step;
 pub mod resource;
 pub mod resource_block;
 pub mod resource_block_collection;
@@ -253,9 +266,11 @@ pub mod storage_group;
 pub mod storage_group_collection;
 pub mod storage_pool;
 pub mod storage_pool_collection;
+pub mod storage_pool_metrics;
 pub mod storage_replica_info;
 pub mod storage_service;
 pub mod storage_service_collection;
+pub mod storage_service_metrics;
 pub mod storage_system_collection;
 pub mod switch;
 pub mod switch_collection;
@@ -283,5 +298,6 @@ pub mod vlan_network_interface;
 pub mod vlan_network_interface_collection;
 pub mod volume;
 pub mod volume_collection;
+pub mod volume_metrics;
 pub mod zone;
 pub mod zone_collection;

redfish-models/src/registries.rs

@@ -16,4 +16,5 @@ pub mod resource_event;
 pub mod sensor_event;
 pub mod storage_device;
 pub mod task_event;
+pub mod telemetry;
 pub mod update;

seuss/src/auth/session.rs

@@ -1,5 +1,5 @@
 use axum::{http::request::Parts, response::Response};
-use redfish_models::models::{odata_v4, redfish, session::v1_6_0};
+use redfish_models::models::{odata_v4, redfish, session::v1_7_2};
 use redfish_core::auth::{
     unauthorized, unauthorized_with_error, AuthenticateRequest, AuthenticatedUser,
 };
@@ -14,10 +14,10 @@ pub trait SessionManagement {
     fn sessions(&self) -> Result<Vec<odata_v4::IdRef>, redfish::Error>;
     fn create_session(
         &mut self,
-        session: v1_6_0::Session,
+        session: v1_7_2::Session,
         base_path: String,
-    ) -> Result<v1_6_0::Session, redfish::Error>;
-    fn get_session(&self, id: Self::Id) -> Result<v1_6_0::Session, redfish::Error>;
+    ) -> Result<v1_7_2::Session, redfish::Error>;
+    fn get_session(&self, id: Self::Id) -> Result<v1_7_2::Session, redfish::Error>;
     fn delete_session(&mut self, id: Self::Id) -> Result<(), redfish::Error>;
 }
 

seuss/src/auth/session_manager.rs

@@ -1,7 +1,7 @@
 use chrono::{DateTime, Local};
 use redfish_models::{
-    models::{odata_v4, redfish, resource, session::v1_6_0},
-    registries::base::v1_16_0::Base,
+    models::{odata_v4, redfish, resource, session::v1_7_2},
+    registries::base::v1_18_1::Base,
 };
 use redfish_core::{auth::AuthenticatedUser, convert::IntoRedfishMessage, error};
 use std::{
@@ -15,7 +15,7 @@ use crate::auth::{SessionAuthentication, SessionManagement};
 
 #[derive(Clone)]
 struct ManagedSession {
-    session: v1_6_0::Session,
+    session: v1_7_2::Session,
     last_request: DateTime<Local>,
     user: AuthenticatedUser,
 }
@@ -111,9 +111,9 @@ where
 
     fn create_session(
         &mut self,
-        session: v1_6_0::Session,
+        session: v1_7_2::Session,
         base_path: String,
-    ) -> Result<v1_6_0::Session, redfish::Error> {
+    ) -> Result<v1_7_2::Session, redfish::Error> {
         let user_name = session.user_name.clone().ok_or_else(|| {
             error::one_message(Base::PropertyMissing("UserName".to_string()).into_redfish_message())
         })?;
@@ -134,7 +134,7 @@ where
         }
         let token = self.token(&user_name);
 
-        let created_session = v1_6_0::Session {
+        let created_session = v1_7_2::Session {
             user_name: Some(user_name),
             odata_id: odata_v4::Id(base_path + "/" + &id),
             id: resource::Id(id.clone()),
@@ -168,7 +168,7 @@ where
             .ok_or_else(|| error::one_message(Base::NoValidSession.into_redfish_message()))
     }
 
-    fn get_session(&self, id: Self::Id) -> Result<v1_6_0::Session, redfish::Error> {
+    fn get_session(&self, id: Self::Id) -> Result<v1_7_2::Session, redfish::Error> {
         let sessions = self.sessions.lock().unwrap();
         sessions
             .iter()

seuss/src/error.rs

@@ -3,7 +3,7 @@ use axum::{
     response::{IntoResponse, Response},
     Json,
 };
-use redfish_models::registries::base::v1_16_0::Base;
+use redfish_models::registries::base::v1_18_1::Base;
 use redfish_core::{convert::IntoRedfishMessage, error};
 use tracing::{event, Level};
 

seuss/src/middleware/odata.rs

@@ -14,7 +14,7 @@ use axum::{
     routing::Route,
     Json,
 };
-use redfish_models::{registries::base::v1_16_0::Base, ODATA_VERSION};
+use redfish_models::{registries::base::v1_18_1::Base, ODATA_VERSION};
 use redfish_core::{convert::IntoRedfishMessage, error};
 use tower::{Layer, Service};
 

seuss/src/service/account_service.rs

@@ -3,8 +3,8 @@ use std::str::FromStr;
 use axum::{extract::OriginalUri, response::Response, Extension, Router};
 use redfish_axum::{role::Role, role_collection::RoleCollection};
 use redfish_models::models::{
-    account_service::v1_13_0::AccountService as AccountServiceModel, odata_v4,
-    privileges::PrivilegeType, resource, role::v1_3_1::Role as RoleModel,
+    account_service::v1_15_1::AccountService as AccountServiceModel, odata_v4,
+    privileges::PrivilegeType, resource, role::v1_3_2::Role as RoleModel,
     role_collection::RoleCollection as RoleCollectionModel,
 };
 use redfish_core::{auth::AuthenticateRequest, privilege};

seuss/src/service/session_service.rs

@@ -8,9 +8,9 @@ use axum::{
 };
 use redfish_axum::{session::Session, session_collection::SessionCollection};
 use redfish_models::models::{
-    odata_v4, resource, session::v1_6_0::Session as SessionModel,
+    odata_v4, resource, session::v1_7_2::Session as SessionModel,
     session_collection::SessionCollection as SessionCollectionModel,
-    session_service::v1_1_8::SessionService as SessionServiceModel,
+    session_service::v1_1_9::SessionService as SessionServiceModel,
 };
 use redfish_core::auth::AuthenticateRequest;