Mentions légales du service

Skip to content
Snippets Groups Projects
Commit 6f7785e2 authored by Lucas Nussbaum's avatar Lucas Nussbaum
Browse files

[dev] cleanup

parent da63a73d
No related branches found
No related tags found
1 merge request!223move as much stuff as possible from refrepo/gen/reference-api.rb to input_loader.rb (bug 13083)
...@@ -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
# #
......
...@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment