diff options
| author | Joe Stringer <joe@ovn.org> | 2016-05-23 18:20:26 -0700 |
|---|---|---|
| committer | Joe Stringer <joe@ovn.org> | 2016-06-07 16:18:44 -0700 |
| commit | 8b35f045e18a1d1c9cf10eb214adf6d6f290592d (patch) | |
| tree | f77fa25e73520a6c01618827f13eb9612bd55fef /xenserver | |
| parent | 6dcc2d0bdffddf7db055873a657832afc3ffb232 (diff) | |
| download | openvswitch-8b35f045e18a1d1c9cf10eb214adf6d6f290592d.tar.gz | |
xenserver: Sort vsctl port options.
In python3, dictionaries are less likely to be sorted consistently from
one run to the next, so sort port options when outputting to provide
reliable test results.
Signed-off-by: Joe Stringer <joe@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
Diffstat (limited to 'xenserver')
| -rw-r--r-- | xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py b/xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py index 1379fb462..30fc17669 100644 --- a/xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py +++ b/xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py @@ -206,7 +206,7 @@ def datapath_configure_bond(pif,slaves): argv += ['--', 'set', 'Port', interface] if pifrec['MAC'] != "": argv += ['MAC=%s' % vsctl_escape(pifrec['MAC'])] - for (name,val) in bond_options.items(): + for (name,val) in sorted(bond_options.items()): if name in ['updelay', 'downdelay']: # updelay and downdelay have dedicated schema columns. # The value must be a nonnegative integer. |