summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Mangin <thomas.mangin@exa.net.uk>2020-03-22 20:05:11 +0000
committerThomas Mangin <thomas.mangin@exa.net.uk>2020-03-22 20:56:59 +0000
commitac7593ffaff1d7e4529dbe98210bbdc071500310 (patch)
treefc0a3a4e91b607b7be40e763a8ef945b29223ac2
parentda292d3a17e88ac14d0bd3065bcf95dc893a2ebb (diff)
downloadvyos-1x-ac7593ffaff1d7e4529dbe98210bbdc071500310.tar.gz
vyos-1x-ac7593ffaff1d7e4529dbe98210bbdc071500310.zip
vxlan: T2057: rewrite _create command
-rw-r--r--python/vyos/ifconfig/vxlan.py34
1 files changed, 20 insertions, 14 deletions
diff --git a/python/vyos/ifconfig/vxlan.py b/python/vyos/ifconfig/vxlan.py
index c34f500a5..75cdf8957 100644
--- a/python/vyos/ifconfig/vxlan.py
+++ b/python/vyos/ifconfig/vxlan.py
@@ -42,6 +42,12 @@ class VXLANIf(Interface):
options = ['group', 'remote', 'dev', 'port', 'vni']
+ mapping = {
+ 'ifname': 'add',
+ 'vni': 'id',
+ 'port': 'dstport',
+ }
+
default = {
'type': 'vxlan',
'vni': 0,
@@ -53,22 +59,22 @@ 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)