Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Eric Zheng
slapos.core
Commits
099de512
Commit
099de512
authored
Oct 26, 2012
by
Łukasz Nowak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Drop hackish updateLocalRolesOnSecurityGroups.
parent
b08851ed
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
1 addition
and
17 deletions
+1
-17
master/bt5/slapos_cloud/TestTemplateItem/testSlapOSCoreAllocation.py
...slapos_cloud/TestTemplateItem/testSlapOSCoreAllocation.py
+0
-4
master/bt5/slapos_cloud/TestTemplateItem/testSlapOSCorePersonComputerSupply.py
...ud/TestTemplateItem/testSlapOSCorePersonComputerSupply.py
+0
-2
master/bt5/slapos_cloud/TestTemplateItem/testSlapOSCorePersonRequest.py
...pos_cloud/TestTemplateItem/testSlapOSCorePersonRequest.py
+0
-2
master/bt5/slapos_cloud/TestTemplateItem/testSlapOSCorePersonRequestComputer.py
...d/TestTemplateItem/testSlapOSCorePersonRequestComputer.py
+0
-1
master/bt5/slapos_cloud/TestTemplateItem/testSlapOSCoreSoftwareInstanceRequest.py
...TestTemplateItem/testSlapOSCoreSoftwareInstanceRequest.py
+0
-2
master/bt5/slapos_cloud/TestTemplateItem/testSlapOSSlapTool.py
...r/bt5/slapos_cloud/TestTemplateItem/testSlapOSSlapTool.py
+0
-5
master/bt5/slapos_cloud/bt/revision
master/bt5/slapos_cloud/bt/revision
+1
-1
No files found.
master/bt5/slapos_cloud/TestTemplateItem/testSlapOSCoreAllocation.py
View file @
099de512
...
@@ -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
()
...
...
master/bt5/slapos_cloud/TestTemplateItem/testSlapOSCorePersonComputerSupply.py
View file @
099de512
...
@@ -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
()
...
...
master/bt5/slapos_cloud/TestTemplateItem/testSlapOSCorePersonRequest.py
View file @
099de512
...
@@ -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
)
...
...
master/bt5/slapos_cloud/TestTemplateItem/testSlapOSCorePersonRequestComputer.py
View file @
099de512
...
@@ -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
()
...
...
master/bt5/slapos_cloud/TestTemplateItem/testSlapOSCoreSoftwareInstanceRequest.py
View file @
099de512
...
@@ -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
...
...
master/bt5/slapos_cloud/TestTemplateItem/testSlapOSSlapTool.py
View file @
099de512
...
@@ -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
()
...
...
master/bt5/slapos_cloud/bt/revision
View file @
099de512
121
122
\ No newline at end of file
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment