diff --git a/data/grid5000/sites/rennes/network_equipments/bigdata-sw.json b/data/grid5000/sites/rennes/network_equipments/bigdata-sw.json
deleted file mode 100644
index 4b036742c369f495a3dd3934df7521ea757ef3c5..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/rennes/network_equipments/bigdata-sw.json
+++ /dev/null
@@ -1,127 +0,0 @@
-{
- "backplane_bps": 1280000000000,
- "ip": "172.17.111.203",
- "kind": "switch",
- "linecards": [
- {
- "kavlan_pattern": "%PORT%",
- "kind": "node",
- "ports": [
- {
- "kind": "switch",
- "port": "1:3",
- "snmp_name": "TenGigabitEthernet 0/0",
- "uid": "c6509"
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- "kind": "server",
- "snmp_name": "TenGigabitEthernet 0/11",
- "uid": "srv-bigdata"
- }
- ],
- "rate": 10000000000,
- "snmp_pattern": "TenGigabitEthernet %LINECARD%/%PORT%"
- }
- ],
- "managed_by_us": true,
- "metrics": [
- {
- "description": "Input byte counter for the network device port",
- "name": "network_ifacein_bytes_total",
- "period": 15000,
- "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": 15000,
- "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": 15000,
- "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": 15000,
- "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": 15000,
- "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": 15000,
- "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": 15000,
- "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": 15000,
- "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": "Force10 S4810",
- "site": "rennes",
- "snmp_community": "public",
- "type": "network_equipment",
- "uid": "bigdata-sw",
- "warranty": "2018-10-01"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/network_equipments/c6509.json b/data/grid5000/sites/rennes/network_equipments/c6509.json
deleted file mode 100644
index 681822f04aa5d0ee92ed2bbeabf36542cab936bc..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/rennes/network_equipments/c6509.json
+++ /dev/null
@@ -1,139 +0,0 @@
-{
- "backplane_bps": 720000000000,
- "ip": "172.17.111.207",
- "kind": "switch",
- "linecards": [
- {
- },
- {
- "backplane_bps": 40000000000,
- "kavlan_pattern": "TenGigabitEthernet%LINECARD%/%PORT%",
- "kind": "virtual",
- "model": "WS-X6704-10GE",
- "ports": [
- {
- },
- {
- },
- {
- "kind": "switch",
- "port": "Ethernet2/23",
- "snmp_name": "TenGigabitEthernet1/2",
- "uid": "parasilo-sw-1"
- },
- {
- "kind": "switch",
- "snmp_name": "TenGigabitEthernet1/3",
- "uid": "bigdata-sw"
- }
- ],
- "rate": 10000000000,
- "snmp_pattern": "TenGigabitEthernet%LINECARD%/%PORT%"
- },
- {
- },
- {
- "backplane_bps": 40000000000,
- "kavlan_pattern": "Gi%LINECARD%/%PORT%",
- "kind": "node",
- "model": "WS-X6748-GE-TX",
- "ports": [
-
- ],
- "rate": 1000000000,
- "snmp_pattern": "GigabitEthernet%LINECARD%/%PORT%"
- },
- {
- "backplane_bps": 40000000000,
- "kavlan_pattern": "Gi%LINECARD%/%PORT%",
- "kind": "node",
- "model": "WS-X6748-GE-TX",
- "ports": [
-
- ],
- "rate": 1000000000,
- "snmp_pattern": "GigabitEthernet%LINECARD%/%PORT%"
- }
- ],
- "managed_by_us": true,
- "metrics": [
- {
- "description": "Input byte counter for the network device port",
- "name": "network_ifacein_bytes_total",
- "period": 10000,
- "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": 10000,
- "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": 10000,
- "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": 10000,
- "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": 10000,
- "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": 10000,
- "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": 10000,
- "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": 10000,
- "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": "Cisco WS-C6509-E",
- "site": "rennes",
- "snmp_community": "privkavlan",
- "type": "network_equipment",
- "uid": "c6509",
- "warranty": "expired"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/network_equipments/parasilo-sw-1.json b/data/grid5000/sites/rennes/network_equipments/parasilo-sw-1.json
index 6e721c6dddbf82a0c11f4357e0c370e72030a923..f860d6eabb8b821405aec70a0708663c6e998669 100644
--- a/data/grid5000/sites/rennes/network_equipments/parasilo-sw-1.json
+++ b/data/grid5000/sites/rennes/network_equipments/parasilo-sw-1.json
@@ -1,19 +1,5 @@
{
"backplane_bps": 1440000000000,
- "channels": {
- "port-channel2": {
- "kind": "switch",
- "port": "port-channel1",
- "rate": 80000000000,
- "uid": "paravance-sw-1"
- },
- "port-channel3": {
- "kind": "switch",
- "port": "port-channel4",
- "rate": 80000000000,
- "uid": "paravance-sw-2"
- }
- },
"ip": "172.17.111.204",
"kind": "switch",
"linecards": [
@@ -304,30 +290,6 @@
"port": "eth0",
"snmp_name": "Ethernet1/48",
"uid": "parasilo-24"
- },
- {
- "kind": "channel",
- "rate": 40000000000,
- "snmp_name": "Ethernet1/49",
- "uid": "port-channel3"
- },
- {
- "kind": "channel",
- "rate": 40000000000,
- "snmp_name": "Ethernet1/50",
- "uid": "port-channel3"
- },
- {
- "kind": "channel",
- "rate": 40000000000,
- "snmp_name": "Ethernet1/51",
- "uid": "port-channel2"
- },
- {
- "kind": "channel",
- "rate": 40000000000,
- "snmp_name": "Ethernet1/52",
- "uid": "port-channel2"
}
],
"rate": 10000000000,
@@ -416,14 +378,6 @@
"port": "1/1/45",
"snmp_name": "Ethernet2/21",
"uid": "gw"
- },
- {
- },
- {
- "kind": "switch",
- "port": "TenGigabitEthernet1/2",
- "snmp_name": "Ethernet2/23",
- "uid": "c6509"
}
],
"rate": 10000000000,
diff --git a/data/grid5000/sites/rennes/servers/bigdata-disc.json b/data/grid5000/sites/rennes/servers/bigdata-disc.json
deleted file mode 100644
index afaae43305891ad6df109c6998e79ae25dbef178..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/rennes/servers/bigdata-disc.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "alias": [
-
- ],
- "kind": "storage",
- "network_adapters": {
- },
- "serial": "D12LGZ1",
- "type": "server",
- "uid": "bigdata-disc",
- "warranty": "2018-10"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/servers/md3260-bg-1.json b/data/grid5000/sites/rennes/servers/md3260-bg-1.json
deleted file mode 100644
index 5e6d1e15e2627b73a9262ab5ad98ba8f520b0a4e..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/rennes/servers/md3260-bg-1.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "kind": "storage",
- "network_adapters": {
- "default": {
- "ip": "172.17.111.221"
- }
- },
- "type": "server",
- "uid": "md3260-bg-1"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/servers/md3260-bg-2.json b/data/grid5000/sites/rennes/servers/md3260-bg-2.json
deleted file mode 100644
index c3fe5da33a77c961dceaf4d6ebcc05d66d41f604..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/rennes/servers/md3260-bg-2.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "kind": "storage",
- "network_adapters": {
- "default": {
- "ip": "172.17.111.222"
- }
- },
- "type": "server",
- "uid": "md3260-bg-2"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/servers/srv-bigdata.json b/data/grid5000/sites/rennes/servers/srv-bigdata.json
deleted file mode 100644
index 21495a4d9ccaa2736fd420e0f454359b06b294c8..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/rennes/servers/srv-bigdata.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "alias": [
- "storage"
- ],
- "kind": "physical",
- "network_adapters": {
- "bmc": {
- "ip": "172.17.111.7"
- },
- "default": {
- "ip": "172.16.111.7"
- }
- },
- "redfish": true,
- "serial": "6V9FGZ1",
- "type": "server",
- "uid": "srv-bigdata",
- "warranty": "2018-10"
-}
\ No newline at end of file
diff --git a/input/grid5000/sites/rennes/networks/bigdata-sw.yaml b/input/grid5000/sites/rennes/networks/bigdata-sw.yaml
deleted file mode 100644
index 17ec94ba94ba6f9be03efa07b291e4f58026290a..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/rennes/networks/bigdata-sw.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
----
-bigdata-sw:
- model: Force10 S4810
- warranty: 2018-10-01
- kind: switch
- managed_by_us: true
- site: rennes
- snmp_community: public
- ip: 172.17.111.203
- backplane_bps: 1280000000000
- metrics:
- - name: network_ifacein_bytes_total
- description: Input byte counter for the network device port
- period: 15000
- 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: 15000
- 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: 15000
- 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: 15000
- 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: 15000
- 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: 15000
- 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: 15000
- 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: 15000
- 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% }}
- linecards:
- 0:
- snmp_pattern: "TenGigabitEthernet %LINECARD%/%PORT%"
- kavlan_pattern: "%PORT%"
- kind: node
- rate: 10000000000
- ports:
- 0:
- uid: c6509
- kind: switch
- port: "1:3"
- 11:
- uid: srv-bigdata
- kind: server
diff --git a/input/grid5000/sites/rennes/networks/c6509.yaml b/input/grid5000/sites/rennes/networks/c6509.yaml
deleted file mode 100644
index c367e8e64b1054c19476175362dfe2f70628d1c8..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/rennes/networks/c6509.yaml
+++ /dev/null
@@ -1,91 +0,0 @@
----
-c6509:
- model: Cisco WS-C6509-E
- warranty: "expired"
- kind: switch
- managed_by_us: true
- site: rennes
- snmp_community: privkavlan
- ip: 172.17.111.207
- backplane_bps: 720000000000
- metrics:
- - name: network_ifacein_bytes_total
- description: Input byte counter for the network device port
- period: 10000
- 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: 10000
- 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: 10000
- 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: 10000
- 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: 10000
- 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: 10000
- 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: 10000
- 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: 10000
- 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% }}
- linecards:
- 1:
- kind: virtual
- snmp_pattern: TenGigabitEthernet%LINECARD%/%PORT%
- kavlan_pattern: TenGigabitEthernet%LINECARD%/%PORT%
- rate: 10000000000
- backplane_bps: 40000000000
- model: WS-X6704-10GE
- ports:
- 2:
- uid: parasilo-sw-1
- kind: switch
- port: Ethernet2/23
- 3:
- uid: bigdata-sw
- kind: switch
- 3:
- kind: node
- snmp_pattern: GigabitEthernet%LINECARD%/%PORT%
- kavlan_pattern: Gi%LINECARD%/%PORT%
- rate: 1000000000
- backplane_bps: 40000000000
- model: WS-X6748-GE-TX
- ports: []
- 4:
- kind: node
- snmp_pattern: GigabitEthernet%LINECARD%/%PORT%
- kavlan_pattern: Gi%LINECARD%/%PORT%
- rate: 1000000000
- backplane_bps: 40000000000
- model: WS-X6748-GE-TX
- ports: []
diff --git a/input/grid5000/sites/rennes/networks/parasilo-sw-1.yaml b/input/grid5000/sites/rennes/networks/parasilo-sw-1.yaml
index 1f0e98462ab8f672da55873372a0fc3408c131a4..ea8783773a4c1a7bf9c952455737afd843d8d74d 100644
--- a/input/grid5000/sites/rennes/networks/parasilo-sw-1.yaml
+++ b/input/grid5000/sites/rennes/networks/parasilo-sw-1.yaml
@@ -156,22 +156,6 @@ parasilo-sw-1:
uid: parasilo-24-eth1
48:
uid: parasilo-24
- 49:
- uid: port-channel3
- rate: 40000000000
- kind: channel
- 50:
- uid: port-channel3
- rate: 40000000000
- kind: channel
- 51:
- uid: port-channel2
- rate: 40000000000
- kind: channel
- 52:
- uid: port-channel2
- rate: 40000000000
- kind: channel
2:
snmp_pattern: "Ethernet%LINECARD%/%PORT%"
kavlan_pattern: "Ethernet%LINECARD%/%PORT%"
@@ -198,18 +182,3 @@ parasilo-sw-1:
uid: gw
kind: router
port: 1/1/45
- 23:
- uid: c6509
- kind: switch
- port: TenGigabitEthernet1/2
- channels:
- port-channel3:
- kind: switch
- rate: 80000000000
- uid: paravance-sw-2
- port: port-channel4
- port-channel2:
- kind: switch
- rate: 80000000000
- uid: paravance-sw-1
- port: port-channel1
diff --git a/input/grid5000/sites/rennes/servers/physical.yaml b/input/grid5000/sites/rennes/servers/physical.yaml
index 0a276033c0d5ec91f5bf0ab22ed5b3145174e1b3..5cc518ded3342f96c250a13423c0daaaeabf2518 100644
--- a/input/grid5000/sites/rennes/servers/physical.yaml
+++ b/input/grid5000/sites/rennes/servers/physical.yaml
@@ -1,16 +1,4 @@
---
-srv-bigdata:
- kind: physical
- alias:
- - storage
- warranty: 2018-10
- serial: 6V9FGZ1
- network_adapters:
- default:
- ip: 172.16.111.7
- bmc:
- ip: 172.17.111.7
-
pve-1:
kind: physical
alias:
@@ -103,25 +91,6 @@ srv-data3:
size: 115000000000000
rate: 50000000000
-md3260-bg-1:
- kind: storage
- network_adapters:
- default:
- ip: 172.17.111.221
-
-md3260-bg-2:
- kind: storage
- network_adapters:
- default:
- ip: 172.17.111.222
-
-bigdata-disc:
- kind: storage
- alias: []
- warranty: 2018-10
- serial: D12LGZ1
- network_adapters: {}
-
ceph-devel-1:
kind: physical
alias: []