erp5_scalability_test: fixing configurator installation issue

/reviewed-on !527

bt5/erp5_scalability_test/SkinTemplateItem/portal_skins/erp5_scalability_test/ERP5Site_bootstrapScalabilityTest.py

-# Script that installs the configurator and create users for scalabiility tests:
+# Script that installs the configurator for scalabiility tests
 
-import time
-from DateTime import DateTime
 import random
 import string
 import json
@@ -10,10 +8,13 @@ request = context.REQUEST
 portal = context.getPortalObject()
 portal_catalog = portal.portal_catalog
 
-now = DateTime()
 status_code = 0
 error_message = "No error."
 
+user_quantity = request.get('user_quantity')
+if user_quantity is None: return json.dumps({"status_code" : 1, "error_message": "Parameter 'user_quantity' is required.", "password" : None })
+password = ''.join(random.choice(string.digits + string.letters) for i in xrange(10))
+
 # check erp5_scalability_test business template is present
 configurator = portal.business_configuration_module.default_standard_configuration
 if configurator == None or not configurator.contentValues(portal_type='Configuration Save'):
@@ -27,68 +28,19 @@ if configurator.getSimulationState() == "draft":
   if person is None or organisation is None:
     try:
       configurator.buildConfiguration()
-      # wait 15 minutes while configurator is installed
-      time.sleep(15*60)
     except Exception as e:
       status_code = 1
       error_message = "Error during installation: " + str(e)
       return json.dumps({"status_code" : 1, "error_message": error_message })
 
-# create users
-user_quantity = request.get('user_quantity')
-if user_quantity is None: return json.dumps({"status_code" : 1, "error_message": "Parameter 'user_quantity' is required.", "password" : None })
-password = ''.join(random.choice(string.digits + string.letters) for i in xrange(10))
-
+# create users if installation is done
 try:
-  organisation = portal_catalog.getResultValue(
-                    portal_type="Organisation",
-                    title = 'Scalability company')
-  if organisation is None:
-    error_message = "Could not find the scalability organisation. Standard configuration not installed?"
-    return json.dumps({"status_code" : 1, "error_message": error_message, "password" : None })
-  organisation = organisation.getObject().getRelativeUrl()
-
-  for i in xrange(0, int(user_quantity)):
-    user_id = "scalability_user_%i" % i
-    person = portal_catalog.getResultValue(
-                    portal_type="Person",
-                    id = user_id)
-    if person is None:
-      person = portal.person_module.newContent(
-                      portal_type = "Person",
-                      id = user_id,
-                      first_name = "scalability",
-                      last_name = "user %i" % i,
-                      function_list = ["company/manager"],
-      )
-      person.validate()
-
-    assignment_id_list = [x.getId() for x in person.objectValues(portal_type="Assignment")]
-    if assignment_id_list: person.manage_delObjects(ids=assignment_id_list)
-    assignment = person.newContent(
-                    portal_type = "Assignment",
-                    id = "assignment_%s" % user_id,
-                    title = "user assignment",
-                    function_list = ["company/manager"],
-                    destination_relative_url = organisation,
-                    destination = organisation,
-                    group_list = ["my_group"],
-                    start_date = now,
-                    stop_date = DateTime(3000, 1, 1)
-    )
-    assignment.open()
-
-    user_id_list = [x.getId() for x in person.objectValues(portal_type="ERP5 Login")]
-    if user_id_list: person.manage_delObjects(ids=user_id_list)
-    user = person.newContent(
-                    portal_type = "ERP5 Login",
-                    id = "login_%s" % user_id,
-                    default_reference = user_id,
-                    password = password,
-    )
-    user.validate()
+  context.portal_categories.activate(after_method_id = ('ERP5Site_afterConfigurationSetup',
+                                     'recursiveImmediateReindexObject',
+                                     'immediateReindexObject')
+                                     ).ERP5Site_createTestData(user_quantity, password)
 except Exception as e:
   status_code = 1
-  error_message = str(e)
-
+  error_message = "Error calling ERP5Site_createTestData script: " + str(e)
+  return json.dumps({"status_code" : 1, "error_message": error_message })
 return json.dumps({"status_code" : status_code, "error_message": error_message, "password" : password, "quantity" : user_quantity })

bt5/erp5_scalability_test/SkinTemplateItem/portal_skins/erp5_scalability_test/ERP5Site_createScalabilityTestUsers.py → bt5/erp5_scalability_test/SkinTemplateItem/portal_skins/erp5_scalability_test/ERP5Site_createTestData.py

-# Script that creates "user_quantity" user for scalabiility tests:
+# Script that creates "user_quantity" users for scalabiility tests:
 # creates and validates persons
 # adds assignment and starts it
 # creates user (login credentials)
-# password is random for every call
-# creates the scalability users file
-
+# random password is given by parameter
 from DateTime import DateTime
-import random
-import string
+now = DateTime()
 
-request = context.REQUEST
 portal = context.getPortalObject()
 portal_catalog = portal.portal_catalog
 
-now = DateTime()
-status_code = 0
-error_message = "No error."
-
-configurator = portal_catalog.getResultValue(
-                  portal_type = "Business Configuration",
-                  id = "default_standard_configuration",
-                  title = "Small And Medium Business")
-
-if configurator == None or not configurator.contentValues(portal_type='Configuration Save'):
-  error_message = "Could not find the scalability business configuration object. Standard configuration not installed?"
-  return {'status_code' : 1, 'error_message': error_message, 'password' : None }
-
-user_quantity = request.get('user_quantity')
-if user_quantity is None: return {'status_code' : 1, 'error_message': "Parameter 'user_quantity' is required.", 'password' : None }
-password = ''.join(random.choice(string.digits + string.letters) for i in xrange(10))
-
 try:
   organisation = portal_catalog.getResultValue(
                     portal_type="Organisation",
                     title = 'Scalability company')
   if organisation is None:
     error_message = "Could not find the scalability organisation. Standard configuration not installed?"
-    return {'status_code' : 1, 'error_message': error_message, 'password' : None }
+    return json.dumps({"status_code" : 1, "error_message": error_message, "password" : None })
   organisation = organisation.getObject().getRelativeUrl()
 
   for i in xrange(0, int(user_quantity)):
@@ -81,5 +60,4 @@ try:
 except Exception as e:
   status_code = 1
   error_message = str(e)
-
-return {'status_code' : status_code, 'error_message': error_message, 'password' : password }
+  raise e

bt5/erp5_scalability_test/SkinTemplateItem/portal_skins/erp5_scalability_test/ERP5Site_createScalabilityTestUsers.xml → bt5/erp5_scalability_test/SkinTemplateItem/portal_skins/erp5_scalability_test/ERP5Site_createTestData.xml

@@ -60,7 +60,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>ERP5Site_createScalabilityTestUsers</string> </value>
+            <value> <string>ERP5Site_createTestData</string> </value>
         </item>
       </dictionary>
     </pickle>