move src/api2/config/network.rs to src/api2/node/network.rs

So that we have the same api path for network config as pve.

src/api2/config.rs

@@ -3,11 +3,9 @@ use proxmox::list_subdirs_api_method;
 
 pub mod datastore;
 pub mod remote;
-pub mod network;
 
 const SUBDIRS: SubdirMap = &[
     ("datastore", &datastore::ROUTER),
-    ("network", &network::ROUTER),
     ("remote", &remote::ROUTER),
 ];
 

src/api2/config/network.rs

@@ -1,359 +0,0 @@
-use anyhow::{Error, bail};
-use serde_json::{Value, to_value};
-use ::serde::{Deserialize, Serialize};
-
-use proxmox::api::{api, ApiMethod, Router, RpcEnvironment, Permission};
-
-use crate::config::network;
-use crate::config::acl::{PRIV_SYS_AUDIT, PRIV_SYS_MODIFY};
-use crate::api2::types::*;
-
-#[api(
-    input: {
-        properties: {},
-    },
-    returns: {
-        description: "List network devices (with config digest).",
-        type: Array,
-        items: {
-            type: Interface,
-        },
-    },
-    access: {
-        permission: &Permission::Privilege(&[], PRIV_SYS_AUDIT, false),
-    },
-)]
-/// List all datastores
-pub fn list_network_devices(
-    _param: Value,
-    _info: &ApiMethod,
-    rpcenv: &mut dyn RpcEnvironment,
-) -> Result<Value, Error> {
-
-    let (config, digest) = network::config()?;
-    let digest = proxmox::tools::digest_to_hex(&digest);
-
-    let mut list = Vec::new();
-
-    for interface in config.interfaces.values() {
-        let mut item: Value = to_value(interface)?;
-        item["digest"] = digest.clone().into();
-        list.push(item);
-    }
-
-    let diff = network::changes()?;
-    if !diff.is_empty() {
-        rpcenv.set_result_attrib("changes",  diff.into());
-    }
-
-    Ok(list.into())
-}
-
-#[api(
-   input: {
-        properties: {
-            name: {
-                schema: NETWORK_INTERFACE_NAME_SCHEMA,
-            },
-        },
-    },
-    returns: {
-        description: "The network interface configuration (with config digest).",
-        type: Interface,
-    },
-    access: {
-        permission: &Permission::Privilege(&[], PRIV_SYS_AUDIT, false),
-    },
-)]
-/// Read a network interface configuration.
-pub fn read_interface(name: String) -> Result<Value, Error> {
-
-    let (config, digest) = network::config()?;
-
-    let interface = config.lookup(&name)?;
-
-    let mut data: Value = to_value(interface)?;
-    data["digest"] = proxmox::tools::digest_to_hex(&digest).into();
-
-    Ok(data)
-}
-
-#[api()]
-#[derive(Serialize, Deserialize)]
-#[allow(non_camel_case_types)]
-/// Deletable property name
-pub enum DeletableProperty {
-    /// Delete the IPv4 address property.
-    address_v4,
-    /// Delete the IPv6 address property.
-    address_v6,
-    /// Delete the IPv4 gateway property.
-    gateway_v4,
-    /// Delete the IPv6 gateway property.
-    gateway_v6,
-    /// Delete the whole IPv4 configuration entry.
-    method_v4,
-    /// Delete the whole IPv6 configuration entry.
-    method_v6,
-    /// Delete IPv4 comments
-    comments_v4,
-    /// Delete IPv6 comments
-    comments_v6,
-    /// Delete mtu.
-    mtu,
-    /// Delete auto flag
-    auto,
-    /// Delete bridge ports (set to 'none')
-    bridge_ports,
-    /// Delete bond-slaves (set to 'none')
-    bond_slaves,
-}
-
-
-#[api(
-    protected: true,
-    input: {
-        properties: {
-            name: {
-                schema: NETWORK_INTERFACE_NAME_SCHEMA,
-            },
-            auto: {
-                description: "Autostart interface.",
-                type: bool,
-                optional: true,
-            },
-            method_v4: {
-                type: NetworkConfigMethod,
-                optional: true,
-            },
-            method_v6: {
-                type: NetworkConfigMethod,
-                optional: true,
-            },
-            comments_v4: {
-                description: "Comments (inet, may span multiple lines)",
-                type: String,
-                optional: true,
-            },
-            comments_v6: {
-                description: "Comments (inet5, may span multiple lines)",
-                type: String,
-                optional: true,
-            },
-            address: {
-                schema: CIDR_SCHEMA,
-                optional: true,
-            },
-            gateway: {
-                schema: IP_SCHEMA,
-                optional: true,
-            },
-            mtu: {
-                description: "Maximum Transmission Unit.",
-                optional: true,
-                minimum: 46,
-                maximum: 65535,
-                default: 1500,
-            },
-            bridge_ports: {
-                schema: NETWORK_INTERFACE_LIST_SCHEMA,
-                optional: true,
-            },
-            bond_slaves: {
-                schema: NETWORK_INTERFACE_LIST_SCHEMA,
-                optional: true,
-            },
-            delete: {
-                description: "List of properties to delete.",
-                type: Array,
-                optional: true,
-                items: {
-                    type: DeletableProperty,
-                }
-            },
-            digest: {
-                optional: true,
-                schema: PROXMOX_CONFIG_DIGEST_SCHEMA,
-            },
-        },
-    },
-    access: {
-        permission: &Permission::Privilege(&[], PRIV_SYS_MODIFY, false),
-    },
-)]
-/// Update network interface config.
-pub fn update_interface(
-    name: String,
-    auto: Option<bool>,
-    method_v4: Option<NetworkConfigMethod>,
-    method_v6: Option<NetworkConfigMethod>,
-    comments_v4: Option<String>,
-    comments_v6: Option<String>,
-    address: Option<String>,
-    gateway: Option<String>,
-    mtu: Option<u64>,
-    bridge_ports: Option<Vec<String>>,
-    bond_slaves: Option<Vec<String>>,
-    delete: Option<Vec<DeletableProperty>>,
-    digest: Option<String>,
-) -> Result<(), Error> {
-
-    let _lock = crate::tools::open_file_locked(network::NETWORK_LOCKFILE, std::time::Duration::new(10, 0))?;
-
-    let (mut config, expected_digest) = network::config()?;
-
-    if let Some(ref digest) = digest {
-        let digest = proxmox::tools::hex_to_digest(digest)?;
-        crate::tools::detect_modified_configuration_file(&digest, &expected_digest)?;
-    }
-
-    let current_gateway_v4 = config.interfaces.iter()
-        .find(|(_, interface)| interface.gateway_v4.is_some())
-        .map(|(name, _)| name.to_string());
-
-    let current_gateway_v6 = config.interfaces.iter()
-        .find(|(_, interface)| interface.gateway_v4.is_some())
-        .map(|(name, _)| name.to_string());
-
-    let interface = config.lookup_mut(&name)?;
-
-    if let Some(delete) = delete {
-        for delete_prop in delete {
-            match delete_prop {
-                DeletableProperty::address_v4 => { interface.cidr_v4 = None; },
-                DeletableProperty::address_v6 => { interface.cidr_v6 = None; },
-                DeletableProperty::gateway_v4 => { interface.gateway_v4 = None; },
-                DeletableProperty::gateway_v6 => { interface.gateway_v6 = None; },
-                DeletableProperty::method_v4 => { interface.method_v4 = None; },
-                DeletableProperty::method_v6 => { interface.method_v6 = None; },
-                DeletableProperty::comments_v4 => { interface.comments_v4 = None; },
-                DeletableProperty::comments_v6 => { interface.comments_v6 = None; },
-                DeletableProperty::mtu => { interface.mtu = None; },
-                DeletableProperty::auto => { interface.auto = false; },
-                DeletableProperty::bridge_ports => { interface.set_bridge_ports(Vec::new())?; }
-                DeletableProperty::bond_slaves => { interface.set_bond_slaves(Vec::new())?; }
-            }
-        }
-    }
-
-    if let Some(auto) = auto { interface.auto = auto; }
-    if method_v4.is_some() { interface.method_v4 = method_v4; }
-    if method_v6.is_some() { interface.method_v6 = method_v6; }
-    if mtu.is_some() { interface.mtu = mtu; }
-    if let Some(ports) = bridge_ports { interface.set_bridge_ports(ports)?; }
-    if let Some(slaves) = bond_slaves { interface.set_bond_slaves(slaves)?; }
-
-    if let Some(address) = address {
-        let (_, _, is_v6) = network::parse_cidr(&address)?;
-        if is_v6 {
-            interface.cidr_v6 = Some(address);
-        } else {
-            interface.cidr_v4 = Some(address);
-        }
-    }
-
-    if let Some(gateway) = gateway {
-        let is_v6 = gateway.contains(':');
-        if is_v6 {
-            if let Some(current_gateway_v6) = current_gateway_v6 {
-                if current_gateway_v6 != name {
-                    bail!("Default IPv6 gateway already exists on interface '{}'", current_gateway_v6);
-                }
-            }
-            interface.gateway_v6 = Some(gateway);
-        } else {
-            if let Some(current_gateway_v4) = current_gateway_v4 {
-                if current_gateway_v4 != name {
-                    bail!("Default IPv4 gateway already exists on interface '{}'", current_gateway_v4);
-                }
-            }
-            interface.gateway_v4 = Some(gateway);
-        }
-    }
-
-    if comments_v4.is_some() { interface.comments_v4 = comments_v4; }
-    if comments_v6.is_some() { interface.comments_v6 = comments_v6; }
-
-    network::save_config(&config)?;
-
-    Ok(())
-}
-
-#[api(
-    protected: true,
-    input: {
-        properties: {
-            name: {
-                schema: NETWORK_INTERFACE_NAME_SCHEMA,
-            },
-            digest: {
-                optional: true,
-                schema: PROXMOX_CONFIG_DIGEST_SCHEMA,
-            },
-        },
-    },
-    access: {
-        permission: &Permission::Privilege(&[], PRIV_SYS_MODIFY, false),
-    },
-)]
-/// Remove network interface configuration.
-pub fn delete_interface(name: String, digest: Option<String>) -> Result<(), Error> {
-
-    let _lock = crate::tools::open_file_locked(network::NETWORK_LOCKFILE, std::time::Duration::new(10, 0))?;
-
-    let (mut config, expected_digest) = network::config()?;
-
-    if let Some(ref digest) = digest {
-        let digest = proxmox::tools::hex_to_digest(digest)?;
-        crate::tools::detect_modified_configuration_file(&digest, &expected_digest)?;
-    }
-
-    let _interface = config.lookup(&name)?; // check if interface exists
-
-    config.interfaces.remove(&name);
-
-    network::save_config(&config)?;
-
-    Ok(())
-}
-
-#[api(
-    access: {
-        permission: &Permission::Privilege(&[], PRIV_SYS_MODIFY, false),
-    },
-)]
-/// Reload network configuration (requires ifupdown2).
-pub fn reload_network_config() -> Result<(), Error> {
-
-    network::assert_ifupdown2_installed()?;
-
-    let _ = std::fs::rename(network::NETWORK_INTERFACES_NEW_FILENAME, network::NETWORK_INTERFACES_FILENAME);
-
-    network::network_reload()?;
-
-    Ok(())
-}
-
-#[api(
-    access: {
-        permission: &Permission::Privilege(&[], PRIV_SYS_MODIFY, false),
-    },
-)]
-/// Revert network configuration (rm /etc/network/interfaces.new).
-pub fn revert_network_config() -> Result<(), Error> {
-
-    let _ = std::fs::remove_file(network::NETWORK_INTERFACES_NEW_FILENAME);
-
-    Ok(())
-}
-
-const ITEM_ROUTER: Router = Router::new()
-    .get(&API_METHOD_READ_INTERFACE)
-    .put(&API_METHOD_UPDATE_INTERFACE)
-    .delete(&API_METHOD_DELETE_INTERFACE);
-
-pub const ROUTER: Router = Router::new()
-    .get(&API_METHOD_LIST_NETWORK_DEVICES)
-    .put(&API_METHOD_RELOAD_NETWORK_CONFIG)
-    .delete(&API_METHOD_REVERT_NETWORK_CONFIG)
-    .match_all("name", &ITEM_ROUTER);

src/api2/node.rs

@@ -3,7 +3,7 @@ use proxmox::list_subdirs_api_method;
 
 pub mod tasks;
 mod time;
-mod network;
+pub mod network;
 pub mod dns;
 mod syslog;
 mod journal;

src/api2/node/network.rs

@@ -1,10 +1,12 @@
-use anyhow::{Error};
+use anyhow::{Error, bail};
-use serde_json::{json, Value};
+use serde_json::{Value, to_value};
+use ::serde::{Deserialize, Serialize};
 
-use proxmox::api::{api, Router, Permission};
+use proxmox::api::{api, ApiMethod, Router, RpcEnvironment, Permission};
 
+use crate::config::network;
+use crate::config::acl::{PRIV_SYS_AUDIT, PRIV_SYS_MODIFY};
 use crate::api2::types::*;
-use crate::config::acl::{PRIV_SYS_AUDIT};
 
 #[api(
     input: {
@@ -15,23 +17,370 @@ use crate::config::acl::{PRIV_SYS_AUDIT};
         },
     },
     returns: {
-        description: "The network configuration from /etc/network/interfaces.",
+        description: "List network devices (with config digest).",
-        properties: {
+        type: Array,
-            // fixme
+        items: {
+            type: Interface,
         },
     },
     access: {
         permission: &Permission::Privilege(&[], PRIV_SYS_AUDIT, false),
     },
 )]
-/// Read network configuration.
+/// List all datastores
-fn get_network_config(
+pub fn list_network_devices(
     _param: Value,
+    _info: &ApiMethod,
+    rpcenv: &mut dyn RpcEnvironment,
 ) -> Result<Value, Error> {
 
-    Ok(json!({}))
+    let (config, digest) = network::config()?;
+    let digest = proxmox::tools::digest_to_hex(&digest);
+
+    let mut list = Vec::new();
+
+    for interface in config.interfaces.values() {
+        let mut item: Value = to_value(interface)?;
+        item["digest"] = digest.clone().into();
+        list.push(item);
+    }
+
+    let diff = network::changes()?;
+    if !diff.is_empty() {
+        rpcenv.set_result_attrib("changes",  diff.into());
+    }
+
+    Ok(list.into())
 }
 
-pub const ROUTER: Router = Router::new()
+#[api(
-    .get(&API_METHOD_GET_NETWORK_CONFIG);
+   input: {
+        properties: {
+            node: {
+                schema: NODE_SCHEMA,
+            },
+            name: {
+                schema: NETWORK_INTERFACE_NAME_SCHEMA,
+            },
+        },
+    },
+    returns: {
+        description: "The network interface configuration (with config digest).",
+        type: Interface,
+    },
+    access: {
+        permission: &Permission::Privilege(&[], PRIV_SYS_AUDIT, false),
+    },
+)]
+/// Read a network interface configuration.
+pub fn read_interface(name: String) -> Result<Value, Error> {
 
+    let (config, digest) = network::config()?;
+
+    let interface = config.lookup(&name)?;
+
+    let mut data: Value = to_value(interface)?;
+    data["digest"] = proxmox::tools::digest_to_hex(&digest).into();
+
+    Ok(data)
+}
+
+#[api()]
+#[derive(Serialize, Deserialize)]
+#[allow(non_camel_case_types)]
+/// Deletable property name
+pub enum DeletableProperty {
+    /// Delete the IPv4 address property.
+    address_v4,
+    /// Delete the IPv6 address property.
+    address_v6,
+    /// Delete the IPv4 gateway property.
+    gateway_v4,
+    /// Delete the IPv6 gateway property.
+    gateway_v6,
+    /// Delete the whole IPv4 configuration entry.
+    method_v4,
+    /// Delete the whole IPv6 configuration entry.
+    method_v6,
+    /// Delete IPv4 comments
+    comments_v4,
+    /// Delete IPv6 comments
+    comments_v6,
+    /// Delete mtu.
+    mtu,
+    /// Delete auto flag
+    auto,
+    /// Delete bridge ports (set to 'none')
+    bridge_ports,
+    /// Delete bond-slaves (set to 'none')
+    bond_slaves,
+}
+
+
+#[api(
+    protected: true,
+    input: {
+        properties: {
+            node: {
+                schema: NODE_SCHEMA,
+            },
+            name: {
+                schema: NETWORK_INTERFACE_NAME_SCHEMA,
+            },
+            auto: {
+                description: "Autostart interface.",
+                type: bool,
+                optional: true,
+            },
+            method_v4: {
+                type: NetworkConfigMethod,
+                optional: true,
+            },
+            method_v6: {
+                type: NetworkConfigMethod,
+                optional: true,
+            },
+            comments_v4: {
+                description: "Comments (inet, may span multiple lines)",
+                type: String,
+                optional: true,
+            },
+            comments_v6: {
+                description: "Comments (inet5, may span multiple lines)",
+                type: String,
+                optional: true,
+            },
+            address: {
+                schema: CIDR_SCHEMA,
+                optional: true,
+            },
+            gateway: {
+                schema: IP_SCHEMA,
+                optional: true,
+            },
+            mtu: {
+                description: "Maximum Transmission Unit.",
+                optional: true,
+                minimum: 46,
+                maximum: 65535,
+                default: 1500,
+            },
+            bridge_ports: {
+                schema: NETWORK_INTERFACE_LIST_SCHEMA,
+                optional: true,
+            },
+            bond_slaves: {
+                schema: NETWORK_INTERFACE_LIST_SCHEMA,
+                optional: true,
+            },
+            delete: {
+                description: "List of properties to delete.",
+                type: Array,
+                optional: true,
+                items: {
+                    type: DeletableProperty,
+                }
+            },
+            digest: {
+                optional: true,
+                schema: PROXMOX_CONFIG_DIGEST_SCHEMA,
+            },
+        },
+    },
+    access: {
+        permission: &Permission::Privilege(&[], PRIV_SYS_MODIFY, false),
+    },
+)]
+/// Update network interface config.
+pub fn update_interface(
+    name: String,
+    auto: Option<bool>,
+    method_v4: Option<NetworkConfigMethod>,
+    method_v6: Option<NetworkConfigMethod>,
+    comments_v4: Option<String>,
+    comments_v6: Option<String>,
+    address: Option<String>,
+    gateway: Option<String>,
+    mtu: Option<u64>,
+    bridge_ports: Option<Vec<String>>,
+    bond_slaves: Option<Vec<String>>,
+    delete: Option<Vec<DeletableProperty>>,
+    digest: Option<String>,
+) -> Result<(), Error> {
+
+    let _lock = crate::tools::open_file_locked(network::NETWORK_LOCKFILE, std::time::Duration::new(10, 0))?;
+
+    let (mut config, expected_digest) = network::config()?;
+
+    if let Some(ref digest) = digest {
+        let digest = proxmox::tools::hex_to_digest(digest)?;
+        crate::tools::detect_modified_configuration_file(&digest, &expected_digest)?;
+    }
+
+    let current_gateway_v4 = config.interfaces.iter()
+        .find(|(_, interface)| interface.gateway_v4.is_some())
+        .map(|(name, _)| name.to_string());
+
+    let current_gateway_v6 = config.interfaces.iter()
+        .find(|(_, interface)| interface.gateway_v4.is_some())
+        .map(|(name, _)| name.to_string());
+
+    let interface = config.lookup_mut(&name)?;
+
+    if let Some(delete) = delete {
+        for delete_prop in delete {
+            match delete_prop {
+                DeletableProperty::address_v4 => { interface.cidr_v4 = None; },
+                DeletableProperty::address_v6 => { interface.cidr_v6 = None; },
+                DeletableProperty::gateway_v4 => { interface.gateway_v4 = None; },
+                DeletableProperty::gateway_v6 => { interface.gateway_v6 = None; },
+                DeletableProperty::method_v4 => { interface.method_v4 = None; },
+                DeletableProperty::method_v6 => { interface.method_v6 = None; },
+                DeletableProperty::comments_v4 => { interface.comments_v4 = None; },
+                DeletableProperty::comments_v6 => { interface.comments_v6 = None; },
+                DeletableProperty::mtu => { interface.mtu = None; },
+                DeletableProperty::auto => { interface.auto = false; },
+                DeletableProperty::bridge_ports => { interface.set_bridge_ports(Vec::new())?; }
+                DeletableProperty::bond_slaves => { interface.set_bond_slaves(Vec::new())?; }
+            }
+        }
+    }
+
+    if let Some(auto) = auto { interface.auto = auto; }
+    if method_v4.is_some() { interface.method_v4 = method_v4; }
+    if method_v6.is_some() { interface.method_v6 = method_v6; }
+    if mtu.is_some() { interface.mtu = mtu; }
+    if let Some(ports) = bridge_ports { interface.set_bridge_ports(ports)?; }
+    if let Some(slaves) = bond_slaves { interface.set_bond_slaves(slaves)?; }
+
+    if let Some(address) = address {
+        let (_, _, is_v6) = network::parse_cidr(&address)?;
+        if is_v6 {
+            interface.cidr_v6 = Some(address);
+        } else {
+            interface.cidr_v4 = Some(address);
+        }
+    }
+
+    if let Some(gateway) = gateway {
+        let is_v6 = gateway.contains(':');
+        if is_v6 {
+            if let Some(current_gateway_v6) = current_gateway_v6 {
+                if current_gateway_v6 != name {
+                    bail!("Default IPv6 gateway already exists on interface '{}'", current_gateway_v6);
+                }
+            }
+            interface.gateway_v6 = Some(gateway);
+        } else {
+            if let Some(current_gateway_v4) = current_gateway_v4 {
+                if current_gateway_v4 != name {
+                    bail!("Default IPv4 gateway already exists on interface '{}'", current_gateway_v4);
+                }
+            }
+            interface.gateway_v4 = Some(gateway);
+        }
+    }
+
+    if comments_v4.is_some() { interface.comments_v4 = comments_v4; }
+    if comments_v6.is_some() { interface.comments_v6 = comments_v6; }
+
+    network::save_config(&config)?;
+
+    Ok(())
+}
+
+#[api(
+    protected: true,
+    input: {
+        properties: {
+            node: {
+                schema: NODE_SCHEMA,
+            },
+            name: {
+                schema: NETWORK_INTERFACE_NAME_SCHEMA,
+            },
+            digest: {
+                optional: true,
+                schema: PROXMOX_CONFIG_DIGEST_SCHEMA,
+            },
+        },
+    },
+    access: {
+        permission: &Permission::Privilege(&[], PRIV_SYS_MODIFY, false),
+    },
+)]
+/// Remove network interface configuration.
+pub fn delete_interface(name: String, digest: Option<String>) -> Result<(), Error> {
+
+    let _lock = crate::tools::open_file_locked(network::NETWORK_LOCKFILE, std::time::Duration::new(10, 0))?;
+
+    let (mut config, expected_digest) = network::config()?;
+
+    if let Some(ref digest) = digest {
+        let digest = proxmox::tools::hex_to_digest(digest)?;
+        crate::tools::detect_modified_configuration_file(&digest, &expected_digest)?;
+    }
+
+    let _interface = config.lookup(&name)?; // check if interface exists
+
+    config.interfaces.remove(&name);
+
+    network::save_config(&config)?;
+
+    Ok(())
+}
+
+#[api(
+    input: {
+        properties: {
+            node: {
+                schema: NODE_SCHEMA,
+            },
+        },
+    },
+    access: {
+        permission: &Permission::Privilege(&[], PRIV_SYS_MODIFY, false),
+    },
+)]
+/// Reload network configuration (requires ifupdown2).
+pub fn reload_network_config() -> Result<(), Error> {
+
+    network::assert_ifupdown2_installed()?;
+
+    let _ = std::fs::rename(network::NETWORK_INTERFACES_NEW_FILENAME, network::NETWORK_INTERFACES_FILENAME);
+
+    network::network_reload()?;
+
+    Ok(())
+}
+
+#[api(
+    input: {
+        properties: {
+            node: {
+                schema: NODE_SCHEMA,
+            },
+        },
+    },
+    access: {
+        permission: &Permission::Privilege(&[], PRIV_SYS_MODIFY, false),
+    },
+)]
+/// Revert network configuration (rm /etc/network/interfaces.new).
+pub fn revert_network_config() -> Result<(), Error> {
+
+    let _ = std::fs::remove_file(network::NETWORK_INTERFACES_NEW_FILENAME);
+
+    Ok(())
+}
+
+const ITEM_ROUTER: Router = Router::new()
+    .get(&API_METHOD_READ_INTERFACE)
+    .put(&API_METHOD_UPDATE_INTERFACE)
+    .delete(&API_METHOD_DELETE_INTERFACE);
+
+pub const ROUTER: Router = Router::new()
+    .get(&API_METHOD_LIST_NETWORK_DEVICES)
+    .put(&API_METHOD_RELOAD_NETWORK_CONFIG)
+    .delete(&API_METHOD_REVERT_NETWORK_CONFIG)
+    .match_all("name", &ITEM_ROUTER);

src/bin/proxmox-backup-manager.rs

@@ -248,7 +248,7 @@ fn list_network_devices(param: Value, rpcenv: &mut dyn RpcEnvironment) -> Result
 
     let output_format = get_output_format(&param);
 
-    let info = &api2::config::network::API_METHOD_LIST_NETWORK_DEVICES;
+    let info = &api2::node::network::API_METHOD_LIST_NETWORK_DEVICES;
     let mut data = match info.handler {
         ApiHandler::Sync(handler) => (handler)(param, info, rpcenv)?,
         _ => unreachable!(),
@@ -308,7 +308,7 @@ fn list_network_devices(param: Value, rpcenv: &mut dyn RpcEnvironment) -> Result
 /// Show pending configuration changes (diff)
 fn pending_network_changes(param: Value, rpcenv: &mut dyn RpcEnvironment) -> Result<Value, Error> {
 
-    let info = &api2::config::network::API_METHOD_LIST_NETWORK_DEVICES;
+    let info = &api2::node::network::API_METHOD_LIST_NETWORK_DEVICES;
     let _data = match info.handler {
         ApiHandler::Sync(handler) => (handler)(param, info, rpcenv)?,
         _ => unreachable!(),
@@ -326,24 +326,39 @@ fn pending_network_changes(param: Value, rpcenv: &mut dyn RpcEnvironment) -> Res
 fn network_commands() -> CommandLineInterface {
 
     let cmd_def = CliCommandMap::new()
-        .insert("list", CliCommand::new(&API_METHOD_LIST_NETWORK_DEVICES))
+        .insert(
-        .insert("changes", CliCommand::new(&API_METHOD_PENDING_NETWORK_CHANGES))
+            "list",
+            CliCommand::new(&API_METHOD_LIST_NETWORK_DEVICES)
+                .fixed_param("node", String::from("localhost"))
+        )
+        .insert(
+            "changes",
+            CliCommand::new(&API_METHOD_PENDING_NETWORK_CHANGES)
+                .fixed_param("node", String::from("localhost"))
+        )
         .insert(
             "update",
-            CliCommand::new(&api2::config::network::API_METHOD_UPDATE_INTERFACE)
+            CliCommand::new(&api2::node::network::API_METHOD_UPDATE_INTERFACE)
+                .fixed_param("node", String::from("localhost"))
                 .arg_param(&["name"])
                 .completion_cb("name", config::network::complete_interface_name)
         )
         .insert(
             "remove",
-            CliCommand::new(&api2::config::network::API_METHOD_DELETE_INTERFACE)
+            CliCommand::new(&api2::node::network::API_METHOD_DELETE_INTERFACE)
+                .fixed_param("node", String::from("localhost"))
                 .arg_param(&["name"])
                 .completion_cb("name", config::network::complete_interface_name)
         )
-        .insert("revert", CliCommand::new(&api2::config::network::API_METHOD_REVERT_NETWORK_CONFIG))
+        .insert(
+            "revert",
+            CliCommand::new(&api2::node::network::API_METHOD_REVERT_NETWORK_CONFIG)
+                .fixed_param("node", String::from("localhost"))
+        )
         .insert(
             "reload",
-            CliCommand::new(&api2::config::network::API_METHOD_RELOAD_NETWORK_CONFIG)
+            CliCommand::new(&api2::node::network::API_METHOD_RELOAD_NETWORK_CONFIG)
+                .fixed_param("node", String::from("localhost"))
         );
 
     cmd_def.into()