diff options
Diffstat (limited to 'python')
| -rw-r--r-- | python/vyos/ifconfig/vxlan.py | 34 |
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) |