Skip to content

Commit 220cc87

Browse files
authored
update cert and minor test fixes (#67)
this fixes tests for the following issues: - Updates the certs - disable tls for integration tests because the mock uses a self-signed cert - fix liteon integration test (vendor was missing)
1 parent 3f87005 commit 220cc87

8 files changed

Lines changed: 61 additions & 57 deletions

File tree

src/dell.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1037,7 +1037,7 @@ impl Redfish for Bmc {
10371037
}
10381038
}
10391039

1040-
return Err(RedfishError::MissingBootOption(expected_boot_option_name));
1040+
Err(RedfishError::MissingBootOption(expected_boot_option_name))
10411041
})
10421042
}
10431043

src/jsonmap.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -246,8 +246,8 @@ mod tests {
246246
});
247247
let map = value.as_object().unwrap();
248248

249-
assert_eq!(get_bool(map, "Enabled", "http://test/url").unwrap(), true);
250-
assert_eq!(get_bool(map, "Disabled", "http://test/url").unwrap(), false);
249+
assert!(get_bool(map, "Enabled", "http://test/url").unwrap());
250+
assert!(!get_bool(map, "Disabled", "http://test/url").unwrap());
251251
}
252252

253253
// test_get_i64_success tests that get_i64 correctly extracts an integer value.

src/lib.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,10 +222,12 @@ pub trait Redfish: Send + Sync + 'static {
222222
/// - boot_interface_mac: MAC Address of the NIC you wish to boot from
223223
/// If not given we look for a Mellanox Bluefield DPU and use that.
224224
/// Not applicable to Supermicro and the DPU itself.
225-
/// bios_profiles: Map of vendor/model (with spaces replaced by underscores)/profile/type
225+
/// bios_profiles: Map of vendor/model (with spaces replaced by underscores)/profile/type
226226
/// to extra settings; expected to come from config rather than hardcoded.
227-
/// selected_profile: Profile to use (if present)
227+
/// selected_profile: Profile to use (if present)
228+
///
228229
/// Returns Ok(Some(job_id)) when the vendor creates a job for the BIOS PATCH (e.g. Dell);
230+
///
229231
/// Ok(None) when no job is created. Caller should wait for job completion before configuring boot order.
230232
fn machine_setup<'a>(
231233
&'a self,

src/network.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -781,7 +781,7 @@ fn truncate(s: &str, len: usize) -> &str {
781781
/// `Password`, `OldPassword`, `NewPassword` — standard Redfish account/BIOS ops
782782
/// `CurrentUefiPassword`, `UefiPassword` — NVIDIA DPU Bios/Settings PATCH
783783
/// `ImportBuffer` — Dell ImportSystemConfiguration XML blob
784-
784+
///
785785
/// A `Display` wrapper that redacts sensitive JSON fields on formatting.
786786
///
787787
/// Passing this to `tracing::debug!` defers evaluation until the macro decides the

tests/cert.pem

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,20 @@
11
-----BEGIN CERTIFICATE-----
2-
MIIDkzCCAnugAwIBAgIUXVYkRCrM/ge03DVymDtXCuybp7gwDQYJKoZIhvcNAQEL
3-
BQAwWTELMAkGA1UEBhMCVVMxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM
4-
GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDESMBAGA1UEAwwJbG9jYWxob3N0MB4X
5-
DTIxMDczMTE0MjIxMloXDTIyMDczMTE0MjIxMlowWTELMAkGA1UEBhMCVVMxEzAR
6-
BgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5
7-
IEx0ZDESMBAGA1UEAwwJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
8-
MIIBCgKCAQEA02V5ZjmqLB/VQwTarrz/35qsa83L+DbAoa0001+jVmmC+G9Nufi0
9-
daroFWj/Uicv2fZWETU8JoZKUrX4BK9og5cg5rln/CtBRWCUYIwRgY9R/CdBGPn4
10-
kp+XkSJaCw74ZIyLy/Zfux6h8ES1m9YRnBza+s7U+ImRBRf4MRPtXQ3/mqJxAZYq
11-
dOnKnvssRyD2qutgVTAxwMUvJWIivRhRYDj7WOpS4CEEeQxP1iH1/T5P7FdtTGdT
12-
bVBABCA8JhL96uFGPpOYHcM/7R5EIA3yZ5FNg931QzoDITjtXGtQ6y9/l/IYkWm6
13-
J67RWcN0IoTsZhz0WNU4gAeslVtJLofn8QIDAQABo1MwUTAdBgNVHQ4EFgQUzFnK
14-
NfS4LAYuKeWwHbzooER0yZ0wHwYDVR0jBBgwFoAUzFnKNfS4LAYuKeWwHbzooER0
15-
yZ0wDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAk4O+e9jia59W
16-
ZwetN4GU7OWcYhmOgSizRSs6u7mTfp62LDMt96WKU3THksOnZ44HnqWQxsSfdFVU
17-
XJD12tjvVU8Z4FWzQajcHeemUYiDze8EAh6TnxnUcOrU8IcwiKGxCWRY/908jnWg
18-
+MMscfMCMYTRdeTPqD8fGzAlUCtmyzH6KLE3s4Oo/r5+NR+Uvrwpdvb7xe0MwwO9
19-
Q/zR4N8ep/HwHVEObcaBofE1ssZLksX7ZgCP9wMgXRWpNAtC5EWxMbxYjBfWFH24
20-
fDJlBMiGJWg8HHcxK7wQhFh+fuyNzE+xEWPsI9VL1zDftd9x8/QsOagyEOnY8Vxr
21-
AopvZ09uEQ==
2+
MIIDSzCCAjOgAwIBAgIUJctSuhvufWDDxfQl4MKiCdjf+3EwDQYJKoZIhvcNAQEL
3+
BQAwFDESMBAGA1UEAwwJbG9jYWxob3N0MCAXDTI2MDUxMTE2MzU0N1oYDzIzMDAw
4+
MjI0MTYzNTQ3WjAUMRIwEAYDVQQDDAlsb2NhbGhvc3QwggEiMA0GCSqGSIb3DQEB
5+
AQUAA4IBDwAwggEKAoIBAQCpqpzhK3Gyn9l46pm4fFPk23kX6taXnQw8w6UWtFM3
6+
lqmsanhRSr+7RE2FDNcReXL01ftk7JZpz0yrsWXiHXrJRKJBry2btLjxwEcVE8Uy
7+
wbIDoLFbUwyIpW7YCv0Z+xkFNJXXZJFz1Ad74yMrGd3ob2KWcVvDXKnRRDFqDrC3
8+
anAFlHuxfIA+AOAIOGps6B/o4bBkwOZp7aWWaETd0XdkH5/R9x3osIZDkUaKk8GE
9+
XbzdipDWndBHTDr9myaWQvCutQVzScl5l+U+pX7pOpK2TzC2neeCZXmanXI+Vngt
10+
vlkTAT0BeWA3nBnybkymmHlXK8fVX9CDVb5YAJNAcAWxAgMBAAGjgZIwgY8wHQYD
11+
VR0OBBYEFBraZNxyzWkaWHiBzAZtbwHZGPE2MB8GA1UdIwQYMBaAFBraZNxyzWka
12+
WHiBzAZtbwHZGPE2MBoGA1UdEQQTMBGCCWxvY2FsaG9zdIcEfwAAATAMBgNVHRMB
13+
Af8EAjAAMA4GA1UdDwEB/wQEAwIFoDATBgNVHSUEDDAKBggrBgEFBQcDATANBgkq
14+
hkiG9w0BAQsFAAOCAQEAAdKJB77Isjv53fkJiCrL34RJ9LwFQLRiPL/lH7FQhenh
15+
bjoavDv39xEgIZ/rzvICUaBEXcyJPVFEkM8CrBUrf7U+wljqIrQRkwrxkPXF8eXE
16+
vJGvPfGboere/X1lOM/V+z5v8AQwxFR+W8sC2L1ec1UnqAeqh/7T9yYuhhKBr6zR
17+
3WTNbhet7wXNydA784iPV+5ftL9krBsiMoHAkgXcQnuqzjBy01OHKASMe0e7y66C
18+
WcZ6QEcgXlNBksg7l3bKOgT+/dxIbEM0Wa+t80YkkUc3SuT836qK+rwnuFNzzKpJ
19+
GPqvHm229Azp33cDIOZf2wncm3+9U/OK7eqzZyqdQQ==
2220
-----END CERTIFICATE-----

tests/integration_test.rs

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,9 @@ async fn test_forbidden_error_handling() -> anyhow::Result<()> {
142142
..Default::default()
143143
};
144144

145-
let pool = libredfish::RedfishClientPool::builder().build()?;
145+
let pool = libredfish::RedfishClientPool::builder()
146+
.danger_accept_invalid_certs()
147+
.build()?;
146148
let redfish = pool.create_standard_client(endpoint)?;
147149

148150
match redfish.get_chassis_all().await {
@@ -301,7 +303,9 @@ async fn run_integration_test(
301303
..Default::default()
302304
};
303305

304-
let pool = libredfish::RedfishClientPool::builder().build()?;
306+
let pool = libredfish::RedfishClientPool::builder()
307+
.danger_accept_invalid_certs()
308+
.build()?;
305309
let redfish = pool.create_client(endpoint).await?;
306310

307311
if vendor_dir == "nvidia_dpu" {
@@ -443,7 +447,7 @@ async fn run_integration_test(
443447
if vendor_dir == "lenovo" {
444448
assert!(redfish.lockdown_status().await?.is_fully_enabled());
445449
}
446-
if vendor_dir != "nvidia_gh200" {
450+
if vendor_dir != "nvidia_gh200" && vendor_dir != "liteon_powershelf" {
447451
let tm = redfish.get_thermal_metrics().await?;
448452
if vendor_dir == "nvidia_gb200" {
449453
assert!(tm.leak_detectors.is_some());
@@ -452,7 +456,7 @@ async fn run_integration_test(
452456
_ = redfish.get_power_metrics().await?;
453457
}
454458
}
455-
if vendor_dir != "supermicro" {
459+
if vendor_dir != "supermicro" && vendor_dir != "liteon_powershelf" {
456460
_ = redfish.get_system_event_log().await?;
457461
}
458462

tests/key.pem

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
-----BEGIN PRIVATE KEY-----
2-
MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDTZXlmOaosH9VD
3-
BNquvP/fmqxrzcv4NsChrTTTX6NWaYL4b025+LR1qugVaP9SJy/Z9lYRNTwmhkpS
4-
tfgEr2iDlyDmuWf8K0FFYJRgjBGBj1H8J0EY+fiSn5eRIloLDvhkjIvL9l+7HqHw
5-
RLWb1hGcHNr6ztT4iZEFF/gxE+1dDf+aonEBlip06cqe+yxHIPaq62BVMDHAxS8l
6-
YiK9GFFgOPtY6lLgIQR5DE/WIfX9Pk/sV21MZ1NtUEAEIDwmEv3q4UY+k5gdwz/t
7-
HkQgDfJnkU2D3fVDOgMhOO1ca1DrL3+X8hiRabonrtFZw3QihOxmHPRY1TiAB6yV
8-
W0kuh+fxAgMBAAECggEADltu8k1qTFLhJgsXWxTFAAe+PBgfCT2WuaRM2So+qqjB
9-
12Of0MieYPt5hbK63HaC3nfHgqWt7yPhulpXfOH45C8IcgMXl93MMg0MJr58leMI
10-
+2ojFrIrerHSFm5R1TxwDEwrVm/mMowzDWFtQCc6zPJ8wNn5RuP48HKfTZ3/2fjw
11-
zEjSwPO2wFMfo1EJNTjlI303lFbdFBs67NaX6puh30M7Tn+gznHKyO5a7F57wkIt
12-
fkgnEy/sgMedQlwX7bRpUoD6f0fZzV8Qz4cHFywtYErczZJh3VGitJoO/VCIDdty
13-
RPXOAqVDd7EpP1UUehZlKVWZ0OZMEfRgKbRCel5abQKBgQDwgwrIQ5+BiZv6a0VT
14-
ETeXB+hRbvBinRykNo/RvLc3j1enRh9/zO/ShadZIXgOAiM1Jnr5Gp8KkNGca6K1
15-
myhtad7xYPODYzNXXp6T1OPgZxHZLIYzVUj6ypXeV64Te5ZiDaJ1D49czsq+PqsQ
16-
XRcgBJSNpFtDFiXWpjXWfx8PxwKBgQDhAnLY5Sl2eeQo+ud0MvjwftB/mN2qCzJY
17-
5AlQpRI4ThWxJgGPuHTR29zVa5iWNYuA5LWrC1y/wx+t5HKUwq+5kxvs+npYpDJD
18-
ZX/w0Glc6s0Jc/mFySkbw9B2LePedL7lRF5OiAyC6D106Sc9V2jlL4IflmOzt4CD
19-
ZTNbLtC6hwKBgHfIzBXxl/9sCcMuqdg1Ovp9dbcZCaATn7ApfHd5BccmHQGyav27
20-
k7XF2xMJGEHhzqcqAxUNrSgV+E9vTBomrHvRvrd5Ec7eGTPqbBA0d0nMC5eeFTh7
21-
wV0miH20LX6Gjt9G6yJiHYSbeV5G1+vOcTYBEft5X/qJjU7aePXbWh0BAoGBAJlV
22-
5tgCCuhvFloK6fHYzqZtdT6O+PfpW20SMXrgkvMF22h2YvgDFrDwqKRUB47NfHzg
23-
3yBpxNH1ccA5/w97QO8w3gX3h6qicpJVOAPusu6cIBACFZfjRv1hyszOZwvw+Soa
24-
Fj5kHkqTY1YpkREPYS9V2dIW1Wjic1SXgZDw7VM/AoGAP/cZ3ZHTSCDTFlItqy5C
25-
rIy2AiY0WJsx+K0qcvtosPOOwtnGjWHb1gdaVdfX/IRkSsX4PAOdnsyidNC5/l/m
26-
y8oa+5WEeGFclWFhr4dnTA766o8HrM2UjIgWWYBF2VKdptGnHxFeJWFUmeQC/xeW
27-
w37pCS7ykL+7gp7V0WShYsw=
2+
MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCpqpzhK3Gyn9l4
3+
6pm4fFPk23kX6taXnQw8w6UWtFM3lqmsanhRSr+7RE2FDNcReXL01ftk7JZpz0yr
4+
sWXiHXrJRKJBry2btLjxwEcVE8UywbIDoLFbUwyIpW7YCv0Z+xkFNJXXZJFz1Ad7
5+
4yMrGd3ob2KWcVvDXKnRRDFqDrC3anAFlHuxfIA+AOAIOGps6B/o4bBkwOZp7aWW
6+
aETd0XdkH5/R9x3osIZDkUaKk8GEXbzdipDWndBHTDr9myaWQvCutQVzScl5l+U+
7+
pX7pOpK2TzC2neeCZXmanXI+VngtvlkTAT0BeWA3nBnybkymmHlXK8fVX9CDVb5Y
8+
AJNAcAWxAgMBAAECggEAAXJ6GhWTx7FDWputqfwtfwM8Oi7/m5V0WERW8SWinBPF
9+
6LmTwyW/EurXOm5Mm1KM33e/yDGYatigz8oYk2Aq/vJ968+BtRVKio1YTd64TOGI
10+
Ei3ZtWy066l1k5Qsan9QzFGRgZ/S+cjyM2VRlHmJAgWJMr1OyhDNRgKt5Tiw2y+i
11+
rFj0erHT1WAFdyoJKozWsGsXvkOCkO8yMN8oGBXpKfeZhUdf2oolR58f4slRF0CL
12+
hZfc3ybNJ6s/MCfO7CS06UbboHH0EeJyB68pi715jJrML6QrV1ZpNViRcZfoa+iI
13+
+qXRypZTS/NaS4tnhUb5jiLbg8yl2BO88gbtd0aTTQKBgQDXKbYlaxpU722VTn1b
14+
qvY/xdr1A0l4TKyW9NeYvQG5UBNQX86J3dVL5H0C5v1rPnmSZMu3R3oE/gKyMGU6
15+
o5MRtomYVPwNApDCyF1FVjKs0ZkxZxGyXMixu/isCJGH4WQE0k/PNWa+l95VI8av
16+
yklTSn5TvaqJafl4kh1DIxbhuwKBgQDJ3lQcu3sdebCspOSUq/XjOZD2S15R+aRg
17+
kzWNyrZwvSTRGrxwXF+pTfMPA6qLIsuKH0Rch4ET4vpfZqEMfD66zE+mOYP/ZsNl
18+
Q9GB+hACQCTratzRFFLMj4TQNhD0C8ze7lo3HRQO80Asz7VSW9pyBSlDP3nn+B7l
19+
QDi5z3nZgwKBgQClOIWDJERbFmQqs9P1UUm43ODvJjADrbUWUjtAMVsihwfdv0Ql
20+
f+/rUDBiyyesc5P9Q2NfgQaE0N0XIayKI9OqVWZBUHkgMGki+aMNvEw7gtPFKOVg
21+
9niyaqpgyE+gbQZV4X2hmtsj3hC/hjJrCMXXrKtm+Iz86iDEYkcQJ+DJQwKBgDL4
22+
tHxcyoVyyK2PJTh1Ay1Qx82o0jQYuOy5vvgCi3aEC9vQyGwGpxD04b6Uymc/be1+
23+
X6CNhoYi9d1I6LliVeSM2j+6nh3LMONM8IXFQm2PDMN0xDT20MFeK8b3H+i/YgeY
24+
X6cy7HGp8jZebAZTsyC/NOAKExoDiKmSQcCJJtdJAoGAYdck3veztSI8uP18gduh
25+
u4QIjwtZg9eLrhBxadxXr9yfd4hR3kJ+fObiqtIUTPVG1O8SZaQAZzyB65ArInPW
26+
PvbRDxtiSvaRclKDtgs4j2b4mtq3eJeSY7sv0nqwNHZBEa2hKjF+Ep5w6khl15KC
27+
7o+f3FaeSJdagWHJkJP+JTI=
2828
-----END PRIVATE KEY-----

tests/mockups/liteon_powershelf/redfish/v1/index.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,4 +59,4 @@
5959
"UpdateService": {
6060
"@odata.id": "/redfish/v1/UpdateService"
6161
}
62-
}
62+
}

0 commit comments

Comments
 (0)