summaryrefslogtreecommitdiff
path: root/src/conf_mode
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2020-06-24 18:30:37 +0200
committerGitHub <noreply@github.com>2020-06-24 18:30:37 +0200
commitd4ed1b0602f1a96cd5b5104268c1a1155c042062 (patch)
treeaddf080125bc147c394f017ce7e0a90a2d15d242 /src/conf_mode
parent5644809bb4384de8e409042d803d1898124178e1 (diff)
parente507d0867326782bf93ed703ca877ca31dead2d6 (diff)
downloadvyos-1x-d4ed1b0602f1a96cd5b5104268c1a1155c042062.tar.gz
vyos-1x-d4ed1b0602f1a96cd5b5104268c1a1155c042062.zip
Merge pull request #474 from thomas-mangin/T2637
dictconfig: T2637: identify sub-interfaces (vif) to delete
Diffstat (limited to 'src/conf_mode')
-rwxr-xr-xsrc/conf_mode/interfaces-ethernet.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/conf_mode/interfaces-ethernet.py b/src/conf_mode/interfaces-ethernet.py
index 8d657acba..8b895c4d2 100755
--- a/src/conf_mode/interfaces-ethernet.py
+++ b/src/conf_mode/interfaces-ethernet.py
@@ -187,6 +187,9 @@ def generate(eth):
def apply(eth):
e = EthernetIf(eth['intf'])
if eth['deleted']:
+ # apply all vlans to interface (they need removing too)
+ apply_all_vlans(e, eth)
+
# delete interface
e.remove()
else:
@@ -304,7 +307,6 @@ def apply(eth):
# apply all vlans to interface
apply_all_vlans(e, eth)
- return None
if __name__ == '__main__':
try: