diff options
| -rw-r--r-- | python/vyos/ifconfig/__init__.py | 3 | ||||
| -rw-r--r-- | python/vyos/ifconfig/geneve.py | 16 | ||||
| -rw-r--r-- | python/vyos/ifconfig/vxlan.py | 50 | ||||
| -rw-r--r-- | python/vyos/ifconfig/wireless.py | 63 | ||||
| -rwxr-xr-x | src/conf_mode/interfaces-tunnel.py | 2 | ||||
| -rwxr-xr-x | src/conf_mode/interfaces-wireless.py | 74 |
6 files changed, 144 insertions, 64 deletions
diff --git a/python/vyos/ifconfig/__init__.py b/python/vyos/ifconfig/__init__.py index a7588e5bc..16c29a704 100644 --- a/python/vyos/ifconfig/__init__.py +++ b/python/vyos/ifconfig/__init__.py @@ -34,4 +34,5 @@ from vyos.ifconfig.tunnel import IPIPIf from vyos.ifconfig.tunnel import IPIP6If from vyos.ifconfig.tunnel import IP6IP6If from vyos.ifconfig.tunnel import SitIf -from vyos.ifconfig.tunnel import Sit6RDIf
\ No newline at end of file +from vyos.ifconfig.tunnel import Sit6RDIf +from vyos.ifconfig.wireless import WiFiIf diff --git a/python/vyos/ifconfig/geneve.py b/python/vyos/ifconfig/geneve.py index c6834fcd7..a3b3a4c4a 100644 --- a/python/vyos/ifconfig/geneve.py +++ b/python/vyos/ifconfig/geneve.py @@ -13,6 +13,7 @@ # You should have received a copy of the GNU Lesser General Public # License along with this library. If not, see <http://www.gnu.org/licenses/>. +from copy import deepcopy from vyos.ifconfig.interface import Interface @@ -30,18 +31,19 @@ class GeneveIf(Interface): default = { 'type': 'geneve', + 'vni': 0, + 'remote': '', } def _create(self): - cmd = 'ip link add name {} type geneve id {} remote {}' \ - .format(self.config['ifname'], config['vni'], config['remote']) + cmd = 'ip link add name {ifname} type geneve id {vni} remote {remote}'.format(**self.config) self._cmd(cmd) # interface is always A/D down. It needs to be enabled explicitly self.set_state('down') - @staticmethod - def get_config(): + @classmethod + def get_config(cls): """ GENEVE interfaces require a configuration when they are added using iproute2. This static method will provide the configuration dictionary @@ -50,8 +52,4 @@ class GeneveIf(Interface): Example: >> dict = GeneveIf().get_config() """ - config = { - 'vni': 0, - 'remote': '' - } - return config + return deepcopy(cls.default) diff --git a/python/vyos/ifconfig/vxlan.py b/python/vyos/ifconfig/vxlan.py index f7a04d81b..75cdf8957 100644 --- a/python/vyos/ifconfig/vxlan.py +++ b/python/vyos/ifconfig/vxlan.py @@ -13,6 +13,8 @@ # You should have received a copy of the GNU Lesser General Public # License along with this library. If not, see <http://www.gnu.org/licenses/>. +from copy import deepcopy + from vyos import ConfigError from vyos.ifconfig.interface import Interface @@ -40,6 +42,12 @@ class VXLANIf(Interface): options = ['group', 'remote', 'dev', 'port', 'vni'] + mapping = { + 'ifname': 'add', + 'vni': 'id', + 'port': 'dstport', + } + default = { 'type': 'vxlan', 'vni': 0, @@ -51,27 +59,27 @@ class VXLANIf(Interface): } def _create(self): - cmd = '' + cmdline = set() if self.config['remote']: - # an underlay device is only mandatory with multicast, not unicast - dev = '' - if self.config['dev']: - dev = 'dev {}'.format(self.config['dev']) - # iproute2 command for unicast - cmd = 'ip link add {ifname} type vxlan id {vni} remote {remote} {dev_optional} dstport {port}'.format( - **self.config, dev_optional=dev) + cmdline = ('ifname', 'type', 'remote', 'dev', 'vni', 'port') + elif self.config['group'] and self.config['dev']: + cmdline = ('ifname', 'type', 'group', 'dev', 'vni', 'port') else: - if not self.config['dev']: - raise ConfigError( - f'VXLAN "{self.config["ifname"]}" is missing mandatory underlay interface for a multicast network.') - # iproute2 command for multicast - cmd = 'ip link add {ifname} type vxlan id {vni} group {group} dev {dev} dstport {port}'.format( - **self.config) + intf = self.config['intf'] + raise ConfigError( + f'VXLAN "{intf}" is missing mandatory underlay interface for a multicast network.') + + cmd = 'ip link' + for key in cmdline: + value = self.config.get(key, '') + if not value: + continue + cmd += ' {} {}'.format(self.mapping.get(key, key), value) self._cmd(cmd) - @staticmethod - def get_config(): + @classmethod + def get_config(cls): """ VXLAN interfaces require a configuration when they are added using iproute2. This static method will provide the configuration dictionary @@ -80,12 +88,4 @@ class VXLANIf(Interface): Example: >> dict = VXLANIf().get_config() """ - config = { - 'vni': 0, - 'dev': '', - 'group': '', - 'port': 8472, # The Linux implementation of VXLAN pre-dates - # the IANA's selection of a standard destination port - 'remote': '' - } - return config + return deepcopy(cls.default) diff --git a/python/vyos/ifconfig/wireless.py b/python/vyos/ifconfig/wireless.py new file mode 100644 index 000000000..faa47358d --- /dev/null +++ b/python/vyos/ifconfig/wireless.py @@ -0,0 +1,63 @@ +# Copyright 2020 VyOS maintainers and contributors <maintainers@vyos.io> +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library. If not, see <http://www.gnu.org/licenses/>. + +import os + +from vyos.ifconfig.vlan import VLANIf + +class WiFiIf(VLANIf): + """ + Handle WIFI/WLAN interfaces. + """ + + options = ['phy', 'op_mode'] + + default = { + 'type': 'wifi', + 'phy': 'phy0', + 'op_mode': 'monitor' + } + + def _create(self): + cmd = 'iw phy {phy} interface add {ifname} type {op_mode}' \ + .format(**self.config) + self._cmd(cmd) + + # place interface in administrative down state + # this should be improved in the long run to reduce the amount of + # interface flaps + self.set_state('down') + + def _delete(self): + cmd = 'iw dev {ifname} del' \ + .format(**self.config) + self._cmd(cmd) + + @staticmethod + def get_config(): + """ + WiFi interfaces require a configuration when they are added using + iw (type/phy). This static method will provide the configuration + ictionary used by this class. + + Example: + >> conf = WiFiIf().get_config() + """ + config = { + 'phy': 'phy0', + 'op_mode': 'monitor' # required for proper interface deletion, as + # _update() is called prior to remove() + } + return config diff --git a/src/conf_mode/interfaces-tunnel.py b/src/conf_mode/interfaces-tunnel.py index 3d4f26374..90c1f8f71 100755 --- a/src/conf_mode/interfaces-tunnel.py +++ b/src/conf_mode/interfaces-tunnel.py @@ -339,7 +339,7 @@ def verify(conf): raise ConfigError(f'Can not set "{create}" for tunnel {iftype} {ifname} at tunnel creation') for modify in actions['modify']: - if modify not in kls.updates: + if modify not in valid: raise ConfigError(f'Can not modify "{modify}" for tunnel {iftype} {ifname}. it must be set at tunnel creation') for delete in actions['delete']: diff --git a/src/conf_mode/interfaces-wireless.py b/src/conf_mode/interfaces-wireless.py index 59fb21125..8132a396c 100755 --- a/src/conf_mode/interfaces-wireless.py +++ b/src/conf_mode/interfaces-wireless.py @@ -847,7 +847,7 @@ default_config_data = { 'sec_wpa_passphrase' : '', 'sec_wpa_radius' : [], 'ssid' : '', - 'type' : 'monitor', + 'op_mode' : 'monitor', 'vif': [], 'vif_remove': [], 'vrf': '' @@ -1255,7 +1255,11 @@ def get_config(): # Wireless device type for this interface if conf.exists('type'): - wifi['type'] = conf.return_value('type') + tmp = conf.return_value('type') + if tmp == 'access-point': + tmp = 'ap' + + wifi['op_mode'] = tmp # re-set configuration level to parse new nodes conf.set_level(cfg_base) @@ -1287,13 +1291,13 @@ def verify(wifi): if wifi['deleted']: return None - if wifi['type'] != 'monitor' and not wifi['ssid']: + if wifi['op_mode'] != 'monitor' and not wifi['ssid']: raise ConfigError('SSID must be set for {}'.format(wifi['intf'])) if not wifi['phy']: raise ConfigError('You must specify physical-device') - if wifi['type'] == 'access-point': + if wifi['op_mode'] == 'ap': c = Config() if not c.exists('system wifi-regulatory-domain'): raise ConfigError('Wireless regulatory domain is mandatory,\n' \ @@ -1328,29 +1332,24 @@ def verify(wifi): # use common function to verify VLAN configuration verify_vlan_config(wifi) + conf = Config() + # Only one wireless interface per phy can be in station mode + base = ['interfaces', 'wireless'] + for phy in os.listdir('/sys/class/ieee80211'): + stations = [] + for wlan in conf.list_nodes(base): + # the following node is mandatory + if conf.exists(base + [wlan, 'physical-device', phy]): + tmp = conf.return_value(base + [wlan, 'type']) + if tmp == 'station': + stations.append(wlan) + + if len(stations) > 1: + raise ConfigError('Only one station per wireless physical interface possible!') + return None def generate(wifi): - - if not wifi['mac']: - # http://wiki.stocksy.co.uk/wiki/Multiple_SSIDs_with_hostapd - # generate locally administered MAC address from used phy interface - with open('/sys/class/ieee80211/{}/addresses'.format(wifi['phy']), 'r') as f: - tmp = EUI(f.read().rstrip()).value - # mask last nibble from the MAC address - tmp &= 0xfffffffffff0 - # set locally administered bit in MAC address - tmp |= 0x020000000000 - # we now need to add an offset to our MAC address indicating this - # subinterfaces index - tmp += int(findall(r'\d+', wifi['intf'])[0]) - - # convert integer to "real" MAC address representation - mac = EUI(hex(tmp).split('x')[-1]) - # change dialect to use : as delimiter instead of - - mac.dialect = mac_unix_expanded - wifi['mac'] = str(mac) - pid = 0 # always stop hostapd service first before reconfiguring it pidfile = get_pid('hostapd', wifi['intf']) @@ -1386,14 +1385,33 @@ def generate(wifi): return None + if not wifi['mac']: + # http://wiki.stocksy.co.uk/wiki/Multiple_SSIDs_with_hostapd + # generate locally administered MAC address from used phy interface + with open('/sys/class/ieee80211/{}/addresses'.format(wifi['phy']), 'r') as f: + tmp = EUI(f.read().rstrip()).value + # mask last nibble from the MAC address + tmp &= 0xfffffffffff0 + # set locally administered bit in MAC address + tmp |= 0x020000000000 + # we now need to add an offset to our MAC address indicating this + # subinterfaces index + tmp += int(findall(r'\d+', wifi['intf'])[0]) + + # convert integer to "real" MAC address representation + mac = EUI(hex(tmp).split('x')[-1]) + # change dialect to use : as delimiter instead of - + mac.dialect = mac_unix_expanded + wifi['mac'] = str(mac) + # render appropriate new config files depending on access-point or station mode - if wifi['type'] == 'access-point': + if wifi['op_mode'] == 'ap': tmpl = Template(config_hostapd_tmpl) config_text = tmpl.render(wifi) with open(get_conf_file('hostapd', wifi['intf']), 'w') as f: f.write(config_text) - elif wifi['type'] == 'station': + elif wifi['op_mode'] == 'station': tmpl = Template(config_wpa_suppl_tmpl) config_text = tmpl.render(wifi) with open(get_conf_file('wpa_supplicant', wifi['intf']), 'w') as f: @@ -1497,7 +1515,7 @@ def apply(wifi): # Physical interface is now configured. Proceed by starting hostapd or # wpa_supplicant daemon. When type is monitor we can just skip this. - if wifi['type'] == 'access-point': + if wifi['op_mode'] == 'ap': cmd = 'start-stop-daemon --start --quiet' cmd += ' --exec /usr/sbin/hostapd' # now pass arguments to hostapd binary @@ -1508,7 +1526,7 @@ def apply(wifi): # execute assembled command subprocess_cmd(cmd) - elif wifi['type'] == 'station': + elif wifi['op_mode'] == 'station': cmd = 'start-stop-daemon --start --quiet' cmd += ' --exec /sbin/wpa_supplicant' # now pass arguments to hostapd binary |