From 32167a98a4b03d29ebf1c67d0955c8e3c04357df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Gaidamour?= <jeremie.gaidamour@inria.fr>
Date: Mon, 21 Mar 2016 18:54:51 +0100
Subject: [PATCH] [dev] Updated generators also mv net-links -> networks
---
generators/dhcp/dhcp.rb | 2 +-
generators/lib/input_loader.rb | 2 +
generators/reference-api/reference-api.rb | 64 ++++++++++++-------
.../{net-links => networks}/gw-grenoble.yaml | 0
.../{net-links => networks}/ib-grenoble.yaml | 0
.../{net-links => networks}/sw-edel-1.yaml | 0
.../{net-links => networks}/sw-edel-2.yaml | 0
.../{net-links => networks}/sw-edel-3.yaml | 0
.../{net-links => networks}/sw-edel-4.yaml | 0
.../{net-links => networks}/voltaire-1.yaml | 0
.../{net-links => networks}/voltaire-2.yaml | 0
.../{net-links => networks}/voltaire-3.yaml | 0
.../{net-links => networks}/gw-lille.yaml | 0
.../{net-links => networks}/myrinet.yaml | 0
.../gw-luxembourg.yaml | 0
.../{net-links => networks}/mxl1.yaml | 0
.../{net-links => networks}/mxl2.yaml | 0
.../ul-grid5000-sw02.yaml | 0
.../lyon/{net-links => networks}/force10.yaml | 0
.../lyon/{net-links => networks}/gw-lyon.yaml | 0
.../lyon/{net-links => networks}/pat.yaml | 0
.../lyon/{net-links => networks}/salome.yaml | 0
.../{net-links => networks}/gw-nancy.yaml | 0
.../{net-links => networks}/net-links.yaml | 0
.../{net-links => networks}/sgraoullyib.yaml | 0
.../{net-links => networks}/sgraphene1.yaml | 0
.../{net-links => networks}/sgraphene2.yaml | 0
.../{net-links => networks}/sgraphene3.yaml | 0
.../{net-links => networks}/sgraphene4.yaml | 0
.../{net-links => networks}/sgrapheneib.yaml | 0
.../{net-links => networks}/sgravillon1.yaml | 0
.../{net-links => networks}/sgrelon1.yaml | 0
.../{net-links => networks}/sgriffon1.yaml | 0
.../{net-links => networks}/sgriffon2.yaml | 0
.../{net-links => networks}/sgriffon3.yaml | 0
.../{net-links => networks}/sgriffonib.yaml | 0
.../nancy/{net-links => networks}/smbi1.yaml | 0
.../nancy/{net-links => networks}/stalc1.yaml | 0
.../nancy/{net-links => networks}/stalc2.yaml | 0
.../nancy/{net-links => networks}/stalc3.yaml | 0
.../nancy/{net-links => networks}/stalc4.yaml | 0
.../{net-links => networks}/gw-nantes.yaml | 0
.../{net-links => networks}/gw-reims.yaml | 0
.../{net-links => networks}/bigdata-sw.yaml | 0
.../rennes/{net-links => networks}/c6509.yaml | 0
.../{net-links => networks}/gw-rennes.yaml | 0
.../paravance-sw-1.yaml | 0
.../paravance-sw-2.yaml | 0
.../{net-links => networks}/edgeiron.yaml | 0
.../{net-links => networks}/gw-sophia.yaml | 0
50 files changed, 43 insertions(+), 25 deletions(-)
rename input/grid5000/sites/grenoble/{net-links => networks}/gw-grenoble.yaml (100%)
rename input/grid5000/sites/grenoble/{net-links => networks}/ib-grenoble.yaml (100%)
rename input/grid5000/sites/grenoble/{net-links => networks}/sw-edel-1.yaml (100%)
rename input/grid5000/sites/grenoble/{net-links => networks}/sw-edel-2.yaml (100%)
rename input/grid5000/sites/grenoble/{net-links => networks}/sw-edel-3.yaml (100%)
rename input/grid5000/sites/grenoble/{net-links => networks}/sw-edel-4.yaml (100%)
rename input/grid5000/sites/grenoble/{net-links => networks}/voltaire-1.yaml (100%)
rename input/grid5000/sites/grenoble/{net-links => networks}/voltaire-2.yaml (100%)
rename input/grid5000/sites/grenoble/{net-links => networks}/voltaire-3.yaml (100%)
rename input/grid5000/sites/lille/{net-links => networks}/gw-lille.yaml (100%)
rename input/grid5000/sites/lille/{net-links => networks}/myrinet.yaml (100%)
rename input/grid5000/sites/luxembourg/{net-links => networks}/gw-luxembourg.yaml (100%)
rename input/grid5000/sites/luxembourg/{net-links => networks}/mxl1.yaml (100%)
rename input/grid5000/sites/luxembourg/{net-links => networks}/mxl2.yaml (100%)
rename input/grid5000/sites/luxembourg/{net-links => networks}/ul-grid5000-sw02.yaml (100%)
rename input/grid5000/sites/lyon/{net-links => networks}/force10.yaml (100%)
rename input/grid5000/sites/lyon/{net-links => networks}/gw-lyon.yaml (100%)
rename input/grid5000/sites/lyon/{net-links => networks}/pat.yaml (100%)
rename input/grid5000/sites/lyon/{net-links => networks}/salome.yaml (100%)
rename input/grid5000/sites/nancy/{net-links => networks}/gw-nancy.yaml (100%)
rename input/grid5000/sites/nancy/{net-links => networks}/net-links.yaml (100%)
rename input/grid5000/sites/nancy/{net-links => networks}/sgraoullyib.yaml (100%)
rename input/grid5000/sites/nancy/{net-links => networks}/sgraphene1.yaml (100%)
rename input/grid5000/sites/nancy/{net-links => networks}/sgraphene2.yaml (100%)
rename input/grid5000/sites/nancy/{net-links => networks}/sgraphene3.yaml (100%)
rename input/grid5000/sites/nancy/{net-links => networks}/sgraphene4.yaml (100%)
rename input/grid5000/sites/nancy/{net-links => networks}/sgrapheneib.yaml (100%)
rename input/grid5000/sites/nancy/{net-links => networks}/sgravillon1.yaml (100%)
rename input/grid5000/sites/nancy/{net-links => networks}/sgrelon1.yaml (100%)
rename input/grid5000/sites/nancy/{net-links => networks}/sgriffon1.yaml (100%)
rename input/grid5000/sites/nancy/{net-links => networks}/sgriffon2.yaml (100%)
rename input/grid5000/sites/nancy/{net-links => networks}/sgriffon3.yaml (100%)
rename input/grid5000/sites/nancy/{net-links => networks}/sgriffonib.yaml (100%)
rename input/grid5000/sites/nancy/{net-links => networks}/smbi1.yaml (100%)
rename input/grid5000/sites/nancy/{net-links => networks}/stalc1.yaml (100%)
rename input/grid5000/sites/nancy/{net-links => networks}/stalc2.yaml (100%)
rename input/grid5000/sites/nancy/{net-links => networks}/stalc3.yaml (100%)
rename input/grid5000/sites/nancy/{net-links => networks}/stalc4.yaml (100%)
rename input/grid5000/sites/nantes/{net-links => networks}/gw-nantes.yaml (100%)
rename input/grid5000/sites/reims/{net-links => networks}/gw-reims.yaml (100%)
rename input/grid5000/sites/rennes/{net-links => networks}/bigdata-sw.yaml (100%)
rename input/grid5000/sites/rennes/{net-links => networks}/c6509.yaml (100%)
rename input/grid5000/sites/rennes/{net-links => networks}/gw-rennes.yaml (100%)
rename input/grid5000/sites/rennes/{net-links => networks}/paravance-sw-1.yaml (100%)
rename input/grid5000/sites/rennes/{net-links => networks}/paravance-sw-2.yaml (100%)
rename input/grid5000/sites/sophia/{net-links => networks}/edgeiron.yaml (100%)
rename input/grid5000/sites/sophia/{net-links => networks}/gw-sophia.yaml (100%)
diff --git a/generators/dhcp/dhcp.rb b/generators/dhcp/dhcp.rb
index 90ab5deb36b..45039678da7 100644
--- a/generators/dhcp/dhcp.rb
+++ b/generators/dhcp/dhcp.rb
@@ -66,7 +66,7 @@ global_hash["sites"].each { |site_uid, site_hash|
}
# Other dhcp files
- ["net-links", "laptops", "dom0"].each { |key|
+ ["networks", "laptops", "dom0"].each { |key|
write_dhcp_file({
"filename" => key + ".conf",
"site_uid" => site_uid,
diff --git a/generators/lib/input_loader.rb b/generators/lib/input_loader.rb
index dbd50c0cbf4..88fc4b7c08d 100755
--- a/generators/lib/input_loader.rb
+++ b/generators/lib/input_loader.rb
@@ -43,6 +43,8 @@ def load_yaml_file_hierarchy(directory)
}
+# pp global_hash
+
return global_hash
end
diff --git a/generators/reference-api/reference-api.rb b/generators/reference-api/reference-api.rb
index 8ba6adca9a7..8f082934095 100755
--- a/generators/reference-api/reference-api.rb
+++ b/generators/reference-api/reference-api.rb
@@ -37,7 +37,7 @@ end
# In the network description, if the node interface is given (using "port" attribute),
# the interface parameter must be used.
def net_switch_port_lookup(site, node_uid, interface='')
- site["net-links"].each do |switch_uid, switch| # TODO: rename net-links<->network
+ site["networks"].each do |switch_uid, switch|
#pp switch_uid
switch["linecards"].each do |lc_uid,lc|
lc["ports"].each do |port_uid,port|
@@ -82,7 +82,7 @@ global_hash["sites"].each do |site_uid, site|
cluster.reject {|k, v| k == "nodes"})
# Write node info
- cluster["nodes"].each do |node_uid, node|
+ cluster["nodes"].each do |node_uid, node|# _sort_by_node_uid
pp node_uid
#pp node if node_uid == "graoully-1"
@@ -101,15 +101,13 @@ global_hash["sites"].each do |site_uid, site|
node["main_memory"] = {} unless node.key?("main_memory")
node["main_memory"]["virtual_size"] ||= nil
- node["monitoring"] = {} unless node.key?("monitoring")
- node["monitoring"]["wattmeter"] ||= "false"
-
# Delete keys
node["storage_devices"].keys.each { |key|
node["storage_devices"][key].delete("timeread") if node["storage_devices"][key].key?("timeread")
node["storage_devices"][key].delete("timewrite") if node["storage_devices"][key].key?("timewrite")
}
-
+ node.delete("status")
+
# Type conversion
node["network_adapters"].each { |key, hash| hash["rate"] = hash["rate"].to_i if hash["rate"].is_a?(Float) }
@@ -162,29 +160,47 @@ global_hash["sites"].each do |site_uid, site|
node["sensors"] ||= {}
- if node.key?("pdu") and node["pdu"].key?("pdu_name")
- pdu_name = node["pdu"]["pdu_name"]
- pdu_position = node["pdu"]["pdu_position"]
-
- if cluster_uid == "graphene"
- pp "aa #{pdu_name} #{pdu_position} : #{pdu_info[pdu_name][pdu_position]}"
- end
-
-# if pdu_info[pdu_name][pdu_position] == 1
-# node["monitoring"]["wattmeter"] = "true"
-# else
-# node["monitoring"]["wattmeter"] = "shared"
-# end
+ node["monitoring"] = {} unless node.key?("monitoring")
+ node["monitoring"]["wattmeter"] ||= false
+ node["monitoring"]["wattmeter"] = "true" if node["monitoring"]["wattmeter"] == true
+ node["monitoring"]["wattmeter"] = "false" if node["monitoring"]["wattmeter"] == false
+ if (node.key?("pdu") && node["pdu"].key?("pdu_name")) ||
+ (node.key?("pdu1") && node["pdu1"].key?("pdu_name"))
+
+ #if cluster_uid == "graphene"
+ # pp "#{pdu_name} #{pdu_position} : #{pdu_info[pdu_name][pdu_position]}"
+ #end
+
+# if pdu_info[pdu_name][pdu_position] == 1
+# node["monitoring"]["wattmeter"] = "true"
+# else
+# node["monitoring"]["wattmeter"] = "shared"
+# end
node["sensors"]["power"] ||= {}
+ node["sensors"]["power"]["available"] = true if node["monitoring"]["wattmeter"] != "false"
+
node["sensors"]["power"]["via"] ||= {}
node["sensors"]["power"]["via"]["pdu"] ||= []
- node["sensors"]["power"]["via"]["pdu"][0] ||= {}
-
- node["sensors"]["power"]["via"]["pdu"][0]["uid"] = pdu_name
- node["sensors"]["power"]["via"]["pdu"][0]["port"] = pdu_position
+ i=0
+ ['pdu', 'pdu1', 'pdu2'].each { |key|
+ if (node.key?(key) and node[key].key?("pdu_name"))
+ node["sensors"]["power"]["via"]["pdu"][i] ||= {}
+ node["sensors"]["power"]["via"]["pdu"][i]["uid"] = node[key]["pdu_name"]
+ node["sensors"]["power"]["via"]["pdu"][i]["port"] = node[key]["pdu_position"] unless node["monitoring"]["wattmeter"] == "shared"
+ node["sensors"]["power"]["via"]["pdu"][i].delete("port") if node["monitoring"]["wattmeter"] == "shared"
+ node.delete(key)
+ i = i+1
+ end
+ }
+
+ pp node["monitoring"]["wattmeter"]
+
+ if node["monitoring"]["wattmeter"] != "false"
+ node["sensors"]["power"]["via"]["api"] ||= {}
+ node["sensors"]["power"]["via"]["api"]["metric"] = "power"
+ end
- node.delete("pdu")
end
node.delete("kavlan")
diff --git a/input/grid5000/sites/grenoble/net-links/gw-grenoble.yaml b/input/grid5000/sites/grenoble/networks/gw-grenoble.yaml
similarity index 100%
rename from input/grid5000/sites/grenoble/net-links/gw-grenoble.yaml
rename to input/grid5000/sites/grenoble/networks/gw-grenoble.yaml
diff --git a/input/grid5000/sites/grenoble/net-links/ib-grenoble.yaml b/input/grid5000/sites/grenoble/networks/ib-grenoble.yaml
similarity index 100%
rename from input/grid5000/sites/grenoble/net-links/ib-grenoble.yaml
rename to input/grid5000/sites/grenoble/networks/ib-grenoble.yaml
diff --git a/input/grid5000/sites/grenoble/net-links/sw-edel-1.yaml b/input/grid5000/sites/grenoble/networks/sw-edel-1.yaml
similarity index 100%
rename from input/grid5000/sites/grenoble/net-links/sw-edel-1.yaml
rename to input/grid5000/sites/grenoble/networks/sw-edel-1.yaml
diff --git a/input/grid5000/sites/grenoble/net-links/sw-edel-2.yaml b/input/grid5000/sites/grenoble/networks/sw-edel-2.yaml
similarity index 100%
rename from input/grid5000/sites/grenoble/net-links/sw-edel-2.yaml
rename to input/grid5000/sites/grenoble/networks/sw-edel-2.yaml
diff --git a/input/grid5000/sites/grenoble/net-links/sw-edel-3.yaml b/input/grid5000/sites/grenoble/networks/sw-edel-3.yaml
similarity index 100%
rename from input/grid5000/sites/grenoble/net-links/sw-edel-3.yaml
rename to input/grid5000/sites/grenoble/networks/sw-edel-3.yaml
diff --git a/input/grid5000/sites/grenoble/net-links/sw-edel-4.yaml b/input/grid5000/sites/grenoble/networks/sw-edel-4.yaml
similarity index 100%
rename from input/grid5000/sites/grenoble/net-links/sw-edel-4.yaml
rename to input/grid5000/sites/grenoble/networks/sw-edel-4.yaml
diff --git a/input/grid5000/sites/grenoble/net-links/voltaire-1.yaml b/input/grid5000/sites/grenoble/networks/voltaire-1.yaml
similarity index 100%
rename from input/grid5000/sites/grenoble/net-links/voltaire-1.yaml
rename to input/grid5000/sites/grenoble/networks/voltaire-1.yaml
diff --git a/input/grid5000/sites/grenoble/net-links/voltaire-2.yaml b/input/grid5000/sites/grenoble/networks/voltaire-2.yaml
similarity index 100%
rename from input/grid5000/sites/grenoble/net-links/voltaire-2.yaml
rename to input/grid5000/sites/grenoble/networks/voltaire-2.yaml
diff --git a/input/grid5000/sites/grenoble/net-links/voltaire-3.yaml b/input/grid5000/sites/grenoble/networks/voltaire-3.yaml
similarity index 100%
rename from input/grid5000/sites/grenoble/net-links/voltaire-3.yaml
rename to input/grid5000/sites/grenoble/networks/voltaire-3.yaml
diff --git a/input/grid5000/sites/lille/net-links/gw-lille.yaml b/input/grid5000/sites/lille/networks/gw-lille.yaml
similarity index 100%
rename from input/grid5000/sites/lille/net-links/gw-lille.yaml
rename to input/grid5000/sites/lille/networks/gw-lille.yaml
diff --git a/input/grid5000/sites/lille/net-links/myrinet.yaml b/input/grid5000/sites/lille/networks/myrinet.yaml
similarity index 100%
rename from input/grid5000/sites/lille/net-links/myrinet.yaml
rename to input/grid5000/sites/lille/networks/myrinet.yaml
diff --git a/input/grid5000/sites/luxembourg/net-links/gw-luxembourg.yaml b/input/grid5000/sites/luxembourg/networks/gw-luxembourg.yaml
similarity index 100%
rename from input/grid5000/sites/luxembourg/net-links/gw-luxembourg.yaml
rename to input/grid5000/sites/luxembourg/networks/gw-luxembourg.yaml
diff --git a/input/grid5000/sites/luxembourg/net-links/mxl1.yaml b/input/grid5000/sites/luxembourg/networks/mxl1.yaml
similarity index 100%
rename from input/grid5000/sites/luxembourg/net-links/mxl1.yaml
rename to input/grid5000/sites/luxembourg/networks/mxl1.yaml
diff --git a/input/grid5000/sites/luxembourg/net-links/mxl2.yaml b/input/grid5000/sites/luxembourg/networks/mxl2.yaml
similarity index 100%
rename from input/grid5000/sites/luxembourg/net-links/mxl2.yaml
rename to input/grid5000/sites/luxembourg/networks/mxl2.yaml
diff --git a/input/grid5000/sites/luxembourg/net-links/ul-grid5000-sw02.yaml b/input/grid5000/sites/luxembourg/networks/ul-grid5000-sw02.yaml
similarity index 100%
rename from input/grid5000/sites/luxembourg/net-links/ul-grid5000-sw02.yaml
rename to input/grid5000/sites/luxembourg/networks/ul-grid5000-sw02.yaml
diff --git a/input/grid5000/sites/lyon/net-links/force10.yaml b/input/grid5000/sites/lyon/networks/force10.yaml
similarity index 100%
rename from input/grid5000/sites/lyon/net-links/force10.yaml
rename to input/grid5000/sites/lyon/networks/force10.yaml
diff --git a/input/grid5000/sites/lyon/net-links/gw-lyon.yaml b/input/grid5000/sites/lyon/networks/gw-lyon.yaml
similarity index 100%
rename from input/grid5000/sites/lyon/net-links/gw-lyon.yaml
rename to input/grid5000/sites/lyon/networks/gw-lyon.yaml
diff --git a/input/grid5000/sites/lyon/net-links/pat.yaml b/input/grid5000/sites/lyon/networks/pat.yaml
similarity index 100%
rename from input/grid5000/sites/lyon/net-links/pat.yaml
rename to input/grid5000/sites/lyon/networks/pat.yaml
diff --git a/input/grid5000/sites/lyon/net-links/salome.yaml b/input/grid5000/sites/lyon/networks/salome.yaml
similarity index 100%
rename from input/grid5000/sites/lyon/net-links/salome.yaml
rename to input/grid5000/sites/lyon/networks/salome.yaml
diff --git a/input/grid5000/sites/nancy/net-links/gw-nancy.yaml b/input/grid5000/sites/nancy/networks/gw-nancy.yaml
similarity index 100%
rename from input/grid5000/sites/nancy/net-links/gw-nancy.yaml
rename to input/grid5000/sites/nancy/networks/gw-nancy.yaml
diff --git a/input/grid5000/sites/nancy/net-links/net-links.yaml b/input/grid5000/sites/nancy/networks/net-links.yaml
similarity index 100%
rename from input/grid5000/sites/nancy/net-links/net-links.yaml
rename to input/grid5000/sites/nancy/networks/net-links.yaml
diff --git a/input/grid5000/sites/nancy/net-links/sgraoullyib.yaml b/input/grid5000/sites/nancy/networks/sgraoullyib.yaml
similarity index 100%
rename from input/grid5000/sites/nancy/net-links/sgraoullyib.yaml
rename to input/grid5000/sites/nancy/networks/sgraoullyib.yaml
diff --git a/input/grid5000/sites/nancy/net-links/sgraphene1.yaml b/input/grid5000/sites/nancy/networks/sgraphene1.yaml
similarity index 100%
rename from input/grid5000/sites/nancy/net-links/sgraphene1.yaml
rename to input/grid5000/sites/nancy/networks/sgraphene1.yaml
diff --git a/input/grid5000/sites/nancy/net-links/sgraphene2.yaml b/input/grid5000/sites/nancy/networks/sgraphene2.yaml
similarity index 100%
rename from input/grid5000/sites/nancy/net-links/sgraphene2.yaml
rename to input/grid5000/sites/nancy/networks/sgraphene2.yaml
diff --git a/input/grid5000/sites/nancy/net-links/sgraphene3.yaml b/input/grid5000/sites/nancy/networks/sgraphene3.yaml
similarity index 100%
rename from input/grid5000/sites/nancy/net-links/sgraphene3.yaml
rename to input/grid5000/sites/nancy/networks/sgraphene3.yaml
diff --git a/input/grid5000/sites/nancy/net-links/sgraphene4.yaml b/input/grid5000/sites/nancy/networks/sgraphene4.yaml
similarity index 100%
rename from input/grid5000/sites/nancy/net-links/sgraphene4.yaml
rename to input/grid5000/sites/nancy/networks/sgraphene4.yaml
diff --git a/input/grid5000/sites/nancy/net-links/sgrapheneib.yaml b/input/grid5000/sites/nancy/networks/sgrapheneib.yaml
similarity index 100%
rename from input/grid5000/sites/nancy/net-links/sgrapheneib.yaml
rename to input/grid5000/sites/nancy/networks/sgrapheneib.yaml
diff --git a/input/grid5000/sites/nancy/net-links/sgravillon1.yaml b/input/grid5000/sites/nancy/networks/sgravillon1.yaml
similarity index 100%
rename from input/grid5000/sites/nancy/net-links/sgravillon1.yaml
rename to input/grid5000/sites/nancy/networks/sgravillon1.yaml
diff --git a/input/grid5000/sites/nancy/net-links/sgrelon1.yaml b/input/grid5000/sites/nancy/networks/sgrelon1.yaml
similarity index 100%
rename from input/grid5000/sites/nancy/net-links/sgrelon1.yaml
rename to input/grid5000/sites/nancy/networks/sgrelon1.yaml
diff --git a/input/grid5000/sites/nancy/net-links/sgriffon1.yaml b/input/grid5000/sites/nancy/networks/sgriffon1.yaml
similarity index 100%
rename from input/grid5000/sites/nancy/net-links/sgriffon1.yaml
rename to input/grid5000/sites/nancy/networks/sgriffon1.yaml
diff --git a/input/grid5000/sites/nancy/net-links/sgriffon2.yaml b/input/grid5000/sites/nancy/networks/sgriffon2.yaml
similarity index 100%
rename from input/grid5000/sites/nancy/net-links/sgriffon2.yaml
rename to input/grid5000/sites/nancy/networks/sgriffon2.yaml
diff --git a/input/grid5000/sites/nancy/net-links/sgriffon3.yaml b/input/grid5000/sites/nancy/networks/sgriffon3.yaml
similarity index 100%
rename from input/grid5000/sites/nancy/net-links/sgriffon3.yaml
rename to input/grid5000/sites/nancy/networks/sgriffon3.yaml
diff --git a/input/grid5000/sites/nancy/net-links/sgriffonib.yaml b/input/grid5000/sites/nancy/networks/sgriffonib.yaml
similarity index 100%
rename from input/grid5000/sites/nancy/net-links/sgriffonib.yaml
rename to input/grid5000/sites/nancy/networks/sgriffonib.yaml
diff --git a/input/grid5000/sites/nancy/net-links/smbi1.yaml b/input/grid5000/sites/nancy/networks/smbi1.yaml
similarity index 100%
rename from input/grid5000/sites/nancy/net-links/smbi1.yaml
rename to input/grid5000/sites/nancy/networks/smbi1.yaml
diff --git a/input/grid5000/sites/nancy/net-links/stalc1.yaml b/input/grid5000/sites/nancy/networks/stalc1.yaml
similarity index 100%
rename from input/grid5000/sites/nancy/net-links/stalc1.yaml
rename to input/grid5000/sites/nancy/networks/stalc1.yaml
diff --git a/input/grid5000/sites/nancy/net-links/stalc2.yaml b/input/grid5000/sites/nancy/networks/stalc2.yaml
similarity index 100%
rename from input/grid5000/sites/nancy/net-links/stalc2.yaml
rename to input/grid5000/sites/nancy/networks/stalc2.yaml
diff --git a/input/grid5000/sites/nancy/net-links/stalc3.yaml b/input/grid5000/sites/nancy/networks/stalc3.yaml
similarity index 100%
rename from input/grid5000/sites/nancy/net-links/stalc3.yaml
rename to input/grid5000/sites/nancy/networks/stalc3.yaml
diff --git a/input/grid5000/sites/nancy/net-links/stalc4.yaml b/input/grid5000/sites/nancy/networks/stalc4.yaml
similarity index 100%
rename from input/grid5000/sites/nancy/net-links/stalc4.yaml
rename to input/grid5000/sites/nancy/networks/stalc4.yaml
diff --git a/input/grid5000/sites/nantes/net-links/gw-nantes.yaml b/input/grid5000/sites/nantes/networks/gw-nantes.yaml
similarity index 100%
rename from input/grid5000/sites/nantes/net-links/gw-nantes.yaml
rename to input/grid5000/sites/nantes/networks/gw-nantes.yaml
diff --git a/input/grid5000/sites/reims/net-links/gw-reims.yaml b/input/grid5000/sites/reims/networks/gw-reims.yaml
similarity index 100%
rename from input/grid5000/sites/reims/net-links/gw-reims.yaml
rename to input/grid5000/sites/reims/networks/gw-reims.yaml
diff --git a/input/grid5000/sites/rennes/net-links/bigdata-sw.yaml b/input/grid5000/sites/rennes/networks/bigdata-sw.yaml
similarity index 100%
rename from input/grid5000/sites/rennes/net-links/bigdata-sw.yaml
rename to input/grid5000/sites/rennes/networks/bigdata-sw.yaml
diff --git a/input/grid5000/sites/rennes/net-links/c6509.yaml b/input/grid5000/sites/rennes/networks/c6509.yaml
similarity index 100%
rename from input/grid5000/sites/rennes/net-links/c6509.yaml
rename to input/grid5000/sites/rennes/networks/c6509.yaml
diff --git a/input/grid5000/sites/rennes/net-links/gw-rennes.yaml b/input/grid5000/sites/rennes/networks/gw-rennes.yaml
similarity index 100%
rename from input/grid5000/sites/rennes/net-links/gw-rennes.yaml
rename to input/grid5000/sites/rennes/networks/gw-rennes.yaml
diff --git a/input/grid5000/sites/rennes/net-links/paravance-sw-1.yaml b/input/grid5000/sites/rennes/networks/paravance-sw-1.yaml
similarity index 100%
rename from input/grid5000/sites/rennes/net-links/paravance-sw-1.yaml
rename to input/grid5000/sites/rennes/networks/paravance-sw-1.yaml
diff --git a/input/grid5000/sites/rennes/net-links/paravance-sw-2.yaml b/input/grid5000/sites/rennes/networks/paravance-sw-2.yaml
similarity index 100%
rename from input/grid5000/sites/rennes/net-links/paravance-sw-2.yaml
rename to input/grid5000/sites/rennes/networks/paravance-sw-2.yaml
diff --git a/input/grid5000/sites/sophia/net-links/edgeiron.yaml b/input/grid5000/sites/sophia/networks/edgeiron.yaml
similarity index 100%
rename from input/grid5000/sites/sophia/net-links/edgeiron.yaml
rename to input/grid5000/sites/sophia/networks/edgeiron.yaml
diff --git a/input/grid5000/sites/sophia/net-links/gw-sophia.yaml b/input/grid5000/sites/sophia/networks/gw-sophia.yaml
similarity index 100%
rename from input/grid5000/sites/sophia/net-links/gw-sophia.yaml
rename to input/grid5000/sites/sophia/networks/gw-sophia.yaml
--
GitLab