summaryrefslogtreecommitdiff
path: root/src/migration-scripts/interfaces/1-to-2
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2019-09-04 15:52:39 +0200
committerChristian Poessinger <christian@poessinger.com>2019-09-04 16:28:18 +0200
commit07ebd7589a961aaa8d4f3099836dd94e4bce2379 (patch)
tree1d2db69237454e438bba1507418ecc026efea4be /src/migration-scripts/interfaces/1-to-2
parent0d156a3947981e71774359b4566ac2af5892abe9 (diff)
downloadvyos-1x-07ebd7589a961aaa8d4f3099836dd94e4bce2379.tar.gz
vyos-1x-07ebd7589a961aaa8d4f3099836dd94e4bce2379.zip
bonding: T1614: T532: new commit validators
As in the past during the priority race of the bash script invalid configuration could appear in the CLI and are de-synced from the kernle state, e.g. some bonding modes do not support arp_interval. This is no longer allowed and added to the migration script so that the config again represents the truth.
Diffstat (limited to 'src/migration-scripts/interfaces/1-to-2')
-rwxr-xr-xsrc/migration-scripts/interfaces/1-to-219
1 files changed, 19 insertions, 0 deletions
diff --git a/src/migration-scripts/interfaces/1-to-2 b/src/migration-scripts/interfaces/1-to-2
index 10d542d1d..050137318 100755
--- a/src/migration-scripts/interfaces/1-to-2
+++ b/src/migration-scripts/interfaces/1-to-2
@@ -36,6 +36,25 @@ else:
# create new bond member interface
config.set(base + [bond, 'member', 'interface'], value=intf, replace=False)
+ #
+ # some combinations were allowed in the past from a CLI perspective
+ # but the kernel overwrote them - remove from CLI to not confuse the users.
+ # In addition new consitency checks are in place so users can't repeat the
+ # mistake. One of those nice issues is https://phabricator.vyos.net/T532
+ for bond in config.list_nodes(base):
+ if config.exists(base + [bond, 'arp-monitor', 'interval']) and config.exists(base + [bond, 'mode']):
+ mode = config.return_value(base + [bond, 'mode'])
+ if mode in ['802.3ad', 'transmit-load-balance', 'adaptive-load-balance']:
+ intvl = int(config.return_value(base + [bond, 'arp-monitor', 'interval']))
+ if intvl > 0:
+ # this is not allowed and the linux kernel replies with:
+ # option arp_interval: mode dependency failed, not supported in mode 802.3ad(4)
+ # option arp_interval: mode dependency failed, not supported in mode balance-alb(6)
+ # option arp_interval: mode dependency failed, not supported in mode balance-tlb(5)
+ #
+ # so we simply disable arp_interval by setting it to 0 and miimon will take care about the link
+ config.set(base + [bond, 'arp-monitor', 'interval'], value='0')
+
try:
with open(file_name, 'w') as f:
f.write(config.to_string())