nv-redfish: support NvSwitch wrong Chassis part location type

Signed-off-by: Dmitry Porokh <dporokh@nvidia.com>

Author: poroh

redfish/Cargo.toml

@@ -58,7 +58,7 @@ assembly = []
 accounts = ["patch-payload-get", "patch-payload-update", "patch-collection-create"]
 bios = []
 boot-options = []
-chassis = ["patch-payload-get", "nv-bmc-expand"]
+chassis = ["patch-payload-get", "patch-collection", "nv-bmc-expand"]
 computer-systems = ["patch-payload-get", "patch-collection"]
 ethernet-interfaces = []
 host-interfaces = []

redfish/src/bmc_quirks.rs

@@ -34,16 +34,19 @@ enum Platform {
     AmiViking,
     Nvidia,
     Anonymous1_9_0,
+    NvSwitch,
 }
 
 impl BmcQuirks {
     pub fn new(root: &ServiceRoot) -> Self {
         let vendor_str = root.vendor.as_ref().and_then(Option::as_deref);
         let redfish_version_str = root.redfish_version.as_deref();
+        let product_str = root.product.as_ref().and_then(Option::as_deref);
         let platform = match vendor_str {
             Some("HPE") => Some(Platform::Hpe),
             Some("Dell") => Some(Platform::Dell),
             Some("AMI") if redfish_version_str == Some("1.11.0") => Some(Platform::AmiViking),
+            Some("NVIDIA") if product_str == Some("P3809") => Some(Platform::NvSwitch),
             Some("NVIDIA") => Some(Platform::Nvidia),
             None if redfish_version_str == Some("1.9.0") => Some(Platform::Anonymous1_9_0),
             _ => None,
@@ -175,6 +178,14 @@ impl BmcQuirks {
         self.platform == Some(Platform::Anonymous1_9_0)
     }
 
+    /// NVSwitch provides invalid (Unknown) Location/PartLocation/LocationType in Chassis.
+    #[cfg(feature = "chassis")]
+    pub(crate) fn wrong_resource_part_location_type(&self) -> bool {
+        // Note that Liteon prefer not to tell about itself. So we
+        // apply patches for all platforms that are not identified.
+        self.platform == Some(Platform::NvSwitch)
+    }
+
     /// In some cases we expand is not working according to spec,
     /// if it is the case for specific chassis, we would disable
     /// expand api

redfish/src/chassis/item.rs

@@ -22,6 +22,7 @@ use crate::hardware_id::SerialNumber as HardwareIdSerialNumber;
 use crate::patch_support::JsonValue;
 use crate::patch_support::Payload;
 use crate::patch_support::ReadPatchFn;
+use crate::patches::remove_invalid_resource_part_location_type;
 use crate::patches::remove_invalid_resource_state;
 use crate::schema::redfish::chassis::Chassis as ChassisSchema;
 use crate::Error;
@@ -75,7 +76,7 @@ pub type PartNumber<T> = HardwareIdPartNumber<T, ChassisTag>;
 pub type SerialNumber<T> = HardwareIdSerialNumber<T, ChassisTag>;
 
 pub struct Config {
-    read_patch_fn: Option<ReadPatchFn>,
+    pub read_patch_fn: Option<ReadPatchFn>,
 }
 
 impl Config {
@@ -93,6 +94,9 @@ impl Config {
         if quirks.wrong_resource_status_state() {
             patches.push(remove_invalid_resource_state);
         }
+        if quirks.wrong_resource_part_location_type() {
+            patches.push(remove_invalid_resource_part_location_type);
+        }
         let read_patch_fn = (!patches.is_empty())
             .then(|| Arc::new(move |v| patches.iter().fold(v, |acc, f| f(acc))) as ReadPatchFn);
         Self { read_patch_fn }

redfish/src/chassis/mod.rs

@@ -66,9 +66,14 @@ pub use power_supply::PowerSupply;
 pub use thermal::Thermal;
 
 use crate::core::NavProperty;
+use crate::patch_support::CollectionWithPatch;
 use crate::resource::Resource as _;
+use crate::schema::redfish::chassis::Chassis as ChassisSchema;
 use crate::schema::redfish::chassis_collection::ChassisCollection as ChassisCollectionSchema;
-use crate::{Error, NvBmc, ServiceRoot};
+use crate::schema::redfish::resource::ResourceCollection;
+use crate::Error;
+use crate::NvBmc;
+use crate::ServiceRoot;
 
 /// Chassis collection.
 ///
@@ -84,8 +89,11 @@ impl<B: Bmc> ChassisCollection<B> {
         bmc: &NvBmc<B>,
         root: &ServiceRoot<B>,
     ) -> Result<Option<Self>, Error<B>> {
+        let item_config = item::Config::new(&bmc.quirks);
         if let Some(collection_ref) = &root.root.chassis {
-            bmc.expand_property(collection_ref).await.map(Some)
+            Self::expand_collection(bmc, collection_ref, item_config.read_patch_fn.as_ref())
+                .await
+                .map(Some)
         } else if bmc.quirks.bug_missing_root_nav_properties() {
             bmc.expand_property(&NavProperty::new_reference(
                 format!("{}/Chassis", root.odata_id()).into(),
@@ -96,13 +104,10 @@ impl<B: Bmc> ChassisCollection<B> {
             Ok(None)
         }
         .map(|c| {
-            c.map(|collection| {
-                let item_config = item::Config::new(&bmc.quirks).into();
-                Self {
-                    bmc: bmc.clone(),
-                    collection,
-                    item_config,
-                }
+            c.map(|collection| Self {
+                bmc: bmc.clone(),
+                collection,
+                item_config: item_config.into(),
             })
         })
     }
@@ -121,3 +126,14 @@ impl<B: Bmc> ChassisCollection<B> {
         Ok(chassis_members)
     }
 }
+
+impl<B: Bmc> CollectionWithPatch<ChassisCollectionSchema, ChassisSchema, B>
+    for ChassisCollection<B>
+{
+    fn convert_patched(
+        base: ResourceCollection,
+        members: Vec<NavProperty<ChassisSchema>>,
+    ) -> ChassisCollectionSchema {
+        ChassisCollectionSchema { base, members }
+    }
+}

redfish/src/patches.rs

@@ -16,10 +16,11 @@
 //! Sometimes Redfish implementations do not perfectly match the CSDL
 //! specification. This module provides helpers to deal with that.
 
-/// Redfish collection related patches.
+use crate::schema::redfish::resource::State as ResourceStateSchema;
 use serde_json::Value;
 
-use crate::schema::redfish::resource::State as ResourceStateSchema;
+#[cfg(feature = "chassis")]
+use crate::schema::redfish::resource::LocationType as ResourceLocationTypeSchema;
 
 /// Remove unsupported `Status.State` enum values from a resource payload.
 ///
@@ -40,3 +41,26 @@ pub fn remove_invalid_resource_state(mut resource: Value) -> Value {
     }
     resource
 }
+
+/// Remove unsupported `Location.PartLocation.LocationType` enum values from a resource payload.
+///
+/// Some BMCs return state values outside Redfish schema enum constraints
+/// (for example `"Unknown"`). This helper drops only invalid state values
+/// and keeps all other payload fields unchanged.
+#[cfg(feature = "chassis")]
+#[must_use]
+pub fn remove_invalid_resource_part_location_type(mut resource: Value) -> Value {
+    if let Value::Object(ref mut obj) = resource {
+        if let Some(Value::Object(ref mut location)) = obj.get_mut("Location") {
+            if let Some(Value::Object(ref mut part_location)) = location.get_mut("PartLocation") {
+                let location_type_is_invalid = part_location.get("LocationType").is_some_and(|v| {
+                    serde_json::from_value::<ResourceLocationTypeSchema>(v.clone()).is_err()
+                });
+                if location_type_is_invalid {
+                    part_location.remove("LocationType");
+                }
+            }
+        }
+    }
+    resource
+}

tests/tests/test-chassis.rs

@@ -20,6 +20,7 @@ use nv_redfish::ServiceRoot;
 use nv_redfish_core::ODataId;
 use nv_redfish_tests::ami_viking_service_root;
 use nv_redfish_tests::anonymous_1_9_service_root;
+use nv_redfish_tests::json_merge;
 use nv_redfish_tests::Bmc;
 use nv_redfish_tests::Expect;
 use nv_redfish_tests::ODATA_ID;
@@ -187,6 +188,58 @@ async fn anonymous_1_9_0_wrong_chassis_status_state_workaround() -> Result<(), B
     Ok(())
 }
 
+#[test]
+async fn nvswitch_wrong_location_part_location_type_workaround() -> Result<(), Box<dyn StdError>> {
+    // Platform under test: NVSwitch (`Vendor=NVIDIA`, `Product=P3809`).
+    // Quirk under test: invalid Location.PartLocation.LocationType="Unknown".
+    let bmc = Arc::new(Bmc::default());
+    let ids = ids();
+    let root = expect_nvswitch_service_root(
+        bmc.clone(),
+        &ids,
+        json!({
+            "Chassis": { ODATA_ID: &ids.chassis_collection_id }
+        }),
+    )
+    .await?;
+    bmc.expect(Expect::expand(
+        &ids.chassis_collection_id,
+        json!({
+            ODATA_ID: &ids.chassis_collection_id,
+            ODATA_TYPE: CHASSIS_COLLECTION_DATA_TYPE,
+            "Id": "Chassis",
+            "Name": "Chassis Collection",
+            "Members": [
+                {
+                    ODATA_ID: &ids.chassis_id
+                }
+            ]
+        }),
+    ));
+
+    let collection = root.chassis().await?.unwrap();
+    expect_chassis_get(
+        bmc.clone(),
+        &ids,
+        json!({ // Real id: CPLD_0
+            ODATA_ID: &ids.chassis_id,
+            ODATA_TYPE: CHASSIS_DATA_TYPE,
+            "Id": "1",
+            "Name": "Chassis",
+            "ChassisType": "Module",
+            "Location": {
+                "PartLocation": {
+                    "LocationType": "Unknown"
+                }
+            }
+        }),
+    );
+    let members = collection.members().await?;
+    assert_eq!(members.len(), 1);
+
+    Ok(())
+}
+
 async fn expect_viking_service_root(
     bmc: Arc<Bmc>,
     ids: &Ids,
@@ -211,6 +264,34 @@ async fn expect_anonymous_1_9_service_root(
     ServiceRoot::new(bmc).await.map_err(Into::into)
 }
 
+async fn expect_nvswitch_service_root(
+    bmc: Arc<Bmc>,
+    ids: &Ids,
+    fields: Value,
+) -> Result<ServiceRoot<Bmc>, Box<dyn StdError>> {
+    bmc.expect(Expect::get(
+        &ids.root_id,
+        json_merge([
+            &json!({
+                ODATA_ID: &ids.root_id,
+                ODATA_TYPE: "#ServiceRoot.v1_13_0.ServiceRoot",
+                "Id": "RootService",
+                "Name": "RootService",
+                "Vendor": "NVIDIA",
+                "Product": "P3809",
+                "ProtocolFeaturesSupported": {
+                    "ExpandQuery": {
+                        "NoLinks": true
+                    }
+                },
+                "Links": {}
+            }),
+            &fields,
+        ]),
+    ));
+    ServiceRoot::new(bmc).await.map_err(Into::into)
+}
+
 fn expect_chassis_collection(bmc: Arc<Bmc>, ids: &Ids) {
     bmc.expect(Expect::get(
         &ids.chassis_collection_id,