slapos_accounting: select the correct software release/type on open order

master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/InstanceTree_requestUpdateOpenSaleOrder.py

@@ -90,11 +90,23 @@ if instance_tree.getCausalityState() == 'diverged':
         raise NotImplementedError('No Software Product defined for %s' % instance_tree.getRelativeUrl())
 
       #assert instance_tree.getPortalType() in service.getRequiredAggregatedPortalTypeList()
+      software_release = portal.portal_catalog.getResultValue(
+        parent_uid=service.getUid(),
+        url_string=instance_tree.getUrlString(),
+        portal_type="Software Product Release Variation"
+      )
+      software_type = portal.portal_catalog.getResultValue(
+        parent_uid=service.getUid(),
+        title=instance_tree.getSourceReference(),
+        portal_type="Software Product Type Variation"
+      )
 
-      resource_vcl = list(service.getVariationCategoryList(
-                                     omit_individual_variation=0))
+      resource_vcl = [
+        'software_release/%s' % software_release.getRelativeUrl(),
+        'software_type/%s' % software_type.getRelativeUrl()
+      ]
       resource_vcl.sort()
-      assert len(resource_vcl) != 0, service
+      assert len(resource_vcl) == 2, service
 
       edit_kw = {
         'resource_value': service,