slapos_*: return user after joinSlapOS

   Deduplicate code since this code is written every where for no major reason.

master/bt5/slapos_accounting/TestTemplateItem/portal_components/test.erp5.testSlapOSERP5ManualAccountingScenario.py

@@ -18,14 +18,9 @@ class TestSlapOSManualAccountingScenarioMixin(TestSlapOSVirtualMasterScenarioMix
     self.logout()
     # lets join as slapos administrator, which will manager the project
     accountant_reference = 'accountant-%s' % self.generateNewId()
-    self.joinSlapOS(self.web_site, accountant_reference)
+    accountant_person = self.joinSlapOS(self.web_site, accountant_reference)
 
-    self.login()
-    accountant_person = self.portal.portal_catalog.getResultValue(
-      portal_type="ERP5 Login",
-      reference=accountant_reference).getParentValue()
     self.tic()
-
     self.login(sale_person.getUserId())
     self.addAccountingManagerAssignment(accountant_person)
 

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

@@ -144,7 +144,7 @@ class DefaultScenarioMixin(TestSlapOSSecurityMixin):
     to_click_url = re.search('href="(.+?)"', to_click_message).group(1)
 
     self.assertIn('%s/hateoas/connection/ERP5Site_activeLogin' % self.web_site.getId(), to_click_url)
-    
+
     join_key = to_click_url.split('=')[-1]
     self.assertNotEqual(join_key, None)
     self.portal.portal_skins.changeSkin('RJS')
@@ -159,6 +159,12 @@ class DefaultScenarioMixin(TestSlapOSSecurityMixin):
     welcome_message = findMessage(email, "the creation of you new")
     self.assertNotEqual(None, welcome_message)
 
+    self.login()
+    # Fetch the user from login and return
+    return self.portal.portal_catalog.getResultValue(
+        portal_type="ERP5 Login",
+        reference=reference).getParentValue()
+
   def _getCurrentInstanceTreeList(self):
     person = self.portal.portal_membership.getAuthenticatedMember().getUserValue()
 

master/bt5/slapos_erp5/TestTemplateItem/portal_components/test.erp5.testSlapOSERP5AllocationScenario.py

@@ -102,14 +102,8 @@ class TestSlapOSAllocationScenarioMixin(TestSlapOSVirtualMasterScenarioMixin):
   def joinSlapOSAsOwner(self):
     # lets join as slapos administrator, which will own few compute_nodes
     owner_reference = 'owner-%s' % self.generateNewId()
-    self.joinSlapOS(self.web_site, owner_reference)
-
+    owner_person = self.joinSlapOS(self.web_site, owner_reference)
     self.login()
-    owner_person = self.portal.portal_catalog.getResultValue(
-      portal_type="ERP5 Login",
-      reference=owner_reference).getParentValue()
-    # owner_person.setCareerSubordinationValue(seller_organisation)
-
     self.tic()
     return owner_person
 
@@ -196,8 +190,7 @@ class TestSlapOSAllocationScenario(TestSlapOSAllocationScenarioMixin):
       for d in computer_information_dict['_computer_partition_list'] 
         if d['partition_id'] == partition.getReference()][0]
     self.assertEqual(timestamp,
-      partition_parameter_dict['_parameter_dict']['timestamp'])                                                                                                                                                                                                          
-
+      partition_parameter_dict['_parameter_dict']['timestamp'])
     self.login(owner_person.getUserId())
 
     # and the instances
@@ -212,7 +205,7 @@ class TestSlapOSAllocationScenario(TestSlapOSAllocationScenarioMixin):
     self.checkERP5StateBeforeExit()
 
   def test_slave_instance_allocation_scenario(self):
-    project, owner_person = self.bootstrapVirtualMasterTestWithProject()    
+    project, owner_person = self.bootstrapVirtualMasterTestWithProject()
     self.logout()
 
     # and install some software on them

master/bt5/slapos_erp5/TestTemplateItem/portal_components/test.erp5.testSlapOSERP5SubscriptionChangeRequestScenario.py

@@ -26,16 +26,10 @@ class TestSlapOSSubscriptionChangeRequestScenario(TestSlapOSSubscriptionChangeRe
     with PinnedDateTime(self, DateTime('2023/12/25')):
       # lets join as slapos administrator, which will own few compute_nodes
       owner_reference = 'owner-%s' % self.generateNewId()
-      self.joinSlapOS(self.web_site, owner_reference)
+      owner_person = self.joinSlapOS(self.web_site, owner_reference)
 
       self.login()
-      owner_person = self.portal.portal_catalog.getResultValue(
-        portal_type="ERP5 Login",
-        reference=owner_reference).getParentValue()
-      #owner_person.setCareerSubordinationValue(seller_organisation)
-
       self.tic()
-
       # hooray, now it is time to create compute_nodes
       self.logout()
       self.login(sale_person.getUserId())
@@ -74,19 +68,14 @@ class TestSlapOSSubscriptionChangeRequestScenario(TestSlapOSSubscriptionChangeRe
 
     with PinnedDateTime(self, DateTime('2023/12/29')):
       public_reference = 'public-%s' % self.generateNewId()
-      self.joinSlapOS(self.web_site, public_reference)
+      public_person = self.joinSlapOS(self.web_site, public_reference)
+      self.logout()
     with PinnedDateTime(self, DateTime('2024/01/01')):
       public_reference2 = 'public2-%s' % self.generateNewId()
-      self.joinSlapOS(self.web_site, public_reference2)
+      public_person2 = self.joinSlapOS(self.web_site, public_reference2)
+      self.logout()
 
     self.login()
-    public_person = self.portal.portal_catalog.getResultValue(
-      portal_type="ERP5 Login",
-      reference=public_reference).getParentValue()
-    public_person2 = self.portal.portal_catalog.getResultValue(
-      portal_type="ERP5 Login",
-      reference=public_reference2).getParentValue()
-
     person_user_id = public_person.getUserId()
     software_release = public_server_software
     software_type = public_instance_type
@@ -194,16 +183,10 @@ class TestSlapOSSubscriptionChangeRequestScenario(TestSlapOSSubscriptionChangeRe
     with PinnedDateTime(self, DateTime('2024/01/25')):
       # lets join as slapos administrator, which will own few compute_nodes
       owner_reference = 'owner-%s' % self.generateNewId()
-      self.joinSlapOS(self.web_site, owner_reference)
+      owner_person = self.joinSlapOS(self.web_site, owner_reference)
 
       self.login()
-      owner_person = self.portal.portal_catalog.getResultValue(
-        portal_type="ERP5 Login",
-        reference=owner_reference).getParentValue()
-      #owner_person.setCareerSubordinationValue(seller_organisation)
-
       self.tic()
-
       # hooray, now it is time to create compute_nodes
       self.logout()
       self.login(sale_person.getUserId())
@@ -298,16 +281,10 @@ class TestSlapOSSubscriptionChangeRequestScenario(TestSlapOSSubscriptionChangeRe
     with PinnedDateTime(self, DateTime('2024/01/25')):
       # lets join as slapos administrator, which will own few compute_nodes
       owner_reference = 'owner-%s' % self.generateNewId()
-      self.joinSlapOS(self.web_site, owner_reference)
+      owner_person = self.joinSlapOS(self.web_site, owner_reference)
 
       self.login()
-      owner_person = self.portal.portal_catalog.getResultValue(
-        portal_type="ERP5 Login",
-        reference=owner_reference).getParentValue()
-      #owner_person.setCareerSubordinationValue(seller_organisation)
-
       self.tic()
-
       # hooray, now it is time to create compute_nodes
       self.logout()
       self.login(sale_person.getUserId())

master/bt5/slapos_erp5/TestTemplateItem/portal_components/test.erp5.testSlapOSERP5SubscriptionScenario.py

@@ -47,13 +47,7 @@ class TestSlapOSSubscriptionScenario(TestSlapOSSubscriptionScenarioMixin):
       self.logout()
       # lets join as slapos administrator, which will manager the project
       project_owner_reference = 'project-%s' % self.generateNewId()
-      self.joinSlapOS(self.web_site, project_owner_reference)
-
-      self.login()
-      project_owner_person = self.portal.portal_catalog.getResultValue(
-        portal_type="ERP5 Login",
-        reference=project_owner_reference).getParentValue()
-      # owner_person.setCareerSubordinationValue(seller_organisation)
+      project_owner_person = self.joinSlapOS(self.web_site, project_owner_reference)
 
       self.tic()
       self.logout()
@@ -104,12 +98,9 @@ class TestSlapOSSubscriptionScenario(TestSlapOSSubscriptionScenarioMixin):
 
       # lets join as slapos administrator, which will own few compute_nodes
       owner_reference = 'owner-%s' % self.generateNewId()
-      self.joinSlapOS(self.web_site, owner_reference)
+      owner_person = self.joinSlapOS(self.web_site, owner_reference)
 
       self.login()
-      owner_person = self.portal.portal_catalog.getResultValue(
-        portal_type="ERP5 Login",
-        reference=owner_reference).getParentValue()
 
       # first slapos administrator assignment can only be created by
       # the erp5 manager
@@ -156,12 +147,9 @@ class TestSlapOSSubscriptionScenario(TestSlapOSSubscriptionScenarioMixin):
       # compute_node
       self.logout()
       public_reference = 'public-%s' % self.generateNewId()
-      self.joinSlapOS(self.web_site, public_reference)
-
+      public_person = self.joinSlapOS(self.web_site, public_reference)
       self.login()
-      public_person = self.portal.portal_catalog.getResultValue(
-        portal_type="ERP5 Login",
-        reference=public_reference).getParentValue()
+
 
     with PinnedDateTime(self, DateTime('2024/02/17 01:01')):
       public_instance_title = 'Public title %s' % self.generateNewId()
@@ -267,13 +255,7 @@ class TestSlapOSSubscriptionScenario(TestSlapOSSubscriptionScenarioMixin):
       self.logout()
       # lets join as slapos administrator, which will manager the project
       project_owner_reference = 'project-%s' % self.generateNewId()
-      self.joinSlapOS(self.web_site, project_owner_reference)
-
-      self.login()
-      project_owner_person = self.portal.portal_catalog.getResultValue(
-        portal_type="ERP5 Login",
-        reference=project_owner_reference).getParentValue()
-      # owner_person.setCareerSubordinationValue(seller_organisation)
+      project_owner_person = self.joinSlapOS(self.web_site, project_owner_reference)
 
       self.tic()
       self.logout()
@@ -299,12 +281,9 @@ class TestSlapOSSubscriptionScenario(TestSlapOSSubscriptionScenarioMixin):
 
       # lets join as slapos administrator, which will own few compute_nodes
       owner_reference = 'owner-%s' % self.generateNewId()
-      self.joinSlapOS(self.web_site, owner_reference)
+      owner_person = self.joinSlapOS(self.web_site, owner_reference)
 
       self.login()
-      owner_person = self.portal.portal_catalog.getResultValue(
-        portal_type="ERP5 Login",
-        reference=owner_reference).getParentValue()
 
       # first slapos administrator assignment can only be created by
       # the erp5 manager
@@ -316,7 +295,7 @@ class TestSlapOSSubscriptionScenario(TestSlapOSSubscriptionScenarioMixin):
       # Pay deposit to validate virtual master
       deposit_amount = 42.0
       ledger = self.portal.portal_categories.ledger.automated
-      
+
       outstanding_amount_list = project_owner_person.Entity_getOutstandingDepositAmountList(
           currency.getUid(), ledger_uid=ledger.getUid())
       amount = sum([i.total_price for i in outstanding_amount_list])
@@ -367,13 +346,7 @@ class TestSlapOSSubscriptionScenario(TestSlapOSSubscriptionScenarioMixin):
       self.logout()
       # lets join as slapos administrator, which will manager the project
       project_owner_reference = 'project-%s' % self.generateNewId()
-      self.joinSlapOS(self.web_site, project_owner_reference)
-
-      self.login()
-      project_owner_person = self.portal.portal_catalog.getResultValue(
-        portal_type="ERP5 Login",
-        reference=project_owner_reference).getParentValue()
-      # owner_person.setCareerSubordinationValue(seller_organisation)
+      project_owner_person = self.joinSlapOS(self.web_site, project_owner_reference)
 
       self.tic()
       self.logout()
@@ -427,13 +400,9 @@ class TestSlapOSSubscriptionScenario(TestSlapOSSubscriptionScenarioMixin):
 
       # lets join as slapos administrator, which will own few compute_nodes
       owner_reference = 'owner-%s' % self.generateNewId()
-      self.joinSlapOS(self.web_site, owner_reference)
+      owner_person = self.joinSlapOS(self.web_site, owner_reference)
 
       self.login()
-      owner_person = self.portal.portal_catalog.getResultValue(
-        portal_type="ERP5 Login",
-        reference=owner_reference).getParentValue()
-
       # first slapos administrator assignment can only be created by
       # the erp5 manager
       self.addProjectProductionManagerAssignment(owner_person, project)
@@ -653,14 +622,9 @@ class TestSlapOSSubscriptionScenario(TestSlapOSSubscriptionScenarioMixin):
       self.logout()
       # lets join as slapos administrator, which will manager the project
       project_owner_reference = 'project-%s' % self.generateNewId()
-      self.joinSlapOS(self.web_site, project_owner_reference)
+      project_owner_person = self.joinSlapOS(self.web_site, project_owner_reference)
 
       self.login()
-      project_owner_person = self.portal.portal_catalog.getResultValue(
-        portal_type="ERP5 Login",
-        reference=project_owner_reference).getParentValue()
-      # owner_person.setCareerSubordinationValue(seller_organisation)
-
       self.tic()
       self.logout()
       self.login(sale_person.getUserId())
@@ -714,13 +678,9 @@ class TestSlapOSSubscriptionScenario(TestSlapOSSubscriptionScenarioMixin):
 
       # lets join as slapos administrator, which will own few compute_nodes
       owner_reference = 'owner-%s' % self.generateNewId()
-      self.joinSlapOS(self.web_site, owner_reference)
+      owner_person = self.joinSlapOS(self.web_site, owner_reference)
 
       self.login()
-      owner_person = self.portal.portal_catalog.getResultValue(
-        portal_type="ERP5 Login",
-        reference=owner_reference).getParentValue()
-
       # first slapos administrator assignment can only be created by
       # the erp5 manager
       self.addProjectProductionManagerAssignment(owner_person, project)
@@ -787,12 +747,8 @@ class TestSlapOSSubscriptionScenario(TestSlapOSSubscriptionScenarioMixin):
       # compute_node
       self.logout()
       public_reference = 'public-%s' % self.generateNewId()
-      self.joinSlapOS(self.web_site, public_reference)
-
+      public_person = self.joinSlapOS(self.web_site, public_reference)
       self.login()
-      public_person = self.portal.portal_catalog.getResultValue(
-        portal_type="ERP5 Login",
-        reference=public_reference).getParentValue()
 
     with PinnedDateTime(self, DateTime('2024/02/17 01:01')):
       public_instance_title = 'Public title %s' % self.generateNewId()