Refactor code to find correctly a Software Instance, because if...

Refactor code to find correctly a Software Instance, because if slave_reference is None the query must ensure that Slave Instance will be ignored

master/product/Vifib/Tool/SlapTool.py

@@ -774,10 +774,14 @@ class SlapTool(BaseTool):
     state_list.extend(portal.getPortalCurrentInventoryStateList())
     state_list.extend(portal.getPortalReservedInventoryStateList())
     state_list.extend(portal.getPortalTransitInventoryStateList())
-    aggregate_dict = {"aggregate_relative_url" : \
-        computer_partition_document.getRelativeUrl()}
     if slave_reference is not None:
-      aggregate_dict["aggregate_reference"] = slave_reference
+      query = ComplexQuery(Query(aggregate_reference=slave_reference),
+          Query(aggregate_relative_url=computer_partition_document.getRelativeUrl()),
+          operator="AND")
+    else:
+      query = ComplexQuery(Query(aggregate_portal_type="Software Instance"),
+          Query(aggregate_relative_url=computer_partition_document.getRelativeUrl()),
+          operator="AND")
 
     # Use getTrackingList
     catalog_result = portal.portal_catalog(
@@ -786,7 +790,7 @@ class SlapTool(BaseTool):
       default_resource_uid=service_uid_list,
       sort_on=(('movement.start_date', 'DESC'),),
       limit=1,
-      **aggregate_dict
+      query=query
     )
     if len(catalog_result):
       return catalog_result[0].getObject()

master/product/Vifib/tests/testVifibSlapWebService.py

@@ -4725,7 +4725,7 @@ class TestVifibSlapWebService(testVifibMixin):
       Tic
       Logout
       LoginDefaultUser
-      CheckComputerPartitionInstanceHostingSalePackingListConfirmed
+      CheckComputerPartitionInstanceSetupSalePackingListConfirmed
       Logout
     """
     sequence_list.addSequenceString(sequence_string)
@@ -4752,7 +4752,7 @@ class TestVifibSlapWebService(testVifibMixin):
       Tic
       Logout
       LoginDefaultUser
-      CheckComputerPartitionInstanceHostingSalePackingListStopped
+      CheckComputerPartitionInstanceSetupSalePackingListStopped
       Logout
     """
     sequence_list.addSequenceString(sequence_string)