diff --git a/master/bt5/slapos_slap_tool/TestTemplateItem/testSlapOSSlapTool.py b/master/bt5/slapos_slap_tool/TestTemplateItem/testSlapOSSlapTool.py index 4c4d6dc6548b529827c9168747bdf1bb8c9ab86a..ff1aee5ac539a7e9c297cee4337a83b7bb5b627a 100644 --- a/master/bt5/slapos_slap_tool/TestTemplateItem/testSlapOSSlapTool.py +++ b/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 diff --git a/master/bt5/slapos_slap_tool/bt/revision b/master/bt5/slapos_slap_tool/bt/revision index 978b4e8e518d1242cbf102a1bebdb52e41705102..a5c750feac4168f62cfd29aa62b4624f0a430cd5 100644 --- a/master/bt5/slapos_slap_tool/bt/revision +++ b/master/bt5/slapos_slap_tool/bt/revision @@ -1 +1 @@ -26 \ No newline at end of file +27 \ No newline at end of file diff --git a/master/product/Vifib/Tool/SlapTool.py b/master/product/Vifib/Tool/SlapTool.py index 6d1ab3f7915e2ece68f7ed80a8bc49fcc38f24e0..f32cc1bd1235246f3ad029766076a654d1ba3c7d 100644 --- a/master/product/Vifib/Tool/SlapTool.py +++ b/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,