Merge branch 'kavlanng_sort' into 'master'

RINGOT Patrice · RINGOT Patrice · commit 2b857cee1a79 · 2022-05-05T09:07:13.000Z
[kavlanngg5k] force order of the top level entries of the site level...

See merge request grid5000/reference-repository!369
diff --git a/lib/refrepo/gen/puppet/kavlanngg5k.rb b/lib/refrepo/gen/puppet/kavlanngg5k.rb
@@ -47,11 +47,12 @@ def gen_json(output_path)
   end
   # consistent order
   site_data_hierarchy['sites'] = site_data_hierarchy['sites'].sort_by { |site_id, _site_h| site_id }.to_h
-  site_data_hierarchy['sites'].each { |_site_id, site_h|
+  site_data_hierarchy['sites'].each { |site_id, site_h|
     site_h['clusters'] = site_h['clusters'].sort_by { |cluster_id, _cluster_h| cluster_id }.to_h
     site_h['clusters'].each { |_cluster_id, cluster_h|
       cluster_h['nodes'] = cluster_h['nodes'].sort_by { |node_id, _node_h| node_id[/(\d+)/].to_i }.to_h
     }
+    site_data_hierarchy['sites'][site_id] = site_h.sort_by { |key| key}.to_h
   }
 
   output_file = File.new(output_path, 'w')

Original file line number	Diff line number	Diff line change
`@@ -47,11 +47,12 @@ def gen_json(output_path)`
`47`	`47`	`end`
`48`	`48`	`# consistent order`
`49`	`49`	`site_data_hierarchy['sites'] = site_data_hierarchy['sites'].sort_by { \|site_id, _site_h\| site_id }.to_h`
`50`		`- site_data_hierarchy['sites'].each { \|_site_id, site_h\|`
	`50`	`+ site_data_hierarchy['sites'].each { \|site_id, site_h\|`
`51`	`51`	`site_h['clusters'] = site_h['clusters'].sort_by { \|cluster_id, _cluster_h\| cluster_id }.to_h`
`52`	`52`	`site_h['clusters'].each { \|_cluster_id, cluster_h\|`
`53`	`53`	`cluster_h['nodes'] = cluster_h['nodes'].sort_by { \|node_id, _node_h\| node_id[/(\d+)/].to_i }.to_h`
`54`	`54`	`}`
	`55`	`+ site_data_hierarchy['sites'][site_id] = site_h.sort_by { \|key\| key}.to_h`
`55`	`56`	`}`
`56`	`57`
`57`	`58`	`output_file = File.new(output_path, 'w')`