Base_generateSupportRequestForSlapOS should include some indications

master/bt5/slapos_crm/SkinTemplateItem/portal_skins/slapos_crm/Base_generateSupportRequestForSlapOS.xml

@@ -59,6 +59,8 @@ if source_project_value.getPortalType() == "Computer":\n
   destination_decision = source_project_value.getSourceAdministration()\n
 elif source_project_value.getPortalType() == "Software Instance":\n
   destination_decision = source_project_value.getSpecialiseValue().getDestinationSection()\n
+elif source_project_value.getPortalType() == "Hosting Subscription":\n
+  destination_decision = source_project_value.getDestinationSection()\n
 else:\n
   destination_decision = None\n
 \n
@@ -66,6 +68,7 @@ if portal.ERP5Site_isSupportRequestCreationClosed(destination_decision):\n
   # Stop ticket creation\n
   return\n
 \n
+title = \'[MONITORING] \' + title\n
 support_request_in_progress = portal.portal_catalog.getResultValue(\n
   portal_type = \'Support Request\',\n
   title = title,\n
@@ -74,6 +77,8 @@ support_request_in_progress = portal.portal_catalog.getResultValue(\n
 )\n
 \n
 if support_request_in_progress is None:\n
+  ressource = portal.service_module.\\\n
+                  slapos_crm_monitoring.getRelativeUrl()\n
   support_request = portal.\\\n
     support_request_module.\\\n
     slapos_crm_support_request_template_for_monitoring.\\\n
@@ -83,7 +88,8 @@ if support_request_in_progress is None:\n
     description = description,\n
     start_date = DateTime(),\n
     destination_decision=destination_decision,\n
-    source_project_value = source_relative_url\n
+    source_project_value = source_relative_url,\n
+    ressource=ressource\n
   )\n
   support_request.validate()\n
 \n

master/bt5/slapos_crm/TestTemplateItem/testSlapOSCRMSupportRequestGeneration.py

@@ -184,6 +184,23 @@ class TestSlapOSCloudSupportRequestGeneration(testSlapOSMixin):
     self.assertEquals(support_request.getDestinationDecision(),
                       host_sub.getDestinationSection())
   
+  def test_hosting_subscription_Base_generateSupportRequestForSlapOS(self):
+    host_sub = self._makeHostingSubscription(self.new_id)
+
+    title = "Test Support Request %s" % self.new_id
+    support_request = host_sub.Base_generateSupportRequestForSlapOS(
+      title, title, host_sub.getRelativeUrl()
+    )
+    self.tic()
+
+    self.assertNotEqual(support_request, None)
+
+    support_request = self.portal.restrictedTraverse(support_request)
+ 
+    # The support request is added to computer owner.
+    self.assertEquals(support_request.getDestinationDecision(),
+                      host_sub.getDestinationSection())
+
   def test_Base_generateSupportRequestForSlapOS_do_not_recreate_if_open(self):
     title = "Test Support Request %s" % self.new_id
     computer = self._makeComputer(self.new_id)
@@ -775,7 +792,7 @@ portal_workflow.doActionFor(context, action='edit_action', comment='Visited by C
       computer.workflow_history['edit_workflow'][-1]['comment'])
   
   def _simulateHostingSubscription_checkSofwareInstanceState(self):
-    script_name = 'HostingSubscription_checkSofwareInstanceState'
+    script_name = 'HostingSubscription_checkSofwareInstanceAllocationState'
     if script_name in self.portal.portal_skins.custom.objectIds():
       raise ValueError('Precondition failed: %s exists in custom' % script_name)
     createZODBPythonScript(self.portal.portal_skins.custom,
@@ -783,11 +800,11 @@ portal_workflow.doActionFor(context, action='edit_action', comment='Visited by C
       '*args, **kw',
       '# Script body\n'
 """portal_workflow = context.portal_workflow
-portal_workflow.doActionFor(context, action='edit_action', comment='Visited by HostingSubscription_checkSofwareInstanceState') """ )
+portal_workflow.doActionFor(context, action='edit_action', comment='Visited by HostingSubscription_checkSofwareInstanceAllocationState') """ )
     transaction.commit()
   
   def _dropHostingSubscription_checkSofwareInstanceState(self):
-    script_name = 'HostingSubscription_checkSofwareInstanceState'
+    script_name = 'HostingSubscription_checkSofwareInstanceAllocationState'
     if script_name in self.portal.portal_skins.custom.objectIds():
       self.portal.portal_skins.custom.manage_delObjects(script_name)
     transaction.commit()
@@ -806,6 +823,6 @@ portal_workflow.doActionFor(context, action='edit_action', comment='Visited by H
     finally:
       self._dropHostingSubscription_checkSofwareInstanceState()
 
-    self.assertEqual('Visited by HostingSubscription_checkSofwareInstanceState',
+    self.assertEqual('Visited by HostingSubscription_checkSofwareInstanceAllocationState',
       host_sub.workflow_history['edit_workflow'][-1]['comment'])
     
\ No newline at end of file

master/bt5/slapos_crm/bt/revision

-39
\ No newline at end of file
+40
\ No newline at end of file