slapos_cloud: rename Service_getSubscriptionStatus to Item_getSubscriptionStatus

master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/Service_getSubscriptionStatus.py → master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/Item_getSubscriptionStatus.py

@@ -8,6 +8,7 @@ open_sale_order_movement_list = portal.portal_catalog(
   validation_state='validated',
   limit=1
 )
+context.log("%s %s" % (service.getRelativeUrl(), len(open_sale_order_movement_list)))
 if len(open_sale_order_movement_list) == 0:
   return "not_subscribed"
 

master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/Service_getSubscriptionStatus.xml → master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/Item_getSubscriptionStatus.xml

@@ -54,7 +54,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>Service_getSubscriptionStatus</string> </value>
+            <value> <string>Item_getSubscriptionStatus</string> </value>
         </item>
       </dictionary>
     </pickle>

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

@@ -195,8 +195,7 @@ for compute_partition_candidate in portal.portal_catalog(
 
   compute_node = compute_partition_candidate.getParentValue()
   if compute_node.getPortalType() == 'Compute Node':
-    subscription_state = compute_node.Service_getSubscriptionStatus()
-    compute_node.log('subscription_state for Compute Node %s: %s' % (compute_node.getRelativeUrl(), subscription_state))
+    subscription_state = compute_node.Item_getSubscriptionStatus()
     if subscription_state in ('not_subscribed', 'nopaid'):
       continue
     elif subscription_state in ('subscribed', 'todestroy'):

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

@@ -592,7 +592,7 @@ class SlapOSTestCaseMixin(testSlapOSMixin):
       url_string='type%s' % self.generateNewId(),
     )
 
-  @simulate('Service_getSubscriptionStatus', '*args, **kwargs', 'return "subscribed"')
+  @simulate('Item_getSubscriptionStatus', '*args, **kwargs', 'return "subscribed"')
   def bootstrapAllocableInstanceTree(self, allocation_state='possible', shared=False, node="compute",
                                      is_accountable=False, base_price=None, has_organisation=False):
     if allocation_state not in ('impossible', 'possible', 'allocated'):

master/bt5/slapos_cloud/WorkflowTemplateItem/portal_workflow/instance_slap_interface_workflow/script_RequesterInstance_request.py

@@ -28,7 +28,7 @@ if requester_instance.getPortalType() == "Instance Tree":
 
   # Do not propagate instante tree changes if current user
   # subscription status is not OK
-  subscription_state = instance_tree.Service_getSubscriptionStatus()
+  subscription_state = instance_tree.Item_getSubscriptionStatus()
   if subscription_state in ('not_subscribed', 'nopaid'):
     context.REQUEST.set('request_instance', None)
     return