Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add support for multiple connection files per logical interface #114

Open
wants to merge 10 commits into
base: main
Choose a base branch
from
Open

Add support for multiple connection files per logical interface #114

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
33aad3b
Add support for multiple connection files per logical interface
koendelaat Oct 11, 2024
9a8b97d
Fix formatting
koendelaat Oct 11, 2024
425f1f5
Fix clippy issues
koendelaat Oct 11, 2024
4ad178b
Address review comments
koendelaat Oct 21, 2024
13a168b
Rework generate_config
koendelaat Oct 21, 2024
d7a5d2b
Proper error handling
koendelaat Oct 30, 2024
ed6ded9
Filter loopback connections
koendelaat Oct 31, 2024
8e27a63
Add check for empty connection_ids
koendelaat Oct 31, 2024
68418be
Fix linting
koendelaat Nov 5, 2024
cd7f3b3
Refactor `populate_connection_ids`
koendelaat Nov 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .dockerignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
target/
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can probably get rid of this file as we never build nmc in a container.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure, I added it because the CI builds a container, and when I tried locally this was a speedup

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is interesting, I wasn't aware it could be a speedup locally.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When built locally, a lot of files are created in the target/ directory. When trying to build the dockerimage, all the files in the target/ directory are copied over to the docker build context. This takes "long" for > 1GB of data...

So this was just a quick fix to remediate this issue. I'm also fine by removing it as we don't need the docker image in the end.

7 changes: 7 additions & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,4 @@ network-interface = "2.0.0"
nmstate = { version = "2.2.36", features = ["gen_conf"] }
serde = { version = "1.0.210", features = ["derive"] }
serde_yaml = "0.9.34"
configparser = "3.1.0"
112 changes: 88 additions & 24 deletions src/apply_conf.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,31 +181,35 @@ fn copy_connection_files(
.to_str()
.ok_or_else(|| anyhow!("Determining host config path"))?;

for interface in &host.interfaces {
for interface in host.interfaces {
info!("Processing interface '{}'...", &interface.logical_name);
let connections = &interface.connection_ids;
koendelaat marked this conversation as resolved.
Show resolved Hide resolved

let mut filename = &interface.logical_name;
for connection in connections {
info!("Processing connection '{}'...", connection);
let mut filename = connection.clone();

let filepath = keyfile_path(host_config_dir, filename)
.ok_or_else(|| anyhow!("Determining source keyfile path"))?;
let filepath = keyfile_path(host_config_dir, &filename)
.ok_or_else(|| anyhow!("Determining source keyfile path"))?;

let mut contents = fs::read_to_string(filepath).context("Reading file")?;
let mut contents = fs::read_to_string(filepath).context("Reading file")?;

// Update the name and all references of the host NIC in the settings file if there is a difference from the static config.
match local_interfaces.get(&interface.logical_name) {
None => {}
Some(local_name) => {
info!(
"Using interface name '{}' instead of the preconfigured '{}'",
local_name, interface.logical_name
);

contents = contents.replace(&interface.logical_name, local_name);
filename = local_name;
// Update the name and all references of the host NIC in the settings file if there is a difference from the static config.
match local_interfaces.get(&interface.logical_name) {
None => {}
Some(local_name) => {
info!(
"Using interface name '{}' instead of the preconfigured '{}'",
local_name, interface.logical_name
);

contents = contents.replace(&interface.logical_name, local_name);
filename = filename.replace(&interface.logical_name, local_name);
koendelaat marked this conversation as resolved.
Show resolved Hide resolved
}
}
}

store_connection_file(filename, contents, destination_dir).context("Storing file")?;
store_connection_file(&filename, contents, destination_dir).context("Storing file")?;
}
}

Ok(())
Expand Down Expand Up @@ -302,6 +306,7 @@ mod tests {
logical_name: "eth0".to_string(),
mac_address: Option::from("00:11:22:33:44:55".to_string()),
interface_type: "ethernet".to_string(),
connection_ids: vec!["eth0".to_string()],
}],
},
Host {
Expand All @@ -310,6 +315,7 @@ mod tests {
logical_name: "".to_string(),
mac_address: Option::from("10:10:10:10:10:10".to_string()),
interface_type: "".to_string(),
connection_ids: Vec::new(),
}],
},
];
Expand All @@ -336,6 +342,7 @@ mod tests {
logical_name: "eth0".to_string(),
mac_address: Option::from("00:11:22:33:44:55".to_string()),
interface_type: "ethernet".to_string(),
connection_ids: vec!["eth0".to_string()],
}]
);
}
Expand All @@ -349,6 +356,7 @@ mod tests {
logical_name: "eth0".to_string(),
mac_address: Option::from("10:20:30:40:50:60".to_string()),
interface_type: "ethernet".to_string(),
connection_ids: vec!["eth0".to_string()],
}],
},
Host {
Expand All @@ -357,6 +365,7 @@ mod tests {
logical_name: "".to_string(),
mac_address: Option::from("00:10:20:30:40:50".to_string()),
interface_type: "".to_string(),
connection_ids: Vec::new(),
}],
},
];
Expand Down Expand Up @@ -389,21 +398,25 @@ mod tests {
logical_name: "eth0".to_string(),
mac_address: Option::from("00:11:22:33:44:55".to_string()),
interface_type: "ethernet".to_string(),
connection_ids: vec!["eth0".to_string()],
},
Interface {
logical_name: "eth1".to_string(),
mac_address: Option::from("00:11:22:33:44:58".to_string()),
interface_type: "ethernet".to_string(),
connection_ids: vec!["eth1".to_string()],
},
Interface {
logical_name: "eth2".to_string(),
mac_address: Option::from("36:5e:6b:a2:ed:80".to_string()),
interface_type: "ethernet".to_string(),
connection_ids: vec!["eth2".to_string()],
},
Interface {
logical_name: "bond0".to_string(),
mac_address: Option::from("00:11:22:aa:44:58".to_string()),
interface_type: "bond".to_string(),
connection_ids: vec!["bond0".to_string()],
},
],
},
Expand All @@ -414,11 +427,36 @@ mod tests {
logical_name: "eth0".to_string(),
mac_address: Option::from("36:5e:6b:a2:ed:81".to_string()),
interface_type: "ethernet".to_string(),
connection_ids: vec!["eth0".to_string()],
},
Interface {
logical_name: "eth0.1365".to_string(),
mac_address: None,
interface_type: "vlan".to_string(),
connection_ids: vec!["eth0.1365".to_string()],
},
],
},
Host {
hostname: "node3".to_string(),
interfaces: vec![
Interface {
logical_name: "br1".to_string(),
mac_address: None,
interface_type: "ovs-bridge".to_string(),
connection_ids: vec!["br1-br".to_string()],
},
Interface {
logical_name: "ovs0".to_string(),
mac_address: None,
interface_type: "ovs-interface".to_string(),
connection_ids: vec!["ovs0-port".to_string(), "ovs0-if".to_string()],
},
Interface {
logical_name: "eth0".to_string(),
mac_address: Option::from("95:b2:92:88:1d:3f".to_string()),
interface_type: "ethernet".to_string(),
connection_ids: vec!["eth0".to_string(), "eth0-port".to_string()],
},
],
},
Expand All @@ -435,26 +473,31 @@ mod tests {
logical_name: "eth0".to_string(),
mac_address: Option::from("00:11:22:33:44:55".to_string()),
interface_type: "ethernet".to_string(),
connection_ids: vec!["eth0".to_string()],
},
Interface {
logical_name: "eth0.1365".to_string(),
mac_address: None,
interface_type: "vlan".to_string(),
connection_ids: vec!["eth0.1365".to_string()],
},
Interface {
logical_name: "eth2".to_string(),
mac_address: Option::from("00:11:22:33:44:56".to_string()),
interface_type: "ethernet".to_string(),
connection_ids: vec!["eth2".to_string()],
},
Interface {
logical_name: "eth2.bridge".to_string(),
mac_address: None,
interface_type: "linux-bridge".to_string(),
connection_ids: vec!["eth2.bridge".to_string()],
},
Interface {
logical_name: "bond0".to_string(),
mac_address: Option::from("00:11:22:33:44:58".to_string()),
interface_type: "bond".to_string(),
connection_ids: vec!["bond0".to_string()],
},
],
};
Expand Down Expand Up @@ -522,34 +565,49 @@ mod tests {
logical_name: "eth0".to_string(),
mac_address: Option::from("00:11:22:33:44:55".to_string()),
interface_type: "ethernet".to_string(),
connection_ids: vec!["eth0".to_string()],
},
Interface {
logical_name: "eth0.1365".to_string(),
mac_address: None,
interface_type: "vlan".to_string(),
connection_ids: vec!["eth0.1365".to_string()],
},
Interface {
logical_name: "br1".to_string(),
mac_address: None,
interface_type: "ovs-bridge".to_string(),
connection_ids: vec!["br1-br".to_string()],
},
Interface {
logical_name: "eth2".to_string(),
mac_address: Option::from("00:11:22:33:44:56".to_string()),
interface_type: "ethernet".to_string(),
connection_ids: vec!["eth2".to_string(), "eth2-port".to_string()],
},
Interface {
logical_name: "eth1".to_string(),
mac_address: Option::from("00:11:22:33:44:57".to_string()),
interface_type: "ethernet".to_string(),
connection_ids: vec!["eth1".to_string()],
},
Interface {
logical_name: "bond0".to_string(),
mac_address: Option::from("00:11:22:33:44:58".to_string()),
interface_type: "bond".to_string(),
connection_ids: vec!["bond0".to_string()],
},
],
};
let detected_interfaces = HashMap::from([("eth2".to_string(), "eth4".to_string())]);

assert!(
copy_connection_files(host, detected_interfaces, source_dir, destination_dir).is_ok()
);
assert!(copy_connection_files(
host,
detected_interfaces.clone(),
source_dir,
destination_dir
)
.is_ok());

let source_path = Path::new(source_dir).join("node1");
let destination_path = Path::new(destination_dir);
Expand All @@ -560,9 +618,15 @@ mod tests {
let mut input = fs::read_to_string(entry.path())?;

// Adjust the name and content for the "eth2"->"eth4" edge case.
if entry.path().file_stem().is_some_and(|stem| stem == "eth2") {
filename = filename.replace("eth2", "eth4");
input = input.replace("eth2", "eth4");
for (src_stem, dst_stem) in detected_interfaces.iter() {
if entry
.path()
.file_stem()
.is_some_and(|stem| stem.to_str().unwrap().contains(src_stem))
{
filename = filename.replace(src_stem, dst_stem);
input = input.replace(src_stem, dst_stem);
}
}

let output = fs::read_to_string(destination_path.join(&filename))?;
Expand Down
Loading