chore: [NODE-1683] Remove deprecated VM fields (#7037)

Bownairo · web-flow · commit 43c193cc05ed · 2025-12-09T16:24:48.000Z
diff --git a/rs/ic_os/config/src/lib.rs b/rs/ic_os/config/src/lib.rs
@@ -74,11 +74,7 @@ mod tests {
             icos_dev_settings,
         };
         let setupos_settings = SetupOSSettings;
-        #[allow(deprecated)]
         let hostos_settings = HostOSSettings {
-            vm_memory: 16,
-            vm_cpu: "kvm".to_string(),
-            vm_nr_of_vcpus: 64,
             verbose: false,
             hostos_dev_settings: HostOSDevSettings {
                 vm_memory: 16,
diff --git a/rs/ic_os/config/src/main.rs b/rs/ic_os/config/src/main.rs
@@ -234,11 +234,7 @@ pub fn assemble_setupos_config(
 
     let setupos_settings = SetupOSSettings;
 
-    #[allow(deprecated)]
     let hostos_settings = HostOSSettings {
-        vm_memory: dev_vm_resources.memory,
-        vm_cpu: dev_vm_resources.cpu.clone(),
-        vm_nr_of_vcpus: dev_vm_resources.nr_of_vcpus,
         verbose,
         hostos_dev_settings: HostOSDevSettings {
             vm_memory: dev_vm_resources.memory,
diff --git a/rs/ic_os/config/src/setupos/deployment_json.rs b/rs/ic_os/config/src/setupos/deployment_json.rs
@@ -16,18 +16,6 @@ pub struct DeploymentSettings {
     pub dev_vm_resources: VmResources,
 }
 
-// NOTE #7037: We should always use DeploymentSettings directly, but we need to
-// be compatible with old naming for some tests.
-#[derive(PartialEq, Debug, Deserialize, Serialize)]
-pub struct CompatDeploymentSettings {
-    pub deployment: Deployment,
-    #[serde(default)]
-    pub logging: Logging,
-    pub nns: Nns,
-    pub vm_resources: Option<VmResources>,
-    pub dev_vm_resources: Option<VmResources>,
-}
-
 #[serde_as]
 #[derive(PartialEq, Debug, Deserialize, Serialize)]
 pub struct Deployment {
diff --git a/rs/ic_os/config_types/compatibility_tests/fixtures/guestos_v1.11.0.json b/rs/ic_os/config_types/compatibility_tests/fixtures/guestos_v1.11.0.json
@@ -0,0 +1,53 @@
+{
+  "config_version": "1.11.0",
+  "network_settings": {
+    "ipv6_config": {
+      "Fixed": {
+        "address": "2a00:fb01:400:200::1/64",
+        "gateway": "2a00:fb01:400:200::1"
+      }
+    },
+    "ipv4_config": {
+      "address": "192.168.1.1",
+      "gateway": "192.168.1.254",
+      "prefix_length": 24
+    },
+    "domain_name": "ic.test"
+  },
+  "icos_settings": {
+    "node_reward_type": "type3.1",
+    "mgmt_mac": "00:00:00:00:00:01",
+    "deployment_environment": "mainnet",
+    "nns_urls": [
+      "https://icp-api.io,https//icp0.io,https://ic0.app"
+    ],
+    "use_node_operator_private_key": true,
+    "enable_trusted_execution_environment": false,
+    "use_ssh_authorized_keys": false,
+    "icos_dev_settings": {}
+  },
+  "guestos_settings": {
+    "inject_ic_crypto": false,
+    "inject_ic_state": false,
+    "inject_ic_registry_local_store": false,
+    "guestos_dev_settings": {
+      "backup_spool": null,
+      "malicious_behavior": null,
+      "query_stats_epoch_length": null,
+      "bitcoind_addr": null,
+      "dogecoind_addr": null,
+      "jaeger_addr": null,
+      "socks_proxy": null,
+      "hostname": null,
+      "generate_ic_boundary_tls_cert": null
+    }
+  },
+  "guest_vm_type": "default",
+  "upgrade_config": {
+    "peer_guest_vm_address": "2a00:fb01:400:200:6801:95ff:fed7:d475"
+  },
+  "trusted_execution_environment_config": {
+    "sev_cert_chain_pem": "-----BEGIN CERTIFICATE----------END CERTIFICATE-----"
+  },
+  "recovery_config": null
+}
diff --git a/rs/ic_os/config_types/compatibility_tests/fixtures/hostos_v1.11.0.json b/rs/ic_os/config_types/compatibility_tests/fixtures/hostos_v1.11.0.json
@@ -0,0 +1,53 @@
+{
+  "config_version": "1.11.0",
+  "network_settings": {
+    "ipv6_config": {
+      "Fixed": {
+        "address": "2a00:fb01:400:200::1/64",
+        "gateway": "2a00:fb01:400:200::1"
+      }
+    },
+    "ipv4_config": {
+      "address": "192.168.1.1",
+      "gateway": "192.168.1.254",
+      "prefix_length": 24
+    },
+    "domain_name": "ic.test"
+  },
+  "icos_settings": {
+    "node_reward_type": "type3.1",
+    "mgmt_mac": "00:00:00:00:00:01",
+    "deployment_environment": "mainnet",
+    "nns_urls": [
+      "https://icp-api.io,https//icp0.io,https://ic0.app"
+    ],
+    "use_node_operator_private_key": true,
+    "enable_trusted_execution_environment": false,
+    "use_ssh_authorized_keys": false,
+    "icos_dev_settings": {}
+  },
+  "hostos_settings": {
+    "hostos_dev_settings": {
+      "vm_memory": 16,
+      "vm_cpu": "kvm",
+      "vm_nr_of_vcpus": 64
+    },
+    "verbose": false
+  },
+  "guestos_settings": {
+    "inject_ic_crypto": false,
+    "inject_ic_state": false,
+    "inject_ic_registry_local_store": false,
+    "guestos_dev_settings": {
+      "backup_spool": null,
+      "malicious_behavior": null,
+      "query_stats_epoch_length": null,
+      "bitcoind_addr": null,
+      "dogecoind_addr": null,
+      "jaeger_addr": null,
+      "socks_proxy": null,
+      "hostname": null,
+      "generate_ic_boundary_tls_cert": null
+    }
+  }
+}
diff --git a/rs/ic_os/config_types/compatibility_tests/src/fixture.rs b/rs/ic_os/config_types/compatibility_tests/src/fixture.rs
@@ -74,11 +74,7 @@ fn generate_hostos_config() -> HostOSConfig {
         icos_dev_settings: ICOSDevSettings::default(),
     };
 
-    #[allow(deprecated)]
     let hostos_settings = HostOSSettings {
-        vm_memory: 16,
-        vm_cpu: "kvm".to_string(),
-        vm_nr_of_vcpus: 64,
         verbose: false,
         hostos_dev_settings: HostOSDevSettings {
             vm_memory: 16,
diff --git a/rs/ic_os/config_types/src/lib.rs b/rs/ic_os/config_types/src/lib.rs
@@ -31,11 +31,16 @@ use std::str::FromStr;
 use strum::EnumString;
 use url::Url;
 
-pub const CONFIG_VERSION: &str = "1.10.0";
+pub const CONFIG_VERSION: &str = "1.11.0";
 
 /// List of field paths that have been removed and should not be reused.
-pub static RESERVED_FIELD_PATHS: &[&str] =
-    &["icos_settings.logging", "icos_settings.use_nns_public_key"];
+pub static RESERVED_FIELD_PATHS: &[&str] = &[
+    "icos_settings.logging",
+    "icos_settings.use_nns_public_key",
+    "hostos_settings.vm_cpu",
+    "hostos_settings.vm_memory",
+    "hostos_settings.vm_nr_of_vcpus",
+];
 
 pub type ConfigMap = HashMap<String, String>;
 
@@ -148,37 +153,13 @@ pub struct ICOSDevSettings {}
 pub struct SetupOSSettings;
 
 /// HostOS-specific settings.
-#[derive(Serialize, Deserialize, Debug, PartialEq, Eq, Clone)]
+#[derive(Serialize, Deserialize, Debug, PartialEq, Eq, Clone, Default)]
 pub struct HostOSSettings {
     #[serde(default)]
     pub hostos_dev_settings: HostOSDevSettings,
-    #[deprecated(note = "Please use hostos_dev_settings")]
-    pub vm_memory: u32,
-    #[deprecated(note = "Please use hostos_dev_settings")]
-    pub vm_cpu: String,
-    #[deprecated(note = "Please use hostos_dev_settings")]
-    #[serde(default = "default_vm_nr_of_vcpus")]
-    pub vm_nr_of_vcpus: u32,
     pub verbose: bool,
 }
 
-impl Default for HostOSSettings {
-    fn default() -> Self {
-        #[allow(deprecated)]
-        HostOSSettings {
-            vm_memory: Default::default(),
-            vm_cpu: Default::default(),
-            vm_nr_of_vcpus: default_vm_nr_of_vcpus(),
-            verbose: Default::default(),
-            hostos_dev_settings: Default::default(),
-        }
-    }
-}
-
-const fn default_vm_nr_of_vcpus() -> u32 {
-    64
-}
-
 /// HostOS development configuration. These settings are strictly used for development images.
 #[derive(Serialize, Deserialize, Debug, PartialEq, Eq, Clone)]
 pub struct HostOSDevSettings {
@@ -337,33 +318,6 @@ mod tests {
     use serde_json::Value;
     use std::collections::HashSet;
 
-    #[test]
-    fn test_vm_nr_of_vcpus_deserialization() -> Result<(), Box<dyn std::error::Error>> {
-        #[allow(deprecated)]
-        {
-            // Test with vm_nr_of_vcpus specified
-            let json = r#"{
-                "vm_memory": 16,
-                "vm_cpu": "host",
-                "vm_nr_of_vcpus": 4,
-                "verbose": true
-            }"#;
-            let settings: HostOSSettings = serde_json::from_str(json)?;
-            assert_eq!(settings.vm_nr_of_vcpus, 4);
-
-            // Test without vm_nr_of_vcpus (should use default)
-            let json = r#"{
-                "vm_memory": 16,
-                "vm_cpu": "host",
-                "verbose": true
-            }"#;
-            let settings: HostOSSettings = serde_json::from_str(json)?;
-            assert_eq!(settings.vm_nr_of_vcpus, 64);
-        }
-
-        Ok(())
-    }
-
     #[test]
     fn test_guest_vm_type_forward_compatibility() -> Result<(), Box<dyn std::error::Error>> {
         // Test that unknown enum variants deserialize to Unknown
diff --git a/rs/ic_os/dev_test_tools/setupos-image-config/src/lib.rs b/rs/ic_os/dev_test_tools/setupos-image-config/src/lib.rs
@@ -9,7 +9,7 @@ use std::{
 use anyhow::{Context, Error, bail};
 
 use config::setupos::config_ini::ConfigIniSettings;
-use config::setupos::deployment_json::CompatDeploymentSettings;
+use config::setupos::deployment_json::DeploymentSettings;
 
 pub fn create_setupos_config(
     config_dir: &Path,
@@ -18,7 +18,7 @@ pub fn create_setupos_config(
     node_operator_private_key: Option<&Path>,
     nns_public_key: Option<&Path>,
     admin_keys: Option<&Path>,
-    deployment_settings: CompatDeploymentSettings,
+    deployment_settings: DeploymentSettings,
 ) -> Result<(), Error> {
     // Check that config and data dirs are valid
     if !config_dir.is_dir() {
diff --git a/rs/ic_os/dev_test_tools/setupos-image-config/src/main.rs b/rs/ic_os/dev_test_tools/setupos-image-config/src/main.rs
@@ -12,7 +12,7 @@ use config::setupos::config_ini::ConfigIniSettings;
 use tempfile::NamedTempFile;
 use url::Url;
 
-use config::setupos::deployment_json::CompatDeploymentSettings;
+use config::setupos::deployment_json::DeploymentSettings;
 use config_types::DeploymentEnvironment;
 use partition_tools::{Partition, ext::ExtPartition, fat::FatPartition};
 use setupos_image_config::write_config;
@@ -108,7 +108,7 @@ fn write_public_keys(path: &Path, ks: Vec<String>) -> Result<(), Error> {
 fn update_deployment(path: &Path, cfg: &DeploymentConfig) -> Result<(), Error> {
     let mut deployment_json = {
         let f = File::open(path).context("failed to open deployment config file")?;
-        let deployment_json: CompatDeploymentSettings = serde_json::from_reader(f)?;
+        let deployment_json: DeploymentSettings = serde_json::from_reader(f)?;
 
         deployment_json
     };
@@ -122,27 +122,15 @@ fn update_deployment(path: &Path, cfg: &DeploymentConfig) -> Result<(), Error> {
     }
 
     if let Some(memory) = cfg.memory_gb {
-        deployment_json
-            .dev_vm_resources
-            .get_or_insert_default()
-            .memory = memory;
-        deployment_json.vm_resources.get_or_insert_default().memory = memory;
+        deployment_json.dev_vm_resources.memory = memory;
     }
 
     if let Some(cpu) = &cfg.cpu {
-        deployment_json.dev_vm_resources.get_or_insert_default().cpu = cpu.to_owned();
-        deployment_json.vm_resources.get_or_insert_default().cpu = cpu.to_owned();
+        deployment_json.dev_vm_resources.cpu = cpu.to_owned();
     }
 
     if let Some(nr_of_vcpus) = &cfg.nr_of_vcpus {
-        deployment_json
-            .dev_vm_resources
-            .get_or_insert_default()
-            .nr_of_vcpus = nr_of_vcpus.to_owned();
-        deployment_json
-            .vm_resources
-            .get_or_insert_default()
-            .nr_of_vcpus = nr_of_vcpus.to_owned();
+        deployment_json.dev_vm_resources.nr_of_vcpus = nr_of_vcpus.to_owned();
     }
 
     if let Some(deployment_environment) = &cfg.deployment_environment {
diff --git a/rs/ic_os/os_tools/guest_vm_runner/src/guest_vm_config.rs b/rs/ic_os/os_tools/guest_vm_runner/src/guest_vm_config.rs
@@ -220,11 +220,7 @@ mod tests {
                 use_ssh_authorized_keys: false,
                 icos_dev_settings: Default::default(),
             },
-            #[allow(deprecated)]
             hostos_settings: HostOSSettings {
-                vm_memory: 16,
-                vm_cpu: "qemu".to_string(),
-                vm_nr_of_vcpus: 56,
                 verbose: false,
                 hostos_dev_settings: HostOSDevSettings {
                     vm_memory: 16,
@@ -311,11 +307,7 @@ mod tests {
     fn test_generate_vm_config_qemu() {
         test_vm_config(
             "guestos_vm_qemu.xml",
-            #[allow(deprecated)]
             HostOSSettings {
-                vm_memory: 16,
-                vm_cpu: "qemu".to_string(),
-                vm_nr_of_vcpus: 56,
                 hostos_dev_settings: HostOSDevSettings {
                     vm_memory: 16,
                     vm_cpu: "qemu".to_string(),
@@ -333,11 +325,7 @@ mod tests {
     fn test_generate_vm_config_upgrade_guestos() {
         test_vm_config(
             "upgrade_guestos.xml",
-            #[allow(deprecated)]
             HostOSSettings {
-                vm_memory: 16,
-                vm_cpu: "qemu".to_string(),
-                vm_nr_of_vcpus: 64,
                 hostos_dev_settings: HostOSDevSettings {
                     vm_memory: 16,
                     vm_cpu: "qemu".to_string(),
@@ -355,11 +343,7 @@ mod tests {
     fn test_generate_vm_config_kvm() {
         test_vm_config(
             "guestos_vm_kvm.xml",
-            #[allow(deprecated)]
             HostOSSettings {
-                vm_memory: 16,
-                vm_cpu: "kvm".to_string(),
-                vm_nr_of_vcpus: 56,
                 hostos_dev_settings: HostOSDevSettings {
                     vm_memory: 16,
                     vm_cpu: "kvm".to_string(),
@@ -377,11 +361,7 @@ mod tests {
     fn test_generate_vm_config_sev() {
         test_vm_config(
             "guestos_vm_sev.xml",
-            #[allow(deprecated)]
             HostOSSettings {
-                vm_memory: 16,
-                vm_cpu: "kvm".to_string(),
-                vm_nr_of_vcpus: 56,
                 hostos_dev_settings: HostOSDevSettings {
                     vm_memory: 16,
                     vm_cpu: "kvm".to_string(),
diff --git a/rs/ic_os/os_tools/guest_vm_runner/src/main.rs b/rs/ic_os/os_tools/guest_vm_runner/src/main.rs
@@ -1013,11 +1013,7 @@ mod tests {
                 use_ssh_authorized_keys: false,
                 icos_dev_settings: Default::default(),
             },
-            #[allow(deprecated)]
             hostos_settings: HostOSSettings {
-                vm_memory: 16,
-                vm_cpu: "qemu".to_string(),
-                vm_nr_of_vcpus: 56,
                 verbose: false,
                 hostos_dev_settings: HostOSDevSettings {
                     vm_memory: 16,
diff --git a/rs/tests/driver/src/driver/bootstrap.rs b/rs/tests/driver/src/driver/bootstrap.rs
