Skip to content

dpd: parse xcvr_defaults.rs without snake_case #422

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
taspelund wants to merge 1 commit into
base: main
Choose a base branch
from
Open

dpd: parse xcvr_defaults.rs without snake_case #422

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 24 additions & 3 deletions dpd/src/switch_port.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ use common::ports::QsfpPort;
use common::ports::RearPort;
use common::ports::TxEq;
use common::ports::XcvrSettings;
use dpd_types_versions::v1;
use std::collections::BTreeMap;

/// Return the backplane link information, if this is a rear port.
Expand All @@ -54,8 +55,9 @@ pub fn module_id_from_qsfp(p: QsfpPort) -> transceiver_controller::ModuleId {
struct XcvrDefaultsEntry {
/// Manufacturer part number - unique identifer for a transceiver
pub mpn: String,
/// FEC
pub fec: Option<PortFec>,
/// FEC. For stability, the on-disk format is parsed with the v1
/// `PortFec` representation.
pub fec: Option<v1::port::PortFec>,
/// Precursor 2
pub pre2: Option<i32>,
/// Precursor 1
Expand Down Expand Up @@ -99,7 +101,8 @@ pub fn load_xcvr_defaults(
} else {
None
};
settings.insert(e.mpn, XcvrSettings { tx_eq, fec: e.fec });
settings
.insert(e.mpn, XcvrSettings { tx_eq, fec: e.fec.map(Into::into) });
}
Ok(settings)
}
Expand Down Expand Up @@ -525,3 +528,21 @@ impl crate::Switch {
Err(DpdError::NoTransceiverController)
}
}

#[cfg(test)]
mod tests {
use super::load_xcvr_defaults;
use common::ports::PortFec;

// The shipped defaults file must keep parsing even as the API's
// `PortFec` serialization changes.
#[test]
fn shipped_xcvr_defaults_parse() {
let path =
concat!(env!("CARGO_MANIFEST_DIR"), "/misc/xcvr_defaults.csv");
let settings = load_xcvr_defaults(path).unwrap();
assert_eq!(settings["OXIDESOFTNPU"].fec, Some(PortFec::RS));
assert_eq!(settings["CAB-Q-Q-5M"].fec, Some(PortFec::None));
assert_eq!(settings["FTLC9558REPM"].fec, None);
}
}
Loading