Skip to content

Commit 72e0466

Browse files
authored
chore: Move SEV host functionality to submodule in order to separate host and guest (#6111)
1 parent 544c5ba commit 72e0466

File tree

7 files changed

+380
-379
lines changed

7 files changed

+380
-379
lines changed

rs/ic_os/config/src/hostos/guestos_config.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use config_types::{
55
};
66
use deterministic_ips::node_type::NodeType;
77
use deterministic_ips::{calculate_deterministic_mac, IpVariant, MacAddr6Ext};
8-
use ic_sev::HostSevCertificateProvider;
8+
use ic_sev::host::HostSevCertificateProvider;
99
use std::net::Ipv6Addr;
1010
use utils::to_cidr;
1111

@@ -100,7 +100,7 @@ mod tests {
100100
DeploymentEnvironment, DeterministicIpv6Config, HostOSConfig, ICOSSettings, Ipv6Config,
101101
NetworkSettings,
102102
};
103-
use ic_sev::testing::mock_host_sev_certificate_provider;
103+
use ic_sev::host::testing::mock_host_sev_certificate_provider;
104104
use std::net::Ipv6Addr;
105105

106106
fn hostos_config_for_test() -> HostOSConfig {

rs/ic_os/os_tools/guest_vm_runner/src/guest_vm_config.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use config::hostos::guestos_config::generate_guestos_config;
66
use config_types::{GuestOSConfig, HostOSConfig};
77
use deterministic_ips::node_type::NodeType;
88
use deterministic_ips::{calculate_deterministic_mac, IpVariant};
9-
use ic_sev::HostSevCertificateProvider;
9+
use ic_sev::host::HostSevCertificateProvider;
1010
use std::path::{Path, PathBuf};
1111

1212
// See build.rs

rs/ic_os/os_tools/guest_vm_runner/src/main.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ use deterministic_ips::{calculate_deterministic_mac, IpVariant, MacAddr6Ext};
1212
use ic_device::device_mapping::MappedDevice;
1313
use ic_device::mount::{GptPartitionProvider, PartitionProvider};
1414
use ic_metrics_tool::{Metric, MetricsWriter};
15-
use ic_sev::HostSevCertificateProvider;
15+
use ic_sev::host::HostSevCertificateProvider;
1616
use nix::unistd::getuid;
1717
use std::fmt::{Debug, Formatter};
1818
use std::io::Write;
@@ -605,7 +605,7 @@ mod tests {
605605
};
606606
use ic_device::mount::testing::ExtractingFilesystemMounter;
607607
use ic_device::mount::GptPartitionProvider;
608-
use ic_sev::testing::mock_host_sev_certificate_provider;
608+
use ic_sev::host::testing::mock_host_sev_certificate_provider;
609609
use nix::sys::signal::SIGTERM;
610610
use regex::Regex;
611611
use std::fs::File;
File renamed without changes.

0 commit comments

Comments
 (0)