Fix encoding usage in setConnectionXml

master/bt5/slapos_slap_tool/TestTemplateItem/testSlapOSSlapTool.py

@@ -1152,16 +1152,16 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin):
     slave_reference = self.start_requested_slave_instance.getReference()
     connection_xml = """<marshal>
   <dictionary id="i2">
-    <string>p1</string>
-    <string>v1</string>
-    <string>p2</string>
-    <string>v2</string>
+    <unicode>p1é</unicode>
+    <unicode>v1é</unicode>
+    <unicode>p2é</unicode>
+    <unicode>v2é</unicode>
   </dictionary>
 </marshal>"""
     stored_xml = """<?xml version='1.0' encoding='utf-8'?>
 <instance>
-  <parameter id="p2">v2</parameter>
-  <parameter id="p1">v1</parameter>
+  <parameter id="p1é">v1é</parameter>
+  <parameter id="p2é">v2é</parameter>
 </instance>
 """
     self.login(self.start_requested_software_instance.getReference())
@@ -1185,16 +1185,16 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin):
         portal_type='Computer Partition').getReference()
     connection_xml = """<marshal>
   <dictionary id="i2">
-    <string>p1</string>
-    <string>v1</string>
-    <string>p2</string>
-    <string>v2</string>
+    <unicode>p1é</unicode>
+    <unicode>v1é</unicode>
+    <unicode>p2é</unicode>
+    <unicode>v2é</unicode>
   </dictionary>
 </marshal>"""
     stored_xml = """<?xml version='1.0' encoding='utf-8'?>
 <instance>
-  <parameter id="p2">v2</parameter>
-  <parameter id="p1">v1</parameter>
+  <parameter id="p1é">v1é</parameter>
+  <parameter id="p2é">v2é</parameter>
 </instance>
 """
     self.login(self.start_requested_software_instance.getReference())
@@ -2390,4 +2390,4 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSSlapToolMixin):
       self.assertRevokeComputerCertificateSimulator((), {})
     finally:
       if os.path.exists(self.revoke_computer_certificate_simulator):
-        os.unlink(self.revoke_computer_certificate_simulator)
+        os.unlink(self.revoke_computer_certificate_simulator)
\ No newline at end of file

master/bt5/slapos_slap_tool/bt/revision

-26
+27
\ No newline at end of file

master/product/Vifib/Tool/SlapTool.py

@@ -1047,8 +1047,6 @@ class SlapTool(BaseTool):
                                               connection_xml)
     instance = etree.Element('instance')
     for parameter_id, parameter_value in partition_parameter_kw.iteritems():
-      # cast everything to string
-      parameter_value = str(parameter_value)
       etree.SubElement(instance, "parameter",
                        attrib={'id':parameter_id}).text = parameter_value
     connection_xml = etree.tostring(instance, pretty_print=True,