Skip to content

S
slapos.core
Commit 3de0ab52 authored by Romain Courteaud's avatar Romain Courteaud
Browse files
Options

Support non ASCII character in slaptool. 

xml_marshaller requires unicode string.
parent 38525388
Show whitespace changes
Inline Side-by-side
Showing with 248 additions and 228 deletions
master/bt5/slapos_cloud/DocumentTemplateItem/SoftwareInstance.py
View file @ 3de0ab52
...@@ -55,7 +55,7 @@ class SoftwareInstance(Item): ...@@ -55,7 +55,7 @@ class SoftwareInstance(Item):
if xml is None or xml == '': if xml is None or xml == '':
return result_dict return result_dict
tree = etree.fromstring(xml.encode('utf-8')) tree = etree.fromstring(xml)
for element in tree.findall('parameter'): for element in tree.findall('parameter'):
key = element.get('id') key = element.get('id')
......
master/bt5/slapos_cloud/bt/revision
View file @ 3de0ab52
278 279
\ No newline at end of file \ No newline at end of file
master/bt5/slapos_slap_tool/TestTemplateItem/testSlapOSSlapTool.py
View file @ 3de0ab52
# -*- coding: utf-8 -*-
# Copyright (c) 2002-2012 Nexedi SA and Contributors. All Rights Reserved. # Copyright (c) 2002-2012 Nexedi SA and Contributors. All Rights Reserved.
from Products.SlapOS.tests.testSlapOSMixin import \ from Products.SlapOS.tests.testSlapOSMixin import \
testSlapOSMixin testSlapOSMixin
...@@ -88,25 +89,25 @@ class TestSlapOSSlapToolComputerAccess(TestSlapOSSlapToolMixin): ...@@ -88,25 +89,25 @@ class TestSlapOSSlapToolComputerAccess(TestSlapOSSlapToolMixin):
<marshal> <marshal>
<object id='i2' module='slapos.slap.slap' class='Computer'> <object id='i2' module='slapos.slap.slap' class='Computer'>
<tuple> <tuple>
<string>%(computer_id)s</string> <unicode>%(computer_id)s</unicode>
</tuple> </tuple>
<dictionary id='i3'> <dictionary id='i3'>
<string>_computer_id</string> <string>_computer_id</string>
<string>%(computer_id)s</string> <unicode>%(computer_id)s</unicode>
<string>_computer_partition_list</string> <string>_computer_partition_list</string>
<list id='i4'> <list id='i4'>
<object id='i5' module='slapos.slap.slap' class='ComputerPartition'> <object id='i5' module='slapos.slap.slap' class='ComputerPartition'>
<tuple> <tuple>
<string>%(computer_id)s</string> <unicode>%(computer_id)s</unicode>
<string>partition4</string> <unicode>partition4</unicode>
</tuple> </tuple>
<dictionary id='i6'> <dictionary id='i6'>
<string>_computer_id</string> <string>_computer_id</string>
<string>%(computer_id)s</string> <unicode>%(computer_id)s</unicode>
<string>_need_modification</string> <string>_need_modification</string>
<int>0</int> <int>0</int>
<string>_partition_id</string> <string>_partition_id</string>
<string>partition4</string> <unicode>partition4</unicode>
<string>_request_dict</string> <string>_request_dict</string>
<none/> <none/>
<string>_requested_state</string> <string>_requested_state</string>
...@@ -117,12 +118,12 @@ class TestSlapOSSlapToolComputerAccess(TestSlapOSSlapToolMixin): ...@@ -117,12 +118,12 @@ class TestSlapOSSlapToolComputerAccess(TestSlapOSSlapToolMixin):
</object> </object>
<object id='i7' module='slapos.slap.slap' class='ComputerPartition'> <object id='i7' module='slapos.slap.slap' class='ComputerPartition'>
<tuple> <tuple>
<string>%(computer_id)s</string> <unicode>%(computer_id)s</unicode>
<string>partition3</string> <unicode>partition3</unicode>
</tuple> </tuple>
<dictionary id='i8'> <dictionary id='i8'>
<string>_computer_id</string> <string>_computer_id</string>
<string>%(computer_id)s</string> <unicode>%(computer_id)s</unicode>
<string>_connection_dict</string> <string>_connection_dict</string>
<dictionary id='i9'/> <dictionary id='i9'/>
<string>_instance_guid</string> <string>_instance_guid</string>
...@@ -134,27 +135,27 @@ class TestSlapOSSlapToolComputerAccess(TestSlapOSSlapToolMixin): ...@@ -134,27 +135,27 @@ class TestSlapOSSlapToolComputerAccess(TestSlapOSSlapToolMixin):
<string>ip_list</string> <string>ip_list</string>
<list id='i11'> <list id='i11'>
<tuple> <tuple>
<string/> <unicode/>
<string>ip_address_3</string> <unicode>ip_address_3</unicode>
</tuple> </tuple>
</list> </list>
<string>param</string> <unicode>paramé</unicode>
<string>%(partition_3_param)s</string> <unicode>%(partition_3_param)s</unicode>
<string>slap_computer_id</string> <string>slap_computer_id</string>
<string>%(computer_id)s</string> <unicode>%(computer_id)s</unicode>
<string>slap_computer_partition_id</string> <string>slap_computer_partition_id</string>
<string>partition3</string> <unicode>partition3</unicode>
<string>slap_software_release_url</string> <string>slap_software_release_url</string>
<string>%(partition_3_software_release_url)s</string> <unicode>%(partition_3_software_release_url)s</unicode>
<string>slap_software_type</string> <string>slap_software_type</string>
<string>%(partition_3_instance_software_type)s</string> <unicode>%(partition_3_instance_software_type)s</unicode>
<string>slave_instance_list</string> <string>slave_instance_list</string>
<list id='i12'/> <list id='i12'/>
<string>timestamp</string> <string>timestamp</string>
<string>%(partition_3_timestamp)s</string> <string>%(partition_3_timestamp)s</string>
</dictionary> </dictionary>
<string>_partition_id</string> <string>_partition_id</string>
<string>partition3</string> <unicode>partition3</unicode>
<string>_request_dict</string> <string>_request_dict</string>
<none/> <none/>
<string>_requested_state</string> <string>_requested_state</string>
...@@ -162,28 +163,28 @@ class TestSlapOSSlapToolComputerAccess(TestSlapOSSlapToolMixin): ...@@ -162,28 +163,28 @@ class TestSlapOSSlapToolComputerAccess(TestSlapOSSlapToolMixin):
<string>_software_release_document</string> <string>_software_release_document</string>
<object id='i13' module='slapos.slap.slap' class='SoftwareRelease'> <object id='i13' module='slapos.slap.slap' class='SoftwareRelease'>
<tuple> <tuple>
<string>%(partition_3_software_release_url)s</string> <unicode>%(partition_3_software_release_url)s</unicode>
<string>%(computer_id)s</string> <unicode>%(computer_id)s</unicode>
</tuple> </tuple>
<dictionary id='i14'> <dictionary id='i14'>
<string>_computer_guid</string> <string>_computer_guid</string>
<string>%(computer_id)s</string> <unicode>%(computer_id)s</unicode>
<string>_software_instance_list</string> <string>_software_instance_list</string>
<list id='i15'/> <list id='i15'/>
<string>_software_release</string> <string>_software_release</string>
<string>%(partition_3_software_release_url)s</string> <unicode>%(partition_3_software_release_url)s</unicode>
</dictionary> </dictionary>
</object> </object>
</dictionary> </dictionary>
</object> </object>
<object id='i16' module='slapos.slap.slap' class='ComputerPartition'> <object id='i16' module='slapos.slap.slap' class='ComputerPartition'>
<tuple> <tuple>
<string>%(computer_id)s</string> <unicode>%(computer_id)s</unicode>
<string>partition2</string> <unicode>partition2</unicode>
</tuple> </tuple>
<dictionary id='i17'> <dictionary id='i17'>
<string>_computer_id</string> <string>_computer_id</string>
<string>%(computer_id)s</string> <unicode>%(computer_id)s</unicode>
<string>_connection_dict</string> <string>_connection_dict</string>
<dictionary id='i18'/> <dictionary id='i18'/>
<string>_instance_guid</string> <string>_instance_guid</string>
...@@ -195,27 +196,27 @@ class TestSlapOSSlapToolComputerAccess(TestSlapOSSlapToolMixin): ...@@ -195,27 +196,27 @@ class TestSlapOSSlapToolComputerAccess(TestSlapOSSlapToolMixin):
<string>ip_list</string> <string>ip_list</string>
<list id='i20'> <list id='i20'>
<tuple> <tuple>
<string/> <unicode/>
<string>ip_address_2</string> <unicode>ip_address_2</unicode>
</tuple> </tuple>
</list> </list>
<string>param</string> <unicode>paramé</unicode>
<string>%(partition_2_param)s</string> <unicode>%(partition_2_param)s</unicode>
<string>slap_computer_id</string> <string>slap_computer_id</string>
<string>%(computer_id)s</string> <unicode>%(computer_id)s</unicode>
<string>slap_computer_partition_id</string> <string>slap_computer_partition_id</string>
<string>partition2</string> <unicode>partition2</unicode>
<string>slap_software_release_url</string> <string>slap_software_release_url</string>
<string>%(partition_2_software_release_url)s</string> <unicode>%(partition_2_software_release_url)s</unicode>
<string>slap_software_type</string> <string>slap_software_type</string>
<string>%(partition_2_instance_software_type)s</string> <unicode>%(partition_2_instance_software_type)s</unicode>
<string>slave_instance_list</string> <string>slave_instance_list</string>
<list id='i21'/> <list id='i21'/>
<string>timestamp</string> <string>timestamp</string>
<string>%(partition_2_timestamp)s</string> <string>%(partition_2_timestamp)s</string>
</dictionary> </dictionary>
<string>_partition_id</string> <string>_partition_id</string>
<string>partition2</string> <unicode>partition2</unicode>
<string>_request_dict</string> <string>_request_dict</string>
<none/> <none/>
<string>_requested_state</string> <string>_requested_state</string>
...@@ -223,28 +224,28 @@ class TestSlapOSSlapToolComputerAccess(TestSlapOSSlapToolMixin): ...@@ -223,28 +224,28 @@ class TestSlapOSSlapToolComputerAccess(TestSlapOSSlapToolMixin):
<string>_software_release_document</string> <string>_software_release_document</string>
<object id='i22' module='slapos.slap.slap' class='SoftwareRelease'> <object id='i22' module='slapos.slap.slap' class='SoftwareRelease'>
<tuple> <tuple>
<string>%(partition_2_software_release_url)s</string> <unicode>%(partition_2_software_release_url)s</unicode>
<string>%(computer_id)s</string> <unicode>%(computer_id)s</unicode>
</tuple> </tuple>
<dictionary id='i23'> <dictionary id='i23'>
<string>_computer_guid</string> <string>_computer_guid</string>
<string>%(computer_id)s</string> <unicode>%(computer_id)s</unicode>
<string>_software_instance_list</string> <string>_software_instance_list</string>
<list id='i24'/> <list id='i24'/>
<string>_software_release</string> <string>_software_release</string>
<string>%(partition_2_software_release_url)s</string> <unicode>%(partition_2_software_release_url)s</unicode>
</dictionary> </dictionary>
</object> </object>
</dictionary> </dictionary>
</object> </object>
<object id='i25' module='slapos.slap.slap' class='ComputerPartition'> <object id='i25' module='slapos.slap.slap' class='ComputerPartition'>
<tuple> <tuple>
<string>%(computer_id)s</string> <unicode>%(computer_id)s</unicode>
<string>partition1</string> <unicode>partition1</unicode>
</tuple> </tuple>
<dictionary id='i26'> <dictionary id='i26'>
<string>_computer_id</string> <string>_computer_id</string>
<string>%(computer_id)s</string> <unicode>%(computer_id)s</unicode>
<string>_connection_dict</string> <string>_connection_dict</string>
<dictionary id='i27'/> <dictionary id='i27'/>
<string>_instance_guid</string> <string>_instance_guid</string>
...@@ -256,38 +257,38 @@ class TestSlapOSSlapToolComputerAccess(TestSlapOSSlapToolMixin): ...@@ -256,38 +257,38 @@ class TestSlapOSSlapToolComputerAccess(TestSlapOSSlapToolMixin):
<string>ip_list</string> <string>ip_list</string>
<list id='i29'> <list id='i29'>
<tuple> <tuple>
<string/> <unicode/>
<string>ip_address_1</string> <unicode>ip_address_1</unicode>
</tuple> </tuple>
</list> </list>
<string>param</string> <unicode>paramé</unicode>
<string>%(partition_1_param)s</string> <unicode>%(partition_1_param)s</unicode>
<string>slap_computer_id</string> <string>slap_computer_id</string>
<string>%(computer_id)s</string> <unicode>%(computer_id)s</unicode>
<string>slap_computer_partition_id</string> <string>slap_computer_partition_id</string>
<string>partition1</string> <unicode>partition1</unicode>
<string>slap_software_release_url</string> <string>slap_software_release_url</string>
<string>%(partition_1_software_release_url)s</string> <unicode>%(partition_1_software_release_url)s</unicode>
<string>slap_software_type</string> <string>slap_software_type</string>
<string>%(partition_1_instance_software_type)s</string> <unicode>%(partition_1_instance_software_type)s</unicode>
<string>slave_instance_list</string> <string>slave_instance_list</string>
<list id='i30'> <list id='i30'>
<dictionary id='i31'> <dictionary id='i31'>
<string>param</string> <unicode>paramé</unicode>
<string>%(slave_1_param)s</string> <unicode>%(slave_1_param)s</unicode>
<string>slap_software_type</string> <string>slap_software_type</string>
<string>%(slave_1_software_type)s</string> <unicode>%(slave_1_software_type)s</unicode>
<string>slave_reference</string> <string>slave_reference</string>
<string>%(slave_1_instance_guid)s</string> <string>%(slave_1_instance_guid)s</string>
<string>slave_title</string> <string>slave_title</string>
<string>%(slave_1_title)s</string> <unicode>%(slave_1_title)s</unicode>
</dictionary> </dictionary>
</list> </list>
<string>timestamp</string> <string>timestamp</string>
<string>%(partition_1_timestamp)s</string> <string>%(partition_1_timestamp)s</string>
</dictionary> </dictionary>
<string>_partition_id</string> <string>_partition_id</string>
<string>partition1</string> <unicode>partition1</unicode>
<string>_request_dict</string> <string>_request_dict</string>
<none/> <none/>
<string>_requested_state</string> <string>_requested_state</string>
...@@ -295,16 +296,16 @@ class TestSlapOSSlapToolComputerAccess(TestSlapOSSlapToolMixin): ...@@ -295,16 +296,16 @@ class TestSlapOSSlapToolComputerAccess(TestSlapOSSlapToolMixin):
<string>_software_release_document</string> <string>_software_release_document</string>
<object id='i32' module='slapos.slap.slap' class='SoftwareRelease'> <object id='i32' module='slapos.slap.slap' class='SoftwareRelease'>
<tuple> <tuple>
<string>%(partition_1_software_release_url)s</string> <unicode>%(partition_1_software_release_url)s</unicode>
<string>%(computer_id)s</string> <unicode>%(computer_id)s</unicode>
</tuple> </tuple>
<dictionary id='i33'> <dictionary id='i33'>
<string>_computer_guid</string> <string>_computer_guid</string>
<string>%(computer_id)s</string> <unicode>%(computer_id)s</unicode>
<string>_software_instance_list</string> <string>_software_instance_list</string>
<list id='i34'/> <list id='i34'/>
<string>_software_release</string> <string>_software_release</string>
<string>%(partition_1_software_release_url)s</string> <unicode>%(partition_1_software_release_url)s</unicode>
</dictionary> </dictionary>
</object> </object>
</dictionary> </dictionary>
...@@ -314,34 +315,34 @@ class TestSlapOSSlapToolComputerAccess(TestSlapOSSlapToolMixin): ...@@ -314,34 +315,34 @@ class TestSlapOSSlapToolComputerAccess(TestSlapOSSlapToolMixin):
<list id='i35'> <list id='i35'>
<object id='i36' module='slapos.slap.slap' class='SoftwareRelease'> <object id='i36' module='slapos.slap.slap' class='SoftwareRelease'>
<tuple> <tuple>
<string>%(destroy_requested_url)s</string> <unicode>%(destroy_requested_url)s</unicode>
<string>%(computer_id)s</string> <unicode>%(computer_id)s</unicode>
</tuple> </tuple>
<dictionary id='i37'> <dictionary id='i37'>
<string>_computer_guid</string> <string>_computer_guid</string>
<string>%(computer_id)s</string> <unicode>%(computer_id)s</unicode>
<string>_requested_state</string> <string>_requested_state</string>
<string>destroyed</string> <string>destroyed</string>
<string>_software_instance_list</string> <string>_software_instance_list</string>
<list id='i38'/> <list id='i38'/>
<string>_software_release</string> <string>_software_release</string>
<string>%(destroy_requested_url)s</string> <unicode>%(destroy_requested_url)s</unicode>
</dictionary> </dictionary>
</object> </object>
<object id='i39' module='slapos.slap.slap' class='SoftwareRelease'> <object id='i39' module='slapos.slap.slap' class='SoftwareRelease'>
<tuple> <tuple>
<string>%(start_requested_url)s</string> <unicode>%(start_requested_url)s</unicode>
<string>%(computer_id)s</string> <unicode>%(computer_id)s</unicode>
</tuple> </tuple>
<dictionary id='i40'> <dictionary id='i40'>
<string>_computer_guid</string> <string>_computer_guid</string>
<string>%(computer_id)s</string> <unicode>%(computer_id)s</unicode>
<string>_requested_state</string> <string>_requested_state</string>
<string>available</string> <string>available</string>
<string>_software_instance_list</string> <string>_software_instance_list</string>
<list id='i41'/> <list id='i41'/>
<string>_software_release</string> <string>_software_release</string>
<string>%(start_requested_url)s</string> <unicode>%(start_requested_url)s</unicode>
</dictionary> </dictionary>
</object> </object>
</list> </list>
...@@ -353,20 +354,20 @@ class TestSlapOSSlapToolComputerAccess(TestSlapOSSlapToolMixin): ...@@ -353,20 +354,20 @@ class TestSlapOSSlapToolComputerAccess(TestSlapOSSlapToolMixin):
destroy_requested_url=self.destroy_requested_software_installation.getUrlString(), destroy_requested_url=self.destroy_requested_software_installation.getUrlString(),
partition_1_instance_guid=self.computer.partition1.getAggregateRelatedValue(portal_type='Software Instance').getReference(), partition_1_instance_guid=self.computer.partition1.getAggregateRelatedValue(portal_type='Software Instance').getReference(),
partition_1_instance_software_type=self.computer.partition1.getAggregateRelatedValue(portal_type='Software Instance').getSourceReference(), partition_1_instance_software_type=self.computer.partition1.getAggregateRelatedValue(portal_type='Software Instance').getSourceReference(),
partition_1_param=self.computer.partition1.getAggregateRelatedValue(portal_type='Software Instance').getInstanceXmlAsDict()['param'], partition_1_param=self.computer.partition1.getAggregateRelatedValue(portal_type='Software Instance').getInstanceXmlAsDict()['paramé'.decode("UTF-8")].encode("UTF-8"),
partition_1_software_release_url=self.computer.partition1.getAggregateRelatedValue(portal_type='Software Instance').getUrlString(), partition_1_software_release_url=self.computer.partition1.getAggregateRelatedValue(portal_type='Software Instance').getUrlString(),
partition_1_timestamp=int(self.computer.partition1.getAggregateRelatedValue(portal_type='Software Instance').getModificationDate()), partition_1_timestamp=int(self.computer.partition1.getAggregateRelatedValue(portal_type='Software Instance').getModificationDate()),
partition_2_instance_guid=self.computer.partition2.getAggregateRelatedValue(portal_type='Software Instance').getReference(), partition_2_instance_guid=self.computer.partition2.getAggregateRelatedValue(portal_type='Software Instance').getReference(),
partition_2_instance_software_type=self.computer.partition2.getAggregateRelatedValue(portal_type='Software Instance').getSourceReference(), partition_2_instance_software_type=self.computer.partition2.getAggregateRelatedValue(portal_type='Software Instance').getSourceReference(),
partition_2_param=self.computer.partition2.getAggregateRelatedValue(portal_type='Software Instance').getInstanceXmlAsDict()['param'], partition_2_param=self.computer.partition2.getAggregateRelatedValue(portal_type='Software Instance').getInstanceXmlAsDict()['paramé'.decode("UTF-8")].encode("UTF-8"),
partition_2_software_release_url=self.computer.partition2.getAggregateRelatedValue(portal_type='Software Instance').getUrlString(), partition_2_software_release_url=self.computer.partition2.getAggregateRelatedValue(portal_type='Software Instance').getUrlString(),
partition_2_timestamp=int(self.computer.partition2.getAggregateRelatedValue(portal_type='Software Instance').getModificationDate()), partition_2_timestamp=int(self.computer.partition2.getAggregateRelatedValue(portal_type='Software Instance').getModificationDate()),
partition_3_instance_guid=self.computer.partition3.getAggregateRelatedValue(portal_type='Software Instance').getReference(), partition_3_instance_guid=self.computer.partition3.getAggregateRelatedValue(portal_type='Software Instance').getReference(),
partition_3_instance_software_type=self.computer.partition3.getAggregateRelatedValue(portal_type='Software Instance').getSourceReference(), partition_3_instance_software_type=self.computer.partition3.getAggregateRelatedValue(portal_type='Software Instance').getSourceReference(),
partition_3_param=self.computer.partition3.getAggregateRelatedValue(portal_type='Software Instance').getInstanceXmlAsDict()['param'], partition_3_param=self.computer.partition3.getAggregateRelatedValue(portal_type='Software Instance').getInstanceXmlAsDict()['paramé'.decode("UTF-8")].encode("UTF-8"),
partition_3_software_release_url=self.computer.partition3.getAggregateRelatedValue(portal_type='Software Instance').getUrlString(), partition_3_software_release_url=self.computer.partition3.getAggregateRelatedValue(portal_type='Software Instance').getUrlString(),
partition_3_timestamp=int(self.computer.partition3.getAggregateRelatedValue(portal_type='Software Instance').getModificationDate()), partition_3_timestamp=int(self.computer.partition3.getAggregateRelatedValue(portal_type='Software Instance').getModificationDate()),
slave_1_param=self.start_requested_slave_instance.getInstanceXmlAsDict()['param'], slave_1_param=self.start_requested_slave_instance.getInstanceXmlAsDict()['paramé'.decode("UTF-8")].encode("UTF-8"),
slave_1_software_type=self.start_requested_slave_instance.getSourceReference(), slave_1_software_type=self.start_requested_slave_instance.getSourceReference(),
slave_1_instance_guid=self.start_requested_slave_instance.getReference(), slave_1_instance_guid=self.start_requested_slave_instance.getReference(),
slave_1_title=self.start_requested_slave_instance.getTitle(), slave_1_title=self.start_requested_slave_instance.getTitle(),
...@@ -406,9 +407,9 @@ class TestSlapOSSlapToolComputerAccess(TestSlapOSSlapToolMixin): ...@@ -406,9 +407,9 @@ class TestSlapOSSlapToolComputerAccess(TestSlapOSSlapToolMixin):
<string>created_at</string> <string>created_at</string>
<string>%(created_at)s</string> <string>%(created_at)s</string>
<string>text</string> <string>text</string>
<string>#error no data found for %(computer_id)s</string> <unicode>#error no data found for %(computer_id)s</unicode>
<string>user</string> <string>user</string>
<string>SlapOS Master</string> <unicode>SlapOS Master</unicode>
</dictionary> </dictionary>
</marshal> </marshal>
""" % dict( """ % dict(
...@@ -736,21 +737,21 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin): ...@@ -736,21 +737,21 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin):
<marshal> <marshal>
<object id='i2' module='slapos.slap.slap' class='Computer'> <object id='i2' module='slapos.slap.slap' class='Computer'>
<tuple> <tuple>
<string>%(computer_id)s</string> <unicode>%(computer_id)s</unicode>
</tuple> </tuple>
<dictionary id='i3'> <dictionary id='i3'>
<string>_computer_id</string> <string>_computer_id</string>
<string>%(computer_id)s</string> <unicode>%(computer_id)s</unicode>
<string>_computer_partition_list</string> <string>_computer_partition_list</string>
<list id='i4'> <list id='i4'>
<object id='i5' module='slapos.slap.slap' class='ComputerPartition'> <object id='i5' module='slapos.slap.slap' class='ComputerPartition'>
<tuple> <tuple>
<string>%(computer_id)s</string> <unicode>%(computer_id)s</unicode>
<string>partition1</string> <unicode>partition1</unicode>
</tuple> </tuple>
<dictionary id='i6'> <dictionary id='i6'>
<string>_computer_id</string> <string>_computer_id</string>
<string>%(computer_id)s</string> <unicode>%(computer_id)s</unicode>
<string>_connection_dict</string> <string>_connection_dict</string>
<dictionary id='i7'/> <dictionary id='i7'/>
<string>_instance_guid</string> <string>_instance_guid</string>
...@@ -762,38 +763,38 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin): ...@@ -762,38 +763,38 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin):
<string>ip_list</string> <string>ip_list</string>
<list id='i9'> <list id='i9'>
<tuple> <tuple>
<string/> <unicode/>
<string>ip_address_1</string> <unicode>ip_address_1</unicode>
</tuple> </tuple>
</list> </list>
<string>param</string> <unicode>paramé</unicode>
<string>%(param)s</string> <unicode>%(param)s</unicode>
<string>slap_computer_id</string> <string>slap_computer_id</string>
<string>%(computer_id)s</string> <unicode>%(computer_id)s</unicode>
<string>slap_computer_partition_id</string> <string>slap_computer_partition_id</string>
<string>partition1</string> <unicode>partition1</unicode>
<string>slap_software_release_url</string> <string>slap_software_release_url</string>
<string>%(software_release_url)s</string> <unicode>%(software_release_url)s</unicode>
<string>slap_software_type</string> <string>slap_software_type</string>
<string>%(software_type)s</string> <unicode>%(software_type)s</unicode>
<string>slave_instance_list</string> <string>slave_instance_list</string>
<list id='i10'> <list id='i10'>
<dictionary id='i11'> <dictionary id='i11'>
<string>param</string> <unicode>paramé</unicode>
<string>%(slave_1_param)s</string> <unicode>%(slave_1_param)s</unicode>
<string>slap_software_type</string> <string>slap_software_type</string>
<string>%(slave_1_software_type)s</string> <unicode>%(slave_1_software_type)s</unicode>
<string>slave_reference</string> <string>slave_reference</string>
<string>%(slave_1_instance_guid)s</string> <string>%(slave_1_instance_guid)s</string>
<string>slave_title</string> <string>slave_title</string>
<string>%(slave_1_title)s</string> <unicode>%(slave_1_title)s</unicode>
</dictionary> </dictionary>
</list> </list>
<string>timestamp</string> <string>timestamp</string>
<string>%(timestamp)s</string> <string>%(timestamp)s</string>
</dictionary> </dictionary>
<string>_partition_id</string> <string>_partition_id</string>
<string>partition1</string> <unicode>partition1</unicode>
<string>_request_dict</string> <string>_request_dict</string>
<none/> <none/>
<string>_requested_state</string> <string>_requested_state</string>
...@@ -801,16 +802,16 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin): ...@@ -801,16 +802,16 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin):
<string>_software_release_document</string> <string>_software_release_document</string>
<object id='i12' module='slapos.slap.slap' class='SoftwareRelease'> <object id='i12' module='slapos.slap.slap' class='SoftwareRelease'>
<tuple> <tuple>
<string>%(software_release_url)s</string> <unicode>%(software_release_url)s</unicode>
<string>%(computer_id)s</string> <unicode>%(computer_id)s</unicode>
</tuple> </tuple>
<dictionary id='i13'> <dictionary id='i13'>
<string>_computer_guid</string> <string>_computer_guid</string>
<string>%(computer_id)s</string> <unicode>%(computer_id)s</unicode>
<string>_software_instance_list</string> <string>_software_instance_list</string>
<list id='i14'/> <list id='i14'/>
<string>_software_release</string> <string>_software_release</string>
<string>%(software_release_url)s</string> <unicode>%(software_release_url)s</unicode>
</dictionary> </dictionary>
</object> </object>
</dictionary> </dictionary>
...@@ -826,9 +827,9 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin): ...@@ -826,9 +827,9 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin):
instance_guid=self.start_requested_software_instance.getReference(), instance_guid=self.start_requested_software_instance.getReference(),
software_release_url=self.start_requested_software_instance.getUrlString(), software_release_url=self.start_requested_software_instance.getUrlString(),
software_type=self.start_requested_software_instance.getSourceReference(), software_type=self.start_requested_software_instance.getSourceReference(),
param=self.start_requested_software_instance.getInstanceXmlAsDict()['param'], param=self.start_requested_software_instance.getInstanceXmlAsDict()['paramé'.decode("UTF-8")].encode("UTF-8"),
timestamp=int(self.start_requested_software_instance.getModificationDate()), timestamp=int(self.start_requested_software_instance.getModificationDate()),
slave_1_param=self.start_requested_slave_instance.getInstanceXmlAsDict()['param'], slave_1_param=self.start_requested_slave_instance.getInstanceXmlAsDict()['paramé'.decode("UTF-8")].encode("UTF-8"),
slave_1_software_type=self.start_requested_slave_instance.getSourceReference(), slave_1_software_type=self.start_requested_slave_instance.getSourceReference(),
slave_1_instance_guid=self.start_requested_slave_instance.getReference(), slave_1_instance_guid=self.start_requested_slave_instance.getReference(),
slave_1_title=self.start_requested_slave_instance.getTitle(), slave_1_title=self.start_requested_slave_instance.getTitle(),
...@@ -866,9 +867,9 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin): ...@@ -866,9 +867,9 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin):
<string>created_at</string> <string>created_at</string>
<string>%(created_at)s</string> <string>%(created_at)s</string>
<string>text</string> <string>text</string>
<string>#error no data found for %(instance_guid)s</string> <unicode>#error no data found for %(instance_guid)s</unicode>
<string>user</string> <string>user</string>
<string>SlapOS Master</string> <unicode>SlapOS Master</unicode>
</dictionary> </dictionary>
</marshal> </marshal>
""" % dict( """ % dict(
...@@ -909,9 +910,9 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin): ...@@ -909,9 +910,9 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin):
<string>created_at</string> <string>created_at</string>
<string>%(created_at)s</string> <string>%(created_at)s</string>
<string>text</string> <string>text</string>
<string>#error no data found for %(instance_guid)s</string> <unicode>#error no data found for %(instance_guid)s</unicode>
<string>user</string> <string>user</string>
<string>SlapOS Master</string> <unicode>SlapOS Master</unicode>
</dictionary> </dictionary>
</marshal> </marshal>
""" % dict( """ % dict(
...@@ -949,12 +950,12 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin): ...@@ -949,12 +950,12 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin):
<marshal> <marshal>
<object id='i2' module='slapos.slap.slap' class='ComputerPartition'> <object id='i2' module='slapos.slap.slap' class='ComputerPartition'>
<tuple> <tuple>
<string>%(computer_id)s</string> <unicode>%(computer_id)s</unicode>
<string>partition1</string> <unicode>partition1</unicode>
</tuple> </tuple>
<dictionary id='i3'> <dictionary id='i3'>
<string>_computer_id</string> <string>_computer_id</string>
<string>%(computer_id)s</string> <unicode>%(computer_id)s</unicode>
<string>_connection_dict</string> <string>_connection_dict</string>
<dictionary id='i4'/> <dictionary id='i4'/>
<string>_instance_guid</string> <string>_instance_guid</string>
...@@ -966,38 +967,38 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin): ...@@ -966,38 +967,38 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin):
<string>ip_list</string> <string>ip_list</string>
<list id='i6'> <list id='i6'>
<tuple> <tuple>
<string/> <unicode/>
<string>ip_address_1</string> <unicode>ip_address_1</unicode>
</tuple> </tuple>
</list> </list>
<string>param</string> <unicode>paramé</unicode>
<string>%(param)s</string> <unicode>%(param)s</unicode>
<string>slap_computer_id</string> <string>slap_computer_id</string>
<string>%(computer_id)s</string> <unicode>%(computer_id)s</unicode>
<string>slap_computer_partition_id</string> <string>slap_computer_partition_id</string>
<string>partition1</string> <unicode>partition1</unicode>
<string>slap_software_release_url</string> <string>slap_software_release_url</string>
<string>%(software_release_url)s</string> <unicode>%(software_release_url)s</unicode>
<string>slap_software_type</string> <string>slap_software_type</string>
<string>%(software_type)s</string> <unicode>%(software_type)s</unicode>
<string>slave_instance_list</string> <string>slave_instance_list</string>
<list id='i7'> <list id='i7'>
<dictionary id='i8'> <dictionary id='i8'>
<string>param</string> <unicode>paramé</unicode>
<string>%(slave_1_param)s</string> <unicode>%(slave_1_param)s</unicode>
<string>slap_software_type</string> <string>slap_software_type</string>
<string>%(slave_1_software_type)s</string> <unicode>%(slave_1_software_type)s</unicode>
<string>slave_reference</string> <string>slave_reference</string>
<string>%(slave_1_instance_guid)s</string> <string>%(slave_1_instance_guid)s</string>
<string>slave_title</string> <string>slave_title</string>
<string>%(slave_1_title)s</string> <unicode>%(slave_1_title)s</unicode>
</dictionary> </dictionary>
</list> </list>
<string>timestamp</string> <string>timestamp</string>
<string>%(timestamp)s</string> <string>%(timestamp)s</string>
</dictionary> </dictionary>
<string>_partition_id</string> <string>_partition_id</string>
<string>partition1</string> <unicode>partition1</unicode>
<string>_request_dict</string> <string>_request_dict</string>
<none/> <none/>
<string>_requested_state</string> <string>_requested_state</string>
...@@ -1005,16 +1006,16 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin): ...@@ -1005,16 +1006,16 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin):
<string>_software_release_document</string> <string>_software_release_document</string>
<object id='i9' module='slapos.slap.slap' class='SoftwareRelease'> <object id='i9' module='slapos.slap.slap' class='SoftwareRelease'>
<tuple> <tuple>
<string>%(software_release_url)s</string> <unicode>%(software_release_url)s</unicode>
<string>%(computer_id)s</string> <unicode>%(computer_id)s</unicode>
</tuple> </tuple>
<dictionary id='i10'> <dictionary id='i10'>
<string>_computer_guid</string> <string>_computer_guid</string>
<string>%(computer_id)s</string> <unicode>%(computer_id)s</unicode>
<string>_software_instance_list</string> <string>_software_instance_list</string>
<list id='i11'/> <list id='i11'/>
<string>_software_release</string> <string>_software_release</string>
<string>%(software_release_url)s</string> <unicode>%(software_release_url)s</unicode>
</dictionary> </dictionary>
</object> </object>
<string>_synced</string> <string>_synced</string>
...@@ -1024,12 +1025,12 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin): ...@@ -1024,12 +1025,12 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin):
</marshal> </marshal>
""" % dict( """ % dict(
computer_id=self.computer_id, computer_id=self.computer_id,
param=self.start_requested_software_instance.getInstanceXmlAsDict()['param'], param=self.start_requested_software_instance.getInstanceXmlAsDict()['paramé'.decode("UTF-8")].encode("UTF-8"),
software_release_url=self.start_requested_software_instance.getUrlString(), software_release_url=self.start_requested_software_instance.getUrlString(),
timestamp=int(self.start_requested_software_instance.getModificationDate()), timestamp=int(self.start_requested_software_instance.getModificationDate()),
instance_guid=self.start_requested_software_instance.getReference(), instance_guid=self.start_requested_software_instance.getReference(),
software_type=self.start_requested_software_instance.getSourceReference(), software_type=self.start_requested_software_instance.getSourceReference(),
slave_1_param=self.start_requested_slave_instance.getInstanceXmlAsDict()['param'], slave_1_param=self.start_requested_slave_instance.getInstanceXmlAsDict()['paramé'.decode("UTF-8")].encode("UTF-8"),
slave_1_software_type=self.start_requested_slave_instance.getSourceReference(), slave_1_software_type=self.start_requested_slave_instance.getSourceReference(),
slave_1_instance_guid=self.start_requested_slave_instance.getReference(), slave_1_instance_guid=self.start_requested_slave_instance.getReference(),
slave_1_title=self.start_requested_slave_instance.getTitle(), slave_1_title=self.start_requested_slave_instance.getTitle(),
...@@ -1063,12 +1064,12 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin): ...@@ -1063,12 +1064,12 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin):
<marshal> <marshal>
<object id='i2' module='slapos.slap.slap' class='ComputerPartition'> <object id='i2' module='slapos.slap.slap' class='ComputerPartition'>
<tuple> <tuple>
<string>%(computer_id)s</string> <unicode>%(computer_id)s</unicode>
<string>partition1</string> <unicode>partition1</unicode>
</tuple> </tuple>
<dictionary id='i3'> <dictionary id='i3'>
<string>_computer_id</string> <string>_computer_id</string>
<string>%(computer_id)s</string> <unicode>%(computer_id)s</unicode>
<string>_connection_dict</string> <string>_connection_dict</string>
<dictionary id='i4'/> <dictionary id='i4'/>
<string>_instance_guid</string> <string>_instance_guid</string>
...@@ -1080,27 +1081,27 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin): ...@@ -1080,27 +1081,27 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin):
<string>ip_list</string> <string>ip_list</string>
<list id='i6'> <list id='i6'>
<tuple> <tuple>
<string/> <unicode/>
<string>ip_address_1</string> <unicode>ip_address_1</unicode>
</tuple> </tuple>
</list> </list>
<string>param</string> <unicode>paramé</unicode>
<string>%(param)s</string> <unicode>%(param)s</unicode>
<string>slap_computer_id</string> <string>slap_computer_id</string>
<string>%(computer_id)s</string> <unicode>%(computer_id)s</unicode>
<string>slap_computer_partition_id</string> <string>slap_computer_partition_id</string>
<string>partition1</string> <unicode>partition1</unicode>
<string>slap_software_release_url</string> <string>slap_software_release_url</string>
<string>%(software_release_url)s</string> <unicode>%(software_release_url)s</unicode>
<string>slap_software_type</string> <string>slap_software_type</string>
<string>%(software_type)s</string> <unicode>%(software_type)s</unicode>
<string>slave_instance_list</string> <string>slave_instance_list</string>
<list id='i7'/> <list id='i7'/>
<string>timestamp</string> <string>timestamp</string>
<string>%(timestamp)s</string> <string>%(timestamp)s</string>
</dictionary> </dictionary>
<string>_partition_id</string> <string>_partition_id</string>
<string>partition1</string> <unicode>partition1</unicode>
<string>_request_dict</string> <string>_request_dict</string>
<none/> <none/>
<string>_requested_state</string> <string>_requested_state</string>
...@@ -1108,16 +1109,16 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin): ...@@ -1108,16 +1109,16 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin):
<string>_software_release_document</string> <string>_software_release_document</string>
<object id='i8' module='slapos.slap.slap' class='SoftwareRelease'> <object id='i8' module='slapos.slap.slap' class='SoftwareRelease'>
<tuple> <tuple>
<string>%(software_release_url)s</string> <unicode>%(software_release_url)s</unicode>
<string>%(computer_id)s</string> <unicode>%(computer_id)s</unicode>
</tuple> </tuple>
<dictionary id='i9'> <dictionary id='i9'>
<string>_computer_guid</string> <string>_computer_guid</string>
<string>%(computer_id)s</string> <unicode>%(computer_id)s</unicode>
<string>_software_instance_list</string> <string>_software_instance_list</string>
<list id='i10'/> <list id='i10'/>
<string>_software_release</string> <string>_software_release</string>
<string>%(software_release_url)s</string> <unicode>%(software_release_url)s</unicode>
</dictionary> </dictionary>
</object> </object>
<string>_synced</string> <string>_synced</string>
...@@ -1127,7 +1128,7 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin): ...@@ -1127,7 +1128,7 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin):
</marshal> </marshal>
""" % dict( """ % dict(
computer_id=self.computer_id, computer_id=self.computer_id,
param=self.start_requested_software_instance.getInstanceXmlAsDict()['param'], param=self.start_requested_software_instance.getInstanceXmlAsDict()['paramé'.decode("UTF-8")].encode("UTF-8"),
software_release_url=self.start_requested_software_instance.getUrlString(), software_release_url=self.start_requested_software_instance.getUrlString(),
timestamp=int(self.start_requested_software_instance.getModificationDate()), timestamp=int(self.start_requested_software_instance.getModificationDate()),
instance_guid=self.start_requested_software_instance.getReference(), instance_guid=self.start_requested_software_instance.getReference(),
...@@ -1611,9 +1612,9 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSSlapToolMixin): ...@@ -1611,9 +1612,9 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSSlapToolMixin):
<string>created_at</string> <string>created_at</string>
<string>%(created_at)s</string> <string>%(created_at)s</string>
<string>text</string> <string>text</string>
<string>#error no data found for %(computer_id)s</string> <unicode>#error no data found for %(computer_id)s</unicode>
<string>user</string> <string>user</string>
<string>SlapOS Master</string> <unicode>SlapOS Master</unicode>
</dictionary> </dictionary>
</marshal> </marshal>
""" % dict( """ % dict(
...@@ -1747,9 +1748,9 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSSlapToolMixin): ...@@ -1747,9 +1748,9 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSSlapToolMixin):
<string>created_at</string> <string>created_at</string>
<string>%(created_at)s</string> <string>%(created_at)s</string>
<string>text</string> <string>text</string>
<string>#error no data found for %(instance_guid)s</string> <unicode>#error no data found for %(instance_guid)s</unicode>
<string>user</string> <string>user</string>
<string>SlapOS Master</string> <unicode>SlapOS Master</unicode>
</dictionary> </dictionary>
</marshal> </marshal>
""" % dict( """ % dict(
...@@ -1792,9 +1793,9 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSSlapToolMixin): ...@@ -1792,9 +1793,9 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSSlapToolMixin):
<string>created_at</string> <string>created_at</string>
<string>%(created_at)s</string> <string>%(created_at)s</string>
<string>text</string> <string>text</string>
<string>#error no data found for %(instance_guid)s</string> <unicode>#error no data found for %(instance_guid)s</unicode>
<string>user</string> <string>user</string>
<string>SlapOS Master</string> <unicode>SlapOS Master</unicode>
</dictionary> </dictionary>
</marshal> </marshal>
""" % dict( """ % dict(
...@@ -1832,12 +1833,12 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSSlapToolMixin): ...@@ -1832,12 +1833,12 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSSlapToolMixin):
<marshal> <marshal>
<object id='i2' module='slapos.slap.slap' class='ComputerPartition'> <object id='i2' module='slapos.slap.slap' class='ComputerPartition'>
<tuple> <tuple>
<string>%(computer_id)s</string> <unicode>%(computer_id)s</unicode>
<string>partition1</string> <unicode>partition1</unicode>
</tuple> </tuple>
<dictionary id='i3'> <dictionary id='i3'>
<string>_computer_id</string> <string>_computer_id</string>
<string>%(computer_id)s</string> <unicode>%(computer_id)s</unicode>
<string>_connection_dict</string> <string>_connection_dict</string>
<dictionary id='i4'/> <dictionary id='i4'/>
<string>_instance_guid</string> <string>_instance_guid</string>
...@@ -1849,38 +1850,38 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSSlapToolMixin): ...@@ -1849,38 +1850,38 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSSlapToolMixin):
<string>ip_list</string> <string>ip_list</string>
<list id='i6'> <list id='i6'>
<tuple> <tuple>
<string/> <unicode/>
<string>ip_address_1</string> <unicode>ip_address_1</unicode>
</tuple> </tuple>
</list> </list>
<string>param</string> <unicode>paramé</unicode>
<string>%(param)s</string> <unicode>%(param)s</unicode>
<string>slap_computer_id</string> <string>slap_computer_id</string>
<string>%(computer_id)s</string> <unicode>%(computer_id)s</unicode>
<string>slap_computer_partition_id</string> <string>slap_computer_partition_id</string>
<string>partition1</string> <unicode>partition1</unicode>
<string>slap_software_release_url</string> <string>slap_software_release_url</string>
<string>%(software_release_url)s</string> <unicode>%(software_release_url)s</unicode>
<string>slap_software_type</string> <string>slap_software_type</string>
<string>%(software_type)s</string> <unicode>%(software_type)s</unicode>
<string>slave_instance_list</string> <string>slave_instance_list</string>
<list id='i7'> <list id='i7'>
<dictionary id='i8'> <dictionary id='i8'>
<string>param</string> <unicode>paramé</unicode>
<string>%(slave_1_param)s</string> <unicode>%(slave_1_param)s</unicode>
<string>slap_software_type</string> <string>slap_software_type</string>
<string>%(slave_1_software_type)s</string> <unicode>%(slave_1_software_type)s</unicode>
<string>slave_reference</string> <string>slave_reference</string>
<string>%(slave_1_instance_guid)s</string> <string>%(slave_1_instance_guid)s</string>
<string>slave_title</string> <string>slave_title</string>
<string>%(slave_1_title)s</string> <unicode>%(slave_1_title)s</unicode>
</dictionary> </dictionary>
</list> </list>
<string>timestamp</string> <string>timestamp</string>
<string>%(timestamp)s</string> <string>%(timestamp)s</string>
</dictionary> </dictionary>
<string>_partition_id</string> <string>_partition_id</string>
<string>partition1</string> <unicode>partition1</unicode>
<string>_request_dict</string> <string>_request_dict</string>
<none/> <none/>
<string>_requested_state</string> <string>_requested_state</string>
...@@ -1888,16 +1889,16 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSSlapToolMixin): ...@@ -1888,16 +1889,16 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSSlapToolMixin):
<string>_software_release_document</string> <string>_software_release_document</string>
<object id='i9' module='slapos.slap.slap' class='SoftwareRelease'> <object id='i9' module='slapos.slap.slap' class='SoftwareRelease'>
<tuple> <tuple>
<string>%(software_release_url)s</string> <unicode>%(software_release_url)s</unicode>
<string>%(computer_id)s</string> <unicode>%(computer_id)s</unicode>
</tuple> </tuple>
<dictionary id='i10'> <dictionary id='i10'>
<string>_computer_guid</string> <string>_computer_guid</string>
<string>%(computer_id)s</string> <unicode>%(computer_id)s</unicode>
<string>_software_instance_list</string> <string>_software_instance_list</string>
<list id='i11'/> <list id='i11'/>
<string>_software_release</string> <string>_software_release</string>
<string>%(software_release_url)s</string> <unicode>%(software_release_url)s</unicode>
</dictionary> </dictionary>
</object> </object>
<string>_synced</string> <string>_synced</string>
...@@ -1907,12 +1908,12 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSSlapToolMixin): ...@@ -1907,12 +1908,12 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSSlapToolMixin):
</marshal> </marshal>
""" % dict( """ % dict(
computer_id=self.computer_id, computer_id=self.computer_id,
param=self.start_requested_software_instance.getInstanceXmlAsDict()['param'], param=self.start_requested_software_instance.getInstanceXmlAsDict()['paramé'.decode("UTF-8")].encode("UTF-8"),
software_release_url=self.start_requested_software_instance.getUrlString(), software_release_url=self.start_requested_software_instance.getUrlString(),
timestamp=int(self.start_requested_software_instance.getModificationDate()), timestamp=int(self.start_requested_software_instance.getModificationDate()),
instance_guid=self.start_requested_software_instance.getReference(), instance_guid=self.start_requested_software_instance.getReference(),
software_type=self.start_requested_software_instance.getSourceReference(), software_type=self.start_requested_software_instance.getSourceReference(),
slave_1_param=self.start_requested_slave_instance.getInstanceXmlAsDict()['param'], slave_1_param=self.start_requested_slave_instance.getInstanceXmlAsDict()['paramé'.decode("UTF-8")].encode("UTF-8"),
slave_1_software_type=self.start_requested_slave_instance.getSourceReference(), slave_1_software_type=self.start_requested_slave_instance.getSourceReference(),
slave_1_instance_guid=self.start_requested_slave_instance.getReference(), slave_1_instance_guid=self.start_requested_slave_instance.getReference(),
slave_1_title=self.start_requested_slave_instance.getTitle(), slave_1_title=self.start_requested_slave_instance.getTitle(),
...@@ -1946,12 +1947,12 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSSlapToolMixin): ...@@ -1946,12 +1947,12 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSSlapToolMixin):
<marshal> <marshal>
<object id='i2' module='slapos.slap.slap' class='ComputerPartition'> <object id='i2' module='slapos.slap.slap' class='ComputerPartition'>
<tuple> <tuple>
<string>%(computer_id)s</string> <unicode>%(computer_id)s</unicode>
<string>partition1</string> <unicode>partition1</unicode>
</tuple> </tuple>
<dictionary id='i3'> <dictionary id='i3'>
<string>_computer_id</string> <string>_computer_id</string>
<string>%(computer_id)s</string> <unicode>%(computer_id)s</unicode>
<string>_connection_dict</string> <string>_connection_dict</string>
<dictionary id='i4'/> <dictionary id='i4'/>
<string>_instance_guid</string> <string>_instance_guid</string>
...@@ -1963,27 +1964,27 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSSlapToolMixin): ...@@ -1963,27 +1964,27 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSSlapToolMixin):
<string>ip_list</string> <string>ip_list</string>
<list id='i6'> <list id='i6'>
<tuple> <tuple>
<string/> <unicode/>
<string>ip_address_1</string> <unicode>ip_address_1</unicode>
</tuple> </tuple>
</list> </list>
<string>param</string> <unicode>paramé</unicode>
<string>%(param)s</string> <unicode>%(param)s</unicode>
<string>slap_computer_id</string> <string>slap_computer_id</string>
<string>%(computer_id)s</string> <unicode>%(computer_id)s</unicode>
<string>slap_computer_partition_id</string> <string>slap_computer_partition_id</string>
<string>partition1</string> <unicode>partition1</unicode>
<string>slap_software_release_url</string> <string>slap_software_release_url</string>
<string>%(software_release_url)s</string> <unicode>%(software_release_url)s</unicode>
<string>slap_software_type</string> <string>slap_software_type</string>
<string>%(software_type)s</string> <unicode>%(software_type)s</unicode>
<string>slave_instance_list</string> <string>slave_instance_list</string>
<list id='i7'/> <list id='i7'/>
<string>timestamp</string> <string>timestamp</string>
<string>%(timestamp)s</string> <string>%(timestamp)s</string>
</dictionary> </dictionary>
<string>_partition_id</string> <string>_partition_id</string>
<string>partition1</string> <unicode>partition1</unicode>
<string>_request_dict</string> <string>_request_dict</string>
<none/> <none/>
<string>_requested_state</string> <string>_requested_state</string>
...@@ -1991,16 +1992,16 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSSlapToolMixin): ...@@ -1991,16 +1992,16 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSSlapToolMixin):
<string>_software_release_document</string> <string>_software_release_document</string>
<object id='i8' module='slapos.slap.slap' class='SoftwareRelease'> <object id='i8' module='slapos.slap.slap' class='SoftwareRelease'>
<tuple> <tuple>
<string>%(software_release_url)s</string> <unicode>%(software_release_url)s</unicode>
<string>%(computer_id)s</string> <unicode>%(computer_id)s</unicode>
</tuple> </tuple>
<dictionary id='i9'> <dictionary id='i9'>
<string>_computer_guid</string> <string>_computer_guid</string>
<string>%(computer_id)s</string> <unicode>%(computer_id)s</unicode>
<string>_software_instance_list</string> <string>_software_instance_list</string>
<list id='i10'/> <list id='i10'/>
<string>_software_release</string> <string>_software_release</string>
<string>%(software_release_url)s</string> <unicode>%(software_release_url)s</unicode>
</dictionary> </dictionary>
</object> </object>
<string>_synced</string> <string>_synced</string>
...@@ -2010,7 +2011,7 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSSlapToolMixin): ...@@ -2010,7 +2011,7 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSSlapToolMixin):
</marshal> </marshal>
""" % dict( """ % dict(
computer_id=self.computer_id, computer_id=self.computer_id,
param=self.start_requested_software_instance.getInstanceXmlAsDict()['param'], param=self.start_requested_software_instance.getInstanceXmlAsDict()['paramé'.decode("UTF-8")].encode("UTF-8"),
software_release_url=self.start_requested_software_instance.getUrlString(), software_release_url=self.start_requested_software_instance.getUrlString(),
timestamp=int(self.start_requested_software_instance.getModificationDate()), timestamp=int(self.start_requested_software_instance.getModificationDate()),
instance_guid=self.start_requested_software_instance.getReference(), instance_guid=self.start_requested_software_instance.getReference(),
...@@ -2211,18 +2212,18 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSSlapToolMixin): ...@@ -2211,18 +2212,18 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSSlapToolMixin):
<string>ip_list</string> <string>ip_list</string>
<list id='i6'> <list id='i6'>
<tuple> <tuple>
<string/> <unicode/>
<string>%(ip)s</string> <unicode>%(ip)s</unicode>
</tuple> </tuple>
</list> </list>
<string>slap_computer_id</string> <string>slap_computer_id</string>
<string>%(computer_id)s</string> <unicode>%(computer_id)s</unicode>
<string>slap_computer_partition_id</string> <string>slap_computer_partition_id</string>
<string>%(partition_id)s</string> <unicode>%(partition_id)s</unicode>
<string>slap_software_release_url</string> <string>slap_software_release_url</string>
<string>%(url_string)s</string> <unicode>%(url_string)s</unicode>
<string>slap_software_type</string> <string>slap_software_type</string>
<string>%(type)s</string> <unicode>%(type)s</unicode>
<string>slave_instance_list</string> <string>slave_instance_list</string>
<list id='i7'/> <list id='i7'/>
<string>timestamp</string> <string>timestamp</string>
...@@ -2260,7 +2261,7 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSSlapToolMixin): ...@@ -2260,7 +2261,7 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSSlapToolMixin):
self.login(self.person_reference) self.login(self.person_reference)
self.computer.requestSoftwareRelease = Simulator( self.computer.requestSoftwareRelease = Simulator(
self.computer_supply_simulator, 'requestSoftwareRelease') self.computer_supply_simulator, 'requestSoftwareRelease')
software_url = 'live_test_url_%i' % self.generateNewId() software_url = 'live_test_url_%s' % self.generateNewId()
response = self.portal_slap.supplySupply( response = self.portal_slap.supplySupply(
software_url, software_url,
self.computer_id, self.computer_id,
...@@ -2289,7 +2290,7 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSSlapToolMixin): ...@@ -2289,7 +2290,7 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSSlapToolMixin):
self.computer_request_computer_simulator, 'requestComputer') self.computer_request_computer_simulator, 'requestComputer')
computer_id = 'Foo Computer' computer_id = 'Foo Computer'
computer_reference = 'live_comp_%i' % self.generateNewId() computer_reference = 'live_comp_%s' % self.generateNewId()
self.portal.REQUEST.set('computer_reference', computer_reference) self.portal.REQUEST.set('computer_reference', computer_reference)
response = self.portal_slap.requestComputer(computer_id) response = self.portal_slap.requestComputer(computer_id)
...@@ -2305,11 +2306,11 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSSlapToolMixin): ...@@ -2305,11 +2306,11 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSSlapToolMixin):
<marshal> <marshal>
<object id='i2' module='slapos.slap.slap' class='Computer'> <object id='i2' module='slapos.slap.slap' class='Computer'>
<tuple> <tuple>
<string>%(computer_id)s</string> <unicode>%(computer_id)s</unicode>
</tuple> </tuple>
<dictionary id='i3'> <dictionary id='i3'>
<string>_computer_id</string> <string>_computer_id</string>
<string>%(computer_id)s</string> <unicode>%(computer_id)s</unicode>
</dictionary> </dictionary>
</object> </object>
</marshal> </marshal>
...@@ -2337,8 +2338,8 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSSlapToolMixin): ...@@ -2337,8 +2338,8 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSSlapToolMixin):
self.generate_computer_certificate_simulator, self.generate_computer_certificate_simulator,
'generateComputerCertificate') 'generateComputerCertificate')
computer_certificate = 'live_\ncertificate_%i' % self.generateNewId() computer_certificate = 'live_\ncertificate_%s' % self.generateNewId()
computer_key = 'live_\nkey_%i' % self.generateNewId() computer_key = 'live_\nkey_%s' % self.generateNewId()
self.portal.REQUEST.set('computer_certificate', computer_certificate) self.portal.REQUEST.set('computer_certificate', computer_certificate)
self.portal.REQUEST.set('computer_key', computer_key) self.portal.REQUEST.set('computer_key', computer_key)
response = self.portal_slap.generateComputerCertificate(self.computer_id) response = self.portal_slap.generateComputerCertificate(self.computer_id)
...@@ -2355,9 +2356,9 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSSlapToolMixin): ...@@ -2355,9 +2356,9 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSSlapToolMixin):
<marshal> <marshal>
<dictionary id='i2'> <dictionary id='i2'>
<string>certificate</string> <string>certificate</string>
<string>%(computer_certificate)s</string> <unicode>%(computer_certificate)s</unicode>
<string>key</string> <string>key</string>
<string>%(computer_key)s</string> <unicode>%(computer_key)s</unicode>
</dictionary> </dictionary>
</marshal> </marshal>
""" % {'computer_key': computer_key, 'computer_certificate': computer_certificate} """ % {'computer_key': computer_key, 'computer_certificate': computer_certificate}
......
master/bt5/slapos_slap_tool/bt/revision
View file @ 3de0ab52
25 26
\ No newline at end of file \ No newline at end of file
master/product/SlapOS/tests/testSlapOSMixin.py
View file @ 3de0ab52
...@@ -541,21 +541,23 @@ class testSlapOSMixin(ERP5TypeTestCase): ...@@ -541,21 +541,23 @@ class testSlapOSMixin(ERP5TypeTestCase):
self.portal.REQUEST.headers = {} self.portal.REQUEST.headers = {}
def generateNewId(self): def generateNewId(self):
return self.portal.portal_ids.generateNewId( return "%sö" % self.portal.portal_ids.generateNewId(
id_group=('slapos_core_test')) id_group=('slapos_core_test'))
def generateNewSoftwareReleaseUrl(self): def generateNewSoftwareReleaseUrl(self):
return 'http://example.org/test%s.cfg' % self.generateNewId() return 'http://example.org/têst%s.cfg' % self.generateNewId()
def generateNewSoftwareType(self): def generateNewSoftwareType(self):
return 'Type%s' % self.generateNewId() return 'Type ë@î %s' % self.generateNewId()
def generateNewSoftwareTitle(self): def generateNewSoftwareTitle(self):
return 'Title%s' % self.generateNewId() return 'Title é#ï %s' % self.generateNewId()
def generateSafeXml(self): def generateSafeXml(self):
return '<?xml version="1.0" encoding="utf-8"?><instance><parameter '\ return '<?xml version="1.0" encoding="utf-8"?><instance><parameter '\
'id="param">%s</parameter></instance>' % self.generateNewId() 'id="%s">%s</parameter></instance>' % \
("paramé".decode("UTF-8").encode("UTF-8"),
self.generateNewId().decode("UTF-8").encode("UTF-8"))
def generateEmptyXml(self): def generateEmptyXml(self):
return '<?xml version="1.0" encoding="utf-8"?><instance></instance>' return '<?xml version="1.0" encoding="utf-8"?><instance></instance>'
......
master/product/Vifib/Tool/SlapTool.py
View file @ 3de0ab52
...@@ -165,7 +165,7 @@ class SlapTool(BaseTool): ...@@ -165,7 +165,7 @@ class SlapTool(BaseTool):
def _getCacheComputerInformation(self, computer_id, user): def _getCacheComputerInformation(self, computer_id, user):
self.REQUEST.response.setHeader('Content-Type', 'text/xml; charset=utf-8') self.REQUEST.response.setHeader('Content-Type', 'text/xml; charset=utf-8')
slap_computer = Computer(computer_id) slap_computer = Computer(computer_id.decode("UTF-8"))
parent_uid = self._getComputerUidByReference(computer_id) parent_uid = self._getComputerUidByReference(computer_id)
slap_computer._computer_partition_list = [] slap_computer._computer_partition_list = []
...@@ -230,7 +230,7 @@ class SlapTool(BaseTool): ...@@ -230,7 +230,7 @@ class SlapTool(BaseTool):
reference=user, portal_type=['Person', 'Computer', 'Software Instance'])) reference=user, portal_type=['Person', 'Computer', 'Software Instance']))
user_type = user_document.getPortalType() user_type = user_document.getPortalType()
self.REQUEST.response.setHeader('Content-Type', 'text/xml; charset=utf-8') self.REQUEST.response.setHeader('Content-Type', 'text/xml; charset=utf-8')
slap_computer = Computer(computer_id) slap_computer = Computer(computer_id.decode("UTF-8"))
parent_uid = self._getComputerUidByReference(computer_id) parent_uid = self._getComputerUidByReference(computer_id)
slap_computer._computer_partition_list = [] slap_computer._computer_partition_list = []
...@@ -386,7 +386,7 @@ class SlapTool(BaseTool): ...@@ -386,7 +386,7 @@ class SlapTool(BaseTool):
portal = self.getPortalObject() portal = self.getPortalObject()
person = portal.ERP5Site_getAuthenticatedMemberPersonValue() person = portal.ERP5Site_getAuthenticatedMemberPersonValue()
person.requestComputer(computer_title=computer_title) person.requestComputer(computer_title=computer_title)
computer = Computer(self.REQUEST.get('computer_reference')) computer = Computer(self.REQUEST.get('computer_reference').decode("UTF-8"))
return xml_marshaller.xml_marshaller.dumps(computer) return xml_marshaller.xml_marshaller.dumps(computer)
security.declareProtected(Permissions.AccessContentsInformation, security.declareProtected(Permissions.AccessContentsInformation,
...@@ -596,8 +596,8 @@ class SlapTool(BaseTool): ...@@ -596,8 +596,8 @@ class SlapTool(BaseTool):
def _generateComputerCertificate(self, computer_id): def _generateComputerCertificate(self, computer_id):
self._getComputerDocument(computer_id).generateCertificate() self._getComputerDocument(computer_id).generateCertificate()
result = { result = {
'certificate': self.REQUEST.get('computer_certificate'), 'certificate': self.REQUEST.get('computer_certificate').decode("UTF-8"),
'key': self.REQUEST.get('computer_key') 'key': self.REQUEST.get('computer_key').decode("UTF-8")
} }
return xml_marshaller.xml_marshaller.dumps(result) return xml_marshaller.xml_marshaller.dumps(result)
...@@ -630,8 +630,8 @@ class SlapTool(BaseTool): ...@@ -630,8 +630,8 @@ class SlapTool(BaseTool):
portal = self.getPortalObject() portal = self.getPortalObject()
computer_partition_document = self._getComputerPartitionDocument( computer_partition_document = self._getComputerPartitionDocument(
computer_reference, computer_partition_reference) computer_reference, computer_partition_reference)
slap_partition = SlapComputerPartition(computer_reference, slap_partition = SlapComputerPartition(computer_reference.decode("UTF-8"),
computer_partition_reference) computer_partition_reference.decode("UTF-8"))
slap_partition._software_release_document = None slap_partition._software_release_document = None
slap_partition._requested_state = 'destroyed' slap_partition._requested_state = 'destroyed'
slap_partition._need_modification = 0 slap_partition._need_modification = 0
...@@ -664,8 +664,10 @@ class SlapTool(BaseTool): ...@@ -664,8 +664,10 @@ class SlapTool(BaseTool):
slap_partition._requested_state = 'started' slap_partition._requested_state = 'started'
slap_partition._software_release_document = SoftwareRelease( slap_partition._software_release_document = SoftwareRelease(
software_release=software_instance.getUrlString(), software_release=software_instance.getUrlString().decode("UTF-8"),
computer_guid=computer_reference) computer_guid=computer_reference.decode("UTF-8"))
slap_partition._software_release_document._software_release = \
slap_partition._software_release_document._software_release.decode("UTF-8")
slap_partition._need_modification = 1 slap_partition._need_modification = 1
...@@ -742,7 +744,7 @@ class SlapTool(BaseTool): ...@@ -742,7 +744,7 @@ class SlapTool(BaseTool):
result_dict = {} result_dict = {}
try: try:
if xml is not None and xml != '': if xml is not None and xml != '':
tree = etree.fromstring(xml.encode('utf-8')) tree = etree.fromstring(xml)
for element in tree.findall('parameter'): for element in tree.findall('parameter'):
key = element.get('id') key = element.get('id')
value = result_dict.get(key, None) value = result_dict.get(key, None)
...@@ -761,9 +763,9 @@ class SlapTool(BaseTool): ...@@ -761,9 +763,9 @@ class SlapTool(BaseTool):
portal = self.getPortalObject() portal = self.getPortalObject()
while computer.getPortalType() != 'Computer': while computer.getPortalType() != 'Computer':
computer = computer.getParentValue() computer = computer.getParentValue()
computer_id = computer.getReference() computer_id = computer.getReference().decode("UTF-8")
slap_partition = SlapComputerPartition(computer_id, slap_partition = SlapComputerPartition(computer_id,
computer_partition_document.getReference()) computer_partition_document.getReference().decode("UTF-8"))
slap_partition._software_release_document = None slap_partition._software_release_document = None
slap_partition._requested_state = 'destroyed' slap_partition._requested_state = 'destroyed'
...@@ -795,8 +797,10 @@ class SlapTool(BaseTool): ...@@ -795,8 +797,10 @@ class SlapTool(BaseTool):
slap_partition._requested_state = 'started' slap_partition._requested_state = 'started'
slap_partition._software_release_document = SoftwareRelease( slap_partition._software_release_document = SoftwareRelease(
software_release=software_instance.getUrlString(), software_release=software_instance.getUrlString().decode("UTF-8"),
computer_guid=computer_id) computer_guid=computer_id)
slap_partition._software_release_document._software_release = \
slap_partition._software_release_document._software_release.decode("UTF-8")
slap_partition._need_modification = 1 slap_partition._need_modification = 1
...@@ -952,8 +956,12 @@ class SlapTool(BaseTool): ...@@ -952,8 +956,12 @@ class SlapTool(BaseTool):
'created_at': '%s' % rfc1123_date(DateTime()), 'created_at': '%s' % rfc1123_date(DateTime()),
"text": "#error no data found for %s" % context_reference "text": "#error no data found for %s" % context_reference
} }
# Prepare for xml marshalling
d["user"] = d["user"].decode("UTF-8")
d["text"] = d["text"].decode("UTF-8")
else: else:
d = json.loads(d) d = json.loads(d)
# Keep in cache server for 7 days # Keep in cache server for 7 days
self.REQUEST.response.setStatus(200) self.REQUEST.response.setStatus(200)
self.REQUEST.response.setHeader('Cache-Control', self.REQUEST.response.setHeader('Cache-Control',
...@@ -1298,7 +1306,9 @@ class SlapTool(BaseTool): ...@@ -1298,7 +1306,9 @@ class SlapTool(BaseTool):
ip_list = [] ip_list = []
for internet_protocol_address in computer_partition.contentValues(portal_type='Internet Protocol Address'): for internet_protocol_address in computer_partition.contentValues(portal_type='Internet Protocol Address'):
ip_list.append((internet_protocol_address.getNetworkInterface(''), internet_protocol_address.getIpAddress())) ip_list.append((
internet_protocol_address.getNetworkInterface('').decode("UTF-8"),
internet_protocol_address.getIpAddress().decode("UTF-8")))
slave_instance_list = [] slave_instance_list = []
if (software_instance.getPortalType() == "Software Instance"): if (software_instance.getPortalType() == "Software Instance"):
...@@ -1313,8 +1323,9 @@ class SlapTool(BaseTool): ...@@ -1313,8 +1323,9 @@ class SlapTool(BaseTool):
# XXX Use catalog to filter more efficiently # XXX Use catalog to filter more efficiently
if slave_instance.getSlapState() == "start_requested": if slave_instance.getSlapState() == "start_requested":
append({ append({
'slave_title': slave_instance.getTitle(), 'slave_title': slave_instance.getTitle().decode("UTF-8"),
'slap_software_type': slave_instance.getSourceReference(), 'slap_software_type': \
slave_instance.getSourceReference().decode("UTF-8"),
'slave_reference': slave_instance.getReference(), 'slave_reference': slave_instance.getReference(),
'xml': slave_instance.getTextContent(), 'xml': slave_instance.getTextContent(),
'connection_xml': slave_instance.getConnectionXml(), 'connection_xml': slave_instance.getConnectionXml(),
...@@ -1326,10 +1337,14 @@ class SlapTool(BaseTool): ...@@ -1326,10 +1337,14 @@ class SlapTool(BaseTool):
'instance_guid': software_instance.getReference(), 'instance_guid': software_instance.getReference(),
'xml': software_instance.getTextContent(), 'xml': software_instance.getTextContent(),
'connection_xml': software_instance.getConnectionXml(), 'connection_xml': software_instance.getConnectionXml(),
'slap_computer_id': computer_partition.getParentValue().getReference(), 'slap_computer_id': \
'slap_computer_partition_id': computer_partition.getReference(), computer_partition.getParentValue().getReference().decode("UTF-8"),
'slap_software_type': software_instance.getSourceReference(), 'slap_computer_partition_id': \
'slap_software_release_url': software_instance.getUrlString(), computer_partition.getReference().decode("UTF-8"),
'slap_software_type': \
software_instance.getSourceReference().decode("UTF-8"),
'slap_software_release_url': \
software_instance.getUrlString().decode("UTF-8"),
'slave_instance_list': slave_instance_list, 'slave_instance_list': slave_instance_list,
'ip_list': ip_list, 'ip_list': ip_list,
'timestamp': "%i" % timestamp, 'timestamp': "%i" % timestamp,
...@@ -1348,8 +1363,10 @@ class SlapTool(BaseTool): ...@@ -1348,8 +1363,10 @@ class SlapTool(BaseTool):
): ):
software_installation = _assertACI(software_installation.getObject()) software_installation = _assertACI(software_installation.getObject())
software_release_response = SoftwareRelease( software_release_response = SoftwareRelease(
software_release=software_installation.getUrlString(), software_release=software_installation.getUrlString().decode('UTF-8'),
computer_guid=computer_reference) computer_guid=computer_reference.decode('UTF-8'))
software_release_response._software_release = \
software_release_response._software_release.decode("UTF-8")
if software_installation.getSlapState() == 'destroy_requested': if software_installation.getSlapState() == 'destroy_requested':
software_release_response._requested_state = 'destroyed' software_release_response._requested_state = 'destroyed'
else: else:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7