diff --git a/data/grid5000/sites/sophia/clusters/esterel41/nodes/esterel41-1.json b/data/grid5000/sites/sophia/clusters/esterel41/nodes/esterel41-1.json
index 173f0b4115dffb25a1dab822a8726997dca9e80a..8c54ac2ac92ab6229ee8a51dc06e07dc348d1e73 100644
--- a/data/grid5000/sites/sophia/clusters/esterel41/nodes/esterel41-1.json
+++ b/data/grid5000/sites/sophia/clusters/esterel41/nodes/esterel41-1.json
@@ -167,7 +167,7 @@
"rate": 1000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": "gw-ng",
+ "switch": "sw-2",
"switch_port": "1/1/36",
"vendor": "Broadcom Inc. and subsidiaries"
},
diff --git a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-3.json b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-3.json
index 6f4361b6dd0b751ecf81b622cce3066923570dc4..8426cdac5d145b474826c78724eb850e055e6a4e 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-3.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-3.json
@@ -132,7 +132,7 @@
"sriov": true,
"sriov_totalvfs": 7,
"switch": "sw-3",
- "switch_port": "1/1/13",
+ "switch_port": "1/1/15",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-4.json b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-4.json
index 3de7706dc5a259d4260178ae3b97378c8f75196e..0f4dd4ddba0a6ebeeb4fff0423b1a6606c743cfb 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-4.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-4.json
@@ -132,7 +132,7 @@
"sriov": true,
"sriov_totalvfs": 7,
"switch": "sw-3",
- "switch_port": "1/1/14",
+ "switch_port": "1/1/16",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-7.json b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-7.json
index 3d01c5f739b49bb4989b89c3c77f920b9ac98add..cefa627d64f8324a8e8c85a9a48de971b4816e1b 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-7.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-7.json
@@ -132,7 +132,7 @@
"sriov": true,
"sriov_totalvfs": 7,
"switch": "sw-3",
- "switch_port": "1/1/11",
+ "switch_port": "1/1/13",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-8.json b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-8.json
index 236af42fdc3fbca12d11c45d6d2a498601f56a33..b578d78299719daebcb59cef95b743e35509e6b0 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-8.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-8.json
@@ -132,7 +132,7 @@
"sriov": true,
"sriov_totalvfs": 7,
"switch": "sw-3",
- "switch_port": "1/1/12",
+ "switch_port": "1/1/14",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/sophia/clusters/musa/nodes/musa-1.json b/data/grid5000/sites/sophia/clusters/musa/nodes/musa-1.json
index 098832fe30a3a6284366dc0274d6398a3792b1ef..4133329f08c42f66d60e7bdbe58eae899b7e01db 100644
--- a/data/grid5000/sites/sophia/clusters/musa/nodes/musa-1.json
+++ b/data/grid5000/sites/sophia/clusters/musa/nodes/musa-1.json
@@ -212,7 +212,7 @@
"rate": 25000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": "sw-1",
+ "switch": "gw",
"switch_port": "1/1/31",
"vendor": "Broadcom Inc. and subsidiaries"
},
diff --git a/data/grid5000/sites/sophia/clusters/musa/nodes/musa-2.json b/data/grid5000/sites/sophia/clusters/musa/nodes/musa-2.json
index 1d87d767b80f54788ff77cb04c61dc2189cfe11a..12e1f79d334cd1879fa0cd1c5da8f2eb7d2a6024 100644
--- a/data/grid5000/sites/sophia/clusters/musa/nodes/musa-2.json
+++ b/data/grid5000/sites/sophia/clusters/musa/nodes/musa-2.json
@@ -212,7 +212,7 @@
"rate": 25000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": "sw-1",
+ "switch": "gw",
"switch_port": "1/1/32",
"vendor": "Broadcom Inc. and subsidiaries"
},
diff --git a/data/grid5000/sites/sophia/clusters/musa/nodes/musa-3.json b/data/grid5000/sites/sophia/clusters/musa/nodes/musa-3.json
index 0ab0bc852c514e9838569eefbf8bba2f7c39386a..930e516edcd6ec8b9b47b5371ae9ff54bc149d57 100644
--- a/data/grid5000/sites/sophia/clusters/musa/nodes/musa-3.json
+++ b/data/grid5000/sites/sophia/clusters/musa/nodes/musa-3.json
@@ -212,7 +212,7 @@
"rate": 25000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": "sw-1",
+ "switch": "gw",
"switch_port": "1/1/33",
"vendor": "Broadcom Inc. and subsidiaries"
},
diff --git a/data/grid5000/sites/sophia/clusters/musa/nodes/musa-4.json b/data/grid5000/sites/sophia/clusters/musa/nodes/musa-4.json
index 15918dfa5be938c418a138d6236467038ffd117f..121d0177779fcea25c81a7aa27ab17b0ec6ff51e 100644
--- a/data/grid5000/sites/sophia/clusters/musa/nodes/musa-4.json
+++ b/data/grid5000/sites/sophia/clusters/musa/nodes/musa-4.json
@@ -212,7 +212,7 @@
"rate": 25000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": "sw-1",
+ "switch": "gw",
"switch_port": "1/1/34",
"vendor": "Broadcom Inc. and subsidiaries"
},
diff --git a/data/grid5000/sites/sophia/clusters/musa/nodes/musa-5.json b/data/grid5000/sites/sophia/clusters/musa/nodes/musa-5.json
index 8453805193a7b0292baa11e4af8a2c7117260f89..860e12588647d748b8d6dccf821063c897315ca9 100644
--- a/data/grid5000/sites/sophia/clusters/musa/nodes/musa-5.json
+++ b/data/grid5000/sites/sophia/clusters/musa/nodes/musa-5.json
@@ -212,7 +212,7 @@
"rate": 25000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": "sw-1",
+ "switch": "gw",
"switch_port": "1/1/35",
"vendor": "Broadcom Inc. and subsidiaries"
},
diff --git a/data/grid5000/sites/sophia/clusters/musa/nodes/musa-6.json b/data/grid5000/sites/sophia/clusters/musa/nodes/musa-6.json
index 3649d5c4cc1c781847b4189c5f15e518b9ae7a28..2107e5e7f90370982a7929abadae6a74267fd524 100644
--- a/data/grid5000/sites/sophia/clusters/musa/nodes/musa-6.json
+++ b/data/grid5000/sites/sophia/clusters/musa/nodes/musa-6.json
@@ -212,7 +212,7 @@
"rate": 25000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": "sw-1",
+ "switch": "gw",
"switch_port": "1/1/36",
"vendor": "Broadcom Inc. and subsidiaries"
},
diff --git a/data/grid5000/sites/sophia/network_equipments/gw.json b/data/grid5000/sites/sophia/network_equipments/gw.json
index d2f1ca59810475552a589349b88b530deea54f69..772caa9c6e2bf002d8ec99bb9fe6a106a0b36edd 100644
--- a/data/grid5000/sites/sophia/network_equipments/gw.json
+++ b/data/grid5000/sites/sophia/network_equipments/gw.json
@@ -1,118 +1,133 @@
{
- "alias": [
- "gw-sophia"
- ],
- "backplane_bps": 900000000000,
- "ip": "172.16.143.254",
- "ip6": "2001:660:4406:800::ffff:ffff",
+ "backplane_bps": 1440000000000,
+ "channels": {
+ "lag1": {
+ "kind": "server",
+ "port": "lag1",
+ "rate": 500000000000,
+ "uid": "srv-data1"
+ },
+ "lag2": {
+ "kind": "server",
+ "port": "lag2",
+ "rate": 500000000000,
+ "uid": "srv-data2"
+ },
+ "lag3": {
+ "kind": "server",
+ "port": "lag3",
+ "rate": 500000000000,
+ "uid": "srv-data3"
+ },
+ "lag4": {
+ "kind": "server",
+ "port": "lag4",
+ "rate": 200000000000,
+ "uid": "srv-data4"
+ },
+ "lag5": {
+ "kind": "server",
+ "port": "lag5",
+ "rate": 200000000000,
+ "uid": "srv-scratch1"
+ },
+ "lag6": {
+ "kind": "server",
+ "port": "lag6",
+ "rate": 200000000000,
+ "uid": "srv-scratch2"
+ },
+ "lag7": {
+ "kind": "server",
+ "port": "lag7",
+ "rate": 200000000000,
+ "uid": "srv-scratch3"
+ }
+ },
+ "ip": "172.17.143.251",
"kind": "router",
"linecards": [
{
},
{
- "backplane_bps": null,
- "kind": "switch",
- "ports": [
- {
- },
- {
- "kind": "backbone",
- "snmp_name": "10GigabitEthernet1/1",
- "uid": "renater-sophia"
- }
- ],
- "rate": 10000000000,
- "snmp_pattern": "10GigabitEthernet%LINECARD%/%PORT%"
- },
- {
- },
- {
- "backplane_bps": 24000000000,
- "kavlan_pattern": "%LINECARD%/%PORT%",
+ "kavlan_pattern": "%LINECARD%/1/%PORT%",
"kind": "node",
"ports": [
{
},
{
+ "kind": "server",
+ "snmp_name": "1/1/1",
+ "uid": "pve-2"
},
{
+ "kind": "server",
+ "snmp_name": "1/1/2",
+ "uid": "pve-1"
},
{
+ "kind": "channel",
+ "snmp_name": "1/1/3",
+ "uid": "lag1"
},
{
+ "kind": "channel",
+ "snmp_name": "1/1/4",
+ "uid": "lag1"
},
{
+ "kind": "channel",
+ "snmp_name": "1/1/5",
+ "uid": "lag2"
},
{
+ "kind": "channel",
+ "snmp_name": "1/1/6",
+ "uid": "lag2"
},
{
+ "kind": "channel",
+ "snmp_name": "1/1/7",
+ "uid": "lag3"
},
{
+ "kind": "channel",
+ "snmp_name": "1/1/8",
+ "uid": "lag3"
},
{
},
{
},
{
+ "kind": "channel",
+ "snmp_name": "1/1/11",
+ "uid": "lag5"
},
{
+ "kind": "channel",
+ "snmp_name": "1/1/12",
+ "uid": "lag5"
},
{
+ "kind": "channel",
+ "snmp_name": "1/1/13",
+ "uid": "lag6"
},
{
+ "kind": "channel",
+ "snmp_name": "1/1/14",
+ "uid": "lag6"
},
{
+ "kind": "channel",
+ "snmp_name": "1/1/15",
+ "uid": "lag7"
},
{
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- }
- ],
- "rate": 1000000000,
- "snmp_pattern": "GigabitEthernet%LINECARD%/%PORT%"
- },
- {
- "backplane_bps": 24000000000,
- "kavlan_pattern": "%LINECARD%/%PORT%",
- "kind": "node",
- "ports": [
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
+ "kind": "channel",
+ "snmp_name": "1/1/16",
+ "uid": "lag7"
},
{
},
@@ -132,32 +147,6 @@
},
{
},
- {
- },
- {
- }
- ],
- "rate": 1000000000,
- "snmp_pattern": "GigabitEthernet%LINECARD%/%PORT%"
- },
- {
- },
- {
- "backplane_bps": 24000000000,
- "kavlan_pattern": "%LINECARD%/%PORT%",
- "kind": "node",
- "port": "eth0",
- "ports": [
-
- ],
- "rate": 1000000000,
- "snmp_pattern": "GigabitEthernet%LINECARD%/%PORT%"
- },
- {
- "backplane_bps": 24000000000,
- "kavlan_pattern": "%LINECARD%/%PORT%",
- "kind": "node",
- "ports": [
{
},
{
@@ -169,254 +158,101 @@
{
},
{
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "1/1/31",
+ "uid": "musa-1"
},
{
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "1/1/32",
+ "uid": "musa-2"
},
{
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "1/1/33",
+ "uid": "musa-3"
},
{
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "1/1/34",
+ "uid": "musa-4"
},
{
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "1/1/35",
+ "uid": "musa-5"
},
{
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "1/1/36",
+ "uid": "musa-6"
},
{
"kind": "server",
- "snmp_name": "GigabitEthernet7/11",
+ "snmp_name": "1/1/37",
"uid": "gwol-south"
},
- {
- "kind": "server",
- "snmp_name": "GigabitEthernet7/12",
- "uid": "srv3-eth2"
- }
- ],
- "rate": 1000000000,
- "snmp_pattern": "GigabitEthernet%LINECARD%/%PORT%"
- },
- {
- },
- {
- "backplane_bps": 12000000000,
- "kavlan_pattern": "%LINECARD%/%PORT%",
- "kind": "node",
- "ports": [
{
},
{
},
{
- "kind": "server",
- "snmp_name": "GigabitEthernet9/2",
- "uid": "srv-data"
+ "kind": "channel",
+ "rate": 100000000000,
+ "snmp_name": "1/1/40",
+ "uid": "lag4"
},
{
+ "kind": "channel",
+ "rate": 100000000000,
+ "snmp_name": "1/1/41",
+ "uid": "lag4"
},
{
},
{
+ "kind": "other",
+ "rate": 1000000000,
+ "snmp_name": "1/1/43",
+ "uid": "LABO"
},
{
},
{
"kind": "switch",
- "snmp_name": "GigabitEthernet9/7",
- "uid": "gw-ng"
+ "rate": 10000000000,
+ "snmp_name": "1/1/45",
+ "uid": "sw-3"
},
{
},
{
"kind": "switch",
- "snmp_name": "GigabitEthernet9/9",
- "uid": "sw-1"
+ "rate": 10000000000,
+ "snmp_name": "1/1/47",
+ "uid": "sw-2"
+ },
+ {
+ "kind": "backbone",
+ "snmp_name": "1/1/48",
+ "uid": "renater-sophia"
}
],
- "rate": 1000000000,
- "snmp_pattern": "GigabitEthernet%LINECARD%/%PORT%"
+ "rate": 25000000000,
+ "snmp_pattern": "%LINECARD%/1/%PORT%"
}
],
"managed_by_us": true,
- "metrics": [
- {
- "description": "Input byte counter for the network device port",
- "name": "network_ifacein_bytes_total",
- "period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.31.1.1.1.6.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
- "protocol": "snmp"
- }
- },
- {
- "description": "Output byte counter for the network device port",
- "name": "network_ifaceout_bytes_total",
- "period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.31.1.1.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
- "protocol": "snmp"
- }
- },
- {
- "description": "Input packet counter for the network device port",
- "name": "network_ifacein_packets_total",
- "period": 1000,
- "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"
- }
- },
- {
- "description": "Output packet counter for the network device port",
- "name": "network_ifaceout_packets_total",
- "period": 1000,
- "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"
- }
- },
- {
- "description": "Input counter of discarded packets for the network device port",
- "name": "network_ifacein_packets_discard_total",
- "period": 1000,
- "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"
- }
- },
- {
- "description": "Output counter of discarded packets for the network device port",
- "name": "network_ifaceout_packets_discard_total",
- "period": 1000,
- "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"
- }
- },
- {
- "description": "Input counter of packet errors for the network device port",
- "name": "network_ifacein_packets_error_total",
- "period": 1000,
- "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"
- }
- },
- {
- "description": "Output counter of packet errors for the network device port",
- "name": "network_ifaceout_packets_error_total",
- "period": 1000,
- "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"
- }
- }
- ],
- "model": "Foundry",
+ "model": "Aruba 8325-48Y8C",
"site": "sophia",
"snmp_community": "public",
"type": "network_equipment",
"uid": "gw",
- "vlans": {
- "vlan100": {
- "addresses": [
- "172.16.143.254"
- ],
- "administrative": true
- },
- "vlan101": {
- "addresses": [
- "172.17.143.254"
- ]
- },
- "vlan500": {
- "addresses": [
- "192.168.4.12"
- ]
- },
- "vlan535": {
- "addresses": [
- "193.51.182.221"
- ]
- },
- "vlan538": {
- "addresses": [
- "172.16.223.250"
- ]
- },
- "vlan540": {
- "addresses": [
- "192.168.69.10"
- ]
- },
- "vlan666": {
- "addresses": [
- "194.254.60.61"
- ]
- },
- "vlan667": {
- "addresses": [
- "192.168.67.253"
- ]
- },
- "vlan701": {
- "addresses": [
- "192.168.192.0/20"
- ],
- "name": "kavlan-1"
- },
- "vlan702": {
- "addresses": [
- "192.168.208.0/20"
- ],
- "name": "kavlan-2"
- },
- "vlan703": {
- "addresses": [
- "192.168.224.0/20"
- ],
- "name": "kavlan-3"
- },
- "vlan704": {
- "addresses": [
- "10.32.0.0/18"
- ],
- "name": "kavlan-4"
- },
- "vlan705": {
- "addresses": [
- "10.32.64.0/18"
- ],
- "name": "kavlan-5"
- },
- "vlan706": {
- "addresses": [
- "10.32.128.0/18"
- ],
- "name": "kavlan-6"
- },
- "vlan707": {
- "addresses": [
- "10.32.192.0/18"
- ],
- "name": "kavlan-7"
- },
- "vlan708": {
- "addresses": [
- "10.33.0.0/18"
- ],
- "name": "kavlan-8"
- },
- "vlan709": {
- "addresses": [
- "10.33.64.0/18"
- ],
- "name": "kavlan-9"
- },
- "vlan718": {
- "addresses": [
- "10.35.192.0/18"
- ],
- "name": "kavlan-18"
- }
- },
- "warranty": "expired"
+ "warranty": "2048-05"
}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/network_equipments/sw-1.json b/data/grid5000/sites/sophia/network_equipments/sw-1.json
deleted file mode 100644
index 9f068318a8af27b0f121624eda89651c2e306f19..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/sophia/network_equipments/sw-1.json
+++ /dev/null
@@ -1,199 +0,0 @@
-{
- "backplane_bps": 1440000000000,
- "channels": {
- "lag1": {
- "kind": "server",
- "port": "lag1",
- "rate": 500000000000,
- "uid": "srv-data1"
- },
- "lag2": {
- "kind": "server",
- "port": "lag2",
- "rate": 500000000000,
- "uid": "srv-data2"
- },
- "lag3": {
- "kind": "server",
- "port": "lag3",
- "rate": 500000000000,
- "uid": "srv-data3"
- },
- "lag4": {
- "kind": "server",
- "port": "lag4",
- "rate": 200000000000,
- "uid": "srv-data4"
- }
- },
- "ip": "172.17.143.251",
- "kind": "switch",
- "linecards": [
- {
- },
- {
- "kavlan_pattern": "%LINECARD%/1/%PORT%",
- "kind": "node",
- "ports": [
- {
- },
- {
- },
- {
- },
- {
- "kind": "channel",
- "snmp_name": "1/1/3",
- "uid": "lag1"
- },
- {
- "kind": "channel",
- "snmp_name": "1/1/4",
- "uid": "lag1"
- },
- {
- "kind": "channel",
- "rate": 25000000000,
- "snmp_name": "1/1/5",
- "uid": "lag2"
- },
- {
- "kind": "channel",
- "snmp_name": "1/1/6",
- "uid": "lag2"
- },
- {
- "kind": "channel",
- "snmp_name": "1/1/7",
- "uid": "lag3"
- },
- {
- "kind": "channel",
- "snmp_name": "1/1/8",
- "uid": "lag3"
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- "kind": "node",
- "port": "eth0",
- "snmp_name": "1/1/31",
- "uid": "musa-1"
- },
- {
- "kind": "node",
- "port": "eth0",
- "snmp_name": "1/1/32",
- "uid": "musa-2"
- },
- {
- "kind": "node",
- "port": "eth0",
- "snmp_name": "1/1/33",
- "uid": "musa-3"
- },
- {
- "kind": "node",
- "port": "eth0",
- "snmp_name": "1/1/34",
- "uid": "musa-4"
- },
- {
- "kind": "node",
- "port": "eth0",
- "snmp_name": "1/1/35",
- "uid": "musa-5"
- },
- {
- "kind": "node",
- "port": "eth0",
- "snmp_name": "1/1/36",
- "uid": "musa-6"
- },
- {
- },
- {
- },
- {
- },
- {
- "kind": "channel",
- "rate": 100000000000,
- "snmp_name": "1/1/40",
- "uid": "lag4"
- },
- {
- "kind": "channel",
- "rate": 100000000000,
- "snmp_name": "1/1/41",
- "uid": "lag4"
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- "kind": "router",
- "rate": 10000000000,
- "snmp_name": "1/1/46",
- "uid": "gw"
- }
- ],
- "rate": 25000000000,
- "snmp_pattern": "%LINECARD%/1/%PORT%"
- }
- ],
- "managed_by_us": true,
- "model": "Aruba 8325-48Y8C",
- "site": "sophia",
- "snmp_community": "public",
- "type": "network_equipment",
- "uid": "sw-1",
- "warranty": "2048-05"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/network_equipments/gw-ng.json b/data/grid5000/sites/sophia/network_equipments/sw-2.json
similarity index 54%
rename from data/grid5000/sites/sophia/network_equipments/gw-ng.json
rename to data/grid5000/sites/sophia/network_equipments/sw-2.json
index 5c9423dc155ac6c69df3a1aab8a92f3bb3b9de40..b9d57e813cf58e2321441d4f5fd9fe945105f444 100644
--- a/data/grid5000/sites/sophia/network_equipments/gw-ng.json
+++ b/data/grid5000/sites/sophia/network_equipments/sw-2.json
@@ -1,30 +1,4 @@
{
- "channels": {
- "lag1": {
- "kind": "server",
- "port": "lag1",
- "rate": 500000000000,
- "uid": "srv-data1"
- },
- "lag2": {
- "kind": "server",
- "port": "lag2",
- "rate": 500000000000,
- "uid": "srv-data2"
- },
- "lag3": {
- "kind": "server",
- "port": "lag3",
- "rate": 500000000000,
- "uid": "srv-data3"
- },
- "lag4": {
- "kind": "server",
- "port": "lag4",
- "rate": 200000000000,
- "uid": "srv-data4"
- }
- },
"ip": "172.17.143.253",
"kind": "switch",
"linecards": [
@@ -37,28 +11,61 @@
{
},
{
+ "kind": "other",
+ "snmp_name": "1/1/1",
+ "uid": "pve-2-bmc"
},
{
+ "kind": "other",
+ "snmp_name": "1/1/2",
+ "uid": "pve-1-bmc"
},
{
+ "kind": "other",
+ "snmp_name": "1/1/3",
+ "uid": "srv-data4-bmc"
},
{
+ "kind": "other",
+ "snmp_name": "1/1/4",
+ "uid": "srv-data2-bmc"
},
{
+ "kind": "other",
+ "snmp_name": "1/1/5",
+ "uid": "srv-data1-bmc"
},
{
+ "kind": "other",
+ "snmp_name": "1/1/6",
+ "uid": "srv-scrath-1-bmc"
},
{
+ "kind": "other",
+ "snmp_name": "1/1/7",
+ "uid": "srv-scrath-2-bmc"
},
{
+ "kind": "other",
+ "snmp_name": "1/1/8",
+ "uid": "srv-scrath-3-bmc"
},
{
},
{
+ "kind": "other",
+ "snmp_name": "1/1/10",
+ "uid": "pve-dmz-south-1-bmc"
},
{
+ "kind": "other",
+ "snmp_name": "1/1/11",
+ "uid": "srv3-bmc"
},
{
+ "kind": "other",
+ "snmp_name": "1/1/12",
+ "uid": "gwol-south-bmc"
},
{
},
@@ -89,6 +96,9 @@
{
},
{
+ "kind": "server",
+ "snmp_name": "1/1/27",
+ "uid": "srv-data"
},
{
},
@@ -119,6 +129,9 @@
{
},
{
+ "kind": "switch",
+ "snmp_name": "1/1/40",
+ "uid": "swadmin-2"
},
{
},
@@ -130,16 +143,19 @@
},
{
},
+ {
+ "kind": "switch",
+ "snmp_name": "1/1/46",
+ "uid": "swadmin-3"
+ },
{
},
{
- "kind": "switch",
- "snmp_name": "1/1/47",
- "uid": "sw-3"
},
{
"kind": "router",
- "snmp_name": "1/1/48",
+ "rate": 10000000000,
+ "snmp_name": "1/1/49",
"uid": "gw"
}
],
@@ -152,6 +168,6 @@
"site": "sophia",
"snmp_community": "public",
"type": "network_equipment",
- "uid": "gw-ng",
+ "uid": "sw-2",
"warranty": "2048-05"
}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/network_equipments/sw-3.json b/data/grid5000/sites/sophia/network_equipments/sw-3.json
index 75db0f68c78bad097cce239f5977e9bbb518e47a..e180495f99eea640931584d03b4ba13f17ece19f 100644
--- a/data/grid5000/sites/sophia/network_equipments/sw-3.json
+++ b/data/grid5000/sites/sophia/network_equipments/sw-3.json
@@ -1,30 +1,4 @@
{
- "channels": {
- "lag1": {
- "kind": "server",
- "port": "lag1",
- "rate": 500000000000,
- "uid": "srv-data1"
- },
- "lag2": {
- "kind": "server",
- "port": "lag2",
- "rate": 500000000000,
- "uid": "srv-data2"
- },
- "lag3": {
- "kind": "server",
- "port": "lag3",
- "rate": 500000000000,
- "uid": "srv-data3"
- },
- "lag4": {
- "kind": "server",
- "port": "lag4",
- "rate": 200000000000,
- "uid": "srv-data4"
- }
- },
"ip": "172.17.143.247",
"kind": "switch",
"linecards": [
@@ -96,28 +70,32 @@
"snmp_name": "1/1/10",
"uid": "mercantour1-4"
},
+ {
+ },
+ {
+ },
{
"kind": "node",
"port": "eth0",
- "snmp_name": "1/1/11",
+ "snmp_name": "1/1/13",
"uid": "mercantour2-7"
},
{
"kind": "node",
"port": "eth0",
- "snmp_name": "1/1/12",
+ "snmp_name": "1/1/14",
"uid": "mercantour2-8"
},
{
"kind": "node",
"port": "eth0",
- "snmp_name": "1/1/13",
+ "snmp_name": "1/1/15",
"uid": "mercantour2-3"
},
{
"kind": "node",
"port": "eth0",
- "snmp_name": "1/1/14",
+ "snmp_name": "1/1/16",
"uid": "mercantour2-4"
},
{
@@ -152,10 +130,6 @@
},
{
},
- {
- },
- {
- },
{
"kind": "node",
"port": "eth0",
@@ -243,9 +217,16 @@
{
},
{
- "kind": "switch",
- "snmp_name": "1/1/48",
- "uid": "gw-ng"
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "router",
+ "rate": 10000000000,
+ "snmp_name": "1/1/51",
+ "uid": "gw"
}
],
"rate": 1000000000,
diff --git a/input/grid5000/sites/sophia/networks/gw-ng.yaml b/input/grid5000/sites/sophia/networks/gw-ng.yaml
deleted file mode 100644
index 2f7abbddcd1545a3caf825fb624e18fc7efe645f..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/sophia/networks/gw-ng.yaml
+++ /dev/null
@@ -1,45 +0,0 @@
----
-gw-ng:
- model: Aruba 6300M
- warranty: 2048-05
- kind: switch
- managed_by_us: true
- site: sophia
- ip: 172.17.143.253
- snmp_community: public
- linecards:
- 1:
- snmp_pattern: "%LINECARD%/1/%PORT%"
- kavlan_pattern: "%LINECARD%/1/%PORT%"
- rate: 1000000000
- kind: node
- ports:
- 36:
- uid: esterel41-1
- 47:
- uid: sw-3
- kind: switch
- 48:
- uid: gw
- kind: router
- channels:
- lag1:
- kind: server
- rate: 500000000000
- uid: srv-data1
- port: lag1
- lag2:
- kind: server
- rate: 500000000000
- uid: srv-data2
- port: lag2
- lag3:
- kind: server
- rate: 500000000000
- uid: srv-data3
- port: lag3
- lag4:
- kind: server
- rate: 200000000000
- uid: srv-data4
- port: lag4
diff --git a/input/grid5000/sites/sophia/networks/gw-sophia.yaml b/input/grid5000/sites/sophia/networks/gw-sophia.yaml
index 3c83b0c4994863b0236476c77689c554eaeb1411..cd464bff6e007eb733b0e8d2bec0142ef59a856c 100644
--- a/input/grid5000/sites/sophia/networks/gw-sophia.yaml
+++ b/input/grid5000/sites/sophia/networks/gw-sophia.yaml
@@ -1,218 +1,133 @@
---
gw:
- model: Foundry
- warranty: expired
+ model: Aruba 8325-48Y8C
+ warranty: 2048-05
kind: router
managed_by_us: true
site: sophia
+ ip: 172.17.143.251
snmp_community: public
- metrics:
- - name: network_ifacein_bytes_total
- description: Input byte counter for the network device port
- period: 1000
- source:
- protocol: snmp
- id: 1.3.6.1.2.1.31.1.1.1.6.{{ 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
- source:
- protocol: snmp
- id: 1.3.6.1.2.1.31.1.1.1.10.{{ 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
- 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
- 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
- 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
- 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
- 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
- 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% }}
- alias:
- - gw-sophia
- ip: 172.16.143.254
- ip6: 2001:660:4406:800::ffff:ffff
- vlans:
- "vlan100":
- administrative: yes
- addresses:
- - 172.16.143.254
- "vlan101":
- addresses:
- - 172.17.143.254
- "vlan500":
- addresses:
- - 192.168.4.12
- "vlan535":
- addresses:
- - 193.51.182.221
- "vlan538":
- addresses:
- - 172.16.223.250
- "vlan540":
- addresses:
- - 192.168.69.10
- "vlan666":
- addresses:
- - 194.254.60.61
- "vlan667":
- addresses:
- - 192.168.67.253
- "vlan701":
- name: kavlan-1
- addresses:
- - 192.168.192.0/20
- "vlan702":
- name: kavlan-2
- addresses:
- - 192.168.208.0/20
- "vlan703":
- name: kavlan-3
- addresses:
- - 192.168.224.0/20
- "vlan704":
- name: kavlan-4
- addresses:
- - 10.32.0.0/18
- "vlan705":
- name: kavlan-5
- addresses:
- - 10.32.64.0/18
- "vlan706":
- name: kavlan-6
- addresses:
- - 10.32.128.0/18
- "vlan707":
- name: kavlan-7
- addresses:
- - 10.32.192.0/18
- "vlan708":
- name: kavlan-8
- addresses:
- - 10.33.0.0/18
- "vlan709":
- name: kavlan-9
- addresses:
- - 10.33.64.0/18
- "vlan718":
- name: kavlan-18
- addresses:
- - 10.35.192.0/18
- backplane_bps: 900000000000
+ backplane_bps: 1440000000000
linecards:
1:
- snmp_pattern: "10GigabitEthernet%LINECARD%/%PORT%"
- kind: switch
- backplane_bps:
- rate: 10000000000
- ports:
- 1:
- uid: renater-sophia
- kind: backbone
- 3:
- snmp_pattern: "GigabitEthernet%LINECARD%/%PORT%"
- kavlan_pattern: "%LINECARD%/%PORT%"
- kind: node
- backplane_bps: 24000000000
- rate: 1000000000
- ports:
- 1:
- 2:
- 3:
- 5:
- 7:
- 10:
- 11:
- 13:
- 14:
- 15:
- 17:
- 18:
- 19:
- 20:
- 22:
- 24:
- 4:
- snmp_pattern: "GigabitEthernet%LINECARD%/%PORT%"
- kavlan_pattern: "%LINECARD%/%PORT%"
+ snmp_pattern: "%LINECARD%/1/%PORT%"
+ kavlan_pattern: "%LINECARD%/1/%PORT%"
+ rate: 25000000000
kind: node
- backplane_bps: 24000000000
- rate: 1000000000
ports:
1:
- 2:
- 4:
- 6:
- 8:
- 9:
- 10:
- 12:
- 14:
- 16:
- 18:
- 20:
- 22:
- 7:
- snmp_pattern: "GigabitEthernet%LINECARD%/%PORT%"
- kavlan_pattern: "%LINECARD%/%PORT%"
- kind: node
- backplane_bps: 24000000000
- rate: 1000000000
- ports:
- 11:
- uid: gwol-south
+ uid: pve-2
kind: server
- 12:
- uid: srv3-eth2
- kind: server
- 9:
- snmp_pattern: "GigabitEthernet%LINECARD%/%PORT%"
- kavlan_pattern: "%LINECARD%/%PORT%"
- kind: node
- backplane_bps: 12000000000
- rate: 1000000000
- ports:
2:
- uid: srv-data
+ uid: pve-1
kind: server
+ 3:
+ uid: lag1
+ kind: channel
+ 4:
+ uid: lag1
+ kind: channel
+ 5:
+ uid: lag2
+ kind: channel
+ 6:
+ uid: lag2
+ kind: channel
7:
- uid: gw-ng
+ uid: lag3
+ kind: channel
+ 8:
+ uid: lag3
+ kind: channel
+ 11:
+ uid: lag5
+ kind: channel
+ 12:
+ uid: lag5
+ kind: channel
+ 13:
+ uid: lag6
+ kind: channel
+ 14:
+ uid: lag6
+ kind: channel
+ 15:
+ uid: lag7
+ kind: channel
+ 16:
+ uid: lag7
+ kind: channel
+ 37:
+ uid: gwol-south
+ kind: server
+ 31:
+ uid: musa-1
+ 32:
+ uid: musa-2
+ 33:
+ uid: musa-3
+ 34:
+ uid: musa-4
+ 35:
+ uid: musa-5
+ 36:
+ uid: musa-6
+ 40:
+ uid: lag4
+ kind: channel
+ rate: 100000000000
+ 41:
+ uid: lag4
+ kind: channel
+ rate: 100000000000
+ 43:
+ uid: LABO
+ kind: other
+ rate: 1000000000
+ 45:
+ uid: sw-3
kind: switch
- 9:
- uid: sw-1
+ rate: 10000000000
+ 47:
+ uid: sw-2
kind: switch
- 6:
- snmp_pattern: "GigabitEthernet%LINECARD%/%PORT%"
- kavlan_pattern: "%LINECARD%/%PORT%"
- kind: node
- port: eth0
- backplane_bps: 24000000000
- rate: 1000000000
- ports: {}
+ rate: 10000000000
+ 48:
+ uid: renater-sophia
+ kind: backbone
+ channels:
+ lag1:
+ kind: server
+ rate: 500000000000
+ uid: srv-data1
+ port: lag1
+ lag2:
+ kind: server
+ rate: 500000000000
+ uid: srv-data2
+ port: lag2
+ lag3:
+ kind: server
+ rate: 500000000000
+ uid: srv-data3
+ port: lag3
+ lag4:
+ kind: server
+ rate: 200000000000
+ uid: srv-data4
+ port: lag4
+ lag5:
+ kind: server
+ rate: 200000000000
+ uid: srv-scratch1
+ port: lag5
+ lag6:
+ kind: server
+ rate: 200000000000
+ uid: srv-scratch2
+ port: lag6
+ lag7:
+ kind: server
+ rate: 200000000000
+ uid: srv-scratch3
+ port: lag7
\ No newline at end of file
diff --git a/input/grid5000/sites/sophia/networks/sw-1.yaml b/input/grid5000/sites/sophia/networks/sw-1.yaml
deleted file mode 100644
index 6b9969c9dbe828b8385b23bfeb8f4fdcbd3dbb7a..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/sophia/networks/sw-1.yaml
+++ /dev/null
@@ -1,107 +0,0 @@
----
-sw-1:
- model: Aruba 8325-48Y8C
- warranty: 2048-05
- kind: switch
- managed_by_us: true
- site: sophia
- ip: 172.17.143.251
- snmp_community: public
- backplane_bps: 1440000000000
- linecards:
- 1:
- snmp_pattern: "%LINECARD%/1/%PORT%"
- kavlan_pattern: "%LINECARD%/1/%PORT%"
- rate: 25000000000
- kind: node
- ports:
- 1:
- 2:
- 3:
- uid: lag1
- kind: channel
- 4:
- uid: lag1
- kind: channel
-
- 5:
- uid: lag2
- kind: channel
- rate: 25000000000
- 6:
- uid: lag2
- kind: channel
-
- 7:
- uid: lag3
- kind: channel
- 8:
- uid: lag3
- kind: channel
- 9:
- 10:
- 11:
- 12:
- 13:
- 14:
- 15:
- 16:
- 17:
- 18:
- 19:
- 20:
- 21:
- 22:
- 23:
- 24:
- 25:
- 26:
- 27:
- 28:
- 29:
- 30:
- 31:
- uid: musa-1
- 32:
- uid: musa-2
- 33:
- uid: musa-3
- 34:
- uid: musa-4
- 35:
- uid: musa-5
- 36:
- uid: musa-6
- 40:
- uid: lag4
- kind: channel
- rate: 100000000000
- 41:
- uid: lag4
- kind: channel
- rate: 100000000000
- 46:
- uid: gw
- kind: router
- rate: 10000000000
- channels:
- lag1:
- kind: server
- rate: 500000000000
- uid: srv-data1
- port: lag1
- lag2:
- kind: server
- rate: 500000000000
- uid: srv-data2
- port: lag2
- lag3:
- kind: server
- rate: 500000000000
- uid: srv-data3
- port: lag3
- lag4:
- kind: server
- rate: 200000000000
- uid: srv-data4
- port: lag4
diff --git a/input/grid5000/sites/sophia/networks/sw-2.yaml b/input/grid5000/sites/sophia/networks/sw-2.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..75521c76aa136a311abbca136b4a47975af4d238
--- /dev/null
+++ b/input/grid5000/sites/sophia/networks/sw-2.yaml
@@ -0,0 +1,64 @@
+---
+sw-2:
+ model: Aruba 6300M
+ warranty: 2048-05
+ kind: switch
+ managed_by_us: true
+ site: sophia
+ ip: 172.17.143.253
+ snmp_community: public
+ linecards:
+ 1:
+ snmp_pattern: "%LINECARD%/1/%PORT%"
+ kavlan_pattern: "%LINECARD%/1/%PORT%"
+ rate: 1000000000
+ kind: node
+ ports:
+ 1:
+ uid: pve-2-bmc
+ kind: other
+ 2:
+ uid: pve-1-bmc
+ kind: other
+ 3:
+ uid: srv-data4-bmc
+ kind: other
+ 4:
+ uid: srv-data2-bmc
+ kind: other
+ 5:
+ uid: srv-data1-bmc
+ kind: other
+ 6:
+ uid: srv-scrath-1-bmc
+ kind: other
+ 7:
+ uid: srv-scrath-2-bmc
+ kind: other
+ 8:
+ uid: srv-scrath-3-bmc
+ kind: other
+ 10:
+ uid: pve-dmz-south-1-bmc
+ kind: other
+ 11:
+ uid: srv3-bmc
+ kind: other
+ 12:
+ uid: gwol-south-bmc
+ kind: other
+ 27:
+ uid: srv-data
+ kind: server
+ 36:
+ uid: esterel41-1
+ 40:
+ uid: swadmin-2
+ kind: switch
+ 46:
+ uid: swadmin-3
+ kind: switch
+ 49:
+ uid: gw
+ kind: router
+ rate: 10000000000
\ No newline at end of file
diff --git a/input/grid5000/sites/sophia/networks/sw-3.yaml b/input/grid5000/sites/sophia/networks/sw-3.yaml
index 61760909d6c8f777474a06ad369c073cf1e7076c..4a2e66db01143b8a829133d4bd6678afd5d9b3f3 100644
--- a/input/grid5000/sites/sophia/networks/sw-3.yaml
+++ b/input/grid5000/sites/sophia/networks/sw-3.yaml
@@ -34,13 +34,13 @@ sw-3:
uid: mercantour1-3
10:
uid: mercantour1-4
- 11:
- uid: mercantour2-7
- 12:
- uid: mercantour2-8
13:
- uid: mercantour2-3
+ uid: mercantour2-7
14:
+ uid: mercantour2-8
+ 15:
+ uid: mercantour2-3
+ 16:
uid: mercantour2-4
33:
uid: mercantour2-2
@@ -70,27 +70,8 @@ sw-3:
uid: uvb-10
46:
uid: uvb-9
- 48:
- uid: gw-ng
- kind: switch
- channels:
- lag1:
- kind: server
- rate: 500000000000
- uid: srv-data1
- port: lag1
- lag2:
- kind: server
- rate: 500000000000
- uid: srv-data2
- port: lag2
- lag3:
- kind: server
- rate: 500000000000
- uid: srv-data3
- port: lag3
- lag4:
- kind: server
- rate: 200000000000
- uid: srv-data4
- port: lag4
+ 51:
+ uid: gw
+ kind: router
+ rate: 10000000000
+