summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2019-08-04 21:50:10 +0200
committerChristian Poessinger <christian@poessinger.com>2019-08-04 21:50:10 +0200
commit74cd9b982a3e965d422bce84375f6283088ec593 (patch)
treea0a11962829dae04bb66efdc8997632e20c57e3c /src
parent5b15c162c008958de2be9cba2cbf8f0b65bc6fb9 (diff)
downloadvyos-1x-74cd9b982a3e965d422bce84375f6283088ec593.tar.gz
vyos-1x-74cd9b982a3e965d422bce84375f6283088ec593.zip
[bridge] T1156: rename igmp-snooping node to igmp
Diffstat (limited to 'src')
-rwxr-xr-xsrc/conf_mode/interface-bridge.py4
-rwxr-xr-xsrc/migration-scripts/interfaces/0-to-13
2 files changed, 3 insertions, 4 deletions
diff --git a/src/conf_mode/interface-bridge.py b/src/conf_mode/interface-bridge.py
index 1c9c6ec10..4f1cbd17c 100755
--- a/src/conf_mode/interface-bridge.py
+++ b/src/conf_mode/interface-bridge.py
@@ -121,8 +121,8 @@ def get_config():
if conf.exists('hello-time'):
bridge['hello_time'] = conf.return_value('hello-time')
- # Enable or disable IGMP querier
- if conf.exists('igmp-snooping querier'):
+ # Enable Internet Group Management Protocol (IGMP) querier
+ if conf.exists('igmp querier'):
bridge['igmp_querier'] = 1
# ARP cache entry timeout in seconds
diff --git a/src/migration-scripts/interfaces/0-to-1 b/src/migration-scripts/interfaces/0-to-1
index 1c6119d86..b8e190f2c 100755
--- a/src/migration-scripts/interfaces/0-to-1
+++ b/src/migration-scripts/interfaces/0-to-1
@@ -33,14 +33,13 @@ for br in config.list_nodes(base):
if stp_val == "true":
config.set(base + [br, 'stp'], value=None)
-
# igmp-snooping: check if enabled
igmp_val = config.return_value(base + [br, 'igmp-snooping', 'querier'])
# igmp-snooping: delete node with old syntax
config.delete(base + [br, 'igmp-snooping', 'querier'])
# igmp-snooping: set new node - if enabled
if igmp_val == "enable":
- config.set(base + [br, 'igmp-snooping', 'querier'], value=None)
+ config.set(base + [br, 'igmp', 'querier'], value=None)
#
# move interface based bridge-group to actual bridge (de-nest)