Commit 941896e5 authored by Cédric Le Ninivin's avatar Cédric Le Ninivin Committed by Titouan Soulard

slapos: slapgrid tests work with slaptool for backward compatibility

parent 80914cc3
...@@ -580,8 +580,8 @@ stderr_logfile_backups=1 ...@@ -580,8 +580,8 @@ stderr_logfile_backups=1
launchSupervisord(instance_root=self.instance_root, logger=self.logger) launchSupervisord(instance_root=self.instance_root, logger=self.logger)
def getComputerPartitionList(self): def getComputerPartitionList(self):
if self.computer_partition_list is None:
if not self.api_backward_compatibility: if not self.api_backward_compatibility:
if self.computer_partition_list is None:
self.computer_partition_list = self.slap.jio_api_connector.allDocs({ self.computer_partition_list = self.slap.jio_api_connector.allDocs({
"portal_type": "Software Instance", "portal_type": "Software Instance",
"compute_node_id": self.computer_id, "compute_node_id": self.computer_id,
...@@ -598,17 +598,19 @@ stderr_logfile_backups=1 ...@@ -598,17 +598,19 @@ stderr_logfile_backups=1
software_release_uri = partition.getSoftwareRelease().getURI() software_release_uri = partition.getSoftwareRelease().getURI()
except (NotFoundError, TypeError, NameError): except (NotFoundError, TypeError, NameError):
software_release_uri = None software_release_uri = None
parameter_dict = partition.getInstanceParameterDict()
self.computer_partition_list.append({ self.computer_partition_list.append({
"reference": partition._instance_guid, "reference": partition._instance_guid,
"portal_type": "Software Instance", "portal_type": "Software Instance",
"compute_partition_id": partition.getId(), "compute_partition_id": partition.getId(),
"state": partition.getState(), "state": partition.getState(),
"software_type": partition.getInstanceParameterDict().get( "software_type": parameter_dict.get('slap_software_type', None),
'slap_software_type', None), "parameters": parameter_dict,
"parameters": partition.getInstanceParameterDict(), "processing_timestamp": parameter_dict.get("timestamp"),
"instance_processing_timestamp": partition.getInstanceParameterDict().get(
"timestamp"),
"slap_partition": partition, "slap_partition": partition,
"ip_list": parameter_dict["ip_list"],
"full_ip_list": parameter_dict.get("full_ip_list", []),
"access_status_message": partition.getAccessStatus(), "access_status_message": partition.getAccessStatus(),
"software_release_uri": software_release_uri, "software_release_uri": software_release_uri,
"sla_parameters": getattr(partition, '_filter_dict', {}), "sla_parameters": getattr(partition, '_filter_dict', {}),
......
This source diff could not be displayed because it is too large. You can view the blob instead.
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