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
Labels
Merge Requests
20
Merge Requests
20
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
slapos.core
Commits
b022e3ad
Commit
b022e3ad
authored
Jun 22, 2013
by
Marco Mariani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapgrid: grammar nazi, added comment
parent
66aa4d59
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
5 deletions
+8
-5
slapos/grid/slapgrid.py
slapos/grid/slapgrid.py
+8
-5
No files found.
slapos/grid/slapgrid.py
View file @
b022e3ad
...
@@ -230,6 +230,9 @@ def create_slapgrid_object(options, logger):
...
@@ -230,6 +230,9 @@ def create_slapgrid_object(options, logger):
def
check_required_only_partitions
(
existing
,
required
):
def
check_required_only_partitions
(
existing
,
required
):
"""
Verify the existence of partitions specified by the --only parameter
"""
missing
=
set
(
required
)
-
set
(
existing
)
missing
=
set
(
required
)
-
set
(
existing
)
if
missing
:
if
missing
:
plural
=
[
's'
,
''
][
len
(
missing
)
==
1
]
plural
=
[
's'
,
''
][
len
(
missing
)
==
1
]
...
@@ -886,7 +889,7 @@ class Slapgrid(object):
...
@@ -886,7 +889,7 @@ class Slapgrid(object):
'../../../../slapos/slap/doc/partition_consumption.xsd'
)
'../../../../slapos/slap/doc/partition_consumption.xsd'
)
clean_run
=
True
clean_run
=
True
# Loop o
n
the different computer partitions
# Loop o
ver
the different computer partitions
computer_partition_list
=
self
.
FilterComputerPartitionList
(
computer_partition_list
=
self
.
FilterComputerPartitionList
(
slap_computer_usage
.
getComputerPartitionList
())
slap_computer_usage
.
getComputerPartitionList
())
...
@@ -894,7 +897,7 @@ class Slapgrid(object):
...
@@ -894,7 +897,7 @@ class Slapgrid(object):
try
:
try
:
computer_partition_id
=
computer_partition
.
getId
()
computer_partition_id
=
computer_partition
.
getId
()
#We want execute all the script in the report folder
#We want
to
execute all the script in the report folder
instance_path
=
os
.
path
.
join
(
self
.
instance_root
,
instance_path
=
os
.
path
.
join
(
self
.
instance_root
,
computer_partition
.
getId
())
computer_partition
.
getId
())
report_path
=
os
.
path
.
join
(
instance_path
,
'etc'
,
'report'
)
report_path
=
os
.
path
.
join
(
instance_path
,
'etc'
,
'report'
)
...
@@ -915,7 +918,7 @@ class Slapgrid(object):
...
@@ -915,7 +918,7 @@ class Slapgrid(object):
invocation_list
=
[]
invocation_list
=
[]
invocation_list
.
append
(
os
.
path
.
join
(
instance_path
,
'etc'
,
'report'
,
invocation_list
.
append
(
os
.
path
.
join
(
instance_path
,
'etc'
,
'report'
,
script
))
script
))
#We add the xml_file name
in
the invocation_list
#We add the xml_file name
to
the invocation_list
#f = tempfile.NamedTemporaryFile()
#f = tempfile.NamedTemporaryFile()
#name_xml = '%s.%s' % ('slapreport', os.path.basename(f.name))
#name_xml = '%s.%s' % ('slapreport', os.path.basename(f.name))
#path_to_slapreport = os.path.join(instance_path, 'var', name_xml)
#path_to_slapreport = os.path.join(instance_path, 'var', name_xml)
...
@@ -1026,8 +1029,8 @@ class Slapgrid(object):
...
@@ -1026,8 +1029,8 @@ class Slapgrid(object):
try
:
try
:
computer_partition_id
=
computer_partition
.
getId
()
computer_partition_id
=
computer_partition
.
getId
()
try
:
try
:
software_url
=
computer_partition
.
getSoftwareRelease
().
getURI
()
software_url
=
computer_partition
.
getSoftwareRelease
().
getURI
()
software_path
=
os
.
path
.
join
(
self
.
software_root
,
md5digest
(
software_url
))
software_path
=
os
.
path
.
join
(
self
.
software_root
,
md5digest
(
software_url
))
except
(
NotFoundError
,
TypeError
):
except
(
NotFoundError
,
TypeError
):
software_url
=
None
software_url
=
None
software_path
=
None
software_path
=
None
...
...
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