github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-27 07:48:55 +00:00
Code Issues Projects Releases Wiki Activity

Revert "kata-ctl: Disable network check on s390x"

Browse Source 
This reverts commit 00981b3c0a.

Signed-off-by: Hendrik Brueckner <brueckner@linux.ibm.com>
This commit is contained in:
Hendrik Brueckner 2022-10-18 11:12:18 +00:00
parent dd60a0298d
commit 9f2c7e47c9
3 changed files with 1 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/tools/kata-ctl/Cargo.toml
View File

@ -12,12 +12,9 @@ edition = "2018"
[dependencies] [dependencies]
anyhow = "1.0.31" anyhow = "1.0.31"
clap = { version = "3.2.20", features = ["derive", "cargo"] } clap = { version = "3.2.20", features = ["derive", "cargo"] }
reqwest = { version = "0.11", default-features = false, features = ["json", "blocking", "rustls-tls"] }
serde_json = "1.0.85" serde_json = "1.0.85"
thiserror = "1.0.35" thiserror = "1.0.35"
# See: https://github.com/kata-containers/kata-containers/issues/5438
[target.'cfg(not(target_arch = "s390x"))'.dependencies]
reqwest = { version = "0.11", default-features = false, features = ["json", "blocking", "rustls-tls"] }
[dev-dependencies] [dev-dependencies]
semver = "1.0.12" semver = "1.0.12"

46
src/tools/kata-ctl/src/check.rs
View File

@ -6,19 +6,8 @@
// Contains checks that are not architecture-specific // Contains checks that are not architecture-specific
use anyhow::{anyhow, Result}; use anyhow::{anyhow, Result};
// See: https://github.com/kata-containers/kata-containers/issues/5438
#[cfg(any(
target_arch = "aarch64",
target_arch = "powerpc64le",
target_arch = "x86_64"
))]
use reqwest::header::{CONTENT_TYPE, USER_AGENT}; use reqwest::header::{CONTENT_TYPE, USER_AGENT};
use serde_json::Value; use serde_json::Value;
#[cfg(any(
target_arch = "aarch64",
target_arch = "powerpc64le",
target_arch = "x86_64"
))]
use std::collections::HashMap; use std::collections::HashMap;
use std::fs; use std::fs;
@ -110,11 +99,6 @@ pub fn run_network_checks() -> Result<()> {
Ok(()) Ok(())
} }
#[cfg(any(
target_arch = "aarch64",
target_arch = "powerpc64le",
target_arch = "x86_64"
))]
fn get_kata_version_by_url(url: &str) -> std::result::Result<String, reqwest::Error> { fn get_kata_version_by_url(url: &str) -> std::result::Result<String, reqwest::Error> {
let content = reqwest::blocking::Client::new() let content = reqwest::blocking::Client::new()
.get(url) .get(url)
@ -127,11 +111,6 @@ fn get_kata_version_by_url(url: &str) -> std::result::Result<String, reqwest::Er
Ok(version.to_string()) Ok(version.to_string())
} }
#[cfg(any(
target_arch = "aarch64",
target_arch = "powerpc64le",
target_arch = "x86_64"
))]
fn handle_reqwest_error(e: reqwest::Error) -> anyhow::Error { fn handle_reqwest_error(e: reqwest::Error) -> anyhow::Error {
if e.is_connect() { if e.is_connect() {
return anyhow!(e).context("http connection failure: connection refused"); return anyhow!(e).context("http connection failure: connection refused");
@ -152,11 +131,6 @@ fn handle_reqwest_error(e: reqwest::Error) -> anyhow::Error {
anyhow!(e).context("unknown http connection failure: {:?}") anyhow!(e).context("unknown http connection failure: {:?}")
} }
#[cfg(any(
target_arch = "aarch64",
target_arch = "powerpc64le",
target_arch = "x86_64"
))]
pub fn check_version() -> Result<()> { pub fn check_version() -> Result<()> {
let version = get_kata_version_by_url(KATA_GITHUB_URL).map_err(handle_reqwest_error)?; let version = get_kata_version_by_url(KATA_GITHUB_URL).map_err(handle_reqwest_error)?;
@ -190,11 +164,6 @@ mod tests {
assert_eq!(expected, actual); assert_eq!(expected, actual);
} }
#[cfg(any(
target_arch = "aarch64",
target_arch = "powerpc64le",
target_arch = "x86_64"
))]
#[test] #[test]
fn check_version_by_empty_url() { fn check_version_by_empty_url() {
const TEST_URL: &str = "http:"; const TEST_URL: &str = "http:";
@ -203,11 +172,6 @@ mod tests {
assert_eq!(expected, actual); assert_eq!(expected, actual);
} }
#[cfg(any(
target_arch = "aarch64",
target_arch = "powerpc64le",
target_arch = "x86_64"
))]
#[test] #[test]
fn check_version_by_garbage_url() { fn check_version_by_garbage_url() {
const TEST_URL: &str = "_localhost_"; const TEST_URL: &str = "_localhost_";
@ -216,11 +180,6 @@ mod tests {
assert_eq!(expected, actual); assert_eq!(expected, actual);
} }
#[cfg(any(
target_arch = "aarch64",
target_arch = "powerpc64le",
target_arch = "x86_64"
))]
#[test] #[test]
fn check_version_by_invalid_url() { fn check_version_by_invalid_url() {
const TEST_URL: &str = "http://localhost :80"; const TEST_URL: &str = "http://localhost :80";
@ -229,11 +188,6 @@ mod tests {
assert_eq!(expected, actual); assert_eq!(expected, actual);
} }
#[cfg(any(
target_arch = "aarch64",
target_arch = "powerpc64le",
target_arch = "x86_64"
))]
#[test] #[test]
fn check_latest_version() { fn check_latest_version() {
let version = get_kata_version_by_url(KATA_GITHUB_URL).unwrap(); let version = get_kata_version_by_url(KATA_GITHUB_URL).unwrap();

9
src/tools/kata-ctl/src/ops/check_ops.rs
View File

@ -32,16 +32,7 @@ pub fn handle_check(checkcmd: CheckArgument) -> Result<()> {
CheckSubCommand::CheckVersionOnly => { CheckSubCommand::CheckVersionOnly => {
// retrieve latest release // retrieve latest release
#[cfg(any(
target_arch = "aarch64",
target_arch = "powerpc64le",
target_arch = "x86_64"
))]
check::check_version()?; check::check_version()?;
// See: https://github.com/kata-containers/kata-containers/issues/5438
#[cfg(target_arch = "s390x")]
unimplemented!("Network check not implemented on s390x")
} }
} }