slapos_cloud: do not check allocation supply if both release and type are not defined

master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/AllocationSupplyCell_asPredicate.py

@@ -8,6 +8,10 @@ if not context.isAllocable():
 
 base_category_tuple = ('resource', 'software_type', 'software_release', 'destination_project')
 
+for base_category in base_category_tuple:
+  if context.getProperty(base_category) is None:
+    return None
+
 if supply.getDestination():
   base_category_tuple += ('destination',)
 

master/bt5/slapos_cloud/TestTemplateItem/portal_components/test.erp5.testSlapOSAllocationSupply.py

@@ -6,6 +6,117 @@ from Products.CMFCore.utils import getToolByName
 
 class TestSlapOSAllocationSupply(SlapOSTestCaseMixin):
 
+  def test_missing_software_type_category(self):
+    # Ensure that no allocation can be done if supply has no software type
+    # Create 2 projects
+    project_1 = self.portal.project_module.newContent(
+      portal_type="Project",
+      title="project_1"
+    )
+    # Create 1 software product
+    # - one with 1 release and 0 type
+    broken_product = self.portal.software_product_module.newContent(
+      portal_type="Software Product",
+      title="Broken Product"
+    )
+    broken_product.newContent(
+      portal_type="Software Product Release Variation",
+      url_string="http://example.org/release_10"
+    )
+
+    # create 2 users
+    person_1 = self.portal.person_module.newContent()
+
+    # create 1 compute node
+    compute_node_1 = self.portal.compute_node_module.newContent(
+      portal_type="Compute Node"
+    )
+
+    # Create 1 allocation supply
+    # - one for everybody (no destination)
+    now = DateTime()
+    everybody_supply = self.portal.allocation_supply_module.newContent(
+      title="Everybody Supply",
+      start_date_range_min=now,
+      destination_project_value=project_1,
+      aggregate_value=compute_node_1
+    )
+
+    # Create Allocation Line/Cell for all product combination
+    allocation_supply_cell_list = []
+    base_id = 'path'
+    for allocation_supply in [everybody_supply]:
+      for software_product in [broken_product]:
+        allocation_supply_line = allocation_supply.newContent(
+          portal_type="Allocation Supply Line",
+          resource_value=software_product
+        )
+        allocation_supply_line.edit(
+          p_variation_base_category_list=allocation_supply_line.getVariationRangeBaseCategoryList()
+        )
+        allocation_supply_line.setCellRange(
+          base_id=base_id,
+          *allocation_supply_line.SupplyLine_asCellRange(base_id=base_id)
+        )
+        for cell_key in list(allocation_supply_line.getCellKeyList(base_id=base_id)):
+          allocation_supply_cell = allocation_supply_line.newCell(
+            base_id=base_id,
+            portal_type='Allocation Supply Cell',
+            *cell_key
+          )
+          allocation_supply_cell.edit(
+            mapped_value_property_list=['allocable'],
+            allocable=True,
+            predicate_category_list=cell_key,
+            variation_category_list=cell_key
+          )
+          allocation_supply_cell_list.append(allocation_supply_cell)
+      allocation_supply.validate()
+
+    self.tic()
+    # Create 2 movements
+    # one for everybody
+    # one for one specific user
+    # check if predicates match
+    i = 0
+    domain_tool = getToolByName(self.portal, 'portal_domains')
+    for software_product in [broken_product]:
+      for software_release in software_product.contentValues(portal_type="Software Product Release Variation"):
+        for project in [project_1, None]:
+          for destination in [person_1, None]:
+            for start_date in [now, now-1, None]:
+
+              tmp_context = self.portal.portal_trash.newContent(
+                portal_type='Movement',
+                temp_object=1,
+                resource_value=software_product,
+                #software_type_value=software_type,
+                software_release_value=software_release,
+                start_date=start_date,
+                destination_project_value=project,
+                destination_value=destination
+              )
+              for allocation_supply_cell in allocation_supply_cell_list:
+                expected_test_result = False
+                assert allocation_supply_cell.test(tmp_context) == expected_test_result, """Expected: %s %i
+Product: %s %s
+Release: %s %s
+Project: %s %s
+Destination: %s %s
+Date: %s %s
+""" % (
+                  expected_test_result, i,
+                  software_product.getRelativeUrl(), allocation_supply_cell.getResource(),
+                  software_release.getRelativeUrl(), allocation_supply_cell.getSoftwareRelease(),
+                  project.getRelativeUrl(),allocation_supply_cell.getParentValue().getParentValue().getDestinationProject(),
+                  destination, allocation_supply_cell.getParentValue().getParentValue().getDestination(),
+                  start_date, allocation_supply_cell.getParentValue().getParentValue().getStartDateRangeMin()
+                )
+                assert (allocation_supply_cell in domain_tool.searchPredicateList(
+                        tmp_context, portal_type=['Allocation Supply Cell'])) == expected_test_result
+                i += 1
+
+
   def test_check(self):
     # Create 2 projects
     project_1 = self.portal.project_module.newContent(