slapos_subscription_request:

* automated ledger path
* add ledger to the accounting template
* only add a project assignment for the existing admin user
* create normal user with the project customer assignment
* update cdn subscription test
  project reference needed
* add project for chinese subscription
* project needed for scenario tests
* all Subscription/Trial object must be linked to a Project
* test: user need to be linked to a project
* propagate source project
* delivery/movement must use source_project instead of follow_up
* set source_project on event
* delivery/movement must use source_project instead of follow_up
* use source_project instead of follow_up
* use source_project instead of follow_up
* test set server allocation_scope/open

master/bt5/slapos_accounting/TestTemplateItem/portal_components/test.erp5.testSlapOSContractAlarm.xml

@@ -6,12 +6,6 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_recorded_property_dict</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
         <item>
             <key> <string>default_reference</string> </key>
             <value> <string>testSlapOSContractAlarm</string> </value>
@@ -55,28 +49,13 @@
         <item>
             <key> <string>workflow_history</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
             </value>
         </item>
       </dictionary>
     </pickle>
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <global name="PersistentMapping" module="Persistence.mapping"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>data</string> </key>
-            <value>
-              <dictionary/>
-            </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
@@ -89,7 +68,7 @@
                 <item>
                     <key> <string>component_validation_workflow</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -98,7 +77,7 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="4" aka="AAAAAAAAAAQ=">
+  <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
     </pickle>

master/bt5/slapos_subscription_request/PathTemplateItem/accounting_module/slapos_pre_payment_template.xml

@@ -97,6 +97,7 @@
                 <string>source/organisation_module/slapos</string>
                 <string>price_currency/currency_module/EUR</string>
                 <string>specialise/sale_trade_condition_module/slapos_aggregated_trade_condition</string>
+                <string>ledger/automated</string>
               </tuple>
             </value>
         </item>

master/bt5/slapos_subscription_request/PathTemplateItem/accounting_module/slapos_wechat_pre_payment_template.xml

@@ -97,6 +97,7 @@
                 <string>specialise/sale_trade_condition_module/slapos_aggregated_trade_condition</string>
                 <string>resource/currency_module/CNY</string>
                 <string>payment_mode/wechat</string>
+                <string>ledger/automated</string>
               </tuple>
             </value>
         </item>

master/bt5/slapos_subscription_request/PathTemplateItem/accounting_module/template_pre_payment_subscription_sale_invoice_transaction.xml

@@ -95,6 +95,7 @@
                 <string>price_currency/currency_module/EUR</string>
                 <string>resource/currency_module/EUR</string>
                 <string>payment_mode/payzen</string>
+                <string>ledger/automated</string>
                 <string>specialise/sale_trade_condition_module/slapos_aggregated_trade_condition</string>
               </tuple>
             </value>

master/bt5/slapos_subscription_request/PathTemplateItem/accounting_module/template_wechat_pre_payment_subscription_sale_invoice_transaction.xml

@@ -91,6 +91,7 @@
             <value>
               <tuple>
                 <string>source_section/organisation_module/slapos</string>
+                <string>ledger/automated</string>
                 <string>source/organisation_module/slapos</string>
                 <string>payment_mode/wechat</string>
                 <string>specialise/sale_trade_condition_module/slapos_aggregated_trade_condition</string>

master/bt5/slapos_subscription_request/PortalTypePropertySheetTemplateItem/property_sheet_list.xml

@@ -3,6 +3,7 @@
   <item>InstanceTree</item>
   <item>Price</item>
   <item>SlapOSSubscriptionCondition</item>
+  <item>SlapOSVirtualMasterSourceProjectConstraint</item>
   <item>SoftwareInstance</item>
   <item>TextDocument</item>
   <item>Url</item>
@@ -15,9 +16,10 @@
   <item>Person</item>
   <item>Price</item>
   <item>Reference</item>
+  <item>SlapOSVirtualMasterSourceProjectConstraint</item>
   <item>SlaposSubscriptionRequestAuditConstraint</item>
   <item>Task</item>
   <item>Url</item>
   <item>VariationRange</item>
  </portal_type>
-</property_sheet_list>
+</property_sheet_list>
\ No newline at end of file

master/bt5/slapos_subscription_request/SkinTemplateItem/portal_skins/slapos_subscription_request/SubscriptionRequestModule_requestSubscriptionProxy.py

@@ -82,6 +82,7 @@ subscription_request = context.subscription_request_module.newContent(
   quantity=user_input_dict["amount"],
   language=target_language,
   specialise_value=subscription_condition,
+  source_project_value=subscription_condition.getSourceProjectValue()
 )
 
 subscription_request.setDefaultEmailText(email)

master/bt5/slapos_subscription_request/SkinTemplateItem/portal_skins/slapos_subscription_request/SubscriptionRequest_createRelatedSaleInvoiceTransaction.py

@@ -39,7 +39,8 @@ if current_invoice is None:
   payment_transaction = portal.restrictedTraverse(payment)
   current_invoice.edit(
     title="Reservation Fee",
-    ledger_value=portal.portal_categories.ledger.accounting.automated,
+    ledger_value=portal.portal_categories.ledger.automated,
+    source_project_value=context.getSourceProjectValue(),
     destination_value=context.getDestinationSection(),
     destination_section_value=context.getDestinationSection(),
     destination_decision_value=context.getDestinationSection(),

master/bt5/slapos_subscription_request/SkinTemplateItem/portal_skins/slapos_subscription_request/SubscriptionRequest_generateReservationRefoundSalePackingList.py

@@ -62,7 +62,8 @@ delivery.edit(
   price_currency=sale_invoice_transaction.getPriceCurrency(),
   source=sale_invoice_transaction.getSource(),
   source_section=sale_invoice_transaction.getSourceSection(),
-  ledger_value=portal.portal_categories.ledger.accounting.automated,
+  ledger_value=portal.portal_categories.ledger.automated,
+  source_project_value=sale_invoice_transaction.getSourceProjectValue(),
 )
 
 line = delivery.newContent(

master/bt5/slapos_subscription_request/SkinTemplateItem/portal_skins/slapos_subscription_request/SubscriptionRequest_processRequest.py

@@ -32,7 +32,7 @@ request_kw.update(
     sla_xml=subscription_condition.getSlaXml(default_xml).strip(),
     shared=bool(subscription_condition.getRootSlave(0)),
     state="started",
-    project_reference=subscription_condition.getFollowUpReference()
+    project_reference=subscription_condition.getSourceProjectReference()
   )
 
 person.requestSoftwareInstance(**request_kw)

master/bt5/slapos_subscription_request/SkinTemplateItem/portal_skins/slapos_subscription_request/SubscriptionRequest_requestPaymentTransaction.py

@@ -33,7 +33,8 @@ if current_invoice is None:
   now = DateTime()
   current_payment.edit(
     title="Payment for Reservation Fee",
-    ledger_value=portal.portal_categories.ledger.accounting.automated,
+    ledger_value=portal.portal_categories.ledger.automated,
+    source_project_value=context.getSourceProjectValue(),
     specialise_value=trade_condition,
     destination_value=context.getDestinationSection(),
     destination_section_value=context.getDestinationSection(),

master/bt5/slapos_subscription_request/TestTemplateItem/portal_components/test.erp5.testSlapOSSubscriptionCDNScenario.py

@@ -62,13 +62,14 @@ class TestSlapOSSubscriptionCDNScenarioMixin(TestSlapOSSubscriptionScenarioMixin
 
 
     # now instantiate it on compute_node and set some nice connection dict
-    self.setServerOpenPersonal(subscription_server)
+    self.setServerOpenPublic(subscription_server)
 
     self.login(self.admin_user.getUserId())
     self.personRequestInstanceNotReady(
       software_release=self.subscription_condition.getUrlString(),
       software_type=self.subscription_condition.getSourceReference(),
-      partition_reference="InstanceForSlave%s" % self.new_id
+      partition_reference="InstanceForSlave%s" % self.new_id,
+      project_reference=self.subscription_project.getReference()
     )
 
     self.stepCallSlaposAllocateInstanceAlarm()
@@ -77,7 +78,8 @@ class TestSlapOSSubscriptionCDNScenarioMixin(TestSlapOSSubscriptionScenarioMixin
     self.personRequestInstance(
       software_release=self.subscription_condition.getUrlString(),
       software_type=self.subscription_condition.getSourceReference(),
-      partition_reference="InstanceForSlave%s" % self.new_id
+      partition_reference="InstanceForSlave%s" % self.new_id,
+      project_reference=self.subscription_project.getReference()
     )
 
     # now instantiate it on compute_node and set some nice connection dict
@@ -85,7 +87,7 @@ class TestSlapOSSubscriptionCDNScenarioMixin(TestSlapOSSubscriptionScenarioMixin
 
     self.tic()
     self.login()
-    self.setServerOpenSubscription(subscription_server)
+    #self.setServerOpenSubscription(subscription_server)
     self.setAccessToMemcached(subscription_server)
     self.tic()
     self.simulateSlapgridCP(subscription_server)

master/bt5/slapos_subscription_request/TestTemplateItem/portal_components/test.erp5.testSlapOSSubscriptionDualOrganisationScenario.py

@@ -171,7 +171,7 @@ class testSlapOSSubscriptionDualOrganisationScenario(TestSlapOSSubscriptionScena
     name="ABC %s" % self.new_id
 
     self.login()
-    self.createNormalUser(default_email_text, name, language)
+    self.createNormalUser(default_email_text, name, language, self.subscription_project)
 
     self.tic()
 

master/bt5/slapos_subscription_request/TestTemplateItem/portal_components/test.erp5.testSlapOSSubscriptionPerUserTradeConditionScenario.py

@@ -58,7 +58,7 @@ class testSlapOSSubscriptionPerUserTradeConditionScenario(TestSlapOSSubscription
     name="ABC %s" % self.new_id
 
     self.login()
-    self.createNormalUser(default_email_text, name, language)
+    self.createNormalUser(default_email_text, name, language, self.subscription_project)
     self.createCustomUserSaleTradeCondition(self.normal_user)
     
     self.tic()
@@ -144,7 +144,7 @@ class testSlapOSSubscriptionPerUserTradeConditionScenarioDetaxed(TestSlapOSSubsc
     name="ABC %s" % self.new_id
 
     self.login()
-    self.createNormalUser(default_email_text, name, language)
+    self.createNormalUser(default_email_text, name, language, self.subscription_project)
     self.createDetaxedUserSaleTradeCondition(self.normal_user)
     
     self.tic()

master/bt5/slapos_subscription_request/TestTemplateItem/portal_components/test.erp5.testSlapOSSubscriptionPerUserTradeConditionScenario.xml

@@ -6,12 +6,6 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_recorded_property_dict</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
         <item>
             <key> <string>default_reference</string> </key>
             <value> <string>testSlapOSSubscriptionPerUserTradeConditionScenario</string> </value>
@@ -61,28 +55,13 @@
         <item>
             <key> <string>workflow_history</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
             </value>
         </item>
       </dictionary>
     </pickle>
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <global name="PersistentMapping" module="Persistence.mapping"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>data</string> </key>
-            <value>
-              <dictionary/>
-            </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
@@ -95,7 +74,7 @@
                 <item>
                     <key> <string>component_validation_workflow</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -104,7 +83,7 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="4" aka="AAAAAAAAAAQ=">
+  <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
     </pickle>

master/bt5/slapos_subscription_request/TestTemplateItem/portal_components/test.erp5.testSlapOSSubscriptionScenario.py

@@ -163,14 +163,6 @@ return dict(vads_url_already_registered="%s/already_registered" % (payment_trans
       if str(notification_message.getVersion("")) == "999":
         notification_message.invalidate()
 
-  def createProject(self):
-    project = self.portal.project_module.newContent(
-      portal_type='Project',
-      title='project-%s' % self.generateNewId()
-    )
-    project.validate()
-    return project
-
   def createNotificationMessage(self, reference,
       content_type='text/html', language="en", text_content='${name} ${login_name} ${login_password}'):
 
@@ -187,40 +179,7 @@ return dict(vads_url_already_registered="%s/already_registered" % (payment_trans
     notification_message.validate()
     return notification_message
 
-  def createAdminUser(self, project):
-    """ Create a Admin user, to manage compute_nodes and instances eventually """
-    admin_user_login = self.portal.portal_catalog.getResultValue(
-      portal_type="ERP5 Login",
-      reference="admin_user",
-      validation_state="validated"
-    )
-
-    if admin_user_login is None:
-      admin_user = self.portal.person_module.template_member.\
-                                 Base_createCloneDocument(batch_mode=1)
-
-      admin_user.newContent(
-        portal_type="ERP5 Login",
-        reference="admin_user").validate()
-
-      admin_user.newContent(
-        portal_type='Assignment',
-        destination_project_value=project,
-        function='computer/manager'
-      ).open()
-
-      admin_user.edit(
-        first_name="Admin User",
-        reference="Admin_user",
-        default_email_text="do_not_reply_to_admin@example.org",
-      )
-
-      admin_user.validate()
-      self.admin_user = admin_user
-    else:
-      self.admin_user = admin_user_login.getParentValue()
-
-  def createNormalUser(self, email, name, language):
+  def createNormalUser(self, email, name, language, project):
     """ Create a Normal user """
     normal_user_login = self.portal.portal_catalog.getResultValue(
       portal_type="ERP5 Login",
@@ -246,9 +205,16 @@ return dict(vads_url_already_registered="%s/already_registered" % (payment_trans
         assignment.open()
 
       normal_user.validate()
-      self.normal_user = normal_user
     else:
-      self.normal_user = normal_user_login.getParentValue()
+      normal_user = normal_user_login.getParentValue()
+
+    normal_user.newContent(
+      portal_type='Assignment',
+      destination_project_value=project,
+      function='customer'
+    ).open()
+
+    self.normal_user = normal_user
     self.normal_user.setLanguage(language)
 
   def createChineseSubscriptionCondition(self, slave=False):
@@ -288,7 +254,8 @@ return dict(vads_url_already_registered="%s/already_registered" % (payment_trans
       sla_xml='<?xml version="1.0" encoding="utf-8"?>\n<instance>\n</instance>',
       text_content='<?xml version="1.0" encoding="utf-8"?>\n<instance>\n</instance>',
       user_input={},
-      specialise_value=sale_trade_condition
+      specialise_value=sale_trade_condition,
+      source_project_value=self.subscription_project
     )
     subscription_condition.validate()
     self.tic()
@@ -304,7 +271,7 @@ return dict(vads_url_already_registered="%s/already_registered" % (payment_trans
       price_currency="currency_module/EUR",
       payment_mode='payzen',
       specialise="sale_trade_condition_module/slapos_subscription_trade_condition",
-      #follow_up_value=self.subscription_project
+      source_project_value=self.subscription_project
     )
     # XXX TODO clarify the with / without tax
     sale_trade_condition.newContent(
@@ -333,7 +300,7 @@ return dict(vads_url_already_registered="%s/already_registered" % (payment_trans
       text_content='<?xml version="1.0" encoding="utf-8"?>\n<instance>\n</instance>',
       user_input={},
       specialise_value=sale_trade_condition,
-      follow_up_value=self.subscription_project
+      source_project_value=self.subscription_project
     )
     self.subscription_condition.validate()
     self.tic()
@@ -1256,6 +1223,7 @@ return dict(vads_url_already_registered="%s/already_registered" % (payment_trans
         portal_type='Compute Node', reference=subscription_server_id)
     self.setAccessToMemcached(subscription_server)
     self.assertNotEqual(None, subscription_server)
+    self.setServerOpenPublic(subscription_server)
     self.assertEqual('open', subscription_server.getCapacityScope())
 
     # and install some software on them
@@ -1661,9 +1629,10 @@ return dict(vads_url_already_registered="%s/already_registered" % (payment_trans
     # Call as anonymous... check response?
     default_email_text = "abc%s@nexedi.com" % self.new_id
     name="ABC %s" % self.new_id
+    project_reference = self.subscription_project.getReference()
 
     self.login()
-    self.createNormalUser(default_email_text, name, language)
+    self.createNormalUser(default_email_text, name, language, self.subscription_project)
     self.tic()
 
     self.subscription_server = self.createPublicServerForAdminUser()
@@ -1692,7 +1661,7 @@ return dict(vads_url_already_registered="%s/already_registered" % (payment_trans
     name="ABC %s" % self.new_id
 
     self.login()
-    self.createNormalUser(default_email_text, name, language)
+    self.createNormalUser(default_email_text, name, language, self.subscription_project)
     self.tic()
 
     self.subscription_server = self.createPublicServerForAdminUser()
@@ -1712,6 +1681,7 @@ return dict(vads_url_already_registered="%s/already_registered" % (payment_trans
         software_release=self.subscription_condition.getUrlString(),
         software_type="default",
         partition_reference="_test_subscription_scenario_with_existing_user_extra_instance",
+        project_reference=project_reference
       )
       self.non_subscription_related_instance_amount = 1
 

master/bt5/slapos_subscription_request/bt/template_portal_type_property_sheet_list

 Subscription Condition | InstanceTree
 Subscription Condition | Price
 Subscription Condition | SlapOSSubscriptionCondition
+Subscription Condition | SlapOSVirtualMasterSourceProjectConstraint
 Subscription Condition | SoftwareInstance
 Subscription Condition | TextDocument
 Subscription Condition | Url
@@ -11,7 +12,8 @@ Subscription Request | InstanceTree
 Subscription Request | Person
 Subscription Request | Price
 Subscription Request | Reference
+Subscription Request | SlapOSVirtualMasterSourceProjectConstraint
 Subscription Request | SlaposSubscriptionRequestAuditConstraint
 Subscription Request | Task
 Subscription Request | Url
-Subscription Request | VariationRange
+Subscription Request | VariationRange
\ No newline at end of file