From 3029053550516f3d39cea8d0c3d0b15e7fd5e953 Mon Sep 17 00:00:00 2001
From: Alexis Bitaillou <alexis.bitaillou@inria.fr>
Date: Thu, 3 Jul 2025 15:21:53 +0200
Subject: [PATCH 1/3] [Nantes] add ecot-prod

---
 .../nantes/network_equipments/ecot-prod.json  | 203 ++++++++++++++++++
 .../sites/nantes/networks/ecot-prod.yaml      |  71 ++++++
 2 files changed, 274 insertions(+)
 create mode 100644 data/grid5000/sites/nantes/network_equipments/ecot-prod.json
 create mode 100644 input/grid5000/sites/nantes/networks/ecot-prod.yaml

diff --git a/data/grid5000/sites/nantes/network_equipments/ecot-prod.json b/data/grid5000/sites/nantes/network_equipments/ecot-prod.json
new file mode 100644
index 00000000000..fa733272f71
--- /dev/null
+++ b/data/grid5000/sites/nantes/network_equipments/ecot-prod.json
@@ -0,0 +1,203 @@
+{
+  "backplane_bps": 1440000000000,
+  "ip": "172.16.207.250",
+  "kind": "switch",
+  "linecards": [
+    {
+    },
+    {
+      "kavlan_pattern": "%LINECARD%/1/%PORT%",
+      "kind": "node",
+      "ports": [
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+          "kind": "router",
+          "rate": 40000000000,
+          "snmp_name": "1/1/49",
+          "uid": "gw"
+        }
+      ],
+      "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": 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"
+      }
+    },
+    {
+      "description": "Output byte counter for the network device port",
+      "name": "network_ifaceout_bytes_total",
+      "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"
+      }
+    },
+    {
+      "description": "Input packet counter for the network device port",
+      "name": "network_ifacein_packets_total",
+      "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"
+      }
+    },
+    {
+      "description": "Output packet counter for the network device port",
+      "name": "network_ifaceout_packets_total",
+      "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"
+      }
+    },
+    {
+      "description": "Input counter of discarded packets for the network device port",
+      "name": "network_ifacein_packets_discard_total",
+      "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"
+      }
+    },
+    {
+      "description": "Output counter of discarded packets for the network device port",
+      "name": "network_ifaceout_packets_discard_total",
+      "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"
+      }
+    },
+    {
+      "description": "Input counter of packet errors for the network device port",
+      "name": "network_ifacein_packets_error_total",
+      "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"
+      }
+    },
+    {
+      "description": "Output counter of packet errors for the network device port",
+      "name": "network_ifaceout_packets_error_total",
+      "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"
+      }
+    }
+  ],
+  "model": "Aruba 8325-48Y8C",
+  "serial": "TW52KM0015",
+  "site": "nantes",
+  "snmp_community": "public",
+  "type": "network_equipment",
+  "uid": "ecot-prod",
+  "warranty": "2030-06-20"
+}
\ No newline at end of file
diff --git a/input/grid5000/sites/nantes/networks/ecot-prod.yaml b/input/grid5000/sites/nantes/networks/ecot-prod.yaml
new file mode 100644
index 00000000000..9fa34219339
--- /dev/null
+++ b/input/grid5000/sites/nantes/networks/ecot-prod.yaml
@@ -0,0 +1,71 @@
+---
+ecot-prod:
+  model: Aruba 8325-48Y8C
+  serial: TW52KM0015
+  warranty: 2030-06-20
+  kind: switch
+  managed_by_us: true
+  site: nantes
+  ip: 172.16.207.250
+  snmp_community: public
+  metrics:
+    - name: network_ifacein_bytes_total
+      description: Input byte counter for the network device port
+      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: 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: 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: 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: 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: 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: 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: 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% }}
+  backplane_bps: 1440000000000
+  linecards:
+    1:
+      snmp_pattern: "%LINECARD%/1/%PORT%"
+      kavlan_pattern: "%LINECARD%/1/%PORT%"
+      rate: 25000000000
+      kind: node
+      ports:
+        49:
+          uid: gw
+          rate: 40_000_000_000
+          kind: router
-- 
GitLab


From 55534238983f9da110f51550dcb3357b4cfddaa6 Mon Sep 17 00:00:00 2001
From: Alexis Bitaillou <alexis.bitaillou@inria.fr>
Date: Thu, 3 Jul 2025 15:42:10 +0200
Subject: [PATCH 2/3] [Nantes] remove connection to gw

---
 input/grid5000/sites/nantes/networks/ecot-prod.yaml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/input/grid5000/sites/nantes/networks/ecot-prod.yaml b/input/grid5000/sites/nantes/networks/ecot-prod.yaml
index 9fa34219339..81d8d5f9eea 100644
--- a/input/grid5000/sites/nantes/networks/ecot-prod.yaml
+++ b/input/grid5000/sites/nantes/networks/ecot-prod.yaml
@@ -64,8 +64,3 @@ ecot-prod:
       kavlan_pattern: "%LINECARD%/1/%PORT%"
       rate: 25000000000
       kind: node
-      ports:
-        49:
-          uid: gw
-          rate: 40_000_000_000
-          kind: router
-- 
GitLab


From af64aa69a3871890f2dd16ac331859c148c46af4 Mon Sep 17 00:00:00 2001
From: Alexis Bitaillou <alexis.bitaillou@inria.fr>
Date: Thu, 3 Jul 2025 15:46:43 +0200
Subject: [PATCH 3/3] [Nantes] ok fix for schema

---
 .../nantes/network_equipments/ecot-prod.json  | 105 +-----------------
 .../sites/nantes/networks/ecot-prod.yaml      |   1 +
 2 files changed, 2 insertions(+), 104 deletions(-)

diff --git a/data/grid5000/sites/nantes/network_equipments/ecot-prod.json b/data/grid5000/sites/nantes/network_equipments/ecot-prod.json
index fa733272f71..cea93c44c8e 100644
--- a/data/grid5000/sites/nantes/network_equipments/ecot-prod.json
+++ b/data/grid5000/sites/nantes/network_equipments/ecot-prod.json
@@ -9,110 +9,7 @@
       "kavlan_pattern": "%LINECARD%/1/%PORT%",
       "kind": "node",
       "ports": [
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-          "kind": "router",
-          "rate": 40000000000,
-          "snmp_name": "1/1/49",
-          "uid": "gw"
-        }
+
       ],
       "rate": 25000000000,
       "snmp_pattern": "%LINECARD%/1/%PORT%"
diff --git a/input/grid5000/sites/nantes/networks/ecot-prod.yaml b/input/grid5000/sites/nantes/networks/ecot-prod.yaml
index 81d8d5f9eea..040ab74cca1 100644
--- a/input/grid5000/sites/nantes/networks/ecot-prod.yaml
+++ b/input/grid5000/sites/nantes/networks/ecot-prod.yaml
@@ -64,3 +64,4 @@ ecot-prod:
       kavlan_pattern: "%LINECARD%/1/%PORT%"
       rate: 25000000000
       kind: node
+      ports: []
-- 
GitLab