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.

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

EDGAR support using custom bridge name in managed mode #180

Merged
merged 1 commit into from
Apr 30, 2024

Conversation

voelkera
Copy link
Contributor

@voelkera voelkera commented Apr 4, 2024

closes #56

@voelkera voelkera force-pushed the 56 branch 3 times, most recently from af159c3 to ff11860 Compare April 9, 2024 15:37
opendut-carl/src/actions/peers.rs Outdated Show resolved Hide resolved
opendut-edgar/src/service/network_interface/manager/mod.rs Outdated Show resolved Hide resolved
opendut-edgar/src/service/network_interface/manager/mod.rs Outdated Show resolved Hide resolved
opendut-edgar/src/setup/start.rs Outdated Show resolved Hide resolved
opendut-edgar/src/setup/tasks/network_interface/mod.rs Outdated Show resolved Hide resolved
opendut-types/src/util/net.rs Outdated Show resolved Hide resolved
opendut-types/src/proto/peer/configuration.rs Outdated Show resolved Hide resolved
opendut-types/src/proto/peer/configuration.rs Outdated Show resolved Hide resolved
@voelkera voelkera force-pushed the 56 branch 3 times, most recently from 2e8a0f9 to 0a237b1 Compare April 26, 2024 15:37
@voelkera voelkera marked this pull request as ready for review April 29, 2024 06:31
Comment on lines 81 to 94
let peer_network_configuration = match peer_descriptor.clone().network.bridge_name {
Some(bridge_name) => {
PeerNetworkConfiguration {
bridge_name,
}
}
None => { PeerNetworkConfiguration::default() }
};

Copy link
Contributor

@mbfm mbfm Apr 29, 2024

Choose a reason for hiding this comment

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

Load this from the carl.toml, e.g.:

[peer]
ethernet.bridge.name.default = "br-opendut"

You will need to pass the loaded settings-object from the lib.rs into the action somehow and then grab the value from there.

Comment on lines 18 to 23
impl Default for PeerNetworkConfiguration {
fn default() -> Self {
Self {
bridge_name: NetworkInterfaceName::try_from("br-opendut").unwrap(),
}
}
Copy link
Contributor

Choose a reason for hiding this comment

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

Remove this default (should be loaded from carl.toml).

Comment on lines 27 to 28
#[table(title = "BridgeName")]
bridge_name: String,
Copy link
Contributor

@mbfm mbfm Apr 29, 2024

Choose a reason for hiding this comment

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

Remove these two lines. The user very likely does not care about the bridge_name when listing or describing peers.

Suggested change
#[table(title = "BridgeName")]
bridge_name: String,

@mbfm mbfm merged commit 4bbccce into eclipse-opendut:development Apr 30, 2024
7 checks passed
@voelkera voelkera deleted the 56 branch May 7, 2024 11:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants