summaryrefslogtreecommitdiff
path: root/src/conf_mode/interfaces-bridge.py
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2020-03-25 09:57:21 +0100
committerGitHub <noreply@github.com>2020-03-25 09:57:21 +0100
commit6e7739e0b69e1d3371ebe36218604cbb1aca18b1 (patch)
treec745b79a378c75e928931073bfddbf8cc76ca730 /src/conf_mode/interfaces-bridge.py
parent7c4d21639d9594ba4a0d96a5d6d90f25189c2817 (diff)
parentbbea850ea5f8ff0402cd276ab63963ece7e0c763 (diff)
downloadvyos-1x-6e7739e0b69e1d3371ebe36218604cbb1aca18b1.tar.gz
vyos-1x-6e7739e0b69e1d3371ebe36218604cbb1aca18b1.zip
Merge pull request #265 from thomas-mangin/2057-dhcp-vlan
ifconfig: T2057: break down DHCP, add register, STP and VLAN as adapters
Diffstat (limited to 'src/conf_mode/interfaces-bridge.py')
-rwxr-xr-xsrc/conf_mode/interfaces-bridge.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/conf_mode/interfaces-bridge.py b/src/conf_mode/interfaces-bridge.py
index f8f20bf5c..c45ab13a8 100755
--- a/src/conf_mode/interfaces-bridge.py
+++ b/src/conf_mode/interfaces-bridge.py
@@ -20,7 +20,8 @@ from copy import deepcopy
from sys import exit
from netifaces import interfaces
-from vyos.ifconfig import BridgeIf, STPIf
+from vyos.ifconfig import BridgeIf
+from vyos.ifconfig.stp import STP
from vyos.configdict import list_diff
from vyos.config import Config
from vyos import ConfigError
@@ -322,9 +323,10 @@ def apply(bridge):
for addr in bridge['address']:
br.add_addr(addr)
+ STPBridgeIf = STP.enable(BridgeIf)
# configure additional bridge member options
for member in bridge['member']:
- i = STPIf(member['name'])
+ i = STPBridgeIf(member['name'])
# configure ARP cache timeout
i.set_arp_cache_tmo(bridge['arp_cache_tmo'])
# ignore link state changes