mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
[nmcli] add runner and runner-hwaddr-policy for network teaming (#2901)
* [nmcli] add runner and runner-hwaddr-policy for network teaming * [nmcli] delete extra space * Update plugins/modules/net_tools/nmcli.py * Update plugins/modules/net_tools/nmcli.py * [nmcli] add changelog fragment * Update plugins/modules/net_tools/nmcli.py Co-authored-by: Amin Vakil <info@aminvakil.com> Co-authored-by: Oriol MULA VALLS <oriol.mula@lxp.lu> Co-authored-by: Alexei Znamensky <103110+russoz@users.noreply.github.com> Co-authored-by: Amin Vakil <info@aminvakil.com>
This commit is contained in:
parent
3fc97bf80a
commit
9ffc1ef393
3 changed files with 59 additions and 1 deletions
2
changelogs/fragments/2901-nmcli_teaming.yml
Normal file
2
changelogs/fragments/2901-nmcli_teaming.yml
Normal file
|
@ -0,0 +1,2 @@
|
||||||
|
minor_changes:
|
||||||
|
- nmcli - add ``runner`` and ``runner_hwaddr_policy`` options (https://github.com/ansible-collections/community.general/issues/2901).
|
|
@ -57,7 +57,7 @@ options:
|
||||||
choices: [ bond, bond-slave, bridge, bridge-slave, ethernet, generic, infiniband, ipip, sit, team, team-slave, vlan, vxlan, wifi ]
|
choices: [ bond, bond-slave, bridge, bridge-slave, ethernet, generic, infiniband, ipip, sit, team, team-slave, vlan, vxlan, wifi ]
|
||||||
mode:
|
mode:
|
||||||
description:
|
description:
|
||||||
- This is the type of device or network connection that you wish to create for a bond, team or bridge.
|
- This is the type of device or network connection that you wish to create for a bond or bridge.
|
||||||
type: str
|
type: str
|
||||||
choices: [ 802.3ad, active-backup, balance-alb, balance-rr, balance-tlb, balance-xor, broadcast ]
|
choices: [ 802.3ad, active-backup, balance-alb, balance-rr, balance-tlb, balance-xor, broadcast ]
|
||||||
default: balance-rr
|
default: balance-rr
|
||||||
|
@ -265,6 +265,20 @@ options:
|
||||||
frame was received on.
|
frame was received on.
|
||||||
type: bool
|
type: bool
|
||||||
default: yes
|
default: yes
|
||||||
|
runner:
|
||||||
|
description:
|
||||||
|
- This is the type of device or network connection that you wish to create for a team.
|
||||||
|
type: str
|
||||||
|
choices: [ broadcast, roundrobin, activebackup, loadbalance, lacp ]
|
||||||
|
default: roundrobin
|
||||||
|
version_added: 3.4.0
|
||||||
|
runner_hwaddr_policy:
|
||||||
|
description:
|
||||||
|
- This defines the policy of how hardware addresses of team device and port devices
|
||||||
|
should be set during the team lifetime.
|
||||||
|
type: str
|
||||||
|
choices: [ same_all, by_active, only_active ]
|
||||||
|
version_added: 3.4.0
|
||||||
vlanid:
|
vlanid:
|
||||||
description:
|
description:
|
||||||
- This is only used with VLAN - VLAN ID in range <0-4095>.
|
- This is only used with VLAN - VLAN ID in range <0-4095>.
|
||||||
|
@ -719,6 +733,8 @@ class Nmcli(object):
|
||||||
self.hairpin = module.params['hairpin']
|
self.hairpin = module.params['hairpin']
|
||||||
self.path_cost = module.params['path_cost']
|
self.path_cost = module.params['path_cost']
|
||||||
self.mac = module.params['mac']
|
self.mac = module.params['mac']
|
||||||
|
self.runner = module.params['runner']
|
||||||
|
self.runner_hwaddr_policy = module.params['runner_hwaddr_policy']
|
||||||
self.vlanid = module.params['vlanid']
|
self.vlanid = module.params['vlanid']
|
||||||
self.vlandev = module.params['vlandev']
|
self.vlandev = module.params['vlandev']
|
||||||
self.flags = module.params['flags']
|
self.flags = module.params['flags']
|
||||||
|
@ -826,6 +842,11 @@ class Nmcli(object):
|
||||||
'bridge.priority': self.priority,
|
'bridge.priority': self.priority,
|
||||||
'bridge.stp': self.stp,
|
'bridge.stp': self.stp,
|
||||||
})
|
})
|
||||||
|
elif self.type == 'team':
|
||||||
|
options.update({
|
||||||
|
'team.runner': self.runner,
|
||||||
|
'team.runner-hwaddr-policy': self.runner_hwaddr_policy,
|
||||||
|
})
|
||||||
elif self.type == 'bridge-slave':
|
elif self.type == 'bridge-slave':
|
||||||
options.update({
|
options.update({
|
||||||
'connection.slave-type': 'bridge',
|
'connection.slave-type': 'bridge',
|
||||||
|
@ -1214,6 +1235,11 @@ def main():
|
||||||
ageingtime=dict(type='int', default=300),
|
ageingtime=dict(type='int', default=300),
|
||||||
hairpin=dict(type='bool', default=True),
|
hairpin=dict(type='bool', default=True),
|
||||||
path_cost=dict(type='int', default=100),
|
path_cost=dict(type='int', default=100),
|
||||||
|
# team specific vars
|
||||||
|
runner=dict(type='str', default='roundrobin',
|
||||||
|
choices=['broadcast', 'roundrobin', 'activebackup', 'loadbalance', 'lacp']),
|
||||||
|
# team active-backup runner specific options
|
||||||
|
runner_hwaddr_policy=dict(type='str', choices=['same_all', 'by_active', 'only_active']),
|
||||||
# vlan specific vars
|
# vlan specific vars
|
||||||
vlanid=dict(type='int'),
|
vlanid=dict(type='int'),
|
||||||
vlandev=dict(type='str'),
|
vlandev=dict(type='str'),
|
||||||
|
@ -1245,6 +1271,10 @@ def main():
|
||||||
# check for issues
|
# check for issues
|
||||||
if nmcli.conn_name is None:
|
if nmcli.conn_name is None:
|
||||||
nmcli.module.fail_json(msg="Please specify a name for the connection")
|
nmcli.module.fail_json(msg="Please specify a name for the connection")
|
||||||
|
# team checks
|
||||||
|
if nmcli.type == "team":
|
||||||
|
if nmcli.runner_hwaddr_policy and not nmcli.runner == "activebackup":
|
||||||
|
nmcli.module.fail_json(msg="Runner-hwaddr-policy is only allowed for runner activebackup")
|
||||||
# team-slave checks
|
# team-slave checks
|
||||||
if nmcli.type == 'team-slave':
|
if nmcli.type == 'team-slave':
|
||||||
if nmcli.master is None:
|
if nmcli.master is None:
|
||||||
|
|
|
@ -279,8 +279,20 @@ ipv4.may-fail: yes
|
||||||
ipv6.method: auto
|
ipv6.method: auto
|
||||||
ipv6.ignore-auto-dns: no
|
ipv6.ignore-auto-dns: no
|
||||||
ipv6.ignore-auto-routes: no
|
ipv6.ignore-auto-routes: no
|
||||||
|
team.runner: roundrobin
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
TESTCASE_TEAM_HWADDR_POLICY_FAILS = [
|
||||||
|
{
|
||||||
|
'type': 'team',
|
||||||
|
'conn_name': 'non_existent_nw_device',
|
||||||
|
'ifname': 'team0_non_existant',
|
||||||
|
'runner_hwaddr_policy': 'by_active',
|
||||||
|
'state': 'present',
|
||||||
|
'_ansible_check_mode': False,
|
||||||
|
}
|
||||||
|
]
|
||||||
|
|
||||||
TESTCASE_TEAM_SLAVE = [
|
TESTCASE_TEAM_SLAVE = [
|
||||||
{
|
{
|
||||||
'type': 'team-slave',
|
'type': 'team-slave',
|
||||||
|
@ -1053,6 +1065,20 @@ def test_team_connection_unchanged(mocked_team_connection_unchanged, capfd):
|
||||||
assert not results['changed']
|
assert not results['changed']
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.parametrize('patch_ansible_module', TESTCASE_TEAM_HWADDR_POLICY_FAILS, indirect=['patch_ansible_module'])
|
||||||
|
def test_team_connection_create_hwaddr_policy_fails(mocked_generic_connection_create, capfd):
|
||||||
|
"""
|
||||||
|
Test : Team connection created
|
||||||
|
"""
|
||||||
|
with pytest.raises(SystemExit):
|
||||||
|
nmcli.main()
|
||||||
|
|
||||||
|
out, err = capfd.readouterr()
|
||||||
|
results = json.loads(out)
|
||||||
|
assert results.get('failed')
|
||||||
|
assert results['msg'] == "Runner-hwaddr-policy is only allowed for runner activebackup"
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.parametrize('patch_ansible_module', TESTCASE_TEAM_SLAVE, indirect=['patch_ansible_module'])
|
@pytest.mark.parametrize('patch_ansible_module', TESTCASE_TEAM_SLAVE, indirect=['patch_ansible_module'])
|
||||||
def test_create_team_slave(mocked_generic_connection_create, capfd):
|
def test_create_team_slave(mocked_generic_connection_create, capfd):
|
||||||
"""
|
"""
|
||||||
|
|
Loading…
Reference in a new issue