slapos_cloud:

* return nothing is no Software Product is found
* check if remote instance is allocated

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

@@ -4,30 +4,32 @@ software_product = None
 software_release = None
 software_type = None
 
+use_category_uid = portal.restrictedTraverse("portal_categories/use/trade/sale").getUid(),
 product_list = portal.portal_catalog(
   portal_type="Software Product",
   validation_state=['validated', 'published'],
-  use__relative_url="trade/sale",
+  use__uid=use_category_uid,
   follow_up__uid=context.getFollowUpUid()
 )
 
-software_release = portal.portal_catalog.getResultValue(
-  portal_type="Software Product Release Variation",
-  url_string=url_string,
-  parent_uid=[x.getUid() for x in product_list]
-)
+if len(product_list) != 0:
+  software_release = portal.portal_catalog.getResultValue(
+    portal_type="Software Product Release Variation",
+    url_string=url_string,
+    parent_uid=[x.getUid() for x in product_list]
+  )
 
-if software_release is not None:
-  software_product = software_release.getParentValue()
+  if software_release is not None:
+    software_product = software_release.getParentValue()
 
-  software_type = portal.portal_catalog.getResultValue(
-    parent_uid=software_product.getUid(),
-    title=context.getSourceReference(),
-    portal_type="Software Product Type Variation"
-  )
+    software_type = portal.portal_catalog.getResultValue(
+      parent_uid=software_product.getUid(),
+      title=context.getSourceReference(),
+      portal_type="Software Product Type Variation"
+    )
 
-  if software_type is None:
-    software_release = None
-    software_product = None
+    if software_type is None:
+      software_release = None
+      software_product = None
 
 return software_product, software_release, software_type

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

@@ -479,22 +479,23 @@ class DefaultScenarioMixin(TestSlapOSSecurityMixin):
 
   def checkRemoteInstanceAllocation(self, person_user_id, person_reference,
       instance_title, software_release, software_type, server,
-      project_reference):
+      project_reference, connection_dict_to_check=None):
 
     self.login(person_user_id)
 
-    self.personRequestInstanceNotReady(
-      software_release=software_release,
-      software_type=software_type,
-      partition_reference=instance_title,
-      project_reference=project_reference
-    )
+    if connection_dict_to_check is None:
+      self.personRequestInstanceNotReady(
+        software_release=software_release,
+        software_type=software_type,
+        partition_reference=instance_title,
+        project_reference=project_reference
+      )
 
-    self.checkCloudContract(person_user_id, person_reference,
-      instance_title, software_release, software_type, server)
+      self.checkCloudContract(person_user_id, person_reference,
+        instance_title, software_release, software_type, server)
 
-    self.stepCallSlaposAllocateInstanceAlarm()
-    self.tic()
+      self.stepCallSlaposAllocateInstanceAlarm()
+      self.tic()
 
     self.personRequestInstance(
       software_release=software_release,
@@ -517,15 +518,14 @@ class DefaultScenarioMixin(TestSlapOSSecurityMixin):
     self.assertEqual(software_instance.getTitle(),
         instance_tree.getTitle())
     connection_dict = software_instance.getConnectionXmlAsDict()
-    self.assertSameSet((), connection_dict.keys())
-    """
-    self.assertSameSet(('url_1', 'url_2'), connection_dict.keys())
-    self.login()
-    partition = software_instance.getAggregateValue()
+
+    if connection_dict_to_check is None:
+      connection_dict_to_check = {}
+
+    self.assertSameSet(connection_dict_to_check.keys(), connection_dict.keys())
     self.assertSameSet(
-        ['http://%s/' % q.getIpAddress() for q in
-            partition.contentValues(portal_type='Internet Protocol Address')],
-        connection_dict.values())"""
+        connection_dict_to_check.values(),
+        connection_dict.values())
 
   def checkSlaveInstanceUnallocation(self, person_user_id,
       person_reference, instance_title,