diff options
| author | Christian Poessinger <christian@poessinger.com> | 2019-08-04 21:50:10 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2019-08-04 21:50:10 +0200 |
| commit | 74cd9b982a3e965d422bce84375f6283088ec593 (patch) | |
| tree | a0a11962829dae04bb66efdc8997632e20c57e3c | |
| parent | 5b15c162c008958de2be9cba2cbf8f0b65bc6fb9 (diff) | |
| download | vyos-1x-74cd9b982a3e965d422bce84375f6283088ec593.tar.gz vyos-1x-74cd9b982a3e965d422bce84375f6283088ec593.zip | |
[bridge] T1156: rename igmp-snooping node to igmp
| -rw-r--r-- | interface-definitions/interfaces-bridge.xml | 6 | ||||
| -rwxr-xr-x | src/conf_mode/interface-bridge.py | 4 | ||||
| -rwxr-xr-x | src/migration-scripts/interfaces/0-to-1 | 3 |
3 files changed, 6 insertions, 7 deletions
diff --git a/interface-definitions/interfaces-bridge.xml b/interface-definitions/interfaces-bridge.xml index af19d9438..16fd8b14c 100644 --- a/interface-definitions/interfaces-bridge.xml +++ b/interface-definitions/interfaces-bridge.xml @@ -139,14 +139,14 @@ <constraintErrorMessage>Bridge Hello interval must be between 1 and 10 seconds</constraintErrorMessage> </properties> </leafNode> - <node name="igmp-snooping"> + <node name="igmp"> <properties> - <help>IGMP snooping settings</help> + <help>Internet Group Management Protocol (IGMP) settings</help> </properties> <children> <leafNode name="querier"> <properties> - <help>Enable or disable IGMP querier</help> + <help>Enable IGMP querier</help> <valueless/> </properties> </leafNode> 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) |