summaryrefslogtreecommitdiff
path: root/python
diff options
context:
space:
mode:
Diffstat (limited to 'python')
-rw-r--r--python/vyos/ifconfig/__init__.py3
-rw-r--r--python/vyos/ifconfig/geneve.py16
-rw-r--r--python/vyos/ifconfig/vxlan.py50
-rw-r--r--python/vyos/ifconfig/wireless.py63
4 files changed, 97 insertions, 35 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
generated by cgit v1.2.3 (git 2.39.1) at 2024-10-18 16:25:51 +0000