diff --git a/data/grid5000/accesses/refrepo.json b/data/grid5000/accesses/refrepo.json
index 87c24be2f3a1a296dfe7f616e1dbe58e054e0213..c65aab9aad4caff2aa44263414ee3694cab3bcc0 100644
--- a/data/grid5000/accesses/refrepo.json
+++ b/data/grid5000/accesses/refrepo.json
@@ -38367,8 +38367,8 @@
"rate": 10000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": "gw",
- "switch_port": "Ethernet6/39",
+ "switch": "gw-next",
+ "switch_port": "1/1/18",
"vendor": "Intel"
},
{
@@ -38615,8 +38615,8 @@
"rate": 10000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": "gw",
- "switch_port": "Ethernet7/44",
+ "switch": "gw-next",
+ "switch_port": "1/1/27",
"vendor": "Intel"
},
{
@@ -38863,8 +38863,8 @@
"rate": 10000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": "gw",
- "switch_port": "Ethernet7/43",
+ "switch": "gw-next",
+ "switch_port": "1/1/28",
"vendor": "Intel"
},
{
@@ -39111,8 +39111,8 @@
"rate": 10000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": "gw",
- "switch_port": "Ethernet7/45",
+ "switch": "gw-next",
+ "switch_port": "1/1/29",
"vendor": "Intel"
},
{
@@ -39359,8 +39359,8 @@
"rate": 10000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": "gw",
- "switch_port": "Ethernet7/41",
+ "switch": "gw-next",
+ "switch_port": "1/1/30",
"vendor": "Intel"
},
{
@@ -39607,8 +39607,8 @@
"rate": 10000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": "gw",
- "switch_port": "Ethernet6/36",
+ "switch": "gw-next",
+ "switch_port": "1/1/19",
"vendor": "Intel"
},
{
@@ -39855,8 +39855,8 @@
"rate": 10000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": "gw",
- "switch_port": "Ethernet6/40",
+ "switch": "gw-next",
+ "switch_port": "1/1/20",
"vendor": "Intel"
},
{
@@ -40103,8 +40103,8 @@
"rate": 10000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": "gw",
- "switch_port": "Ethernet7/48",
+ "switch": "gw-next",
+ "switch_port": "1/1/21",
"vendor": "Intel"
},
{
@@ -40351,8 +40351,8 @@
"rate": 10000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": "gw",
- "switch_port": "Ethernet6/37",
+ "switch": "gw-next",
+ "switch_port": "1/1/22",
"vendor": "Intel"
},
{
@@ -40599,8 +40599,8 @@
"rate": 10000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": "gw",
- "switch_port": "Ethernet6/38",
+ "switch": "gw-next",
+ "switch_port": "1/1/23",
"vendor": "Intel"
},
{
@@ -40847,8 +40847,8 @@
"rate": 10000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": "gw",
- "switch_port": "Ethernet6/35",
+ "switch": "gw-next",
+ "switch_port": "1/1/24",
"vendor": "Intel"
},
{
@@ -41095,8 +41095,8 @@
"rate": 10000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": "gw",
- "switch_port": "Ethernet6/34",
+ "switch": "gw-next",
+ "switch_port": "1/1/25",
"vendor": "Intel"
},
{
@@ -41343,8 +41343,8 @@
"rate": 10000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": "gw",
- "switch_port": "Ethernet7/46",
+ "switch": "gw-next",
+ "switch_port": "1/1/26",
"vendor": "Intel"
},
{
@@ -69275,8 +69275,8 @@
"rate": 10000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": "gw",
- "switch_port": "Ethernet7/15",
+ "switch": "gw-next",
+ "switch_port": "1/1/13",
"vendor": "Intel"
},
{
@@ -69563,8 +69563,8 @@
"rate": 10000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": "gw",
- "switch_port": "Ethernet7/16",
+ "switch": "gw-next",
+ "switch_port": "1/1/14",
"vendor": "Intel"
},
{
@@ -69851,8 +69851,8 @@
"rate": 10000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": "gw",
- "switch_port": "Ethernet7/17",
+ "switch": "gw-next",
+ "switch_port": "1/1/15",
"vendor": "Intel"
},
{
@@ -70139,8 +70139,8 @@
"rate": 10000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": "gw",
- "switch_port": "Ethernet7/18",
+ "switch": "gw-next",
+ "switch_port": "1/1/16",
"vendor": "Intel"
},
{
@@ -70427,8 +70427,8 @@
"rate": 10000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": "gw",
- "switch_port": "Ethernet7/19",
+ "switch": "gw-next",
+ "switch_port": "1/1/17",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/graffiti.json b/data/grid5000/sites/nancy/clusters/graffiti/graffiti.json
index 66ed8678bc6d9d34fe8475bc6e062acfd684cda5..ae06d6100adb3b1170a723309a14e0141d97f36a 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/graffiti.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/graffiti.json
@@ -298,7 +298,7 @@
"interface": "eth2"
},
"name": "network_ifacein_bytes_total",
- "period": 10000,
+ "period": 5000,
"source": {
"protocol": "network_equipment"
}
@@ -309,7 +309,7 @@
"interface": "eth2"
},
"name": "network_ifaceout_bytes_total",
- "period": 10000,
+ "period": 5000,
"source": {
"protocol": "network_equipment"
}
@@ -320,7 +320,7 @@
"interface": "eth2"
},
"name": "network_ifacein_packets_total",
- "period": 10000,
+ "period": 5000,
"source": {
"protocol": "network_equipment"
}
@@ -331,7 +331,7 @@
"interface": "eth2"
},
"name": "network_ifaceout_packets_total",
- "period": 10000,
+ "period": 5000,
"source": {
"protocol": "network_equipment"
}
@@ -342,7 +342,7 @@
"interface": "eth2"
},
"name": "network_ifacein_packets_discard_total",
- "period": 10000,
+ "period": 5000,
"source": {
"protocol": "network_equipment"
}
@@ -353,7 +353,7 @@
"interface": "eth2"
},
"name": "network_ifaceout_packets_discard_total",
- "period": 10000,
+ "period": 5000,
"source": {
"protocol": "network_equipment"
}
@@ -364,7 +364,7 @@
"interface": "eth2"
},
"name": "network_ifacein_packets_error_total",
- "period": 10000,
+ "period": 5000,
"source": {
"protocol": "network_equipment"
}
@@ -375,7 +375,7 @@
"interface": "eth2"
},
"name": "network_ifaceout_packets_error_total",
- "period": 10000,
+ "period": 5000,
"source": {
"protocol": "network_equipment"
}
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-1.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-1.json
index 3e5fa70e580d89f2272003820e4fc6a533d64051..220a32a8ee9c0ef58b324e7db2880e5bd29dd955 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-1.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-1.json
@@ -242,8 +242,8 @@
"rate": 10000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": "gw",
- "switch_port": "Ethernet6/39",
+ "switch": "gw-next",
+ "switch_port": "1/1/18",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-10.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-10.json
index e2842fa824bf451ad371bb4f4b668b3bc630d149..0ac090f454418eed47de73ab21e2c8096d6dde2d 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-10.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-10.json
@@ -242,8 +242,8 @@
"rate": 10000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": "gw",
- "switch_port": "Ethernet7/44",
+ "switch": "gw-next",
+ "switch_port": "1/1/27",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-11.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-11.json
index 61d108706d530763f268c2453999329613915336..478f2686d98e5afc70ba0e245b60b4c9eb0d4235 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-11.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-11.json
@@ -242,8 +242,8 @@
"rate": 10000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": "gw",
- "switch_port": "Ethernet7/43",
+ "switch": "gw-next",
+ "switch_port": "1/1/28",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-12.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-12.json
index ce33b27743ed770d8df48068bcb4f019ed18e678..1818fee63cf54bd329e60cb422a63bb443b6ed3f 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-12.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-12.json
@@ -242,8 +242,8 @@
"rate": 10000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": "gw",
- "switch_port": "Ethernet7/45",
+ "switch": "gw-next",
+ "switch_port": "1/1/29",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-13.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-13.json
index d62a4cc923ce9267df4f9e34b3196873fad2573d..7c84053ed276f88c2a318dae4be11abe9f3fc822 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-13.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-13.json
@@ -242,8 +242,8 @@
"rate": 10000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": "gw",
- "switch_port": "Ethernet7/41",
+ "switch": "gw-next",
+ "switch_port": "1/1/30",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-2.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-2.json
index a621ca6a3993706e72c0cf667bef723e766ee3c7..b4471ac4efc96289bf4d7f8721663eea2fc4a61c 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-2.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-2.json
@@ -242,8 +242,8 @@
"rate": 10000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": "gw",
- "switch_port": "Ethernet6/36",
+ "switch": "gw-next",
+ "switch_port": "1/1/19",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-3.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-3.json
index ea9891a1241f1117e069ff1f8f4a1cf35808fd8e..7d77747b933253f0a5bd9b475a4f99a2eb560273 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-3.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-3.json
@@ -242,8 +242,8 @@
"rate": 10000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": "gw",
- "switch_port": "Ethernet6/40",
+ "switch": "gw-next",
+ "switch_port": "1/1/20",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-4.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-4.json
index 8e8dac7803c7d294ce73cc8b31f13b9f12779b79..2faa4ccc27979df4fd96e195cec9b873bcd2b92b 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-4.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-4.json
@@ -242,8 +242,8 @@
"rate": 10000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": "gw",
- "switch_port": "Ethernet7/48",
+ "switch": "gw-next",
+ "switch_port": "1/1/21",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-5.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-5.json
index d01bf0d146213a41dac57201fa3aba15b80a1b77..83597796da2fcbd81416a2f5af56a13f491901a6 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-5.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-5.json
@@ -242,8 +242,8 @@
"rate": 10000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": "gw",
- "switch_port": "Ethernet6/37",
+ "switch": "gw-next",
+ "switch_port": "1/1/22",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-6.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-6.json
index 613cfec89ee43ac649c1d9cfe91d0e1369f67b7d..a0d6f5c262a0e5d78b6ae5d2e3f62a9131402932 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-6.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-6.json
@@ -242,8 +242,8 @@
"rate": 10000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": "gw",
- "switch_port": "Ethernet6/38",
+ "switch": "gw-next",
+ "switch_port": "1/1/23",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-7.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-7.json
index 87223a80c2e838bd38f6957943d333114b2c4e28..cf1f0a259df8979c74c3d6c8a2ec2bd6fba124a0 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-7.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-7.json
@@ -242,8 +242,8 @@
"rate": 10000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": "gw",
- "switch_port": "Ethernet6/35",
+ "switch": "gw-next",
+ "switch_port": "1/1/24",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-8.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-8.json
index 652be7177a673b93c3e082741f5e438caca30ca6..0931c29406bc152c8f7ccbbef97685f0d686a5e0 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-8.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-8.json
@@ -242,8 +242,8 @@
"rate": 10000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": "gw",
- "switch_port": "Ethernet6/34",
+ "switch": "gw-next",
+ "switch_port": "1/1/25",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-9.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-9.json
index bb84d99825e7ae9967950f0f1d7e40ac674f69b4..80616f6c76cc7f93f6e3cbec9510c0d4c3bc11c1 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-9.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-9.json
@@ -242,8 +242,8 @@
"rate": 10000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": "gw",
- "switch_port": "Ethernet7/46",
+ "switch": "gw-next",
+ "switch_port": "1/1/26",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/nancy/clusters/grostiti/grostiti.json b/data/grid5000/sites/nancy/clusters/grostiti/grostiti.json
index 00cc42cefb648bf98aa25e3ec1a461e6643e9644..ce74248834b00d032c1f0986b83f48b582b9117f 100644
--- a/data/grid5000/sites/nancy/clusters/grostiti/grostiti.json
+++ b/data/grid5000/sites/nancy/clusters/grostiti/grostiti.json
@@ -323,7 +323,7 @@
"interface": "eth0"
},
"name": "network_ifacein_bytes_total",
- "period": 1000,
+ "period": 5000,
"source": {
"protocol": "network_equipment"
}
@@ -334,7 +334,7 @@
"interface": "eth0"
},
"name": "network_ifaceout_bytes_total",
- "period": 1000,
+ "period": 5000,
"source": {
"protocol": "network_equipment"
}
@@ -345,7 +345,7 @@
"interface": "eth0"
},
"name": "network_ifacein_packets_total",
- "period": 1000,
+ "period": 5000,
"source": {
"protocol": "network_equipment"
}
@@ -356,7 +356,7 @@
"interface": "eth0"
},
"name": "network_ifaceout_packets_total",
- "period": 1000,
+ "period": 5000,
"source": {
"protocol": "network_equipment"
}
@@ -367,7 +367,7 @@
"interface": "eth0"
},
"name": "network_ifacein_packets_discard_total",
- "period": 1000,
+ "period": 5000,
"source": {
"protocol": "network_equipment"
}
@@ -378,7 +378,7 @@
"interface": "eth0"
},
"name": "network_ifaceout_packets_discard_total",
- "period": 1000,
+ "period": 5000,
"source": {
"protocol": "network_equipment"
}
@@ -389,7 +389,7 @@
"interface": "eth0"
},
"name": "network_ifacein_packets_error_total",
- "period": 1000,
+ "period": 5000,
"source": {
"protocol": "network_equipment"
}
@@ -400,7 +400,7 @@
"interface": "eth0"
},
"name": "network_ifaceout_packets_error_total",
- "period": 1000,
+ "period": 5000,
"source": {
"protocol": "network_equipment"
}
diff --git a/data/grid5000/sites/nancy/clusters/grue/grue.json b/data/grid5000/sites/nancy/clusters/grue/grue.json
index 9e19fc2bc1a8d3ae9bb0083d915916da4b4e2486..d436dea26a0c721b8b935edd01c28da2163fb391 100644
--- a/data/grid5000/sites/nancy/clusters/grue/grue.json
+++ b/data/grid5000/sites/nancy/clusters/grue/grue.json
@@ -339,7 +339,7 @@
"interface": "eth0"
},
"name": "network_ifacein_bytes_total",
- "period": 10000,
+ "period": 5000,
"source": {
"protocol": "network_equipment"
}
@@ -350,7 +350,7 @@
"interface": "eth0"
},
"name": "network_ifaceout_bytes_total",
- "period": 10000,
+ "period": 5000,
"source": {
"protocol": "network_equipment"
}
@@ -361,7 +361,7 @@
"interface": "eth0"
},
"name": "network_ifacein_packets_total",
- "period": 10000,
+ "period": 5000,
"source": {
"protocol": "network_equipment"
}
@@ -372,7 +372,7 @@
"interface": "eth0"
},
"name": "network_ifaceout_packets_total",
- "period": 10000,
+ "period": 5000,
"source": {
"protocol": "network_equipment"
}
@@ -383,7 +383,7 @@
"interface": "eth0"
},
"name": "network_ifacein_packets_discard_total",
- "period": 10000,
+ "period": 5000,
"source": {
"protocol": "network_equipment"
}
@@ -394,7 +394,7 @@
"interface": "eth0"
},
"name": "network_ifaceout_packets_discard_total",
- "period": 10000,
+ "period": 5000,
"source": {
"protocol": "network_equipment"
}
@@ -405,7 +405,7 @@
"interface": "eth0"
},
"name": "network_ifacein_packets_error_total",
- "period": 10000,
+ "period": 5000,
"source": {
"protocol": "network_equipment"
}
@@ -416,7 +416,7 @@
"interface": "eth0"
},
"name": "network_ifaceout_packets_error_total",
- "period": 10000,
+ "period": 5000,
"source": {
"protocol": "network_equipment"
}
diff --git a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-1.json b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-1.json
index e483247b66b8ca86fad0cf14dd1e0664a99387b9..bb22f096c46dcd56643a4adddd20d5d428db0db0 100644
--- a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-1.json
+++ b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-1.json
@@ -249,8 +249,8 @@
"rate": 10000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": "gw",
- "switch_port": "Ethernet7/15",
+ "switch": "gw-next",
+ "switch_port": "1/1/13",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-2.json b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-2.json
index a50c0b177013c91c598dcff740982a2ce5246bd3..24cc777df6759ac137fcdb89398cd3e7c169ae73 100644
--- a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-2.json
+++ b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-2.json
@@ -249,8 +249,8 @@
"rate": 10000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": "gw",
- "switch_port": "Ethernet7/16",
+ "switch": "gw-next",
+ "switch_port": "1/1/14",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-3.json b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-3.json
index 91ce6b9663afd1a5b4629d2992870c3def7a42d6..7f1123dcb4284ceba54fc29c972b94553467babf 100644
--- a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-3.json
+++ b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-3.json
@@ -249,8 +249,8 @@
"rate": 10000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": "gw",
- "switch_port": "Ethernet7/17",
+ "switch": "gw-next",
+ "switch_port": "1/1/15",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-4.json b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-4.json
index d0f9044d9dac7762a7f292155126e4e3b07eaee3..341762dc469bbfe31d076ad8d165bc12d8fd0196 100644
--- a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-4.json
+++ b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-4.json
@@ -249,8 +249,8 @@
"rate": 10000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": "gw",
- "switch_port": "Ethernet7/18",
+ "switch": "gw-next",
+ "switch_port": "1/1/16",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-5.json b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-5.json
index b6bef259dfe990a1ac728c8759cec895e1d2a2bb..6b6be91866c53c416e04fb2cd98dc8db7d6396d1 100644
--- a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-5.json
+++ b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-5.json
@@ -249,8 +249,8 @@
"rate": 10000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": "gw",
- "switch_port": "Ethernet7/19",
+ "switch": "gw-next",
+ "switch_port": "1/1/17",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/nancy/network_equipments/gw-next.json b/data/grid5000/sites/nancy/network_equipments/gw-next.json
index fa829fa3ac5c564454c627d897a2a42e124c50ad..d6bc844beed62ec3cfd4693fe84ea5c2d354cb8a 100644
--- a/data/grid5000/sites/nancy/network_equipments/gw-next.json
+++ b/data/grid5000/sites/nancy/network_equipments/gw-next.json
@@ -42,40 +42,112 @@
{
},
{
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "1/1/13",
+ "uid": "grue-1"
},
{
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "1/1/14",
+ "uid": "grue-2"
},
{
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "1/1/15",
+ "uid": "grue-3"
},
{
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "1/1/16",
+ "uid": "grue-4"
},
{
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "1/1/17",
+ "uid": "grue-5"
},
{
+ "kind": "node",
+ "port": "eth2",
+ "snmp_name": "1/1/18",
+ "uid": "graffiti-1"
},
{
+ "kind": "node",
+ "port": "eth2",
+ "snmp_name": "1/1/19",
+ "uid": "graffiti-2"
},
{
+ "kind": "node",
+ "port": "eth2",
+ "snmp_name": "1/1/20",
+ "uid": "graffiti-3"
},
{
+ "kind": "node",
+ "port": "eth2",
+ "snmp_name": "1/1/21",
+ "uid": "graffiti-4"
},
{
+ "kind": "node",
+ "port": "eth2",
+ "snmp_name": "1/1/22",
+ "uid": "graffiti-5"
},
{
+ "kind": "node",
+ "port": "eth2",
+ "snmp_name": "1/1/23",
+ "uid": "graffiti-6"
},
{
+ "kind": "node",
+ "port": "eth2",
+ "snmp_name": "1/1/24",
+ "uid": "graffiti-7"
},
{
+ "kind": "node",
+ "port": "eth2",
+ "snmp_name": "1/1/25",
+ "uid": "graffiti-8"
},
{
+ "kind": "node",
+ "port": "eth2",
+ "snmp_name": "1/1/26",
+ "uid": "graffiti-9"
},
{
+ "kind": "node",
+ "port": "eth2",
+ "snmp_name": "1/1/27",
+ "uid": "graffiti-10"
},
{
+ "kind": "node",
+ "port": "eth2",
+ "snmp_name": "1/1/28",
+ "uid": "graffiti-11"
},
{
+ "kind": "node",
+ "port": "eth2",
+ "snmp_name": "1/1/29",
+ "uid": "graffiti-12"
},
{
+ "kind": "node",
+ "port": "eth2",
+ "snmp_name": "1/1/30",
+ "uid": "graffiti-13"
},
{
"kind": "node",
@@ -145,7 +217,7 @@
{
"description": "Input byte counter for the network device port",
"name": "network_ifacein_bytes_total",
- "period": 1000,
+ "period": 5000,
"source": {
"id": "1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
"protocol": "snmp"
@@ -154,7 +226,7 @@
{
"description": "Output byte counter for the network device port",
"name": "network_ifaceout_bytes_total",
- "period": 1000,
+ "period": 5000,
"source": {
"id": "1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
"protocol": "snmp"
@@ -163,7 +235,7 @@
{
"description": "Input packet counter for the network device port",
"name": "network_ifacein_packets_total",
- "period": 1000,
+ "period": 5000,
"source": {
"id": "1.3.6.1.2.1.2.2.1.11.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
"protocol": "snmp"
@@ -172,7 +244,7 @@
{
"description": "Output packet counter for the network device port",
"name": "network_ifaceout_packets_total",
- "period": 1000,
+ "period": 5000,
"source": {
"id": "1.3.6.1.2.1.2.2.1.17.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
"protocol": "snmp"
@@ -181,7 +253,7 @@
{
"description": "Input counter of discarded packets for the network device port",
"name": "network_ifacein_packets_discard_total",
- "period": 1000,
+ "period": 5000,
"source": {
"id": "1.3.6.1.2.1.2.2.1.13.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
"protocol": "snmp"
@@ -190,7 +262,7 @@
{
"description": "Output counter of discarded packets for the network device port",
"name": "network_ifaceout_packets_discard_total",
- "period": 1000,
+ "period": 5000,
"source": {
"id": "1.3.6.1.2.1.2.2.1.19.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
"protocol": "snmp"
@@ -199,7 +271,7 @@
{
"description": "Input counter of packet errors for the network device port",
"name": "network_ifacein_packets_error_total",
- "period": 1000,
+ "period": 5000,
"source": {
"id": "1.3.6.1.2.1.2.2.1.14.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
"protocol": "snmp"
@@ -208,7 +280,7 @@
{
"description": "Output counter of packet errors for the network device port",
"name": "network_ifaceout_packets_error_total",
- "period": 1000,
+ "period": 5000,
"source": {
"id": "1.3.6.1.2.1.2.2.1.20.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
"protocol": "snmp"
diff --git a/data/grid5000/sites/nancy/network_equipments/gw.json b/data/grid5000/sites/nancy/network_equipments/gw.json
index 671793517541b07c686ecdbe59b973b4cfafa5f2..a9a613efdc3fdc31f964aa654dfaaa56137fb1fc 100644
--- a/data/grid5000/sites/nancy/network_equipments/gw.json
+++ b/data/grid5000/sites/nancy/network_equipments/gw.json
@@ -473,46 +473,18 @@
{
},
{
- "kind": "node",
- "port": "eth2",
- "snmp_name": "Ethernet6/34",
- "uid": "graffiti-8"
},
{
- "kind": "node",
- "port": "eth2",
- "snmp_name": "Ethernet6/35",
- "uid": "graffiti-7"
},
{
- "kind": "node",
- "port": "eth2",
- "snmp_name": "Ethernet6/36",
- "uid": "graffiti-2"
},
{
- "kind": "node",
- "port": "eth2",
- "snmp_name": "Ethernet6/37",
- "uid": "graffiti-5"
},
{
- "kind": "node",
- "port": "eth2",
- "snmp_name": "Ethernet6/38",
- "uid": "graffiti-6"
},
{
- "kind": "node",
- "port": "eth2",
- "snmp_name": "Ethernet6/39",
- "uid": "graffiti-1"
},
{
- "kind": "node",
- "port": "eth2",
- "snmp_name": "Ethernet6/40",
- "uid": "graffiti-3"
},
{
},
@@ -643,34 +615,14 @@
"uid": "grele-14"
},
{
- "kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet7/15",
- "uid": "grue-1"
},
{
- "kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet7/16",
- "uid": "grue-2"
},
{
- "kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet7/17",
- "uid": "grue-3"
},
{
- "kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet7/18",
- "uid": "grue-4"
},
{
- "kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet7/19",
- "uid": "grue-5"
},
{
},
@@ -715,44 +667,20 @@
{
},
{
- "kind": "node",
- "port": "eth2",
- "snmp_name": "Ethernet7/41",
- "uid": "graffiti-13"
},
{
},
{
- "kind": "node",
- "port": "eth2",
- "snmp_name": "Ethernet7/43",
- "uid": "graffiti-11"
},
{
- "kind": "node",
- "port": "eth2",
- "snmp_name": "Ethernet7/44",
- "uid": "graffiti-10"
},
{
- "kind": "node",
- "port": "eth2",
- "snmp_name": "Ethernet7/45",
- "uid": "graffiti-12"
},
{
- "kind": "node",
- "port": "eth2",
- "snmp_name": "Ethernet7/46",
- "uid": "graffiti-9"
},
{
},
{
- "kind": "node",
- "port": "eth2",
- "snmp_name": "Ethernet7/48",
- "uid": "graffiti-4"
},
{
},
diff --git a/input/grid5000/sites/nancy/networks/gw-nancy.yaml b/input/grid5000/sites/nancy/networks/gw-nancy.yaml
index 2f57b1142d788d273702c3e1fb36b0909c31c709..536b80ed5c3b39384e11f0b0d18134870c5e71be 100644
--- a/input/grid5000/sites/nancy/networks/gw-nancy.yaml
+++ b/input/grid5000/sites/nancy/networks/gw-nancy.yaml
@@ -183,20 +183,6 @@ gw:
kind: node
rate: 10000000000
ports:
- 34:
- uid: graffiti-8-eth2
- 35:
- uid: graffiti-7-eth2
- 37:
- uid: graffiti-5-eth2
- 36:
- uid: graffiti-2-eth2
- 38:
- uid: graffiti-6-eth2
- 39:
- uid: graffiti-1-eth2
- 40:
- uid: graffiti-3-eth2
51:
uid: port-channel3
kind: channel
@@ -242,28 +228,6 @@ gw:
uid: grele-13
14:
uid: grele-14
- 15:
- uid: grue-1
- 16:
- uid: grue-2
- 17:
- uid: grue-3
- 18:
- uid: grue-4
- 19:
- uid: grue-5
- 41:
- uid: graffiti-13-eth2
- 43:
- uid: graffiti-11-eth2
- 44:
- uid: graffiti-10-eth2
- 45:
- uid: graffiti-12-eth2
- 46:
- uid: graffiti-9-eth2
- 48:
- uid: graffiti-4-eth2
51:
uid: sgros1
kind: switch
diff --git a/input/grid5000/sites/nancy/networks/gw-next.yaml b/input/grid5000/sites/nancy/networks/gw-next.yaml
index c264b2f350490a34e4ec08234f690d73f36ffdb5..8f652dad809f70887da7a71b2c457ca4654c3c71 100644
--- a/input/grid5000/sites/nancy/networks/gw-next.yaml
+++ b/input/grid5000/sites/nancy/networks/gw-next.yaml
@@ -13,49 +13,49 @@ gw-next:
metrics:
- name: network_ifacein_bytes_total
description: Input byte counter for the network device port
- period: 1000
+ period: 5000
source:
protocol: snmp
id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
- name: network_ifaceout_bytes_total
description: Output byte counter for the network device port
- period: 1000
+ period: 5000
source:
protocol: snmp
id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
- name: network_ifacein_packets_total
description: Input packet counter for the network device port
- period: 1000
+ period: 5000
source:
protocol: snmp
id: 1.3.6.1.2.1.2.2.1.11.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
- name: network_ifaceout_packets_total
description: Output packet counter for the network device port
- period: 1000
+ period: 5000
source:
protocol: snmp
id: 1.3.6.1.2.1.2.2.1.17.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
- name: network_ifacein_packets_discard_total
description: Input counter of discarded packets for the network device port
- period: 1000
+ period: 5000
source:
protocol: snmp
id: 1.3.6.1.2.1.2.2.1.13.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
- name: network_ifaceout_packets_discard_total
description: Output counter of discarded packets for the network device port
- period: 1000
+ period: 5000
source:
protocol: snmp
id: 1.3.6.1.2.1.2.2.1.19.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
- name: network_ifacein_packets_error_total
description: Input counter of packet errors for the network device port
- period: 1000
+ period: 5000
source:
protocol: snmp
id: 1.3.6.1.2.1.2.2.1.14.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
- name: network_ifaceout_packets_error_total
description: Output counter of packet errors for the network device port
- period: 1000
+ period: 5000
source:
protocol: snmp
id: 1.3.6.1.2.1.2.2.1.20.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
@@ -67,6 +67,42 @@ gw-next:
rate: 10_000_000_000
kind: node
ports:
+ 13:
+ uid: grue-1
+ 14:
+ uid: grue-2
+ 15:
+ uid: grue-3
+ 16:
+ uid: grue-4
+ 17:
+ uid: grue-5
+ 18:
+ uid: graffiti-1-eth2
+ 19:
+ uid: graffiti-2-eth2
+ 20:
+ uid: graffiti-3-eth2
+ 21:
+ uid: graffiti-4-eth2
+ 22:
+ uid: graffiti-5-eth2
+ 23:
+ uid: graffiti-6-eth2
+ 24:
+ uid: graffiti-7-eth2
+ 25:
+ uid: graffiti-8-eth2
+ 26:
+ uid: graffiti-9-eth2
+ 27:
+ uid: graffiti-10-eth2
+ 28:
+ uid: graffiti-11-eth2
+ 29:
+ uid: graffiti-12-eth2
+ 30:
+ uid: graffiti-13-eth2
31:
uid: grostiti-1
49: