From a63b57d5a52b0cd1a3390d72ec07fb3b08c90f83 Mon Sep 17 00:00:00 2001
From: wkok <wkok@cumulusnetworks.com>
Date: Wed, 10 Feb 2016 20:58:23 -0800
Subject: [PATCH] Disable old LACP bypass options

Ticket: CM-9266
Reviewed-by: trivial
Testing-done:

For now disable old LACP bypass options so that ifreload does
not give errors, as the corresponding sysfs nodes do not exist in
the latest 4.1.y kernel.
---
 addons/bond.py | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/addons/bond.py b/addons/bond.py
index 5f5b490..ae86781 100644
--- a/addons/bond.py
+++ b/addons/bond.py
@@ -82,24 +82,24 @@ class bond(moduleBase):
                          {'help' : 'slave priority for lacp fall back',
                           'compat' : True,
                           'example' : ['bond-lacp-fallback-priority swp1=1 swp2=1 swp3=2']},
-                     'bond-lacp-bypass-allow':
-                         {'help' : 'allow lacp bypass',
-                          'validvals' : ['0', '1'],
-                          'default' : '0',
-                          'example' : ['bond-lacp-bypass-allow 0']},
-                     'bond-lacp-bypass-period':
-                         {'help' : 'grace period (seconds) for lacp bypass',
-                          'validrange' : ['0', '900'],
-                          'default' : '0',
-                          'example' : ['bond-lacp-bypass-period 100']},
-                     'bond-lacp-bypass-priority':
-                         {'help' : 'slave priority for lacp bypass',
-                          'example' : ['bond-lacp-bypass-priority swp1=1 swp2=1 swp3=2']},
-                     'bond-lacp-bypass-all-active':
-                         {'help' : 'allow all slaves to be active in lacp bypass irrespective of priority',
-                          'validvals' : ['0', '1'],
-                          'default' : '0',
-                          'example' : ['bond-lacp-bypass-all-active 1']},
+                     #'bond-lacp-bypass-allow':
+                     #    {'help' : 'allow lacp bypass',
+                     #     'validvals' : ['0', '1'],
+                     #     'default' : '0',
+                     #     'example' : ['bond-lacp-bypass-allow 0']},
+                     #'bond-lacp-bypass-period':
+                     #    {'help' : 'grace period (seconds) for lacp bypass',
+                     #     'validrange' : ['0', '900'],
+                     #     'default' : '0',
+                     #     'example' : ['bond-lacp-bypass-period 100']},
+                     #'bond-lacp-bypass-priority':
+                     #    {'help' : 'slave priority for lacp bypass',
+                     #     'example' : ['bond-lacp-bypass-priority swp1=1 swp2=1 swp3=2']},
+                     #'bond-lacp-bypass-all-active':
+                     #    {'help' : 'allow all slaves to be active in lacp bypass irrespective of priority',
+                     #     'validvals' : ['0', '1'],
+                     #     'default' : '0',
+                     #     'example' : ['bond-lacp-bypass-all-active 1']},
                      'bond-slaves' :
                         {'help' : 'bond slaves',
                          'required' : True,