From 6ef9a4041161c77f5f5cb56d27df2225ca8624a1 Mon Sep 17 00:00:00 2001
From: Samir Noir <samir.noir@inria.fr>
Date: Tue, 25 Feb 2020 16:53:59 +0100
Subject: [PATCH] [gen/puppet/refapi-subset] sort by clusters and nodes names
---
lib/refrepo/gen/puppet/refapi-subset.rb | 3 +++
1 file changed, 3 insertions(+)
diff --git a/lib/refrepo/gen/puppet/refapi-subset.rb b/lib/refrepo/gen/puppet/refapi-subset.rb
index e63082962de..1b60fde25f7 100644
--- a/lib/refrepo/gen/puppet/refapi-subset.rb
+++ b/lib/refrepo/gen/puppet/refapi-subset.rb
@@ -24,7 +24,10 @@ def gen_json(site, output_path)
cluster_hash['nodes'].to_h.each do |node_uid, node_hash|
node_hash.delete_if { |key| key != 'software' }
end
+
+ cluster_hash['nodes'] = cluster_hash['nodes'].sort_by{|node_uid, _node_hash| node_uid[/(\d+)/].to_i }.to_h
end
+ site_data_hierarchy['sites'][site]['clusters'] = site_data_hierarchy['sites'][site]['clusters'].sort_by{ |cluster_uid, cluster_hash| cluster_uid }.to_h
output_file = File.new(output_path, 'w')
output_file.write(JSON.pretty_generate(site_data_hierarchy))
--
GitLab