mirror of
https://github.com/linux-system-roles/network.git
synced 2026-07-20 17:59:00 +00:00
add support for bond.mode and bond.miimon options
This commit is contained in:
Thomas Haller
parent
da312da291
commit
c1b62f01d0
3 changed files with 141 additions and 4 deletions
|
|
@ -11,6 +11,9 @@
|
|||
ip:
|
||||
dhcp4: no
|
||||
auto6: no
|
||||
bond:
|
||||
mode: active-backup
|
||||
miimon: 110
|
||||
|
||||
# enslave an ethernet to the bond
|
||||
- name: prod2-slave1
|
||||
|
|
|
|||
|
|
@ -599,7 +599,6 @@ class ArgValidator_DictIP(ArgValidatorDict):
|
|||
def __init__(self):
|
||||
ArgValidatorDict.__init__(self,
|
||||
name = 'ip',
|
||||
required = False,
|
||||
nested = [
|
||||
ArgValidatorBool('dhcp4', default_value = None),
|
||||
ArgValidatorBool('dhcp4_send_hostname', default_value = None),
|
||||
|
|
@ -634,7 +633,6 @@ class ArgValidator_DictIP(ArgValidatorDict):
|
|||
'dns': [],
|
||||
'dns_search': [],
|
||||
},
|
||||
all_missing_during_validate = False,
|
||||
)
|
||||
|
||||
def _validate_post(self, value, name, result):
|
||||
|
|
@ -649,6 +647,33 @@ class ArgValidator_DictIP(ArgValidatorDict):
|
|||
raise ValidationError(name, '"dhcp4_send_hostname" is only valid if "dhcp4" is enabled')
|
||||
return result
|
||||
|
||||
class ArgValidator_DictBond(ArgValidatorDict):
|
||||
|
||||
VALID_MODES = [ 'balance-rr', 'active-backup', 'balance-xor', 'broadcast', '802.3ad', 'balance-tlb', 'balance-alb']
|
||||
|
||||
def __init__(self):
|
||||
ArgValidatorDict.__init__(self,
|
||||
name = 'bond',
|
||||
nested = [
|
||||
ArgValidatorStr ('mode', enum_values = ArgValidator_DictBond.VALID_MODES),
|
||||
ArgValidatorNum ('miimon', val_min = 0, val_max = 1000000, default_value = None),
|
||||
],
|
||||
default_value = ArgValidator.MISSING,
|
||||
)
|
||||
|
||||
def _validate_post(self, value, name, result):
|
||||
if 'bond_is_present' not in result:
|
||||
result['bond_is_present'] = True
|
||||
return result
|
||||
|
||||
def get_default_bond(self):
|
||||
return {
|
||||
'bond_is_present': False,
|
||||
'mode': ArgValidator_DictBond.VALID_MODES[0],
|
||||
'miimon': None,
|
||||
}
|
||||
|
||||
|
||||
class ArgValidator_DictConnection(ArgValidatorDict):
|
||||
|
||||
VALID_STATES = ['up', 'down', 'present', 'absent', 'wait']
|
||||
|
|
@ -658,7 +683,6 @@ class ArgValidator_DictConnection(ArgValidatorDict):
|
|||
def __init__(self):
|
||||
ArgValidatorDict.__init__(self,
|
||||
name = 'connections[?]',
|
||||
required = False,
|
||||
nested = [
|
||||
ArgValidatorStr ('name'),
|
||||
ArgValidatorStr ('state', enum_values = ArgValidator_DictConnection.VALID_STATES),
|
||||
|
|
@ -675,6 +699,7 @@ class ArgValidator_DictConnection(ArgValidatorDict):
|
|||
ArgValidatorNum ('vlan_id', val_min = 0, val_max = 4094, default_value = None),
|
||||
ArgValidatorBool('ignore_errors', default_value = None),
|
||||
ArgValidator_DictIP(),
|
||||
ArgValidator_DictBond(),
|
||||
],
|
||||
default_value = dict,
|
||||
all_missing_during_validate = True,
|
||||
|
|
@ -769,6 +794,13 @@ class ArgValidator_DictConnection(ArgValidatorDict):
|
|||
if 'parent' in result:
|
||||
raise ValidationError(name + '.parent', '"parent" is only allowed for "type" "vlan"')
|
||||
|
||||
if result['type'] == 'bond':
|
||||
if 'bond' not in result:
|
||||
result['bond'] = self.nested['bond'].get_default_bond()
|
||||
else:
|
||||
if 'bond' in result:
|
||||
raise ValidationError(name + '.bond', '"bond" settings are not allowed for "type" "%s"' % (result['type']))
|
||||
|
||||
for k in VALID_FIELDS:
|
||||
if k in result:
|
||||
continue
|
||||
|
|
@ -941,7 +973,10 @@ class IfcfgUtil:
|
|||
elif connection['type'] == 'bond':
|
||||
ifcfg['TYPE'] = 'Bond'
|
||||
ifcfg['BONDING_MASTER'] = 'yes'
|
||||
ifcfg['BONDING_OPTS'] = 'mode=balance-rr'
|
||||
opts = [ 'mode=%s' % (connection['bond']['mode']) ]
|
||||
if connection['bond']['miimon'] is not None:
|
||||
opts.append(' miimon=%s' % (connection['bond']['miimon']))
|
||||
ifcfg['BONDING_OPTS'] = ' '.join(opts)
|
||||
elif connection['type'] == 'team':
|
||||
ifcfg['DEVICETYPE'] = 'Team'
|
||||
elif connection['type'] == 'vlan':
|
||||
|
|
@ -1240,6 +1275,10 @@ class NMUtil:
|
|||
s_bridge.set_property(NM.SETTING_BRIDGE_STP, False)
|
||||
elif connection['type'] == 'bond':
|
||||
s_con.set_property(NM.SETTING_CONNECTION_TYPE, 'bond')
|
||||
s_bond = self.connection_ensure_setting(con, NM.SettingBond)
|
||||
s_bond.add_option('mode', connection['bond']['mode'])
|
||||
if connection['bond']['miimon'] is not None:
|
||||
s_bond.add_option('miimon', str(connection['bond']['miimon']))
|
||||
elif connection['type'] == 'team':
|
||||
s_con.set_property(NM.SETTING_CONNECTION_TYPE, 'team')
|
||||
elif connection['type'] == 'vlan':
|
||||
|
|
|
|||
|
|
@ -460,6 +460,101 @@ class TestValidator(unittest.TestCase):
|
|||
]),
|
||||
)
|
||||
|
||||
self.assertEqual(
|
||||
[
|
||||
{
|
||||
'autoconnect': True,
|
||||
'name': 'bond1',
|
||||
'parent': None,
|
||||
'ip': {
|
||||
'ip_is_present': False,
|
||||
'dhcp4': True,
|
||||
'route_metric6': None,
|
||||
'route_metric4': None,
|
||||
'dns_search': [],
|
||||
'dhcp4_send_hostname': None,
|
||||
'gateway6': None,
|
||||
'gateway4': None,
|
||||
'auto6': True,
|
||||
'dns': [],
|
||||
'address': []
|
||||
},
|
||||
'mac': None,
|
||||
'mtu': None,
|
||||
'check_iface_exists': True,
|
||||
'state': 'up',
|
||||
'master': None,
|
||||
'vlan_id': None,
|
||||
'ignore_errors': None,
|
||||
'interface_name': 'bond1',
|
||||
'type': 'bond',
|
||||
'slave_type': None,
|
||||
'bond': {
|
||||
'bond_is_present': False,
|
||||
'mode': 'balance-rr',
|
||||
'miimon': None,
|
||||
},
|
||||
'wait': None
|
||||
},
|
||||
],
|
||||
n.AnsibleUtil.ARGS_CONNECTIONS.validate([
|
||||
{
|
||||
'name': 'bond1',
|
||||
'state': 'up',
|
||||
'type': 'bond',
|
||||
},
|
||||
]),
|
||||
)
|
||||
|
||||
self.assertEqual(
|
||||
[
|
||||
{
|
||||
'autoconnect': True,
|
||||
'name': 'bond1',
|
||||
'parent': None,
|
||||
'ip': {
|
||||
'ip_is_present': False,
|
||||
'dhcp4': True,
|
||||
'route_metric6': None,
|
||||
'route_metric4': None,
|
||||
'dns_search': [],
|
||||
'dhcp4_send_hostname': None,
|
||||
'gateway6': None,
|
||||
'gateway4': None,
|
||||
'auto6': True,
|
||||
'dns': [],
|
||||
'address': []
|
||||
},
|
||||
'mac': None,
|
||||
'mtu': None,
|
||||
'check_iface_exists': True,
|
||||
'state': 'up',
|
||||
'master': None,
|
||||
'vlan_id': None,
|
||||
'ignore_errors': None,
|
||||
'interface_name': 'bond1',
|
||||
'type': 'bond',
|
||||
'slave_type': None,
|
||||
'bond': {
|
||||
'bond_is_present': True,
|
||||
'mode': 'active-backup',
|
||||
'miimon': None,
|
||||
},
|
||||
'wait': None
|
||||
},
|
||||
],
|
||||
n.AnsibleUtil.ARGS_CONNECTIONS.validate([
|
||||
{
|
||||
'name': 'bond1',
|
||||
'state': 'up',
|
||||
'type': 'bond',
|
||||
'bond': {
|
||||
'mode': 'active-backup',
|
||||
},
|
||||
},
|
||||
]),
|
||||
)
|
||||
|
||||
self.assertValidationError(n.AnsibleUtil.ARGS_CONNECTIONS,
|
||||
[ { } ])
|
||||
self.assertValidationError(n.AnsibleUtil.ARGS_CONNECTIONS,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue