1292c1292,1294
< return all.keys(), True
---
> # Also make sure to sort the keys based on the objects' path to
> # ensure that the order is the same on all hosts
> return sorted(all.keys(), key = lambda o: o.path()), True
1440c1442,1445
< for child in self._children.itervalues():
---
> # The order of the dict is implementation dependent, so sort
> # it based on the key (name) to ensure the order is the same
> # on all hosts
> for (name, child) in sorted(self._children.iteritems()):
1455c1460,1462
< for portRef in self._port_refs.itervalues():
---
> # Sort the ports based on their attribute name to ensure the
> # order is the same on all hosts
> for (attr, portRef) in sorted(self._port_refs.iteritems()):