parse: improve the parsing of access-points (LP: #1809994) #413
Conversation
There was a problem hiding this comment.
Thank you, this looks mostly good to me! There's one thought mentioned inline, which should be fixed, though.
Also, I think we have a more generic issue here, too: Usually we allow merging of NetDefs on a per-setting level, while we're now skipping/replacing full access-points/SSID blocks, just merging full access-points/SSID blocks from different files (ignoring their individual settings). This is still better than what we had before, where we didn't allow skipping/replacing any duplicated SSID blocks. But we should think about how we could allow merging of individual AP settings across YAML files.
When the parser requires a second pass, it will report access-points it already parsed as duplicates and error out. With this change, access-points will be stored in a local hash table, which will be used to find duplicates in the same netdef, and moved to the netdef->access_points hash table in the end. Access-points already present in the netdef hash table will be considered already parsed and skipped. Add a test to check the problem is fixed and another one to test if merging the access-points when the same interface is present in multiple files is working properly.
If we find an AP with the same name in the same interface, we drop the first one and use the new one. This is done to maintain the documented behavior of respecting the order in which the files are parsed. We still need to implement support for merging AP settings.
daniloegea
force-pushed
the
fix_ap_second_parser_pass
branch
from
c3edd81
to
470192a
Compare
|
When will the update be released? I have this issue on multiple Ubuntu 23.10 machines that results in them becoming unable to connect until network definitions are manually deleted from /etc/netplan. Manually deleting them is not that user-friendly for ordinary users. |
|
It has been released as part of the 0.107.1 bugfix release, currently available in Ubuntu 24.04 "Noble Numbat" development release and Debian testing. |
|
Actually, this seems to be fixed in Ubuntu 23.10 already (as of Nov 15), see https://launchpad.net/ubuntu/+source/netplan.io/0.107-5ubuntu0.2 @isness Can you confirm this? |
|
@slyon Yes, it seems it's fixed now. |
When the parser requires a second pass, it will report access-points it already parsed as duplicates and error out.
With this change, access-points will be stored in a local hash table, which will be used to find duplicates in the same netdef, and moved to the netdef->access_points hash table in the end. Access-points already present in the netdef hash table will be considered already parsed and skipped.
Add a test to check the problem is fixed and another one to test if merging the access-points when the same interface is present in multiple files is working properly.
See LP#1809994 for more details.
Description
Checklist
make checksuccessfully.make check-coverage).