summaryrefslogtreecommitdiff
path: root/src/conf_mode/interfaces-ethernet.py
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2020-03-08 12:35:55 +0100
committerChristian Poessinger <christian@poessinger.com>2020-03-08 12:35:55 +0100
commit8f58dde4c89ae365d0b2cb15d105d8ead73ee0c9 (patch)
tree0131af4fd2b5fc18cff990df87e0c230f50c714c /src/conf_mode/interfaces-ethernet.py
parent4bda9cabba26176d5abdad6b65b793e429fb763c (diff)
downloadvyos-1x-8f58dde4c89ae365d0b2cb15d105d8ead73ee0c9.tar.gz
vyos-1x-8f58dde4c89ae365d0b2cb15d105d8ead73ee0c9.zip
vrf: T31: support VRF usage on VLAN/VIF interfaces
Diffstat (limited to 'src/conf_mode/interfaces-ethernet.py')
-rwxr-xr-xsrc/conf_mode/interfaces-ethernet.py17
1 files changed, 3 insertions, 14 deletions
diff --git a/src/conf_mode/interfaces-ethernet.py b/src/conf_mode/interfaces-ethernet.py
index 67cc56bb2..6d779c94c 100755
--- a/src/conf_mode/interfaces-ethernet.py
+++ b/src/conf_mode/interfaces-ethernet.py
@@ -21,7 +21,7 @@ from copy import deepcopy
from netifaces import interfaces
from vyos.ifconfig import EthernetIf
-from vyos.ifconfig_vlan import apply_vlan_config
+from vyos.ifconfig_vlan import apply_vlan_config, verify_vlan_config
from vyos.configdict import list_diff, vlan_to_dict
from vyos.config import Config
from vyos import ConfigError
@@ -262,19 +262,8 @@ def verify(eth):
if eth['address']:
raise ConfigError('Can not assign address to interface {} which is a member of {}'.format(eth['intf'], bond))
- # DHCPv6 parameters-only and temporary address are mutually exclusive
- for vif_s in eth['vif_s']:
- if vif_s['dhcpv6_prm_only'] and vif_s['dhcpv6_temporary']:
- raise ConfigError('DHCPv6 temporary and parameters-only options are mutually exclusive!')
-
- for vif_c in vif_s['vif_c']:
- if vif_c['dhcpv6_prm_only'] and vif_c['dhcpv6_temporary']:
- raise ConfigError('DHCPv6 temporary and parameters-only options are mutually exclusive!')
-
- for vif in eth['vif']:
- if vif['dhcpv6_prm_only'] and vif['dhcpv6_temporary']:
- raise ConfigError('DHCPv6 temporary and parameters-only options are mutually exclusive!')
-
+ # use common function to verify VLAN configuration
+ verify_vlan_config(eth)
return None
def generate(eth):