mirror of
https://github.com/linux-system-roles/network.git
synced 2026-01-23 10:25:28 +00:00
add support for "infiniband" type
https://bugzilla.redhat.com/show_bug.cgi?id=1470712
This commit is contained in:
Thomas Haller
Lars Karlitski
parent
36cd010fe9
commit
dace7654fe
3 changed files with 118 additions and 20 deletions
24
examples/infiniband.yml
Normal file
24
examples/infiniband.yml
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
---
|
||||
- hosts: network-test
|
||||
vars:
|
||||
network_connections:
|
||||
|
||||
- name: ib0
|
||||
type: infiniband
|
||||
interface_name: ib0
|
||||
|
||||
# Create a simple infiniband profile
|
||||
- name: ib0-10
|
||||
interface_name: ib0.000a
|
||||
type: infiniband
|
||||
autoconnect: yes
|
||||
infiniband_p_key: 10
|
||||
parent: ib0
|
||||
ip:
|
||||
dhcp4: no
|
||||
auto6: no
|
||||
address:
|
||||
- 10.0.0.5/30
|
||||
|
||||
roles:
|
||||
- network
|
||||
|
|
@ -690,7 +690,7 @@ class ArgValidator_DictBond(ArgValidatorDict):
|
|||
class ArgValidator_DictConnection(ArgValidatorDict):
|
||||
|
||||
VALID_STATES = ['up', 'down', 'present', 'absent', 'wait']
|
||||
VALID_TYPES = [ 'ethernet', 'bridge', 'team', 'bond', 'vlan' ]
|
||||
VALID_TYPES = [ 'ethernet', 'infiniband', 'bridge', 'team', 'bond', 'vlan' ]
|
||||
VALID_SLAVE_TYPES = [ 'bridge', 'bond', 'team' ]
|
||||
|
||||
def __init__(self):
|
||||
|
|
@ -711,6 +711,8 @@ class ArgValidator_DictConnection(ArgValidatorDict):
|
|||
ArgValidatorStr ('parent'),
|
||||
ArgValidatorNum ('vlan_id', val_min = 0, val_max = 4094, default_value = None),
|
||||
ArgValidatorBool('ignore_errors', default_value = None),
|
||||
ArgValidatorStr ('infiniband_transport_mode', enum_values = ['datagram', 'connected']),
|
||||
ArgValidatorNum ('infiniband_p_key', val_min = -1, val_max = 0xFFFF, default_value = None),
|
||||
ArgValidator_DictIP(),
|
||||
ArgValidator_DictBond(),
|
||||
],
|
||||
|
|
@ -782,8 +784,26 @@ class ArgValidator_DictConnection(ArgValidatorDict):
|
|||
result['ip'] = self.nested['ip'].get_default_value()
|
||||
|
||||
if 'mac' in result:
|
||||
if result['type'] != 'ethernet':
|
||||
raise ValidationError(name + '.mac', 'a "mac" address is only allowed for type "ethernet"')
|
||||
if result['type'] not in [ 'ethernet', 'infiniband' ]:
|
||||
raise ValidationError(name + '.mac', 'a "mac" address is only allowed for type "ethernet" or "infiniband"')
|
||||
l = len(Util.mac_aton(result['mac']))
|
||||
if result['type'] == 'ethernet' and l != 6:
|
||||
raise ValidationError(name + '.mac', 'a "mac" address for type ethernet requires 6 octets but is "%s"' % result['mac'])
|
||||
if result['type'] == 'infiniband' and l != 20:
|
||||
raise ValidationError(name + '.mac', 'a "mac" address for type ethernet requires 20 octets but is "%s"' % result['mac'])
|
||||
|
||||
if 'infiniband_transport_mode' in result:
|
||||
if result['type'] != 'infiniband':
|
||||
raise ValidationError(name + '.infiniband_transport_mode', 'a "infiniband_transport_mode" property is only allowed for type "infiniband"')
|
||||
elif result['type'] == 'infiniband':
|
||||
result['infiniband_transport_mode'] = 'datagram'
|
||||
|
||||
if 'infiniband_p_key' in result:
|
||||
if result['type'] != 'infiniband':
|
||||
raise ValidationError(name + '.infiniband_p_key', 'a "infiniband_p_key" property is only allowed for type "infiniband"')
|
||||
if 'mac' not in result and \
|
||||
'parent' not in result:
|
||||
raise ValidationError(name + '.infiniband_p_key', 'a infiniband device with "infiniband_p_key" property also needs "mac" or "parent" property')
|
||||
|
||||
if 'interface_name' in result:
|
||||
if not Util.ifname_valid(result['interface_name']):
|
||||
|
|
@ -799,13 +819,15 @@ class ArgValidator_DictConnection(ArgValidatorDict):
|
|||
raise ValidationError(name + '.vlan_id', 'missing "vlan_id" for "type" "vlan"')
|
||||
if 'parent' not in result:
|
||||
raise ValidationError(name + '.parent', 'missing "parent" for "type" "vlan"')
|
||||
if result['parent'] == result['name']:
|
||||
raise ValidationError(name + '.parent', '"parent" cannot refer to itself')
|
||||
else:
|
||||
if 'vlan_id' in result:
|
||||
raise ValidationError(name + '.vlan_id', '"vlan_id" is only allowed for "type" "vlan"')
|
||||
if 'parent' in result:
|
||||
raise ValidationError(name + '.parent', '"parent" is only allowed for "type" "vlan"')
|
||||
|
||||
if 'parent' in result:
|
||||
if result['type'] not in ['vlan', 'infiniband']:
|
||||
raise ValidationError(name + '.parent', '"parent" is only allowed for type "vlan" or "infiniband"')
|
||||
if result['parent'] == result['name']:
|
||||
raise ValidationError(name + '.parent', '"parent" cannot refer to itself')
|
||||
|
||||
if result['type'] == 'bond':
|
||||
if 'bond' not in result:
|
||||
|
|
@ -972,6 +994,15 @@ class IfcfgUtil:
|
|||
if connection['type'] == 'ethernet':
|
||||
ifcfg['TYPE'] = 'Ethernet'
|
||||
ifcfg['HWADDR'] = connection['mac']
|
||||
elif connection['type'] == 'infiniband':
|
||||
ifcfg['TYPE'] = 'InfiniBand'
|
||||
ifcfg['HWADDR'] = connection['mac']
|
||||
ifcfg['CONNECTED_MODE'] = 'yes' if (connection['infiniband_transport_mode'] == 'connected') else 'no'
|
||||
if connection['infiniband_p_key'] not in [ None, -1 ]:
|
||||
ifcfg['PKEY'] = 'yes'
|
||||
ifcfg['PKEY_ID'] = str(connection['infiniband_p_key'])
|
||||
if connection['parent']:
|
||||
ifcfg['PHYSDEV'] = ArgUtil.connection_find_master(connection['parent'], connections, idx)
|
||||
elif connection['type'] == 'bridge':
|
||||
ifcfg['TYPE'] = 'Bridge'
|
||||
elif connection['type'] == 'bond':
|
||||
|
|
@ -1265,6 +1296,15 @@ class NMUtil:
|
|||
s_con.set_property(NM.SETTING_CONNECTION_TYPE, '802-3-ethernet')
|
||||
s_wired = self.connection_ensure_setting(con, NM.SettingWired)
|
||||
s_wired.set_property(NM.SETTING_WIRED_MAC_ADDRESS, connection['mac'])
|
||||
elif connection['type'] == 'infiniband':
|
||||
s_con.set_property(NM.SETTING_CONNECTION_TYPE, 'infiniband')
|
||||
s_infiniband = self.connection_ensure_setting(con, NM.SettingInfiniband)
|
||||
s_infiniband.set_property(NM.SETTING_INFINIBAND_MAC_ADDRESS, connection['mac'])
|
||||
s_infiniband.set_property(NM.SETTING_INFINIBAND_TRANSPORT_MODE, connection['infiniband_transport_mode'])
|
||||
if connection['infiniband_p_key'] not in [ None, -1 ]:
|
||||
s_infiniband.set_property(NM.SETTING_INFINIBAND_P_KEY, connection['infiniband_p_key'])
|
||||
if connection['parent']:
|
||||
s_infiniband.set_property(NM.SETTING_INFINIBAND_PARENT, ArgUtil.connection_find_master(connection['parent'], connections, idx))
|
||||
elif connection['type'] == 'bridge':
|
||||
s_con.set_property(NM.SETTING_CONNECTION_TYPE, 'bridge')
|
||||
s_bridge = self.connection_ensure_setting(con, NM.SettingBridge)
|
||||
|
|
@ -1285,8 +1325,12 @@ class NMUtil:
|
|||
raise MyError('unsupported type %s' % (connection['type']))
|
||||
|
||||
if connection['mtu']:
|
||||
s_wired = self.connection_ensure_setting(con, NM.SettingWired)
|
||||
s_wired.set_property(NM.SETTING_WIRED_MTU, connection['mtu'])
|
||||
if connection['type'] == 'infiniband':
|
||||
s_infiniband = self.connection_ensure_setting(con, NM.SettingInfiniband)
|
||||
s_infiniband.set_property(NM.SETTING_INFINIBAND_MTU, connection['mtu'])
|
||||
else:
|
||||
s_wired = self.connection_ensure_setting(con, NM.SettingWired)
|
||||
s_wired.set_property(NM.SETTING_WIRED_MTU, connection['mtu'])
|
||||
|
||||
if connection['master'] is not None:
|
||||
s_con.set_property(NM.SETTING_CONNECTION_SLAVE_TYPE, connection['slave_type'])
|
||||
|
|
@ -1802,10 +1846,14 @@ class Cmd:
|
|||
li_mac = SysUtil.link_info_find(mac = connection['mac'])
|
||||
if not li_mac:
|
||||
AnsibleUtil.log_fatal(idx, 'profile specifies mac "%s" but no such interface exists' % (connection['mac']))
|
||||
if connection['interface_name'] and connection['type'] == 'ethernet':
|
||||
if connection['interface_name']:
|
||||
li_ifname = SysUtil.link_info_find(ifname = connection['interface_name'])
|
||||
if not li_ifname:
|
||||
AnsibleUtil.log_fatal(idx, 'profile specifies interface_name "%s" but no such interface exists' % (connection['interface_name']))
|
||||
if connection['type'] == 'ethernet':
|
||||
AnsibleUtil.log_fatal(idx, 'profile specifies interface_name "%s" but no such interface exists' % (connection['interface_name']))
|
||||
elif connection['type'] == 'infiniband':
|
||||
if connection['infiniband_p_key'] in [None, -1]:
|
||||
AnsibleUtil.log_fatal(idx, 'profile specifies interface_name "%s" but no such infiniband interface exists' % (connection['interface_name']))
|
||||
if li_mac and li_ifname and li_mac != li_ifname:
|
||||
AnsibleUtil.log_fatal(idx, 'profile specifies interface_name "%s" and mac "%s" but no such interface exists' % (connection['interface_name'], connection['mac']))
|
||||
|
||||
|
|
|
|||
|
|
@ -159,6 +159,8 @@ class TestValidator(unittest.TestCase):
|
|||
'interface_name': None,
|
||||
'check_iface_exists': True,
|
||||
'slave_type': None,
|
||||
'infiniband_p_key': None,
|
||||
'infiniband_transport_mode': None,
|
||||
},
|
||||
{
|
||||
'name': '5',
|
||||
|
|
@ -203,6 +205,8 @@ class TestValidator(unittest.TestCase):
|
|||
'check_iface_exists': True,
|
||||
'slave_type': None,
|
||||
'wait': None,
|
||||
'infiniband_p_key': None,
|
||||
'infiniband_transport_mode': None,
|
||||
},
|
||||
],
|
||||
n.AnsibleUtil.ARGS_CONNECTIONS.validate([
|
||||
|
|
@ -267,7 +271,9 @@ class TestValidator(unittest.TestCase):
|
|||
'interface_name': None,
|
||||
'type': 'ethernet',
|
||||
'slave_type': None,
|
||||
'wait': None
|
||||
'wait': None,
|
||||
'infiniband_p_key': None,
|
||||
'infiniband_transport_mode': None,
|
||||
},
|
||||
],
|
||||
n.AnsibleUtil.ARGS_CONNECTIONS.validate([
|
||||
|
|
@ -313,7 +319,9 @@ class TestValidator(unittest.TestCase):
|
|||
'interface_name': None,
|
||||
'type': 'ethernet',
|
||||
'slave_type': None,
|
||||
'wait': None
|
||||
'wait': None,
|
||||
'infiniband_p_key': None,
|
||||
'infiniband_transport_mode': None,
|
||||
},
|
||||
{
|
||||
'autoconnect': True,
|
||||
|
|
@ -348,7 +356,9 @@ class TestValidator(unittest.TestCase):
|
|||
'interface_name': 'prod.100',
|
||||
'type': 'vlan',
|
||||
'vlan_id': 100,
|
||||
'wait': None
|
||||
'wait': None,
|
||||
'infiniband_p_key': None,
|
||||
'infiniband_transport_mode': None,
|
||||
}
|
||||
],
|
||||
n.AnsibleUtil.ARGS_CONNECTIONS.validate([
|
||||
|
|
@ -401,7 +411,9 @@ class TestValidator(unittest.TestCase):
|
|||
'interface_name': 'bridge2',
|
||||
'type': 'bridge',
|
||||
'slave_type': None,
|
||||
'wait': None
|
||||
'wait': None,
|
||||
'infiniband_p_key': None,
|
||||
'infiniband_transport_mode': None,
|
||||
},
|
||||
{
|
||||
'autoconnect': True,
|
||||
|
|
@ -429,7 +441,9 @@ class TestValidator(unittest.TestCase):
|
|||
'interface_name': 'eth1',
|
||||
'type': 'ethernet',
|
||||
'slave_type': 'bridge',
|
||||
'wait': None
|
||||
'wait': None,
|
||||
'infiniband_p_key': None,
|
||||
'infiniband_transport_mode': None,
|
||||
}
|
||||
],
|
||||
n.AnsibleUtil.ARGS_CONNECTIONS.validate([
|
||||
|
|
@ -485,7 +499,9 @@ class TestValidator(unittest.TestCase):
|
|||
'mode': 'balance-rr',
|
||||
'miimon': None,
|
||||
},
|
||||
'wait': None
|
||||
'wait': None,
|
||||
'infiniband_p_key': None,
|
||||
'infiniband_transport_mode': None,
|
||||
},
|
||||
],
|
||||
n.AnsibleUtil.ARGS_CONNECTIONS.validate([
|
||||
|
|
@ -529,7 +545,9 @@ class TestValidator(unittest.TestCase):
|
|||
'mode': 'active-backup',
|
||||
'miimon': None,
|
||||
},
|
||||
'wait': None
|
||||
'wait': None,
|
||||
'infiniband_p_key': None,
|
||||
'infiniband_transport_mode': None,
|
||||
},
|
||||
],
|
||||
n.AnsibleUtil.ARGS_CONNECTIONS.validate([
|
||||
|
|
@ -566,7 +584,7 @@ class TestValidator(unittest.TestCase):
|
|||
'dns': [],
|
||||
'dns_search': [],
|
||||
},
|
||||
'mac': 'aa:bb:cc',
|
||||
'mac': 'aa:bb:cc:dd:ee:ff',
|
||||
'mtu': None,
|
||||
'master': None,
|
||||
'check_iface_exists': True,
|
||||
|
|
@ -577,13 +595,15 @@ class TestValidator(unittest.TestCase):
|
|||
'state': 'present',
|
||||
'type': 'ethernet',
|
||||
'vlan_id': None,
|
||||
'infiniband_p_key': None,
|
||||
'infiniband_transport_mode': None,
|
||||
},
|
||||
],
|
||||
n.AnsibleUtil.ARGS_CONNECTIONS.validate([
|
||||
{
|
||||
'name': '5',
|
||||
'type': 'ethernet',
|
||||
'mac': 'AA:bb:cC',
|
||||
'mac': 'AA:bb:cC:DD:ee:FF',
|
||||
}
|
||||
]),
|
||||
)
|
||||
|
|
@ -617,6 +637,8 @@ class TestValidator(unittest.TestCase):
|
|||
'check_iface_exists': True,
|
||||
'slave_type': None,
|
||||
'wait': None,
|
||||
'infiniband_p_key': None,
|
||||
'infiniband_transport_mode': None,
|
||||
},
|
||||
],
|
||||
n.AnsibleUtil.ARGS_CONNECTIONS.validate([
|
||||
|
|
@ -656,6 +678,8 @@ class TestValidator(unittest.TestCase):
|
|||
'check_iface_exists': True,
|
||||
'slave_type': None,
|
||||
'wait': None,
|
||||
'infiniband_p_key': None,
|
||||
'infiniband_transport_mode': None,
|
||||
},
|
||||
],
|
||||
n.AnsibleUtil.ARGS_CONNECTIONS.validate([
|
||||
|
|
@ -697,6 +721,8 @@ class TestValidator(unittest.TestCase):
|
|||
'check_iface_exists': True,
|
||||
'slave_type': None,
|
||||
'wait': None,
|
||||
'infiniband_p_key': None,
|
||||
'infiniband_transport_mode': None,
|
||||
},
|
||||
],
|
||||
n.AnsibleUtil.ARGS_CONNECTIONS.validate([
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue