summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2019-12-31 13:06:17 +0100
committerChristian Poessinger <christian@poessinger.com>2019-12-31 13:06:17 +0100
commitd296eb00cc041b4abb5c0d69151aec61bfc8f87c (patch)
treede56f2b01410f39948f1edccbab1cdfac51adcd7 /src
parent68e9026dc33f53ef105aa2f20b777d126a0e3072 (diff)
parent4ebe0e002208b67dd4720a3fa8569557232df7e5 (diff)
downloadvyos-1x-d296eb00cc041b4abb5c0d69151aec61bfc8f87c.tar.gz
vyos-1x-d296eb00cc041b4abb5c0d69151aec61bfc8f87c.zip
Merge branch 't1923-l2tpv3-migration' of github.com:c-po/vyos-1x into current
* 't1923-l2tpv3-migration' of github.com:c-po/vyos-1x: l2tpv3: T1923: support interface deletion l2tpv3: T1923: implementation in XML/Python ifconfig: vxlan: change VXLANIf API ifconfig: geneve: always place interface in A/D state geneve: use proper variable name
Diffstat (limited to 'src')
-rwxr-xr-xsrc/conf_mode/interfaces-geneve.py20
-rwxr-xr-xsrc/conf_mode/interfaces-l2tpv3.py239
2 files changed, 249 insertions, 10 deletions
diff --git a/src/conf_mode/interfaces-geneve.py b/src/conf_mode/interfaces-geneve.py
index 7322e0c50..b0c381656 100755
--- a/src/conf_mode/interfaces-geneve.py
+++ b/src/conf_mode/interfaces-geneve.py
@@ -111,10 +111,10 @@ def generate(geneve):
def apply(geneve):
# Check if GENEVE interface already exists
if geneve['intf'] in interfaces():
- v = GeneveIf(geneve['intf'])
+ g = GeneveIf(geneve['intf'])
# GENEVE is super picky and the tunnel always needs to be recreated,
# thus we can simply always delete it first.
- v.remove()
+ g.remove()
if not geneve['deleted']:
# GENEVE interface needs to be created on-block
@@ -127,28 +127,28 @@ def apply(geneve):
conf['remote'] = geneve['remote']
# Finally create the new interface
- v = GeneveIf(geneve['intf'], config=conf)
+ g = GeneveIf(geneve['intf'], config=conf)
# update interface description used e.g. by SNMP
- v.set_alias(geneve['description'])
+ g.set_alias(geneve['description'])
# Maximum Transfer Unit (MTU)
- v.set_mtu(geneve['mtu'])
+ g.set_mtu(geneve['mtu'])
# configure ARP cache timeout in milliseconds
- v.set_arp_cache_tmo(geneve['ip_arp_cache_tmo'])
+ g.set_arp_cache_tmo(geneve['ip_arp_cache_tmo'])
# Enable proxy-arp on this interface
- v.set_proxy_arp(geneve['ip_proxy_arp'])
+ g.set_proxy_arp(geneve['ip_proxy_arp'])
# Configure interface address(es) - no need to implicitly delete the
# old addresses as they have already been removed by deleting the
# interface above
for addr in geneve['address']:
- v.add_addr(addr)
+ g.add_addr(addr)
- # As the bond interface is always disabled first when changing
+ # As the GENEVE interface is always disabled first when changing
# parameters we will only re-enable the interface if it is not
# administratively disabled
if not geneve['disable']:
- v.set_state('up')
+ g.set_state('up')
return None
diff --git a/src/conf_mode/interfaces-l2tpv3.py b/src/conf_mode/interfaces-l2tpv3.py
new file mode 100755
index 000000000..ae49dadad
--- /dev/null
+++ b/src/conf_mode/interfaces-l2tpv3.py
@@ -0,0 +1,239 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2019 VyOS maintainers and contributors
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 or later as
+# published by the Free Software Foundation.
+#
+# This program 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 General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+import os
+
+from sys import exit
+from copy import deepcopy
+
+from vyos.config import Config
+from vyos.ifconfig import L2TPv3If, Interface
+from vyos import ConfigError
+from netifaces import interfaces
+
+default_config_data = {
+ 'address': [],
+ 'deleted': False,
+ 'description': '',
+ 'disable': False,
+ 'encapsulation': 'udp',
+ 'local_address': '',
+ 'local_port': 5000,
+ 'intf': '',
+ 'mtu': 1488,
+ 'peer_session_id': '',
+ 'peer_tunnel_id': '',
+ 'remote_address': '',
+ 'remote_port': 5000,
+ 'session_id': '',
+ 'tunnel_id': ''
+}
+
+def get_config():
+ l2tpv3 = deepcopy(default_config_data)
+ conf = Config()
+
+ # determine tagNode instance
+ try:
+ l2tpv3['intf'] = os.environ['VYOS_TAGNODE_VALUE']
+ except KeyError as E:
+ print("Interface not specified")
+
+ # Check if interface has been removed
+ if not conf.exists('interfaces l2tpv3 ' + l2tpv3['intf']):
+ l2tpv3['deleted'] = True
+ # to delete the l2tpv3 interface we need to current
+ # tunnel_id and session_id
+ if conf.exists_effective('interfaces l2tpv3 {} tunnel-id'.format(l2tpv3['intf'])):
+ l2tpv3['tunnel_id'] = conf.return_effective_value(
+ 'interfaces l2tpv3 {} tunnel-id'.format(l2tpv3['intf']))
+
+ if conf.exists_effective('interfaces l2tpv3 {} session-id'.format(l2tpv3['intf'])):
+ l2tpv3['session_id'] = conf.return_effective_value(
+ 'interfaces l2tpv3 {} session-id'.format(l2tpv3['intf']))
+
+ return l2tpv3
+
+ # set new configuration level
+ conf.set_level('interfaces l2tpv3 ' + l2tpv3['intf'])
+
+ # retrieve configured interface addresses
+ if conf.exists('address'):
+ l2tpv3['address'] = conf.return_values('address')
+
+ # retrieve interface description
+ if conf.exists('description'):
+ l2tpv3['description'] = conf.return_value('description')
+
+ # get tunnel destination port
+ if conf.exists('destination-port'):
+ l2tpv3['remote_port'] = int(conf.return_value('destination-port'))
+
+ # Disable this interface
+ if conf.exists('disable'):
+ l2tpv3['disable'] = True
+
+ # get tunnel encapsulation type
+ if conf.exists('encapsulation'):
+ l2tpv3['encapsulation'] = conf.return_value('encapsulation')
+
+ # get tunnel local ip address
+ if conf.exists('local-ip'):
+ l2tpv3['local_address'] = conf.return_value('local-ip')
+
+ # Maximum Transmission Unit (MTU)
+ if conf.exists('mtu'):
+ l2tpv3['mtu'] = int(conf.return_value('mtu'))
+
+ # Remote session id
+ if conf.exists('peer-session-id'):
+ l2tpv3['peer_session_id'] = conf.return_value('peer-session-id')
+
+ # Remote tunnel id
+ if conf.exists('peer-tunnel-id'):
+ l2tpv3['peer_tunnel_id'] = conf.return_value('peer-tunnel-id')
+
+ # Remote address of L2TPv3 tunnel
+ if conf.exists('remote-ip'):
+ l2tpv3['remote_address'] = conf.return_value('remote-ip')
+
+ # Local session id
+ if conf.exists('session-id'):
+ l2tpv3['session_id'] = conf.return_value('session-id')
+
+ # get local tunnel port
+ if conf.exists('source-port'):
+ l2tpv3['local_port'] = conf.return_value('source-port')
+
+ # get local tunnel id
+ if conf.exists('tunnel-id'):
+ l2tpv3['tunnel_id'] = conf.return_value('tunnel-id')
+
+ return l2tpv3
+
+
+def verify(l2tpv3):
+ if l2tpv3['deleted']:
+ # bail out early
+ return None
+
+ if not l2tpv3['local_address']:
+ raise ConfigError('Must configure the l2tpv3 local-ip for {}'.format(l2tpv3['intf']))
+
+ if not l2tpv3['remote_address']:
+ raise ConfigError('Must configure the l2tpv3 remote-ip for {}'.format(l2tpv3['intf']))
+
+ if not l2tpv3['tunnel_id']:
+ raise ConfigError('Must configure the l2tpv3 tunnel-id for {}'.format(l2tpv3['intf']))
+
+ if not l2tpv3['peer_tunnel_id']:
+ raise ConfigError('Must configure the l2tpv3 peer-tunnel-id for {}'.format(l2tpv3['intf']))
+
+ if not l2tpv3['session_id']:
+ raise ConfigError('Must configure the l2tpv3 session-id for {}'.format(l2tpv3['intf']))
+
+ if not l2tpv3['peer_session_id']:
+ raise ConfigError('Must configure the l2tpv3 peer-session-id for {}'.format(l2tpv3['intf']))
+
+ return None
+
+
+def generate(l2tpv3):
+ if l2tpv3['deleted']:
+ # bail out early
+ return None
+
+ # initialize kernel module if not loaded
+ if not os.path.isdir('/sys/module/l2tp_eth'):
+ if os.system('modprobe l2tp_eth') != 0:
+ raise ConfigError("failed loading l2tp_eth kernel module")
+
+ if not os.path.isdir('/sys/module/l2tp_netlink'):
+ if os.system('modprobe l2tp_netlink') != 0:
+ raise ConfigError("failed loading l2tp_netlink kernel module")
+
+ if not os.path.isdir('/sys/module/l2tp_ip'):
+ if os.system('modprobe l2tp_ip') != 0:
+ raise ConfigError("failed loading l2tp_ip kernel module")
+
+ if l2tpv3['encapsulation'] == 'ip':
+ if not os.path.isdir('/sys/module/l2tp_ip'):
+ if os.system('modprobe l2tp_ip') != 0:
+ raise ConfigError("failed loading l2tp_ip kernel module")
+
+ if not os.path.isdir('/sys/module/l2tp_ip6 '):
+ if os.system('modprobe l2tp_ip6 ') != 0:
+ raise ConfigError("failed loading l2tp_ip6 kernel module")
+
+ return None
+
+
+def apply(l2tpv3):
+ # L2TPv3 interface needs to be created/deleted on-block, instead of
+ # passing a ton of arguments, I just use a dict that is managed by
+ # vyos.ifconfig
+ conf = deepcopy(L2TPv3If.get_config())
+
+ # Check if L2TPv3 interface already exists
+ if l2tpv3['intf'] in interfaces():
+ # L2TPv3 is picky when changing tunnels/sessions, thus we can simply
+ # always delete it first.
+ conf['session_id'] = l2tpv3['session_id']
+ conf['tunnel_id'] = l2tpv3['tunnel_id']
+ l = L2TPv3If(l2tpv3['intf'], config=conf)
+ l.remove()
+
+ if not l2tpv3['deleted']:
+ conf['peer_tunnel_id'] = l2tpv3['peer_tunnel_id']
+ conf['local_port'] = l2tpv3['local_port']
+ conf['remote_port'] = l2tpv3['remote_port']
+ conf['encapsulation'] = l2tpv3['encapsulation']
+ conf['local_address'] = l2tpv3['local_address']
+ conf['remote_address'] = l2tpv3['remote_address']
+ conf['session_id'] = l2tpv3['session_id']
+ conf['tunnel_id'] = l2tpv3['tunnel_id']
+ conf['peer_session_id'] = l2tpv3['peer_session_id']
+
+ # Finally create the new interface
+ l = L2TPv3If(l2tpv3['intf'], config=conf)
+ # update interface description used e.g. by SNMP
+ l.set_alias(l2tpv3['description'])
+ # Maximum Transfer Unit (MTU)
+ l.set_mtu(l2tpv3['mtu'])
+
+ # Configure interface address(es) - no need to implicitly delete the
+ # old addresses as they have already been removed by deleting the
+ # interface above
+ for addr in l2tpv3['address']:
+ l.add_addr(addr)
+
+ # As the interface is always disabled first when changing parameters
+ # we will only re-enable the interface if it is not administratively
+ # disabled
+ if not l2tpv3['disable']:
+ l.set_state('up')
+
+ return None
+
+if __name__ == '__main__':
+ try:
+ c = get_config()
+ verify(c)
+ generate(c)
+ apply(c)
+ except ConfigError as e:
+ print(e)
+ exit(1)