Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
grid5000
reference-repository
Commits
dfeddacc
Commit
dfeddacc
authored
Mar 08, 2016
by
Jérémie Gaidamour
Browse files
[dev] Modified the output file option
parent
b68b7aff
Changes
1
Hide whitespace changes
Inline
Side-by-side
generators/oar-properties/oar-properties.rb
View file @
dfeddacc
...
...
@@ -51,7 +51,8 @@ OptionParser.new do |opts|
opts
.
separator
""
opts
.
separator
"Output options:"
opts
.
on
(
'-o FILE'
,
'--output=FILE'
,
'Output oarnodesetting command into a file. Default: stdout'
)
do
|
o
|
opts
.
on
(
'-o'
,
'--output [FILE]'
,
'Output oarnodesetting commands to a file. Default FILE is stdout.'
)
do
|
o
|
o
=
true
if
o
==
nil
options
[
:output
]
=
o
end
...
...
@@ -110,16 +111,15 @@ options[:sites].each { |site_uid|
# Get the current OAR properties from the OAR scheduler (["oar"])
#
nodelist_properties
[
"oar"
]
=
{}
options
[
:sites
].
each
{
|
site_uid
|
nodelist_properties
[
"oar"
][
site_uid
]
=
{}
# This is only needed for the -d option
if
options
[
:diff
]
# This is only needed for the -d option
if
options
[
:diff
]
nodelist_properties
[
"oar"
]
=
{}
options
[
:sites
].
each
{
|
site_uid
|
nodelist_properties
[
"oar"
][
site_uid
]
=
{}
filename
=
options
[
:diff
].
is_a?
(
String
)
?
options
[
:diff
].
gsub
(
"%s"
,
site_uid
)
:
nil
nodelist_properties
[
"oar"
][
site_uid
]
=
oarcmd_get_nodelist_properties
(
site_uid
,
filename
,
options
[
:sshkeys
])
end
}
}
end
#
# Diff
...
...
@@ -177,7 +177,7 @@ if options[:output]
opt
=
options
[
:diff
]
?
'diff'
:
'ref'
nodelist_properties
[
opt
].
each
{
|
site_uid
,
site_properties
|
options
[
:output
]
?
o
=
File
.
open
(
options
[
:output
].
gsub
(
"%s"
,
site_uid
),
'w'
)
:
o
=
$stdout
.
dup
options
[
:output
]
.
is_a?
(
String
)
?
o
=
File
.
open
(
options
[
:output
].
gsub
(
"%s"
,
site_uid
),
'w'
)
:
o
=
$stdout
.
dup
site_properties
.
each_filtered_node_uid
(
options
[
:clusters
],
options
[
:nodes
])
{
|
node_uid
,
node_properties
|
o
.
write
(
oarcmd_set_node_properties
(
node_uid
,
node_properties
)
+
"
\n
"
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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