Commit f3532a7b authored by Romain Courteaud's avatar Romain Courteaud

revert libslap

parent 8b5cdc38
...@@ -214,7 +214,7 @@ class DefaultScenarioMixin(TestSlapOSSecurityMixin): ...@@ -214,7 +214,7 @@ class DefaultScenarioMixin(TestSlapOSSecurityMixin):
if not isinstance(compute_node_xml, str): if not isinstance(compute_node_xml, str):
compute_node_xml = compute_node_xml.getBody() compute_node_xml = compute_node_xml.getBody()
slap_compute_node = xml_marshaller.xml_marshaller.loads(compute_node_xml) slap_compute_node = xml_marshaller.xml_marshaller.loads(compute_node_xml)
self.assertEqual('Compute Node', slap_compute_node.__class__.__name__) self.assertEqual('Computer', slap_compute_node.__class__.__name__)
for software_release in slap_compute_node._software_release_list: for software_release in slap_compute_node._software_release_list:
if software_release._requested_state == 'destroyed': if software_release._requested_state == 'destroyed':
self.portal.portal_slap.destroyedSoftwareRelease( self.portal.portal_slap.destroyedSoftwareRelease(
...@@ -238,7 +238,7 @@ class DefaultScenarioMixin(TestSlapOSSecurityMixin): ...@@ -238,7 +238,7 @@ class DefaultScenarioMixin(TestSlapOSSecurityMixin):
if not isinstance(compute_node_xml, str): if not isinstance(compute_node_xml, str):
compute_node_xml = compute_node_xml.getBody() compute_node_xml = compute_node_xml.getBody()
slap_compute_node = xml_marshaller.xml_marshaller.loads(compute_node_xml) slap_compute_node = xml_marshaller.xml_marshaller.loads(compute_node_xml)
self.assertEqual('Compute Node', slap_compute_node.__class__.__name__) self.assertEqual('Computer', slap_compute_node.__class__.__name__)
destroyed_partition_id_list = [] destroyed_partition_id_list = []
for partition in slap_compute_node._compute_partition_list: for partition in slap_compute_node._compute_partition_list:
if partition._requested_state == 'destroyed' \ if partition._requested_state == 'destroyed' \
...@@ -270,7 +270,7 @@ class DefaultScenarioMixin(TestSlapOSSecurityMixin): ...@@ -270,7 +270,7 @@ class DefaultScenarioMixin(TestSlapOSSecurityMixin):
if not isinstance(compute_node_xml, str): if not isinstance(compute_node_xml, str):
compute_node_xml = compute_node_xml.getBody() compute_node_xml = compute_node_xml.getBody()
slap_compute_node = xml_marshaller.xml_marshaller.loads(compute_node_xml) slap_compute_node = xml_marshaller.xml_marshaller.loads(compute_node_xml)
self.assertEqual('Compute Node', slap_compute_node.__class__.__name__) self.assertEqual('Computer', slap_compute_node.__class__.__name__)
for partition in slap_compute_node._compute_partition_list: for partition in slap_compute_node._compute_partition_list:
if partition._requested_state in ('started', 'stopped') \ if partition._requested_state in ('started', 'stopped') \
and partition._need_modification == 1: and partition._need_modification == 1:
......
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