Mentions légales du service
Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
R
reference-repository
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Admin message
GitLab upgrade completed. Current version is 17.11.3.
Show more breadcrumbs
grid5000
reference-repository
Commits
6f7785e2
Commit
6f7785e2
authored
4 years ago
by
Lucas Nussbaum
Browse files
Options
Downloads
Patches
Plain Diff
[dev] cleanup
parent
da63a73d
No related branches found
No related tags found
1 merge request
!223
move as much stuff as possible from refrepo/gen/reference-api.rb to input_loader.rb (bug 13083)
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
lib/refrepo/gen/reference-api.rb
+2
-4
2 additions, 4 deletions
lib/refrepo/gen/reference-api.rb
lib/refrepo/input_loader.rb
+1
-2
1 addition, 2 deletions
lib/refrepo/input_loader.rb
with
3 additions
and
6 deletions
lib/refrepo/gen/reference-api.rb
+
2
−
4
View file @
6f7785e2
...
@@ -140,10 +140,8 @@ def generate_reference_api
...
@@ -140,10 +140,8 @@ def generate_reference_api
servers_path
=
site_path
.
join
(
"servers"
)
servers_path
=
site_path
.
join
(
"servers"
)
servers_path
.
mkpath
()
servers_path
.
mkpath
()
if
site
.
key?
(
"servers"
)
site
.
fetch
(
"servers"
,
[]).
each
do
|
server_uid
,
server
|
site
[
"servers"
].
each
do
|
server_uid
,
server
|
write_json
(
servers_path
.
join
(
"
#{
server_uid
}
.json"
),
server
)
write_json
(
servers_path
.
join
(
"
#{
server_uid
}
.json"
),
server
)
end
end
end
#
#
...
...
This diff is collapsed.
Click to expand it.
lib/refrepo/input_loader.rb
+
1
−
2
View file @
6f7785e2
...
@@ -108,6 +108,7 @@ def add_default_values_and_mappings(h)
...
@@ -108,6 +108,7 @@ def add_default_values_and_mappings(h)
server
[
"uid"
]
=
server_uid
server
[
"uid"
]
=
server_uid
end
end
site
.
fetch
(
"clusters"
,
[]).
sort
.
each
do
|
cluster_uid
,
cluster
|
site
.
fetch
(
"clusters"
,
[]).
sort
.
each
do
|
cluster_uid
,
cluster
|
#
#
...
@@ -206,7 +207,6 @@ def add_default_values_and_mappings(h)
...
@@ -206,7 +207,6 @@ def add_default_values_and_mappings(h)
network_adapter
[
"kavlan"
]
=
node
[
"kavlan"
].
keys
.
include?
(
device
)
?
true
:
false
network_adapter
[
"kavlan"
]
=
node
[
"kavlan"
].
keys
.
include?
(
device
)
?
true
:
false
end
end
end
end
network_adapter
[
"kavlan"
]
||=
node
[
"kavlan"
].
nil?
?
false
:
node
[
"kavlan"
].
keys
.
include?
(
network_adapter
[
"device"
])
?
true
:
false
network_adapter
.
delete
(
"network_address"
)
if
network_adapter
[
"network_address"
]
==
'none'
network_adapter
.
delete
(
"network_address"
)
if
network_adapter
[
"network_address"
]
==
'none'
}
}
...
@@ -220,7 +220,6 @@ def add_default_values_and_mappings(h)
...
@@ -220,7 +220,6 @@ def add_default_values_and_mappings(h)
item
.
delete
(
"port"
)
if
item
[
"port"
]
==
"disabled"
item
.
delete
(
"port"
)
if
item
[
"port"
]
==
"disabled"
}
}
}
}
#TODO: decide if we want to keep it
end
# node.key?("pdu")
end
# node.key?("pdu")
end
end
end
end
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment