From 0a1ff32aebf4d29e225c3d53b14bb71633e22de5 Mon Sep 17 00:00:00 2001
From: Teddy Valette <teddy.valette@inria.fr>
Date: Tue, 5 May 2020 15:44:17 +0000
Subject: [PATCH] [gen/wiki/oar] documenting subnet_address and subnet_prefix
---
lib/refrepo/gen/wiki/generators/oar_properties.rb | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/lib/refrepo/gen/wiki/generators/oar_properties.rb b/lib/refrepo/gen/wiki/generators/oar_properties.rb
index 29dfd745e01..be44125b7d1 100644
--- a/lib/refrepo/gen/wiki/generators/oar_properties.rb
+++ b/lib/refrepo/gen/wiki/generators/oar_properties.rb
@@ -84,6 +84,14 @@ class OarPropertiesGenerator < WikiGenerator
"switch" => {
"description" => "On what switch the resource is directly connected ?"
},
+ "subnet_address" => {
+ "description" => "Subnet address for subnet resources.",
+ "possible_values" => "10.144.52.0, 10.144.24.0, 10.144.132.0, 10.146.28.0, 10.144.236.0, ..."
+ },
+ "subnet_prefix" => {
+ "description" => "Subnet prefix for subnet resources.",
+ "possible_values" => "22"
+ },
"vlan" => {
"description" => "Used for kavlan-topo resources.",
"possible_values" => "1, 1523, 1560, 1597, ..."
@@ -173,7 +181,7 @@ 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", "vlan"],
+ "Hierarchy" => ["chassis", "cluster", "cpu", "cpuset", "core", "disk", "diskpath", "gpu", "gpudevice", "host", "network_address", "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"]
}
--
GitLab