Decode slave reference to unicode.

master/bt5/slapos_slap_tool/TestTemplateItem/testSlapOSSlapTool.py

@@ -279,7 +279,7 @@ class TestSlapOSSlapToolComputerAccess(TestSlapOSSlapToolMixin):
                   <string>slap_software_type</string>
                   <unicode>%(slave_1_software_type)s</unicode>
                   <string>slave_reference</string>
-                  <string>%(slave_1_instance_guid)s</string>
+                  <unicode>%(slave_1_instance_guid)s</unicode>
                   <string>slave_title</string>
                   <unicode>%(slave_1_title)s</unicode>
                 </dictionary>
@@ -785,7 +785,7 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin):
                   <string>slap_software_type</string>
                   <unicode>%(slave_1_software_type)s</unicode>
                   <string>slave_reference</string>
-                  <string>%(slave_1_instance_guid)s</string>
+                  <unicode>%(slave_1_instance_guid)s</unicode>
                   <string>slave_title</string>
                   <unicode>%(slave_1_title)s</unicode>
                 </dictionary>
@@ -989,7 +989,7 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin):
             <string>slap_software_type</string>
             <unicode>%(slave_1_software_type)s</unicode>
             <string>slave_reference</string>
-            <string>%(slave_1_instance_guid)s</string>
+            <unicode>%(slave_1_instance_guid)s</unicode>
             <string>slave_title</string>
             <unicode>%(slave_1_title)s</unicode>
           </dictionary>
@@ -1872,7 +1872,7 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSSlapToolMixin):
             <string>slap_software_type</string>
             <unicode>%(slave_1_software_type)s</unicode>
             <string>slave_reference</string>
-            <string>%(slave_1_instance_guid)s</string>
+            <unicode>%(slave_1_instance_guid)s</unicode>
             <string>slave_title</string>
             <unicode>%(slave_1_title)s</unicode>
           </dictionary>
@@ -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)
\ No newline at end of file
+        os.unlink(self.revoke_computer_certificate_simulator)

master/bt5/slapos_slap_tool/bt/revision

-28
\ No newline at end of file
+29
\ No newline at end of file

master/product/Vifib/Tool/SlapTool.py

@@ -1324,7 +1324,7 @@ class SlapTool(BaseTool):
             'slave_title': slave_instance.getTitle().decode("UTF-8"),
             'slap_software_type': \
                 slave_instance.getSourceReference().decode("UTF-8"),
-            'slave_reference': slave_instance.getReference(),
+            'slave_reference': slave_instance.getReference().decode("UTF-8"),
             'xml': slave_instance.getTextContent(),
             'connection_xml': slave_instance.getConnectionXml(),
           })