DEMO: service: Add support hard coding iface name to MAC #2299
Conversation
| let mut fd = std::fs::File::open(&file_path)?; | ||
| let mut content = String::new(); | ||
| fd.read_to_string(&mut content)?; |
There was a problem hiding this comment.
You almost always want to use a BufReader when reading from files. This is actually just shorter and faster as e.g.:
let content = std::fs::read_to_string(&file_path)?;
| } | ||
|
|
||
| let content = | ||
| format!("[Match]\nMACAddress={mac}\n\n[Link]\nName={iface_name}\n"); |
There was a problem hiding this comment.
Let's add a comment in here like # Generated by nmstate pin-nic-name
| let mut fd = std::fs::OpenOptions::new() | ||
| .write(true) | ||
| .truncate(true) | ||
| .create(true) | ||
| .open(&file_path) | ||
| .map_err(|e| { | ||
| CliError::from(format!( | ||
| "Failed to store captured states to file {}: {e}", | ||
| file_path.display() | ||
| )) | ||
| })?; | ||
| fd.write_all(content.as_bytes())?; |
There was a problem hiding this comment.
I think this is all just:
std::fs::write(&file_path, content.as_bytes()).map_err(|e| ...)?;
There was a problem hiding this comment.
it does not override, I guess. Just copy from my code bank.
| let mut fd = std::fs::File::open(&file_path)?; | ||
| let mut content = String::new(); | ||
| fd.read_to_string(&mut content)?; | ||
| let pin_state: NetworkState = serde_yaml::from_str(&content)?; |
There was a problem hiding this comment.
Although, it's actually a bit more efficient to let serde do the reading from the file directly (not that this matters) like this:
let mut r = std::fs::File::open(&file_path).map(std::io::BufReader::new);
let pin_state: NetworkState = serde_yaml::from_reader(&mut r)?;
to avoid allocating an intermediate string.
| for pin_iface in pin_state | ||
| .interfaces | ||
| .iter() | ||
| .filter(|i| i.iface_type() == InterfaceType::Ethernet) |
There was a problem hiding this comment.
We need to think about bridge/bonds here right?
There was a problem hiding this comment.
virtual interface name never changes by kernel or OS upgrade.
| let pin_iface_name_dir = format!("{folder}/{PIN_IFACE_NAME_FOLDER}"); | ||
| let pin_iface_path = Path::new(&pin_iface_name_dir); | ||
| if pin_iface_path.exists() { | ||
| pin_iface_name(&pin_iface_path)?; |
There was a problem hiding this comment.
So the opt-in mechanism here is that the user creates a file? WDYT about my proposal of a CLI command instead in the bug?
There was a problem hiding this comment.
I prefer no issue no change in case there is side impact on this.
There was a problem hiding this comment.
Yes. If there is pin_iface_name folder in /etc/nmstate and pin.yml file there, nmstate do the pin work.
Some OS upgrade might cause interface name changes. To solve that:
1. Before upgrade,
* mkdir /etc/nmstate/pin_iface_name/
* nmstatectl show -k | sudo tee /etc/nmstate/pin_iface_name/pin.yml
* sudo systemctl enable nmstate
2. Reboot to new version of OS and let nmstate.service run.
3. Reboot again.
The `nmstate.service` will create file like if it found any interface
changed name according to stored state in /etc/nmstate/pin_iface_name/pin.yml
/etc/systemd/network/98-ens9.link
With content:
```
[Match]
MACAddress=01:23:45:67:89:ab
[Link]
Name=ens9
```
After the second reboot, the systemd-udevd will use the old name ens9.
Signed-off-by: Gris Ge <fge@redhat.com>
cathay4t
force-pushed
the
pin_iface_name
branch
from
414bc40
to
23ae5c4
Compare
|
Having a double reboot here is possible but we'll want to be careful here and e.g. ensure that on the next reboot I was thinking a much simpler flow here is to forcibly pin active NICs unconditionally. The flow would be:
|
|
I did a PR over in #2300 with some non-functional cleanups - want to pull that into this PR? |
|
Closing in the favor of #2301 |
Some OS upgrade might cause interface name changes. To solve that:
Before upgrade,
Reboot to new version of OS and let nmstate.service run.
Reboot again.
The
nmstate.servicewill create file like if it found any interfacechanged name according to stored state in /etc/nmstate/pin_iface_name/pin.yml
With content:
After the second reboot, the systemd-udevd will use the old name ens9.
You may refer to the screen recording for detail: https://people.redhat.com/fge/demo/nmstate_pin_iface_name.ogv