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

nmcli: fix error when setting previously unset mac address #5291

Merged
merged 4 commits into from
Sep 28, 2022
Merged

nmcli: fix error when setting previously unset mac address #5291

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
42cf3cc
fix #5290
giorgiga Sep 17, 2022
5b1bc01
add changelog fragment
giorgiga Sep 18, 2022
c677074
remove unnecessary braces
giorgiga Sep 18, 2022
44a8d22
Update changelogs/fragments/5291-fix-nmcli-error-when-setting-unset-m…
giorgiga Sep 18, 2022
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
9 changes: 6 additions & 3 deletions plugins/modules/net_tools/nmcli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2099,15 +2099,18 @@ def _compare_conn_params(self, conn_info, options):
# MAC addresses are case insensitive, nmcli always reports them in uppercase
value = value.upper()
# ensure current_value is also converted to uppercase in case nmcli changes behaviour
current_value = current_value.upper()
if (current_value):
felixfontein marked this conversation as resolved.
Show resolved Hide resolved
current_value = current_value.upper()
if key == 'gsm.apn':
# Depending on version nmcli adds double-qoutes to gsm.apn
# Need to strip them in order to compare both
current_value = current_value.strip('"')
if (current_value):
current_value = current_value.strip('"')
if key == self.mtu_setting and self.mtu is None:
self.mtu = 0
if key == 'vpn.data':
current_value = sorted(re.sub(r'\s*=\s*', '=', part.strip(), count=1) for part in current_value.split(','))
if (current_value):
current_value = sorted(re.sub(r'\s*=\s*', '=', part.strip(), count=1) for part in current_value.split(','))
value = sorted(part.strip() for part in value.split(','))
else:
# parameter does not exist
Expand Down