Commit 099de512 authored by Łukasz Nowak's avatar Łukasz Nowak

Drop hackish updateLocalRolesOnSecurityGroups.

parent b08851ed
...@@ -50,7 +50,6 @@ class TestSlapOSAllocation(testSlapOSMixin): ...@@ -50,7 +50,6 @@ class TestSlapOSAllocation(testSlapOSMixin):
default_email_text="live_test_%s@example.org" % new_id, default_email_text="live_test_%s@example.org" % new_id,
) )
self.person_user.updateLocalRolesOnSecurityGroups()
self.person_user.validate() self.person_user.validate()
for assignment in self.person_user.contentValues(portal_type="Assignment"): for assignment in self.person_user.contentValues(portal_type="Assignment"):
assignment.open() assignment.open()
...@@ -72,7 +71,6 @@ class TestSlapOSAllocation(testSlapOSMixin): ...@@ -72,7 +71,6 @@ class TestSlapOSAllocation(testSlapOSMixin):
predecessor=self.software_instance.getRelativeUrl(), predecessor=self.software_instance.getRelativeUrl(),
destination_section=self.person_user.getRelativeUrl() destination_section=self.person_user.getRelativeUrl()
) )
hosting_subscription.updateLocalRolesOnSecurityGroups()
hosting_subscription.validate() hosting_subscription.validate()
self.portal.portal_workflow._jumpToStateFor(hosting_subscription, 'start_requested') self.portal.portal_workflow._jumpToStateFor(hosting_subscription, 'start_requested')
...@@ -87,7 +85,6 @@ class TestSlapOSAllocation(testSlapOSMixin): ...@@ -87,7 +85,6 @@ class TestSlapOSAllocation(testSlapOSMixin):
) )
self.portal.portal_workflow._jumpToStateFor(self.software_instance, 'start_requested') self.portal.portal_workflow._jumpToStateFor(self.software_instance, 'start_requested')
self.software_instance.validate() self.software_instance.validate()
self.software_instance.updateLocalRolesOnSecurityGroups()
self.tic() self.tic()
self.login() self.login()
...@@ -197,7 +194,6 @@ class TestSlapOSAllocation(testSlapOSMixin): ...@@ -197,7 +194,6 @@ class TestSlapOSAllocation(testSlapOSMixin):
default_email_text="live_test_%s@example.org" % new_id, default_email_text="live_test_%s@example.org" % new_id,
) )
person_user.updateLocalRolesOnSecurityGroups()
person_user.validate() person_user.validate()
for assignment in person_user.contentValues(portal_type="Assignment"): for assignment in person_user.contentValues(portal_type="Assignment"):
assignment.open() assignment.open()
......
...@@ -36,10 +36,8 @@ class TestSlapOSCorePersonComputerSupply(testSlapOSMixin): ...@@ -36,10 +36,8 @@ class TestSlapOSCorePersonComputerSupply(testSlapOSMixin):
reference="TESTCOMP-%s" % new_id, reference="TESTCOMP-%s" % new_id,
source_administration=person_user.getRelativeUrl() source_administration=person_user.getRelativeUrl()
) )
computer.updateLocalRolesOnSecurityGroups()
computer.validate() computer.validate()
self.computer = computer self.computer = computer
person_user.updateLocalRolesOnSecurityGroups()
person_user.validate() person_user.validate()
for assignment in person_user.contentValues(portal_type="Assignment"): for assignment in person_user.contentValues(portal_type="Assignment"):
assignment.open() assignment.open()
......
...@@ -27,7 +27,6 @@ class TestSlapOSCorePersonRequest(testSlapOSMixin): ...@@ -27,7 +27,6 @@ class TestSlapOSCorePersonRequest(testSlapOSMixin):
default_email_text="live_test_%s@example.org" % new_id, default_email_text="live_test_%s@example.org" % new_id,
) )
person_user.updateLocalRolesOnSecurityGroups()
person_user.validate() person_user.validate()
for assignment in person_user.contentValues(portal_type="Assignment"): for assignment in person_user.contentValues(portal_type="Assignment"):
assignment.open() assignment.open()
...@@ -395,7 +394,6 @@ class TestSlapOSCorePersonRequest(testSlapOSMixin): ...@@ -395,7 +394,6 @@ class TestSlapOSCorePersonRequest(testSlapOSMixin):
state=state, state=state,
) )
hosting_subscription = person.REQUEST.get('request_hosting_subscription') hosting_subscription = person.REQUEST.get('request_hosting_subscription')
hosting_subscription.updateLocalRolesOnSecurityGroups()
transaction.commit() transaction.commit()
hosting_subscription2 = hosting_subscription.Base_createCloneDocument( hosting_subscription2 = hosting_subscription.Base_createCloneDocument(
batch_mode=1) batch_mode=1)
......
...@@ -26,7 +26,6 @@ class TestSlapOSCorePersonRequestComputer(testSlapOSMixin): ...@@ -26,7 +26,6 @@ class TestSlapOSCorePersonRequestComputer(testSlapOSMixin):
default_email_text="live_test_%s@example.org" % new_id, default_email_text="live_test_%s@example.org" % new_id,
) )
person_user.updateLocalRolesOnSecurityGroups()
person_user.validate() person_user.validate()
for assignment in person_user.contentValues(portal_type="Assignment"): for assignment in person_user.contentValues(portal_type="Assignment"):
assignment.open() assignment.open()
......
...@@ -55,7 +55,6 @@ class TestSlapOSCoreSoftwareInstanceRequest(testSlapOSMixin): ...@@ -55,7 +55,6 @@ class TestSlapOSCoreSoftwareInstanceRequest(testSlapOSMixin):
root_slave=self.request_kw['shared'], root_slave=self.request_kw['shared'],
predecessor=self.software_instance.getRelativeUrl() predecessor=self.software_instance.getRelativeUrl()
) )
hosting_subscription.updateLocalRolesOnSecurityGroups()
hosting_subscription.validate() hosting_subscription.validate()
self.portal.portal_workflow._jumpToStateFor(hosting_subscription, 'start_requested') self.portal.portal_workflow._jumpToStateFor(hosting_subscription, 'start_requested')
...@@ -70,7 +69,6 @@ class TestSlapOSCoreSoftwareInstanceRequest(testSlapOSMixin): ...@@ -70,7 +69,6 @@ class TestSlapOSCoreSoftwareInstanceRequest(testSlapOSMixin):
) )
self.portal.portal_workflow._jumpToStateFor(self.software_instance, 'start_requested') self.portal.portal_workflow._jumpToStateFor(self.software_instance, 'start_requested')
self.software_instance.validate() self.software_instance.validate()
self.software_instance.updateLocalRolesOnSecurityGroups()
self.tic() self.tic()
# Login as new Software Instance # Login as new Software Instance
......
...@@ -63,7 +63,6 @@ class TestSlapOSSlapToolMixin(testSlapOSMixin): ...@@ -63,7 +63,6 @@ class TestSlapOSSlapToolMixin(testSlapOSMixin):
reference="TESTCOMP-%s" % new_id reference="TESTCOMP-%s" % new_id
) )
self.computer.updateLocalRolesOnSecurityGroups()
self.computer.validate() self.computer.validate()
self.tic() self.tic()
...@@ -162,7 +161,6 @@ class TestSlapOSSlapToolMixin(testSlapOSMixin): ...@@ -162,7 +161,6 @@ class TestSlapOSSlapToolMixin(testSlapOSMixin):
self.portal.portal_workflow._jumpToStateFor( self.portal.portal_workflow._jumpToStateFor(
self.start_requested_software_instance, 'start_requested') self.start_requested_software_instance, 'start_requested')
self.start_requested_software_instance.validate() self.start_requested_software_instance.validate()
self.start_requested_software_instance.updateLocalRolesOnSecurityGroups()
self.stop_requested_software_instance = self.portal.software_instance_module\ self.stop_requested_software_instance = self.portal.software_instance_module\
.template_software_instance.Base_createCloneDocument(batch_mode=1) .template_software_instance.Base_createCloneDocument(batch_mode=1)
...@@ -179,7 +177,6 @@ class TestSlapOSSlapToolMixin(testSlapOSMixin): ...@@ -179,7 +177,6 @@ class TestSlapOSSlapToolMixin(testSlapOSMixin):
self.portal.portal_workflow._jumpToStateFor( self.portal.portal_workflow._jumpToStateFor(
self.stop_requested_software_instance, 'stop_requested') self.stop_requested_software_instance, 'stop_requested')
self.stop_requested_software_instance.validate() self.stop_requested_software_instance.validate()
self.stop_requested_software_instance.updateLocalRolesOnSecurityGroups()
self.destroy_requested_software_instance = self.portal.software_instance_module\ self.destroy_requested_software_instance = self.portal.software_instance_module\
.template_software_instance.Base_createCloneDocument(batch_mode=1) .template_software_instance.Base_createCloneDocument(batch_mode=1)
...@@ -196,7 +193,6 @@ class TestSlapOSSlapToolMixin(testSlapOSMixin): ...@@ -196,7 +193,6 @@ class TestSlapOSSlapToolMixin(testSlapOSMixin):
self.portal.portal_workflow._jumpToStateFor( self.portal.portal_workflow._jumpToStateFor(
self.destroy_requested_software_instance, 'destroy_requested') self.destroy_requested_software_instance, 'destroy_requested')
self.destroy_requested_software_instance.validate() self.destroy_requested_software_instance.validate()
self.destroy_requested_software_instance.updateLocalRolesOnSecurityGroups()
self.destroyed_software_instance = self.portal.software_instance_module\ self.destroyed_software_instance = self.portal.software_instance_module\
.template_software_instance.Base_createCloneDocument(batch_mode=1) .template_software_instance.Base_createCloneDocument(batch_mode=1)
...@@ -214,7 +210,6 @@ class TestSlapOSSlapToolMixin(testSlapOSMixin): ...@@ -214,7 +210,6 @@ class TestSlapOSSlapToolMixin(testSlapOSMixin):
self.destroyed_software_instance, 'destroy_requested') self.destroyed_software_instance, 'destroy_requested')
self.destroyed_software_instance.validate() self.destroyed_software_instance.validate()
self.destroyed_software_instance.invalidate() self.destroyed_software_instance.invalidate()
self.destroyed_software_instance.updateLocalRolesOnSecurityGroups()
self.tic() self.tic()
......
121 122
\ No newline at end of file \ No newline at end of file
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