slapos_subscription_request:

* subscription scenario needs project now
* project is needed when requesting an instance
* hardcode automated ledger category for the newly created sale packing list
* hardcode automated ledger category for the newly created accounting transactions

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

@@ -13,6 +13,7 @@ if current_invoice is None:
   invoice_template = portal.restrictedTraverse(template)
   current_invoice = invoice_template.Base_createCloneDocument(batch_mode=1)
   assert current_invoice is not None
+
   current_invoice.manage_delObjects([x for x in
                                      current_invoice.contentIds() if x != "1"])
   current_invoice.edit(
@@ -38,6 +39,7 @@ if current_invoice is None:
   payment_transaction = portal.restrictedTraverse(payment)
   current_invoice.edit(
     title="Reservation Fee",
+    ledger_value=portal.portal_categories.ledger.accounting.automated,
     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

@@ -61,7 +61,8 @@ delivery.edit(
   causality_uid=context.getUid(),
   price_currency=sale_invoice_transaction.getPriceCurrency(),
   source=sale_invoice_transaction.getSource(),
-  source_section=sale_invoice_transaction.getSourceSection()
+  source_section=sale_invoice_transaction.getSourceSection(),
+  ledger_value=portal.portal_categories.ledger.accounting.automated,
 )
 
 line = delivery.newContent(

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

@@ -17,7 +17,8 @@ request_kw = dict(
       software_type=instance_tree.getSourceReference(),
       instance_xml=instance_tree.getTextContent(),
       sla_xml=instance_tree.getSlaXml(),
-      shared=instance_tree.isRootSlave()
+      shared=instance_tree.isRootSlave(),
+      project_reference=instance_tree.getFollowUpReference()
 )
 
 if not context.SubscriptionRequest_testPaymentBalance():

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

@@ -32,6 +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()
   )
 
 person.requestSoftwareInstance(**request_kw)

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

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

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

@@ -75,8 +75,10 @@ class TestSlapOSSubscriptionScenarioMixin(DefaultScenarioMixin):
       slapos_pre_payment_template.\
        updateLocalRolesOnSecurityGroups()
 
+    self.subscription_project = self.createProject()
+
     # One user to create compute_nodes to deploy the subscription
-    self.createAdminUser()
+    self.createAdminUser(self.subscription_project)
     self.cleanUpNotificationMessage()
     self.portal.portal_catalog.searchAndActivate(
       portal_type='Active Process',
@@ -161,6 +163,14 @@ 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}'):
 
@@ -177,7 +187,7 @@ return dict(vads_url_already_registered="%s/already_registered" % (payment_trans
     notification_message.validate()
     return notification_message
 
-  def createAdminUser(self):
+  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",
@@ -193,15 +203,18 @@ return dict(vads_url_already_registered="%s/already_registered" % (payment_trans
         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",
       )
 
-      for assignment in admin_user.contentValues(portal_type="Assignment"):
-        assignment.open()
-
       admin_user.validate()
       self.admin_user = admin_user
     else:
@@ -290,7 +303,8 @@ return dict(vads_url_already_registered="%s/already_registered" % (payment_trans
       source_payment=self.expected_source_section + "/bank_account",
       price_currency="currency_module/EUR",
       payment_mode='payzen',
-      specialise="sale_trade_condition_module/slapos_subscription_trade_condition"
+      specialise="sale_trade_condition_module/slapos_subscription_trade_condition",
+      #follow_up_value=self.subscription_project
     )
     # XXX TODO clarify the with / without tax
     sale_trade_condition.newContent(
@@ -318,7 +332,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,
+      follow_up_value=self.subscription_project
     )
     self.subscription_condition.validate()
     self.tic()
@@ -1235,12 +1250,13 @@ return dict(vads_url_already_registered="%s/already_registered" % (payment_trans
 
     # Create a Public Server for admin user, and allow
     subscription_server_title = 'Trial Public Server for Admin User %s' % self.new_id
-    subscription_server_id = self.requestComputeNode(subscription_server_title)
+    subscription_server_id = self.requestComputeNode(subscription_server_title,
+                                                     self.subscription_project.getReference())
     subscription_server = self.portal.portal_catalog.getResultValue(
         portal_type='Compute Node', reference=subscription_server_id)
     self.setAccessToMemcached(subscription_server)
     self.assertNotEqual(None, subscription_server)
-    self.setServerOpenSubscription(subscription_server)
+    self.assertEqual('open', subscription_server.getCapacityScope())
 
     # and install some software on them
     subscription_server_software = self.subscription_condition.getUrlString()
@@ -1893,6 +1909,9 @@ return dict(vads_url_already_registered="%s/already_registered" % (payment_trans
 
 class TestSlapOSSubscriptionScenario(TestSlapOSSubscriptionScenarioMixin):
 
+  def test_new_subscription_scenario_with_single_vm(self):
+    self._test_subscription_scenario(amount=1)
+
   def test_subscription_scenario_with_single_vm(self):
     self._test_subscription_scenario(amount=1)