Commit 72752e23 authored by Romain Courteaud's avatar Romain Courteaud

revert libslap changes

parent 87dc2525
......@@ -117,7 +117,7 @@ class DefaultScenarioMixin(TestSlapOSSecurityMixin):
self.tic()
self.assertTrue('marshal' in requestXml)
compute_node = xml_marshaller.xml_marshaller.loads(requestXml)
compute_node_id = getattr(compute_node, '_compute_node_id', None)
compute_node_id = getattr(compute_node, '_computer_id', None)
self.assertNotEqual(None, compute_node_id)
return compute_node_id.encode('UTF-8')
......
......@@ -266,7 +266,7 @@ class TestSlapOSSlapToolComputeNodeAccess(TestSlapOSSlapToolMixin):
<string>%(compute_node_id)s</string>
</tuple>
<dictionary id='i3'>
<string>_compute_node_id</string>
<string>_computer_id</string>
<string>%(compute_node_id)s</string>
<string>_compute_partition_list</string>
<list id='i4'>
......@@ -276,7 +276,7 @@ class TestSlapOSSlapToolComputeNodeAccess(TestSlapOSSlapToolMixin):
<string>partition4</string>
</tuple>
<dictionary id='i6'>
<string>_compute_node_id</string>
<string>_computer_id</string>
<string>%(compute_node_id)s</string>
<string>_need_modification</string>
<int>0</int>
......@@ -298,7 +298,7 @@ class TestSlapOSSlapToolComputeNodeAccess(TestSlapOSSlapToolMixin):
<dictionary id='i8'>
<string>_access_status</string>
<string>%(access_status)s</string>
<string>_compute_node_id</string>
<string>_computer_id</string>
<string>%(compute_node_id)s</string>
<string>_connection_dict</string>
<dictionary id='i9'/>
......@@ -330,7 +330,7 @@ class TestSlapOSSlapToolComputeNodeAccess(TestSlapOSSlapToolMixin):
<string/>
<string>root_instance_title</string>
<string>%(partition_3_root_instance_title)s</string>
<string>slap_compute_node_id</string>
<string>slap_computer_id</string>
<string>%(compute_node_id)s</string>
<string>slap_compute_partition_id</string>
<string>partition3</string>
......@@ -374,7 +374,7 @@ class TestSlapOSSlapToolComputeNodeAccess(TestSlapOSSlapToolMixin):
<dictionary id='i19'>
<string>_access_status</string>
<string>%(access_status)s</string>
<string>_compute_node_id</string>
<string>_computer_id</string>
<string>%(compute_node_id)s</string>
<string>_connection_dict</string>
<dictionary id='i20'/>
......@@ -406,7 +406,7 @@ class TestSlapOSSlapToolComputeNodeAccess(TestSlapOSSlapToolMixin):
<string/>
<string>root_instance_title</string>
<string>%(partition_2_root_instance_title)s</string>
<string>slap_compute_node_id</string>
<string>slap_computer_id</string>
<string>%(compute_node_id)s</string>
<string>slap_compute_partition_id</string>
<string>partition2</string>
......@@ -450,7 +450,7 @@ class TestSlapOSSlapToolComputeNodeAccess(TestSlapOSSlapToolMixin):
<dictionary id='i30'>
<string>_access_status</string>
<string>%(access_status)s</string>
<string>_compute_node_id</string>
<string>_computer_id</string>
<string>%(compute_node_id)s</string>
<string>_connection_dict</string>
<dictionary id='i31'/>
......@@ -482,7 +482,7 @@ class TestSlapOSSlapToolComputeNodeAccess(TestSlapOSSlapToolMixin):
<string/>
<string>root_instance_title</string>
<string>%(partition_1_root_instance_title)s</string>
<string>slap_compute_node_id</string>
<string>slap_computer_id</string>
<string>%(compute_node_id)s</string>
<string>slap_compute_partition_id</string>
<string>partition1</string>
......@@ -1177,7 +1177,7 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin):
<string>%(compute_node_id)s</string>
</tuple>
<dictionary id='i3'>
<string>_compute_node_id</string>
<string>_computer_id</string>
<string>%(compute_node_id)s</string>
<string>_compute_partition_list</string>
<list id='i4'>
......@@ -1189,7 +1189,7 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin):
<dictionary id='i6'>
<string>_access_status</string>
<string>%(access_status)s</string>
<string>_compute_node_id</string>
<string>_computer_id</string>
<string>%(compute_node_id)s</string>
<string>_connection_dict</string>
<dictionary id='i7'/>
......@@ -1221,7 +1221,7 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin):
<string/>
<string>root_instance_title</string>
<string>%(root_instance_title)s</string>
<string>slap_compute_node_id</string>
<string>slap_computer_id</string>
<string>%(compute_node_id)s</string>
<string>slap_compute_partition_id</string>
<string>partition1</string>
......@@ -1424,7 +1424,7 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin):
<string>partition1</string>
</tuple>
<dictionary id='i3'>
<string>_compute_node_id</string>
<string>_computer_id</string>
<string>%(compute_node_id)s</string>
<string>_connection_dict</string>
<dictionary id='i4'/>
......@@ -1456,7 +1456,7 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin):
<string/>
<string>root_instance_title</string>
<string>%(root_instance_title)s</string>
<string>slap_compute_node_id</string>
<string>slap_computer_id</string>
<string>%(compute_node_id)s</string>
<string>slap_compute_partition_id</string>
<string>partition1</string>
......@@ -1558,7 +1558,7 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin):
<string>partition1</string>
</tuple>
<dictionary id='i3'>
<string>_compute_node_id</string>
<string>_computer_id</string>
<string>%(compute_node_id)s</string>
<string>_connection_dict</string>
<dictionary id='i4'/>
......@@ -1590,7 +1590,7 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin):
<string/>
<string>root_instance_title</string>
<string>%(root_instance_title)s</string>
<string>slap_compute_node_id</string>
<string>slap_computer_id</string>
<string>%(compute_node_id)s</string>
<string>slap_compute_partition_id</string>
<string>partition1</string>
......@@ -2747,7 +2747,7 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSSlapToolMixin):
<string>partition1</string>
</tuple>
<dictionary id='i3'>
<string>_compute_node_id</string>
<string>_computer_id</string>
<string>%(compute_node_id)s</string>
<string>_connection_dict</string>
<dictionary id='i4'/>
......@@ -2779,7 +2779,7 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSSlapToolMixin):
<string/>
<string>root_instance_title</string>
<string>%(root_instance_title)s</string>
<string>slap_compute_node_id</string>
<string>slap_computer_id</string>
<string>%(compute_node_id)s</string>
<string>slap_compute_partition_id</string>
<string>partition1</string>
......@@ -2881,7 +2881,7 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSSlapToolMixin):
<string>partition1</string>
</tuple>
<dictionary id='i3'>
<string>_compute_node_id</string>
<string>_computer_id</string>
<string>%(compute_node_id)s</string>
<string>_connection_dict</string>
<dictionary id='i4'/>
......@@ -2913,7 +2913,7 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSSlapToolMixin):
<string/>
<string>root_instance_title</string>
<string>%(root_instance_title)s</string>
<string>slap_compute_node_id</string>
<string>slap_computer_id</string>
<string>%(compute_node_id)s</string>
<string>slap_compute_partition_id</string>
<string>partition1</string>
......@@ -3178,7 +3178,7 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSSlapToolMixin):
<string/>
<string>root_instance_title</string>
<string>%(root_instance_title)s</string>
<string>slap_compute_node_id</string>
<string>slap_computer_id</string>
<string>%(compute_node_id)s</string>
<string>slap_compute_partition_id</string>
<string>%(partition_id)s</string>
......@@ -3273,7 +3273,7 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSSlapToolMixin):
<string>%(compute_node_id)s</string>
</tuple>
<dictionary id='i3'>
<string>_compute_node_id</string>
<string>_computer_id</string>
<string>%(compute_node_id)s</string>
</dictionary>
</object>
......
......@@ -1635,7 +1635,7 @@ class SlapTool(BaseTool):
'xml': software_instance.getTextContent(),
'connection_xml': software_instance.getConnectionXml(),
'filter_xml': software_instance.getSlaXml(),
'slap_compute_node_id': \
'slap_computer_id': \
compute_partition.getParentValue().getReference().decode("UTF-8"),
'slap_compute_partition_id': \
compute_partition.getReference().decode("UTF-8"),
......
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