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 vlan connection modification Fixes #42322 #42415

Merged
merged 2 commits into from
Oct 11, 2018
Merged

nmcli: fix vlan connection modification Fixes #42322 #42415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e912c87
ensure optional items are set to empty strings rather than not presented
dangoscomb Jul 4, 2018
4b97918
extended tests for nmcli
dangoscomb Jul 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
28 changes: 17 additions & 11 deletions lib/ansible/modules/net_tools/nmcli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1033,10 +1033,10 @@ def create_connection_vlan(self):

params = {'dev': self.vlandev,
'id': self.vlanid,
'ip4': self.ip4,
'gw4': self.gw4,
'ip6': self.ip6,
'gw6': self.gw6,
'ip4': self.ip4 or '',
'gw4': self.gw4 or '',
'ip6': self.ip6 or '',
'gw6': self.gw6 or '',
'autoconnect': self.bool_to_string(self.autoconnect)
}
for k, v in params.items():
Expand All @@ -1048,16 +1048,22 @@ def modify_connection_vlan(self):
cmd = [self.nmcli_bin]
cmd.append('con')
cmd.append('mod')
cmd.append('con-name')

if self.conn_name is not None:
cmd.append(self.conn_name)
elif self.ifname is not None:
cmd.append(self.ifname)
else:
cmd.append('vlan%s' % self.vlanid)

params = {'vlan.parent': self.vlandev,
'vlan.id': self.vlanid,
'ipv4.address': self.ip4,
'ipv4.gateway': self.gw4,
'ipv4.dns': self.dns4,
'ipv6.address': self.ip6,
'ipv6.gateway': self.gw6,
'ipv6.dns': self.dns6,
'ipv4.address': self.ip4 or '',
'ipv4.gateway': self.gw4 or '',
'ipv4.dns': self.dns4 or '',
'ipv6.address': self.ip6 or '',
'ipv6.gateway': self.gw6 or '',
'ipv6.dns': self.dns6 or '',
'autoconnect': self.bool_to_string(self.autoconnect)
}

Expand Down
17 changes: 15 additions & 2 deletions test/units/modules/net_tools/test_nmcli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,15 @@ def test_create_vlan_con(mocked_generic_connection_create):
arg_list = nmcli.Nmcli.execute_command.call_args_list
args, kwargs = arg_list[0]

for param in ['vlan']:
assert args[0][0] == '/usr/bin/nmcli'
assert args[0][1] == 'con'
assert args[0][2] == 'add'
assert args[0][3] == 'type'
assert args[0][4] == 'vlan'
assert args[0][5] == 'con-name'
assert args[0][6] == 'non_existent_nw_device'

for param in ['ip4', '10.10.10.10', 'gw4', '10.10.10.1']:
assert param in args[0]


Expand All @@ -419,7 +427,12 @@ def test_mod_vlan_conn(mocked_generic_connection_modify):
arg_list = nmcli.Nmcli.execute_command.call_args_list
args, kwargs = arg_list[0]

for param in ['vlan.id']:
assert args[0][0] == '/usr/bin/nmcli'
assert args[0][1] == 'con'
assert args[0][2] == 'mod'
assert args[0][3] == 'non_existent_nw_device'

for param in ['ipv4.address', '10.10.10.10', 'ipv4.gateway', '10.10.10.1']:
assert param in args[0]


Expand Down