slapos_cloud:

* Subscription Request are invalidated after Open Order is created
* test: create project by doing a subscription request

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

@@ -583,11 +583,13 @@ class DefaultScenarioMixin(TestSlapOSSecurityMixin):
 
     self.stepCallSlaposSubscriptionRequestCreateFromOrphanedItemAlarm()
     self.tic()
+    self.stepCallSlaposSubscriptionRequestValidateSubmittedAlarm()
+    self.tic()
 
     subscription_request = self.portal.portal_catalog.getResultValue(
       portal_type="Subscription Request",
       aggregate__uid=service.getUid(),
-      simulation_state='validated'
+      simulation_state='invalidated'
     )
     self.assertNotEqual(subscription_request, None)
 

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

@@ -147,6 +147,18 @@ class SlapOSTestCaseMixin(testSlapOSMixin):
     """Overwrite this function on project context to tweak production focus tests"""
     pass
 
+  def addAccountingManagerAssignment(self, person):
+    person.newContent(
+      portal_type='Assignment',
+      function='accounting/manager'
+    ).open()
+
+  def addSaleManagerAssignment(self, person):
+    person.newContent(
+      portal_type='Assignment',
+      function='sale/manager'
+    ).open()
+
   def addProjectProductionManagerAssignment(self, person, project):
     person.newContent(
       portal_type='Assignment',
@@ -161,59 +173,17 @@ class SlapOSTestCaseMixin(testSlapOSMixin):
       function='customer'
     ).open()
 
-  def addProject(self, is_accountable=False):
-    project = self.portal.project_module.newContent(
-      portal_type='Project',
-      title='project-%s' % self.generateNewId()
-    )
-    if is_accountable:
-      currency = self.portal.currency_module.newContent(
-        portal_type="Currency",
-        reference="test-currency-%s" % self.generateNewId(),
-        short_title="tc%s" % self.generateNewId(),
-        base_unit_quantity=0.01
-      )
-      currency.validate()
+  def addProject(self, organisation=None, currency=None, person=None, is_accountable=False):
+    # Action to submit project subscription
+    service = self.portal.restrictedTraverse('service_module/slapos_virtual_master_subscription')
+    subscription_request = service.Resource_createSubscriptionRequest(person, None)
+    self.tic()
 
-      seller_organisation = self.portal.organisation_module.newContent(
-        portal_type="Organisation",
-        title="test-seller-%s" % self.generateNewId()
-      )
-      seller_bank_account = seller_organisation.newContent(
-        portal_type="Bank Account",
-        title="test_bank_account_%s" % self.generateNewId()
-      )
-      seller_organisation.validate()
+    self.portal.portal_alarms.slapos_subscription_request_validate_submitted.activeSense()
+    self.tic()
+    self.logout()
 
-      sale_trade_condition = self.portal.sale_trade_condition_module.newContent(
-        portal_type="Sale Trade Condition",
-        reference='seller_organisation_%s' % seller_organisation.getTitle(),
-        # XXX hardcoded
-        specialise="business_process_module/slapos_ultimate_business_process",
-        destination_project_value=project,
-        source_value=seller_organisation,
-        source_section_value=seller_organisation,
-        source_payment_value=seller_bank_account,
-        price_currency_value=currency
-      )
-      sale_trade_condition.newContent(
-        portal_type="Trade Model Line",
-        reference="VAT",
-        resource="service_module/slapos_tax",
-        base_application="base_amount/invoicing/taxable",
-        trade_phase="slapos/tax",
-        price=0.2,
-        quantity=1.0,
-        membership_criterion_base_category=('price_currency',),
-        membership_criterion_category=('price_currency/%s' % currency.getRelativeUrl(),)
-      )
-
-      sale_trade_condition.validate()
-      # XXX Is it a good idea to have a cross relation?
-      project.edit(specialise_value=sale_trade_condition)
-
-    project.validate()
-    return project
+    return subscription_request.getAggregate()
 
   def _addERP5Login(self, document, **kw):
     if document.getPortalType() == "Person":

master/bt5/slapos_cloud/bt/template_keep_path_list

-portal_preferences/slapos_default_site_preference
-portal_preferences/slapos_default_system_preference
-person_module/template_member
 instance_tree_module/template_**
+person_module/template_member
 portal_catalog/**
+portal_preferences/slapos_default_site_preference
+portal_preferences/slapos_default_system_preference
\ No newline at end of file