Skip to content

S
slapos.core
Commit 14216671 authored by Rafael Monnerat's avatar Rafael Monnerat 👻
Browse files
Options

slapos_*: return user after joinSlapOS 

   Deduplicate code since this code is written every where for no major reason.
parent 3da9d621
Hide whitespace changes
Inline Side-by-side
Showing with 56 additions and 222 deletions
master/bt5/slapos_accounting/TestTemplateItem/portal_components/test.erp5.testSlapOSERP5ManualAccountingScenario.py
View file @ 14216671
...@@ -18,14 +18,9 @@ class TestSlapOSManualAccountingScenarioMixin(TestSlapOSVirtualMasterScenarioMix ...@@ -18,14 +18,9 @@ class TestSlapOSManualAccountingScenarioMixin(TestSlapOSVirtualMasterScenarioMix
self.logout() self.logout()
# lets join as slapos administrator, which will manager the project # lets join as slapos administrator, which will manager the project
accountant_reference = 'accountant-%s' % self.generateNewId() 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.tic()
self.login(sale_person.getUserId()) self.login(sale_person.getUserId())
self.addAccountingManagerAssignment(accountant_person) self.addAccountingManagerAssignment(accountant_person)
......
master/bt5/slapos_cloud/TestTemplateItem/portal_components/test.erp5.SlapOSTestCaseDefaultScenarioMixin.py
View file @ 14216671
...@@ -144,7 +144,7 @@ class DefaultScenarioMixin(TestSlapOSSecurityMixin): ...@@ -144,7 +144,7 @@ class DefaultScenarioMixin(TestSlapOSSecurityMixin):
to_click_url = re.search('href="(.+?)"', to_click_message).group(1) 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) self.assertIn('%s/hateoas/connection/ERP5Site_activeLogin' % self.web_site.getId(), to_click_url)
join_key = to_click_url.split('=')[-1] join_key = to_click_url.split('=')[-1]
self.assertNotEqual(join_key, None) self.assertNotEqual(join_key, None)
self.portal.portal_skins.changeSkin('RJS') self.portal.portal_skins.changeSkin('RJS')
...@@ -159,6 +159,12 @@ class DefaultScenarioMixin(TestSlapOSSecurityMixin): ...@@ -159,6 +159,12 @@ class DefaultScenarioMixin(TestSlapOSSecurityMixin):
welcome_message = findMessage(email, "the creation of you new") welcome_message = findMessage(email, "the creation of you new")
self.assertNotEqual(None, welcome_message) 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): def _getCurrentInstanceTreeList(self):
person = self.portal.portal_membership.getAuthenticatedMember().getUserValue() person = self.portal.portal_membership.getAuthenticatedMember().getUserValue()
......
master/bt5/slapos_erp5/TestTemplateItem/portal_components/test.erp5.testSlapOSERP5AllocationScenario.py
View file @ 14216671
...@@ -102,14 +102,8 @@ class TestSlapOSAllocationScenarioMixin(TestSlapOSVirtualMasterScenarioMixin): ...@@ -102,14 +102,8 @@ class TestSlapOSAllocationScenarioMixin(TestSlapOSVirtualMasterScenarioMixin):
def joinSlapOSAsOwner(self): def joinSlapOSAsOwner(self):
# lets join as slapos administrator, which will own few compute_nodes # lets join as slapos administrator, which will own few compute_nodes
owner_reference = 'owner-%s' % self.generateNewId() owner_reference = 'owner-%s' % self.generateNewId()
self.joinSlapOS(self.web_site, owner_reference) owner_person = self.joinSlapOS(self.web_site, owner_reference)
self.login() self.login()
owner_person = self.portal.portal_catalog.getResultValue(
portal_type="ERP5 Login",
reference=owner_reference).getParentValue()
# owner_person.setCareerSubordinationValue(seller_organisation)
self.tic() self.tic()
return owner_person return owner_person
...@@ -196,8 +190,7 @@ class TestSlapOSAllocationScenario(TestSlapOSAllocationScenarioMixin): ...@@ -196,8 +190,7 @@ class TestSlapOSAllocationScenario(TestSlapOSAllocationScenarioMixin):
for d in computer_information_dict['_computer_partition_list'] for d in computer_information_dict['_computer_partition_list']
if d['partition_id'] == partition.getReference()][0] if d['partition_id'] == partition.getReference()][0]
self.assertEqual(timestamp, self.assertEqual(timestamp,
partition_parameter_dict['_parameter_dict']['timestamp']) partition_parameter_dict['_parameter_dict']['timestamp'])
self.login(owner_person.getUserId()) self.login(owner_person.getUserId())
# and the instances # and the instances
...@@ -212,7 +205,7 @@ class TestSlapOSAllocationScenario(TestSlapOSAllocationScenarioMixin): ...@@ -212,7 +205,7 @@ class TestSlapOSAllocationScenario(TestSlapOSAllocationScenarioMixin):
self.checkERP5StateBeforeExit() self.checkERP5StateBeforeExit()
def test_slave_instance_allocation_scenario(self): def test_slave_instance_allocation_scenario(self):
project, owner_person = self.bootstrapVirtualMasterTestWithProject() project, owner_person = self.bootstrapVirtualMasterTestWithProject()
self.logout() self.logout()
# and install some software on them # and install some software on them
......
master/bt5/slapos_erp5/TestTemplateItem/portal_components/test.erp5.testSlapOSERP5SubscriptionChangeRequestScenario.py
View file @ 14216671
...@@ -26,16 +26,10 @@ class TestSlapOSSubscriptionChangeRequestScenario(TestSlapOSSubscriptionChangeRe ...@@ -26,16 +26,10 @@ class TestSlapOSSubscriptionChangeRequestScenario(TestSlapOSSubscriptionChangeRe
with PinnedDateTime(self, DateTime('2023/12/25')): with PinnedDateTime(self, DateTime('2023/12/25')):
# lets join as slapos administrator, which will own few compute_nodes # lets join as slapos administrator, which will own few compute_nodes
owner_reference = 'owner-%s' % self.generateNewId() owner_reference = 'owner-%s' % self.generateNewId()
self.joinSlapOS(self.web_site, owner_reference) owner_person = self.joinSlapOS(self.web_site, owner_reference)
self.login() self.login()
owner_person = self.portal.portal_catalog.getResultValue(
portal_type="ERP5 Login",
reference=owner_reference).getParentValue()
#owner_person.setCareerSubordinationValue(seller_organisation)
self.tic() self.tic()
# hooray, now it is time to create compute_nodes # hooray, now it is time to create compute_nodes
self.logout() self.logout()
self.login(sale_person.getUserId()) self.login(sale_person.getUserId())
...@@ -74,19 +68,14 @@ class TestSlapOSSubscriptionChangeRequestScenario(TestSlapOSSubscriptionChangeRe ...@@ -74,19 +68,14 @@ class TestSlapOSSubscriptionChangeRequestScenario(TestSlapOSSubscriptionChangeRe
with PinnedDateTime(self, DateTime('2023/12/29')): with PinnedDateTime(self, DateTime('2023/12/29')):
public_reference = 'public-%s' % self.generateNewId() 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')): with PinnedDateTime(self, DateTime('2024/01/01')):
public_reference2 = 'public2-%s' % self.generateNewId() 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() 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() person_user_id = public_person.getUserId()
software_release = public_server_software software_release = public_server_software
software_type = public_instance_type software_type = public_instance_type
...@@ -194,16 +183,10 @@ class TestSlapOSSubscriptionChangeRequestScenario(TestSlapOSSubscriptionChangeRe ...@@ -194,16 +183,10 @@ class TestSlapOSSubscriptionChangeRequestScenario(TestSlapOSSubscriptionChangeRe
with PinnedDateTime(self, DateTime('2024/01/25')): with PinnedDateTime(self, DateTime('2024/01/25')):
# lets join as slapos administrator, which will own few compute_nodes # lets join as slapos administrator, which will own few compute_nodes
owner_reference = 'owner-%s' % self.generateNewId() owner_reference = 'owner-%s' % self.generateNewId()
self.joinSlapOS(self.web_site, owner_reference) owner_person = self.joinSlapOS(self.web_site, owner_reference)
self.login() self.login()
owner_person = self.portal.portal_catalog.getResultValue(
portal_type="ERP5 Login",
reference=owner_reference).getParentValue()
#owner_person.setCareerSubordinationValue(seller_organisation)
self.tic() self.tic()
# hooray, now it is time to create compute_nodes # hooray, now it is time to create compute_nodes
self.logout() self.logout()
self.login(sale_person.getUserId()) self.login(sale_person.getUserId())
...@@ -298,16 +281,10 @@ class TestSlapOSSubscriptionChangeRequestScenario(TestSlapOSSubscriptionChangeRe ...@@ -298,16 +281,10 @@ class TestSlapOSSubscriptionChangeRequestScenario(TestSlapOSSubscriptionChangeRe
with PinnedDateTime(self, DateTime('2024/01/25')): with PinnedDateTime(self, DateTime('2024/01/25')):
# lets join as slapos administrator, which will own few compute_nodes # lets join as slapos administrator, which will own few compute_nodes
owner_reference = 'owner-%s' % self.generateNewId() owner_reference = 'owner-%s' % self.generateNewId()
self.joinSlapOS(self.web_site, owner_reference) owner_person = self.joinSlapOS(self.web_site, owner_reference)
self.login() self.login()
owner_person = self.portal.portal_catalog.getResultValue(
portal_type="ERP5 Login",
reference=owner_reference).getParentValue()
#owner_person.setCareerSubordinationValue(seller_organisation)
self.tic() self.tic()
# hooray, now it is time to create compute_nodes # hooray, now it is time to create compute_nodes
self.logout() self.logout()
self.login(sale_person.getUserId()) self.login(sale_person.getUserId())
......
master/bt5/slapos_erp5/TestTemplateItem/portal_components/test.erp5.testSlapOSERP5SubscriptionScenario.py
View file @ 14216671
...@@ -47,13 +47,7 @@ class TestSlapOSSubscriptionScenario(TestSlapOSSubscriptionScenarioMixin): ...@@ -47,13 +47,7 @@ class TestSlapOSSubscriptionScenario(TestSlapOSSubscriptionScenarioMixin):
self.logout() self.logout()
# lets join as slapos administrator, which will manager the project # lets join as slapos administrator, which will manager the project
project_owner_reference = 'project-%s' % self.generateNewId() 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.tic()
self.logout() self.logout()
...@@ -104,12 +98,9 @@ class TestSlapOSSubscriptionScenario(TestSlapOSSubscriptionScenarioMixin): ...@@ -104,12 +98,9 @@ class TestSlapOSSubscriptionScenario(TestSlapOSSubscriptionScenarioMixin):
# lets join as slapos administrator, which will own few compute_nodes # lets join as slapos administrator, which will own few compute_nodes
owner_reference = 'owner-%s' % self.generateNewId() owner_reference = 'owner-%s' % self.generateNewId()
self.joinSlapOS(self.web_site, owner_reference) owner_person = self.joinSlapOS(self.web_site, owner_reference)
self.login() 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 # first slapos administrator assignment can only be created by
# the erp5 manager # the erp5 manager
...@@ -156,12 +147,9 @@ class TestSlapOSSubscriptionScenario(TestSlapOSSubscriptionScenarioMixin): ...@@ -156,12 +147,9 @@ class TestSlapOSSubscriptionScenario(TestSlapOSSubscriptionScenarioMixin):
# compute_node # compute_node
self.logout() self.logout()
public_reference = 'public-%s' % self.generateNewId() public_reference = 'public-%s' % self.generateNewId()
self.joinSlapOS(self.web_site, public_reference) public_person = self.joinSlapOS(self.web_site, public_reference)
self.login() 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')): with PinnedDateTime(self, DateTime('2024/02/17 01:01')):
public_instance_title = 'Public title %s' % self.generateNewId() public_instance_title = 'Public title %s' % self.generateNewId()
...@@ -267,13 +255,7 @@ class TestSlapOSSubscriptionScenario(TestSlapOSSubscriptionScenarioMixin): ...@@ -267,13 +255,7 @@ class TestSlapOSSubscriptionScenario(TestSlapOSSubscriptionScenarioMixin):
self.logout() self.logout()
# lets join as slapos administrator, which will manager the project # lets join as slapos administrator, which will manager the project
project_owner_reference = 'project-%s' % self.generateNewId() 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.tic()
self.logout() self.logout()
...@@ -299,12 +281,9 @@ class TestSlapOSSubscriptionScenario(TestSlapOSSubscriptionScenarioMixin): ...@@ -299,12 +281,9 @@ class TestSlapOSSubscriptionScenario(TestSlapOSSubscriptionScenarioMixin):
# lets join as slapos administrator, which will own few compute_nodes # lets join as slapos administrator, which will own few compute_nodes
owner_reference = 'owner-%s' % self.generateNewId() owner_reference = 'owner-%s' % self.generateNewId()
self.joinSlapOS(self.web_site, owner_reference) owner_person = self.joinSlapOS(self.web_site, owner_reference)
self.login() 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 # first slapos administrator assignment can only be created by
# the erp5 manager # the erp5 manager
...@@ -316,7 +295,7 @@ class TestSlapOSSubscriptionScenario(TestSlapOSSubscriptionScenarioMixin): ...@@ -316,7 +295,7 @@ class TestSlapOSSubscriptionScenario(TestSlapOSSubscriptionScenarioMixin):
# Pay deposit to validate virtual master # Pay deposit to validate virtual master
deposit_amount = 42.0 deposit_amount = 42.0
ledger = self.portal.portal_categories.ledger.automated ledger = self.portal.portal_categories.ledger.automated
outstanding_amount_list = project_owner_person.Entity_getOutstandingDepositAmountList( outstanding_amount_list = project_owner_person.Entity_getOutstandingDepositAmountList(
currency.getUid(), ledger_uid=ledger.getUid()) currency.getUid(), ledger_uid=ledger.getUid())
amount = sum([i.total_price for i in outstanding_amount_list]) amount = sum([i.total_price for i in outstanding_amount_list])
...@@ -367,13 +346,7 @@ class TestSlapOSSubscriptionScenario(TestSlapOSSubscriptionScenarioMixin): ...@@ -367,13 +346,7 @@ class TestSlapOSSubscriptionScenario(TestSlapOSSubscriptionScenarioMixin):
self.logout() self.logout()
# lets join as slapos administrator, which will manager the project # lets join as slapos administrator, which will manager the project
project_owner_reference = 'project-%s' % self.generateNewId() 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.tic()
self.logout() self.logout()
...@@ -427,13 +400,9 @@ class TestSlapOSSubscriptionScenario(TestSlapOSSubscriptionScenarioMixin): ...@@ -427,13 +400,9 @@ class TestSlapOSSubscriptionScenario(TestSlapOSSubscriptionScenarioMixin):
# lets join as slapos administrator, which will own few compute_nodes # lets join as slapos administrator, which will own few compute_nodes
owner_reference = 'owner-%s' % self.generateNewId() owner_reference = 'owner-%s' % self.generateNewId()
self.joinSlapOS(self.web_site, owner_reference) owner_person = self.joinSlapOS(self.web_site, owner_reference)
self.login() 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 # first slapos administrator assignment can only be created by
# the erp5 manager # the erp5 manager
self.addProjectProductionManagerAssignment(owner_person, project) self.addProjectProductionManagerAssignment(owner_person, project)
...@@ -653,14 +622,9 @@ class TestSlapOSSubscriptionScenario(TestSlapOSSubscriptionScenarioMixin): ...@@ -653,14 +622,9 @@ class TestSlapOSSubscriptionScenario(TestSlapOSSubscriptionScenarioMixin):
self.logout() self.logout()
# lets join as slapos administrator, which will manager the project # lets join as slapos administrator, which will manager the project
project_owner_reference = 'project-%s' % self.generateNewId() 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() 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.tic()
self.logout() self.logout()
self.login(sale_person.getUserId()) self.login(sale_person.getUserId())
...@@ -714,13 +678,9 @@ class TestSlapOSSubscriptionScenario(TestSlapOSSubscriptionScenarioMixin): ...@@ -714,13 +678,9 @@ class TestSlapOSSubscriptionScenario(TestSlapOSSubscriptionScenarioMixin):
# lets join as slapos administrator, which will own few compute_nodes # lets join as slapos administrator, which will own few compute_nodes
owner_reference = 'owner-%s' % self.generateNewId() owner_reference = 'owner-%s' % self.generateNewId()
self.joinSlapOS(self.web_site, owner_reference) owner_person = self.joinSlapOS(self.web_site, owner_reference)
self.login() 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 # first slapos administrator assignment can only be created by
# the erp5 manager # the erp5 manager
self.addProjectProductionManagerAssignment(owner_person, project) self.addProjectProductionManagerAssignment(owner_person, project)
...@@ -787,12 +747,8 @@ class TestSlapOSSubscriptionScenario(TestSlapOSSubscriptionScenarioMixin): ...@@ -787,12 +747,8 @@ class TestSlapOSSubscriptionScenario(TestSlapOSSubscriptionScenarioMixin):
# compute_node # compute_node
self.logout() self.logout()
public_reference = 'public-%s' % self.generateNewId() public_reference = 'public-%s' % self.generateNewId()
self.joinSlapOS(self.web_site, public_reference) public_person = self.joinSlapOS(self.web_site, public_reference)
self.login() 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')): with PinnedDateTime(self, DateTime('2024/02/17 01:01')):
public_instance_title = 'Public title %s' % self.generateNewId() public_instance_title = 'Public title %s' % self.generateNewId()
......
master/bt5/slapos_erp5/TestTemplateItem/portal_components/test.erp5.testSlapOSERP5VirtualMasterScenario.py
View file @ 14216671
...@@ -117,11 +117,8 @@ class TestSlapOSVirtualMasterScenarioMixin(DefaultScenarioMixin): ...@@ -117,11 +117,8 @@ class TestSlapOSVirtualMasterScenarioMixin(DefaultScenarioMixin):
# lets join as slapos accountant, which will manages currencies # lets join as slapos accountant, which will manages currencies
self.logout() self.logout()
accountant_reference = 'accountant-%s' % self.generateNewId() accountant_reference = 'accountant-%s' % self.generateNewId()
self.joinSlapOS(self.web_site, accountant_reference) accountant_person = self.joinSlapOS(self.web_site, accountant_reference)
self.login() self.login()
accountant_person = self.portal.portal_catalog.getResultValue(
portal_type="ERP5 Login",
reference=accountant_reference).getParentValue()
self.addAccountingManagerAssignment(accountant_person) self.addAccountingManagerAssignment(accountant_person)
self.tic() self.tic()
...@@ -140,11 +137,8 @@ class TestSlapOSVirtualMasterScenarioMixin(DefaultScenarioMixin): ...@@ -140,11 +137,8 @@ class TestSlapOSVirtualMasterScenarioMixin(DefaultScenarioMixin):
# lets join as slapos sales manager, which will manages trade condition # lets join as slapos sales manager, which will manages trade condition
self.logout() self.logout()
sale_reference = 'sales-%s' % self.generateNewId() sale_reference = 'sales-%s' % self.generateNewId()
self.joinSlapOS(self.web_site, sale_reference) sale_person = self.joinSlapOS(self.web_site, sale_reference)
self.login() self.login()
sale_person = self.portal.portal_catalog.getResultValue(
portal_type="ERP5 Login",
reference=sale_reference).getParentValue()
self.addSaleManagerAssignment(sale_person) self.addSaleManagerAssignment(sale_person)
self.tic() self.tic()
...@@ -274,13 +268,9 @@ class TestSlapOSVirtualMasterScenarioMixin(DefaultScenarioMixin): ...@@ -274,13 +268,9 @@ class TestSlapOSVirtualMasterScenarioMixin(DefaultScenarioMixin):
def createProductionManager(self, project): def createProductionManager(self, project):
production_manager_reference = 'production_manager-%s' % self.generateNewId() production_manager_reference = 'production_manager-%s' % self.generateNewId()
self.joinSlapOS(self.web_site, production_manager_reference) production_manager_person = self.joinSlapOS(
self.web_site, production_manager_reference)
self.login() self.login()
production_manager_person = self.portal.portal_catalog.getResultValue(
portal_type="ERP5 Login",
reference=production_manager_reference).getParentValue()
self.addProjectProductionManagerAssignment(production_manager_person, project) self.addProjectProductionManagerAssignment(production_manager_person, project)
self.tic() self.tic()
return production_manager_person return production_manager_person
...@@ -292,12 +282,8 @@ class TestSlapOSVirtualMasterScenarioMixin(DefaultScenarioMixin): ...@@ -292,12 +282,8 @@ class TestSlapOSVirtualMasterScenarioMixin(DefaultScenarioMixin):
self.logout() self.logout()
# lets join as slapos administrator, which will manager the project # lets join as slapos administrator, which will manager the project
owner_reference = 'project-%s' % self.generateNewId() owner_reference = 'project-%s' % self.generateNewId()
self.joinSlapOS(self.web_site, owner_reference) owner_person = self.joinSlapOS(self.web_site, owner_reference)
self.login() self.login()
owner_person = self.portal.portal_catalog.getResultValue(
portal_type="ERP5 Login",
reference=owner_reference).getParentValue()
self.tic() self.tic()
self.logout() self.logout()
...@@ -335,16 +321,10 @@ class TestSlapOSVirtualMasterScenario(TestSlapOSVirtualMasterScenarioMixin): ...@@ -335,16 +321,10 @@ class TestSlapOSVirtualMasterScenario(TestSlapOSVirtualMasterScenarioMixin):
self.logout() self.logout()
# lets join as slapos administrator, which will own few compute_nodes # lets join as slapos administrator, which will own few compute_nodes
owner_reference = 'owner-%s' % self.generateNewId() owner_reference = 'owner-%s' % self.generateNewId()
self.joinSlapOS(self.web_site, owner_reference) owner_person = self.joinSlapOS(self.web_site, owner_reference)
self.login() self.login()
owner_person = self.portal.portal_catalog.getResultValue(
portal_type="ERP5 Login",
reference=owner_reference).getParentValue()
# owner_person.setCareerSubordinationValue(seller_organisation)
self.tic() self.tic()
# hooray, now it is time to create compute_nodes # hooray, now it is time to create compute_nodes
self.logout() self.logout()
self.login(sale_person.getUserId()) self.login(sale_person.getUserId())
...@@ -404,12 +384,8 @@ class TestSlapOSVirtualMasterScenario(TestSlapOSVirtualMasterScenarioMixin): ...@@ -404,12 +384,8 @@ class TestSlapOSVirtualMasterScenario(TestSlapOSVirtualMasterScenarioMixin):
# compute_node # compute_node
self.logout() self.logout()
public_reference = 'public-%s' % self.generateNewId() public_reference = 'public-%s' % self.generateNewId()
self.joinSlapOS(self.web_site, public_reference) public_person = self.joinSlapOS(self.web_site, public_reference)
self.login() 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')): with PinnedDateTime(self, DateTime('2024/02/17 01:01')):
public_instance_title = 'Public title %s' % self.generateNewId() public_instance_title = 'Public title %s' % self.generateNewId()
...@@ -469,14 +445,10 @@ class TestSlapOSVirtualMasterScenario(TestSlapOSVirtualMasterScenarioMixin): ...@@ -469,14 +445,10 @@ class TestSlapOSVirtualMasterScenario(TestSlapOSVirtualMasterScenarioMixin):
self.logout() self.logout()
# lets join as slapos administrator, which will own few compute_nodes # lets join as slapos administrator, which will own few compute_nodes
owner_reference = 'owner-%s' % self.generateNewId() owner_reference = 'owner-%s' % self.generateNewId()
self.joinSlapOS(self.web_site, owner_reference) owner_person = self.joinSlapOS(self.web_site, owner_reference)
self.login() self.login()
owner_person = self.portal.portal_catalog.getResultValue(
portal_type="ERP5 Login",
reference=owner_reference).getParentValue()
self.tic() self.tic()
self.logout() self.logout()
self.login(owner_person.getUserId()) self.login(owner_person.getUserId())
...@@ -538,13 +510,8 @@ class TestSlapOSVirtualMasterScenario(TestSlapOSVirtualMasterScenarioMixin): ...@@ -538,13 +510,8 @@ class TestSlapOSVirtualMasterScenario(TestSlapOSVirtualMasterScenarioMixin):
self.logout() self.logout()
# lets join as slapos administrator, which will manager the project # lets join as slapos administrator, which will manager the project
owner_reference = 'project-%s' % self.generateNewId() owner_reference = 'project-%s' % self.generateNewId()
self.joinSlapOS(self.web_site, owner_reference) owner_person = self.joinSlapOS(self.web_site, owner_reference)
self.login() self.login()
owner_person = self.portal.portal_catalog.getResultValue(
portal_type="ERP5 Login",
reference=owner_reference).getParentValue()
self.tic() self.tic()
# hooray, now it is time to create compute_nodes # hooray, now it is time to create compute_nodes
...@@ -636,13 +603,9 @@ class TestSlapOSVirtualMasterScenario(TestSlapOSVirtualMasterScenarioMixin): ...@@ -636,13 +603,9 @@ class TestSlapOSVirtualMasterScenario(TestSlapOSVirtualMasterScenarioMixin):
# lets join as slapos administrator, which will own few compute_nodes # lets join as slapos administrator, which will own few compute_nodes
owner_reference = 'owner-%s' % self.generateNewId() owner_reference = 'owner-%s' % self.generateNewId()
self.joinSlapOS(self.web_site, owner_reference) owner_person = self.joinSlapOS(self.web_site, owner_reference)
self.login() 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 # first slapos administrator assignment can only be created by
# the erp5 manager # the erp5 manager
self.addProjectProductionManagerAssignment(owner_person, project) self.addProjectProductionManagerAssignment(owner_person, project)
...@@ -673,12 +636,9 @@ class TestSlapOSVirtualMasterScenario(TestSlapOSVirtualMasterScenarioMixin): ...@@ -673,12 +636,9 @@ class TestSlapOSVirtualMasterScenario(TestSlapOSVirtualMasterScenarioMixin):
# compute_node # compute_node
self.logout() self.logout()
public_reference = 'public-%s' % self.generateNewId() public_reference = 'public-%s' % self.generateNewId()
self.joinSlapOS(self.web_site, public_reference) public_person = self.joinSlapOS(self.web_site, public_reference)
self.login() self.login()
public_person = self.portal.portal_catalog.getResultValue(
portal_type="ERP5 Login",
reference=public_reference).getParentValue()
public_person.setCareerSubordinationValue(customer_subordination_organisation) public_person.setCareerSubordinationValue(customer_subordination_organisation)
# XXX Instance will be paid by the organisation # XXX Instance will be paid by the organisation
...@@ -815,14 +775,9 @@ class TestSlapOSVirtualMasterScenario(TestSlapOSVirtualMasterScenarioMixin): ...@@ -815,14 +775,9 @@ class TestSlapOSVirtualMasterScenario(TestSlapOSVirtualMasterScenarioMixin):
self.logout() self.logout()
# lets join as slapos administrator, which will manager the project # lets join as slapos administrator, which will manager the project
project_owner_reference = 'project-%s' % self.generateNewId() 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() 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.tic()
self.logout() self.logout()
self.login(sale_person.getUserId()) self.login(sale_person.getUserId())
...@@ -876,13 +831,9 @@ class TestSlapOSVirtualMasterScenario(TestSlapOSVirtualMasterScenarioMixin): ...@@ -876,13 +831,9 @@ class TestSlapOSVirtualMasterScenario(TestSlapOSVirtualMasterScenarioMixin):
# lets join as slapos administrator, which will own few compute_nodes # lets join as slapos administrator, which will own few compute_nodes
owner_reference = 'owner-%s' % self.generateNewId() owner_reference = 'owner-%s' % self.generateNewId()
self.joinSlapOS(self.web_site, owner_reference) owner_person = self.joinSlapOS(self.web_site, owner_reference)
self.login() 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 # first slapos administrator assignment can only be created by
# the erp5 manager # the erp5 manager
self.addProjectProductionManagerAssignment(owner_person, project) self.addProjectProductionManagerAssignment(owner_person, project)
...@@ -949,12 +900,8 @@ class TestSlapOSVirtualMasterScenario(TestSlapOSVirtualMasterScenarioMixin): ...@@ -949,12 +900,8 @@ class TestSlapOSVirtualMasterScenario(TestSlapOSVirtualMasterScenarioMixin):
# compute_node # compute_node
self.logout() self.logout()
public_reference = 'public-%s' % self.generateNewId() public_reference = 'public-%s' % self.generateNewId()
self.joinSlapOS(self.web_site, public_reference) public_person = self.joinSlapOS(self.web_site, public_reference)
self.login() 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')): with PinnedDateTime(self, DateTime('2024/02/17 01:01')):
# Simulate access from compute_node, to open the capacity scope # Simulate access from compute_node, to open the capacity scope
...@@ -1066,14 +1013,10 @@ class TestSlapOSVirtualMasterScenario(TestSlapOSVirtualMasterScenarioMixin): ...@@ -1066,14 +1013,10 @@ class TestSlapOSVirtualMasterScenario(TestSlapOSVirtualMasterScenarioMixin):
# lets join as slapos administrator, which will own few compute_nodes # lets join as slapos administrator, which will own few compute_nodes
owner_reference = 'owner-%s' % self.generateNewId() owner_reference = 'owner-%s' % self.generateNewId()
self.joinSlapOS(self.web_site, owner_reference) owner_person = self.joinSlapOS(self.web_site, owner_reference)
self.login() self.login()
owner_person = self.portal.portal_catalog.getResultValue(
portal_type="ERP5 Login",
reference=owner_reference).getParentValue()
self.tic() self.tic()
self.logout() self.logout()
self.login(sale_person.getUserId()) self.login(sale_person.getUserId())
# create a default project # create a default project
...@@ -1125,18 +1068,13 @@ class TestSlapOSVirtualMasterScenario(TestSlapOSVirtualMasterScenarioMixin): ...@@ -1125,18 +1068,13 @@ class TestSlapOSVirtualMasterScenario(TestSlapOSVirtualMasterScenarioMixin):
# compute_node # compute_node
self.logout() self.logout()
public_reference = 'public-%s' % self.generateNewId() public_reference = 'public-%s' % self.generateNewId()
self.joinSlapOS(self.web_site, public_reference) public_person = self.joinSlapOS(self.web_site, public_reference)
self.logout()
shared_public_reference = 'shared_public-%s' % self.generateNewId() shared_public_reference = 'shared_public-%s' % self.generateNewId()
self.joinSlapOS(self.web_site, shared_public_reference) shared_public_person = self.joinSlapOS(self.web_site, shared_public_reference)
self.login() self.login()
public_person = self.portal.portal_catalog.getResultValue(
portal_type="ERP5 Login",
reference=public_reference).getParentValue()
shared_public_person = self.portal.portal_catalog.getResultValue(
portal_type="ERP5 Login",
reference=shared_public_reference).getParentValue()
with PinnedDateTime(self, DateTime('2024/02/17 00:05')): with PinnedDateTime(self, DateTime('2024/02/17 00:05')):
public_instance_title = 'Public title %s' % self.generateNewId() public_instance_title = 'Public title %s' % self.generateNewId()
...@@ -1222,14 +1160,10 @@ class TestSlapOSVirtualMasterScenario(TestSlapOSVirtualMasterScenarioMixin): ...@@ -1222,14 +1160,10 @@ class TestSlapOSVirtualMasterScenario(TestSlapOSVirtualMasterScenarioMixin):
# lets join as slapos administrator, which will own few compute_nodes # lets join as slapos administrator, which will own few compute_nodes
owner_reference = 'owner-%s' % self.generateNewId() owner_reference = 'owner-%s' % self.generateNewId()
self.joinSlapOS(self.web_site, owner_reference) owner_person = self.joinSlapOS(self.web_site, owner_reference)
self.login() self.login()
owner_person = self.portal.portal_catalog.getResultValue(
portal_type="ERP5 Login",
reference=owner_reference).getParentValue()
self.tic() self.tic()
self.logout() self.logout()
self.login(sale_person.getUserId()) self.login(sale_person.getUserId())
# create a default project # create a default project
...@@ -1282,12 +1216,8 @@ class TestSlapOSVirtualMasterScenario(TestSlapOSVirtualMasterScenarioMixin): ...@@ -1282,12 +1216,8 @@ class TestSlapOSVirtualMasterScenario(TestSlapOSVirtualMasterScenarioMixin):
# compute_node # compute_node
self.logout() self.logout()
public_reference = 'public-%s' % self.generateNewId() public_reference = 'public-%s' % self.generateNewId()
self.joinSlapOS(self.web_site, public_reference) public_person = self.joinSlapOS(self.web_site, public_reference)
self.login() self.login()
public_person = self.portal.portal_catalog.getResultValue(
portal_type="ERP5 Login",
reference=public_reference).getParentValue()
with PinnedDateTime(self, DateTime('2024/02/17 00:05')): with PinnedDateTime(self, DateTime('2024/02/17 00:05')):
public_instance_title = 'Public title %s' % self.generateNewId() public_instance_title = 'Public title %s' % self.generateNewId()
...@@ -1340,14 +1270,10 @@ class TestSlapOSVirtualMasterScenario(TestSlapOSVirtualMasterScenarioMixin): ...@@ -1340,14 +1270,10 @@ class TestSlapOSVirtualMasterScenario(TestSlapOSVirtualMasterScenarioMixin):
# lets join as slapos administrator, which will own few compute_nodes # lets join as slapos administrator, which will own few compute_nodes
remote_owner_reference = 'remote-owner-%s' % self.generateNewId() remote_owner_reference = 'remote-owner-%s' % self.generateNewId()
self.joinSlapOS(self.web_site, remote_owner_reference) remote_owner_person = self.joinSlapOS(self.web_site, remote_owner_reference)
self.login() self.login()
remote_owner_person = self.portal.portal_catalog.getResultValue(
portal_type="ERP5 Login",
reference=remote_owner_reference).getParentValue()
self.tic() self.tic()
self.logout() self.logout()
self.login(sale_person.getUserId()) self.login(sale_person.getUserId())
# create a default project # create a default project
...@@ -1399,12 +1325,9 @@ class TestSlapOSVirtualMasterScenario(TestSlapOSVirtualMasterScenarioMixin): ...@@ -1399,12 +1325,9 @@ class TestSlapOSVirtualMasterScenario(TestSlapOSVirtualMasterScenarioMixin):
# compute_node # compute_node
self.logout() self.logout()
remote_public_reference = 'remote-public-%s' % self.generateNewId() remote_public_reference = 'remote-public-%s' % self.generateNewId()
self.joinSlapOS(self.web_site, remote_public_reference) remote_public_person = self.joinSlapOS(self.web_site, remote_public_reference)
self.login() self.login()
remote_public_person = self.portal.portal_catalog.getResultValue(
portal_type="ERP5 Login",
reference=remote_public_reference).getParentValue()
#################################### ####################################
# Create a local project # Create a local project
...@@ -1453,12 +1376,9 @@ class TestSlapOSVirtualMasterScenario(TestSlapOSVirtualMasterScenarioMixin): ...@@ -1453,12 +1376,9 @@ class TestSlapOSVirtualMasterScenario(TestSlapOSVirtualMasterScenarioMixin):
# compute_node # compute_node
self.logout() self.logout()
public_reference = 'public-%s' % self.generateNewId() public_reference = 'public-%s' % self.generateNewId()
self.joinSlapOS(self.web_site, public_reference) public_person = self.joinSlapOS(self.web_site, public_reference)
self.login() 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')): with PinnedDateTime(self, DateTime('2024/02/17 01:01')):
public_instance_title = 'Public title %s' % self.generateNewId() public_instance_title = 'Public title %s' % self.generateNewId()
...@@ -1573,14 +1493,9 @@ class TestSlapOSVirtualMasterScenario(TestSlapOSVirtualMasterScenarioMixin): ...@@ -1573,14 +1493,9 @@ class TestSlapOSVirtualMasterScenario(TestSlapOSVirtualMasterScenarioMixin):
# lets join as slapos administrator, which will own few compute_nodes # lets join as slapos administrator, which will own few compute_nodes
remote_owner_reference = 'remote-owner-%s' % self.generateNewId() remote_owner_reference = 'remote-owner-%s' % self.generateNewId()
self.joinSlapOS(self.web_site, remote_owner_reference) remote_owner_person = self.joinSlapOS(self.web_site, remote_owner_reference)
self.login()
remote_owner_person = self.portal.portal_catalog.getResultValue(
portal_type="ERP5 Login",
reference=remote_owner_reference).getParentValue()
self.tic() self.tic()
self.logout() self.logout()
self.login(sale_person.getUserId()) self.login(sale_person.getUserId())
# create a default project # create a default project
...@@ -1651,12 +1566,8 @@ class TestSlapOSVirtualMasterScenario(TestSlapOSVirtualMasterScenarioMixin): ...@@ -1651,12 +1566,8 @@ class TestSlapOSVirtualMasterScenario(TestSlapOSVirtualMasterScenarioMixin):
# compute_node # compute_node
self.logout() self.logout()
remote_public_reference = 'remote-public-%s' % self.generateNewId() remote_public_reference = 'remote-public-%s' % self.generateNewId()
self.joinSlapOS(self.web_site, remote_public_reference) remote_public_person = self.joinSlapOS(self.web_site, remote_public_reference)
self.login()
remote_public_person = self.portal.portal_catalog.getResultValue(
portal_type="ERP5 Login",
reference=remote_public_reference).getParentValue()
#################################### ####################################
# Create a local project # Create a local project
...@@ -1705,13 +1616,9 @@ class TestSlapOSVirtualMasterScenario(TestSlapOSVirtualMasterScenarioMixin): ...@@ -1705,13 +1616,9 @@ class TestSlapOSVirtualMasterScenario(TestSlapOSVirtualMasterScenarioMixin):
# compute_node # compute_node
self.logout() self.logout()
public_reference = 'public-%s' % self.generateNewId() public_reference = 'public-%s' % self.generateNewId()
self.joinSlapOS(self.web_site, public_reference) public_person = self.joinSlapOS(self.web_site, public_reference)
self.login() self.login()
public_person = self.portal.portal_catalog.getResultValue(
portal_type="ERP5 Login",
reference=public_reference).getParentValue()
public_instance_title = 'Public title %s' % self.generateNewId() public_instance_title = 'Public title %s' % self.generateNewId()
self.checkRemoteInstanceAllocation(public_person.getUserId(), self.checkRemoteInstanceAllocation(public_person.getUserId(),
public_reference, public_instance_title, public_reference, public_instance_title,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7