From da292d3a17e88ac14d0bd3065bcf95dc893a2ebb Mon Sep 17 00:00:00 2001
From: Thomas Mangin <thomas.mangin@exa.net.uk>
Date: Sun, 22 Mar 2020 19:09:59 +0000
Subject: vxlan: T2057: use self.default as template for get_config
---
python/vyos/ifconfig/vxlan.py | 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)
(limited to 'python')
diff --git a/python/vyos/ifconfig/vxlan.py b/python/vyos/ifconfig/vxlan.py
index f7a04d81b..c34f500a5 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
@@ -70,8 +72,8 @@ class VXLANIf(Interface):
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 +82,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)
--
cgit v1.2.3
From ac7593ffaff1d7e4529dbe98210bbdc071500310 Mon Sep 17 00:00:00 2001
From: Thomas Mangin <thomas.mangin@exa.net.uk>
Date: Sun, 22 Mar 2020 20:05:11 +0000
Subject: vxlan: T2057: rewrite _create command
---
python/vyos/ifconfig/vxlan.py | 34 ++++++++++++++++++++--------------
1 file changed, 20 insertions(+), 14 deletions(-)
(limited to 'python')
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)
--
cgit v1.2.3
From 71da71cd71158a247005c30d16cabec312a611ee Mon Sep 17 00:00:00 2001
From: Thomas Mangin <thomas.mangin@exa.net.uk>
Date: Sun, 22 Mar 2020 21:01:54 +0000
Subject: geneve: T2057: use self.default as template for get_config
---
python/vyos/ifconfig/geneve.py | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
(limited to 'python')
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)
--
cgit v1.2.3