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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
slapos.core
Commits
144605b4
Commit
144605b4
authored
Aug 03, 2011
by
Gabriel Monnerat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rename variable to make sense
parent
4f65be8b
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
3 deletions
+2
-3
master/product/Vifib/Tool/SlapTool.py
master/product/Vifib/Tool/SlapTool.py
+2
-3
No files found.
master/product/Vifib/Tool/SlapTool.py
View file @
144605b4
...
@@ -418,7 +418,6 @@ class SlapTool(BaseTool):
...
@@ -418,7 +418,6 @@ class SlapTool(BaseTool):
elif
movement
.
getResource
()
==
\
elif
movement
.
getResource
()
==
\
portal_preferences
.
getPreferredInstanceHostingResource
():
portal_preferences
.
getPreferredInstanceHostingResource
():
if
movement
.
getSimulationState
()
==
'confirmed'
:
if
movement
.
getSimulationState
()
==
'confirmed'
:
slap_partition
.
_requested_state
=
'started'
slap_partition
.
_requested_state
=
'started'
slap_partition
.
_need_modification
=
1
slap_partition
.
_need_modification
=
1
...
@@ -460,7 +459,7 @@ class SlapTool(BaseTool):
...
@@ -460,7 +459,7 @@ class SlapTool(BaseTool):
setup_service
=
portal
.
restrictedTraverse
(
setup_service
=
portal
.
restrictedTraverse
(
portal_preferences
.
getPreferredInstanceSetupResource
())
portal_preferences
.
getPreferredInstanceSetupResource
())
slave
_query
=
ComplexQuery
(
Query
(
aggregate_portal_type
=
"Slave Instance"
),
hosting
_query
=
ComplexQuery
(
Query
(
aggregate_portal_type
=
"Slave Instance"
),
Query
(
aggregate_relative_url
=
computer_partition_document
.
getRelativeUrl
()),
Query
(
aggregate_relative_url
=
computer_partition_document
.
getRelativeUrl
()),
# Search only for Confirmed and Stopped, the only one states that require
# Search only for Confirmed and Stopped, the only one states that require
# buildout be re-updated.
# buildout be re-updated.
...
@@ -474,7 +473,7 @@ class SlapTool(BaseTool):
...
@@ -474,7 +473,7 @@ class SlapTool(BaseTool):
Query
(
default_resource_uid
=
setup_service
.
getUid
()),
Query
(
default_resource_uid
=
setup_service
.
getUid
()),
operator
=
"AND"
)
operator
=
"AND"
)
query
=
ComplexQuery
(
slave
_query
,
setup_query
,
operator
=
"OR"
)
query
=
ComplexQuery
(
hosting
_query
,
setup_query
,
operator
=
"OR"
)
# Use getTrackingList
# Use getTrackingList
catalog_result
=
portal
.
portal_catalog
(
catalog_result
=
portal
.
portal_catalog
(
...
...
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