From caa23e5fedbe399cdf30455e250d89878a63f707 Mon Sep 17 00:00:00 2001
From: Sam Tannous <stannous@cumulusnetworks.com>
Date: Mon, 8 Feb 2016 19:43:20 -0500
Subject: [PATCH] ifupdown2 needs to set fdelay before maxage in bridge
 mstpctl.py addon module

Ticket: CM-8725
Reviewed By: roopa
Testing Done: tested with user's config on amd64 platform

When setting mstpctl params from user given fdelay and maxage,
ifreload and ifup is setting maxage before fdelay.

Since there is a check for (Bridge Foward Delay - 1 second) >= Bridge Max Age
fdelay must be set before maxage because the fdelay is a default value.
---
 addons/mstpctl.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mstpctl.py b/addons/mstpctl.py
index aaa7f21..4ceca70 100644
--- a/addons/mstpctl.py
+++ b/addons/mstpctl.py
@@ -153,8 +153,8 @@ class mstpctl(moduleBase):
     # XXX: This can be encoded in the modules dict above
     _attrs_map = OrderedDict([('mstpctl-treeprio' , 'treeprio'),
                   ('mstpctl-ageing' , 'ageing'),
-                  ('mstpctl-maxage' , 'maxage'),
                   ('mstpctl-fdelay' , 'fdelay'),
+                  ('mstpctl-maxage' , 'maxage'),
                   ('mstpctl-maxhops' , 'maxhops'),
                   ('mstpctl-txholdcount' , 'txholdcount'),
                   ('mstpctl-forcevers', 'forcevers'),