From 998393925bf4917bb14821e94cc882ff0d9f31f1 Mon Sep 17 00:00:00 2001
From: Pierre Neyron <pierre.neyron@imag.fr>
Date: Wed, 27 May 2020 15:58:29 +0200
Subject: [PATCH] [gen/wiki/oar] Move network_address from hiearchy to misc
properties
Because 'network_address' is now blocked by the resource hierarchy
safeguard.
I checked: no user used it in the oarsub `-l` part til now, and no
documentation use it either.
'host' must be used, or 'nodes'.
'network_address' can still be used as a property filter in oarsub (but
using 'host' is shorted to write for the same result).
---
lib/refrepo/gen/wiki/generators/oar_properties.rb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/refrepo/gen/wiki/generators/oar_properties.rb b/lib/refrepo/gen/wiki/generators/oar_properties.rb
index caee60a2cf8..3d2acf86568 100644
--- a/lib/refrepo/gen/wiki/generators/oar_properties.rb
+++ b/lib/refrepo/gen/wiki/generators/oar_properties.rb
@@ -194,9 +194,9 @@ class OarPropertiesGenerator < WikiGenerator
#Group properties by categories
@@categories = {
"Job-related properties" => ["besteffort", "deploy", "production", "cluster_priority", "max_walltime"],
- "Hierarchy" => ["chassis", "cluster", "cpu", "cpuset", "core", "disk", "diskpath", "gpu", "gpudevice", "host", "network_address", "slash_[16-22]", "switch", "subnet_address", "subnet_prefix", "vlan"],
+ "Hierarchy" => ["chassis", "cluster", "cpu", "cpuset", "core", "disk", "diskpath", "gpu", "gpudevice", "host", "slash_[16-22]", "switch", "subnet_address", "subnet_prefix", "vlan"],
"Hardware" => ["gpu_model", "gpu_count", "memnode", "memcore", "memcpu", "disktype", "disk_reservation_count", "myri_rate", "myri_count", "myri", "ib_rate", "ib_count", "ib", "opa_rate", "opa_count", "eth_rate", "eth_count", "cpufreq", "cputype", "cpucore", "cpuarch", "virtual", "mic"],
- "Miscellaneous" => ["wattmeter", "nodemodel", "ip", "type", "expiry_date", "comment", "maintenance"]
+ "Miscellaneous" => ["wattmeter", "nodemodel", "network_address", "ip", "type", "expiry_date", "comment", "maintenance"]
}
#Existing properties that won't be documented
--
GitLab