squash! Synchronise xml2dict and dict2xml

Stabilise generated XMLs by sorting the dictionary.

slapos/tests/test_util.py

@@ -123,14 +123,14 @@ class TestUtil(unittest.TestCase):
   xml2dict_xml = slapos.util.bytes2str(b"""<?xml version='1.0' encoding='utf-8'?>
 <instance>
   <parameter id="badstr">\xc5\x81</parameter>
+  <parameter id="badu">\xc5\x81</parameter>
+  <parameter id="emptystr"></parameter>
+  <parameter id="int">1</parameter>
   <parameter id="intstr">1</parameter>
   <parameter id="key">str</parameter>
-  <parameter id="ukey">ustr</parameter>
-  <parameter id="int">1</parameter>
   <parameter id="list">[\'one\', 2]</parameter>
-  <parameter id="emptystr"></parameter>
   <parameter id="none">None</parameter>
-  <parameter id="badu">\xc5\x81</parameter>
+  <parameter id="ukey">ustr</parameter>
 </instance>
 """)
 

slapos/util.py

@@ -153,7 +153,7 @@ else:
 
 def dict2xml(dictionary):
   instance = etree.Element('instance')
-  for k, v in six.iteritems(dictionary):
+  for k, v in sorted(six.iteritems(dictionary)):
     if isinstance(k, bytes):
       k = k.decode('utf-8')
     if isinstance(v, bytes):