Commit 261cd0bb authored by Gabriel Monnerat's avatar Gabriel Monnerat

master/product/Vifib/Tool/SlapTool.py

clean up the code because this part is related to Slave Instance and Slave Instance is obsolete
parent b48b631e
...@@ -144,7 +144,7 @@ class SlapTool(BaseTool): ...@@ -144,7 +144,7 @@ class SlapTool(BaseTool):
for computer_partition_document in computer_document.contentValues( for computer_partition_document in computer_document.contentValues(
portal_type="Computer Partition"): portal_type="Computer Partition"):
slap_computer._computer_partition_list.append( slap_computer._computer_partition_list.append(
self._convertToSlapPartition(computer_partition_document, computer_id)) self._getSlapPartitionByPackingList(computer_partition_document))
return xml_marshaller.xml_marshaller.dumps(slap_computer) return xml_marshaller.xml_marshaller.dumps(slap_computer)
security.declareProtected(Permissions.AccessContentsInformation, security.declareProtected(Permissions.AccessContentsInformation,
...@@ -352,15 +352,6 @@ class SlapTool(BaseTool): ...@@ -352,15 +352,6 @@ class SlapTool(BaseTool):
result_dict[key] = value result_dict[key] = value
return result_dict return result_dict
def _getModificationStatusForSlave(self, computer_partition_document):
for slave in computer_partition_document.contentValues(
portal_type='Slave Partition'):
if slave.getSlapState() == 'busy':
slap_partition = self._getSlapPartitionByPackingList(slave)
if slap_partition._need_modification == 1:
return 1
return 0
def _getSlapPartitionByPackingList(self, computer_partition_document): def _getSlapPartitionByPackingList(self, computer_partition_document):
computer = computer_partition_document computer = computer_partition_document
portal = self.getPortalObject() portal = self.getPortalObject()
...@@ -438,18 +429,6 @@ class SlapTool(BaseTool): ...@@ -438,18 +429,6 @@ class SlapTool(BaseTool):
movement.getResource() movement.getResource()
return slap_partition return slap_partition
def _convertToSlapPartition(self, computer_partition_document, computer_id):
slap_partition = self._getSlapPartitionByPackingList(
computer_partition_document)
if computer_partition_document.getPortalType() == 'Slave Partition':
slap_partition._need_modification = 0
elif computer_partition_document.getQuantity() > 0 and \
slap_partition._need_modification == 0:
slap_partition._need_modification = self._getModificationStatusForSlave(
computer_partition_document)
return slap_partition
@convertToREST @convertToREST
def _buildingSoftwareRelease(self, url, computer_id): def _buildingSoftwareRelease(self, url, computer_id):
""" """
...@@ -698,14 +677,9 @@ class SlapTool(BaseTool): ...@@ -698,14 +677,9 @@ class SlapTool(BaseTool):
""" """
# Related key might be nice # Related key might be nice
computer = self._getComputerDocument(computer_reference) computer = self._getComputerDocument(computer_reference)
try:
return self._getDocument(portal_type='Computer Partition', return self._getDocument(portal_type='Computer Partition',
reference=computer_partition_reference, reference=computer_partition_reference,
parent_uid=computer.getUid()) parent_uid=computer.getUid())
except NotFound:
return self._getDocument(portal_type='Slave Partition',
reference=computer_partition_reference,
grand_parent_uid=computer.getUid())
def _getUsageReportServiceDocument(self): def _getUsageReportServiceDocument(self):
service_document = self.Base_getUsageReportServiceDocument() service_document = self.Base_getUsageReportServiceDocument()
......
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