cli:ip:leases: search for NM's internal DHCP client and dhclient leases (LP: #1979674) #284
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
slyon
changed the title
slyon
force-pushed
the
slyon/ip-lease-NM-internal
branch
from
19b4704
to
4b8baf5
Compare
slyon
force-pushed
the
slyon/ip-lease-NM-internal
branch
from
1ff82e4
to
070ec61
Compare
ogayot
approved these changes
Aug 4, 2022
| stdout=subprocess.PIPE) | ||
| for line in nmcli_dev_out.stdout: | ||
| line = line.decode('utf-8') | ||
| nmcli_dev_out = subprocess.check_output(['nmcli', 'dev', 'show', self.interface], |
There was a problem hiding this comment.
Not strictly related to the change from this PR but if you want (and if you're targetting a version of NM that has this option) you can use the following construct to simplify how the output is parsed:
nmcli --get-values GENERAL.CONNECTION dev show "$interface"
nmcli --get-values connection.uuid show id "$conn_id"This is strictly up to you.
There was a problem hiding this comment.
This is a good suggestion, but I'll leave it open for a bigger refactoring of ip.py. For now, I just want to provide a minimal fix to solve the reported bug (LP#1979674).
V2: use os.defpath fallback for os.environ.get('PATH')
slyon
force-pushed
the
slyon/ip-lease-NM-internal
branch
from
070ec61
to
bd99841
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Check for NetworkManager leases in
var/lib/NetworkManager/internal-{UUID}-{INTERFACE}.leaseand fallback tovar/lib/NetworkManager/dhclient-{UUID}-{INTERFACE}.leaseif that does not exist. Dhclient is deprecated, but might still be used in some legacy setups.Also, use some mocking (custom
MockCmdclass, as used elsewhere in our code) to actually run some unit tests on this code and increase the coverage.The whole code in
ip.pyis pretty old and in bad shape; it should be refactored, but I don't have the time for that right now, just wanted to fix LP#1979674 as a first step.Checklist
make checksuccessfully.make check-coverage).