summaryrefslogtreecommitdiff
path: root/python
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2022-07-30 19:06:35 +0200
committerChristian Poessinger <christian@poessinger.com>2022-07-30 19:06:35 +0200
commit99ff0ac7d29a65466a0fe4a12ef1a42cce90ece0 (patch)
tree1276225715a5134aaecbfd31b8a312e693085943 /python
parent332aa77860487398214a10c77d3e6d020f1e68ef (diff)
downloadvyos-1x-99ff0ac7d29a65466a0fe4a12ef1a42cce90ece0.tar.gz
vyos-1x-99ff0ac7d29a65466a0fe4a12ef1a42cce90ece0.zip
Revert "vyos.configdict(): T4228: is_member() must split VLAN interfaces"
This reverts commit fdeae251431cb747e8f60d96269b4365b7401807.
Diffstat (limited to 'python')
-rw-r--r--python/vyos/configdict.py20
1 files changed, 2 insertions, 18 deletions
diff --git a/python/vyos/configdict.py b/python/vyos/configdict.py
index a61666afc..e9ef39930 100644
--- a/python/vyos/configdict.py
+++ b/python/vyos/configdict.py
@@ -222,24 +222,8 @@ def is_member(conf, interface, intftype=None):
for intf in conf.list_nodes(base):
member = base + [intf, 'member', 'interface', interface]
if conf.exists(member):
- member_type = Section.section(interface)
- # Check if it's a VLAN (QinQ) interface
- interface = interface.split('.')
- if len(interface) == 3:
- if conf.exists(['interfaces', member_type, interface[0], 'vif-s', interface[1], 'vif-c', interface[2]]):
- tmp = conf.get_config_dict(['interfaces', member_type, interface[0]],
- key_mangling=('-', '_'), get_first_key=True)
- ret_val.update({intf : tmp})
- elif len(interface) == 2:
- if conf.exists(['interfaces', member_type, interface[0], 'vif', interface[1]]):
- tmp = conf.get_config_dict(['interfaces', member_type, interface[0]],
- key_mangling=('-', '_'), get_first_key=True)
- ret_val.update({intf : tmp})
- else:
- if conf.exists(['interfaces', member_type, interface[0]]):
- tmp = conf.get_config_dict(['interfaces', member_type, interface[0]],
- key_mangling=('-', '_'), get_first_key=True)
- ret_val.update({intf : tmp})
+ if conf.exists(['interfaces', Section.section(interface), interface]):
+ ret_val.update({intf : {}})
return ret_val