summaryrefslogtreecommitdiff
path: root/src/conf_mode
diff options
context:
space:
mode:
authorThomas Mangin <thomas.mangin@exa.net.uk>2020-03-24 18:34:59 +0000
committerThomas Mangin <thomas.mangin@exa.net.uk>2020-03-24 18:34:59 +0000
commit8ac524b6d12618d696fa883ff78ded8c35c26d05 (patch)
treea7fe1242c79cca0c3f6de8573a72092640f78118 /src/conf_mode
parent1a57edcb8e3052a70296808d394c3d166bcda275 (diff)
downloadvyos-1x-8ac524b6d12618d696fa883ff78ded8c35c26d05.tar.gz
vyos-1x-8ac524b6d12618d696fa883ff78ded8c35c26d05.zip
ifconfig: T2057: convert STP to adapter
Diffstat (limited to 'src/conf_mode')
-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