From b8fd9830eb8f3f532fcc398262fe7dcf323e5ad9 Mon Sep 17 00:00:00 2001
From: Lucas Nussbaum <lucas.nussbaum@loria.fr>
Date: Wed, 4 Sep 2019 12:57:20 +0200
Subject: [PATCH] Revert "Revert "[lib] update hashvalidator""
This reverts commit b452ab43c5a11de26bd013e6c50b18bf7f6c6de0.
---
lib/refrepo/gen/oar-properties.rb | 10 +++++-----
lib/refrepo/valid/homogeneity.rb | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/lib/refrepo/gen/oar-properties.rb b/lib/refrepo/gen/oar-properties.rb
index 71a93b42b98..85b98ba1eb2 100644
--- a/lib/refrepo/gen/oar-properties.rb
+++ b/lib/refrepo/gen/oar-properties.rb
@@ -99,7 +99,7 @@ def get_ref_node_properties_internal(cluster_uid, cluster, node_uid, node)
h['ib'] = ib_map[h['ib_rate']]
puts "#{node_uid}: Warning - no rate info for the ib interface" if h['ib_count'] > 0 && h['ib_rate'] == 0
-
+
# OMNIPATH
ni_mountable = node['network_adapters'].select { |na| /^ib[0-9]*(\.[0-9]*)?$/.match(na['device']) && (na['interface'] == 'Omni-Path' and na['enabled'] == true && (na['mounted'] == true || na['mountable'] == true)) }
ni_fastest = ni_mountable.max_by { |na| na['rate'] || 0 }
@@ -351,10 +351,10 @@ def diff_properties(type, properties_oar, properties_ref)
properties_ref.delete('state')
elsif type == 'default' && properties_ref.size == 1
# For dead nodes, when information is missing from the reference-repo, only enforce the 'state' property and ignore other differences.
- return HashDiff.diff({'state' => properties_oar['state']}, {'state' => properties_ref['state']})
+ return Hashdiff.diff({'state' => properties_oar['state']}, {'state' => properties_ref['state']})
end
- return HashDiff.diff(properties_oar, properties_ref)
+ return Hashdiff.diff(properties_oar, properties_ref)
end
# These keys will not be created neither compared with the -d option
@@ -552,7 +552,7 @@ def ssh_exec(cmds, options, site_uid)
end
cmds.each { |cmd|
- channel.send_data cmd
+ channel.send_data cmd
}
channel.eof!
}
@@ -698,7 +698,7 @@ def generate_oar_properties(options)
end
end
- # Get the list of property keys from the OAR scheduler (['oar'])
+ # Get the list of property keys from the OAR scheduler (['oar'])
properties_keys['oar'][site_uid] = get_property_keys(properties['oar'][site_uid])
# Build the list of properties that must be created in the OAR server
diff --git a/lib/refrepo/valid/homogeneity.rb b/lib/refrepo/valid/homogeneity.rb
index a226ca30e4f..0dc97b9e06d 100644
--- a/lib/refrepo/valid/homogeneity.rb
+++ b/lib/refrepo/valid/homogeneity.rb
@@ -193,7 +193,7 @@ def cluster_homogeneity(refapi_hash, options = {:verbose => false})
next
end
- diffs = HashDiff.diff(refnode, node)
+ diffs = Hashdiff.diff(refnode, node)
# Hack HashDiff output for arrays:
#[["-", "pdu[1]", {"uid"=>"graphene-pdu9", "port"=>24}],
--
GitLab