From 6491142f9348c1a8dbdc0de5710ed4409be6032e Mon Sep 17 00:00:00 2001
From: BERARD Benjamin <benjamin.berard@inria.fr>
Date: Tue, 2 Feb 2021 12:15:33 +0100
Subject: [PATCH] =?UTF-8?q?Revert=20"[grouille/nancy]=C2=A0Add=20interface?=
=?UTF-8?q?=20for=20grouille-[1,2]"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This reverts commit d7f3f652f3ed35fdb33636141b1aa8f2d240be70.
---
.../nancy/clusters/grouille/grouille.json | 23 +------------------
.../clusters/grouille/nodes/grouille-1.json | 4 ++--
.../clusters/grouille/nodes/grouille-2.json | 4 ++--
.../nancy/network_equipments/sgrappe.json | 8 -------
.../sites/nancy/networks/sgrappe.yaml | 4 ----
5 files changed, 5 insertions(+), 38 deletions(-)
diff --git a/data/grid5000/sites/nancy/clusters/grouille/grouille.json b/data/grid5000/sites/nancy/clusters/grouille/grouille.json
index 1ff9d158621..10bde3899d4 100644
--- a/data/grid5000/sites/nancy/clusters/grouille/grouille.json
+++ b/data/grid5000/sites/nancy/clusters/grouille/grouille.json
@@ -3,28 +3,7 @@
"exotic": false,
"kavlan": false,
"metrics": [
- {
- "description": "Input byte counter for the network device port",
- "labels": {
- "interface": "eth2"
- },
- "name": "network_ifacein_bytes_total",
- "period": 1000,
- "source": {
- "protocol": "network_equipment"
- }
- },
- {
- "description": "Output byte counter for the network device port",
- "labels": {
- "interface": "eth2"
- },
- "name": "network_ifaceout_bytes_total",
- "period": 1000,
- "source": {
- "protocol": "network_equipment"
- }
- }
+
],
"model": "Dell PowerEdge R7525",
"queues": [
diff --git a/data/grid5000/sites/nancy/clusters/grouille/nodes/grouille-1.json b/data/grid5000/sites/nancy/clusters/grouille/nodes/grouille-1.json
index 143abfcaa51..8272053d8f3 100644
--- a/data/grid5000/sites/nancy/clusters/grouille/nodes/grouille-1.json
+++ b/data/grid5000/sites/nancy/clusters/grouille/nodes/grouille-1.json
@@ -92,8 +92,8 @@
"name": "eno33",
"network_address": "grouille-1.nancy.grid5000.fr",
"rate": 25000000000,
- "switch": "sgrappe",
- "switch_port": "ethernet1/1/17",
+ "switch": null,
+ "switch_port": null,
"vendor": "Mellanox Technologies"
},
{
diff --git a/data/grid5000/sites/nancy/clusters/grouille/nodes/grouille-2.json b/data/grid5000/sites/nancy/clusters/grouille/nodes/grouille-2.json
index 8cd5c6d9798..c80deb0abe4 100644
--- a/data/grid5000/sites/nancy/clusters/grouille/nodes/grouille-2.json
+++ b/data/grid5000/sites/nancy/clusters/grouille/nodes/grouille-2.json
@@ -92,8 +92,8 @@
"name": "eno33",
"network_address": "grouille-2.nancy.grid5000.fr",
"rate": 25000000000,
- "switch": "sgrappe",
- "switch_port": "ethernet1/1/18",
+ "switch": null,
+ "switch_port": null,
"vendor": "Mellanox Technologies"
},
{
diff --git a/data/grid5000/sites/nancy/network_equipments/sgrappe.json b/data/grid5000/sites/nancy/network_equipments/sgrappe.json
index 41eef1678f0..fcd5896d346 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgrappe.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgrappe.json
@@ -116,16 +116,8 @@
"uid": "grappe-16"
},
{
- "kind": "node",
- "port": "eth0",
- "snmp_name": "ethernet1/1/17",
- "uid": "grouille-1"
},
{
- "kind": "node",
- "port": "eth0",
- "snmp_name": "ethernet1/1/18",
- "uid": "grouille-2"
},
{
},
diff --git a/input/grid5000/sites/nancy/networks/sgrappe.yaml b/input/grid5000/sites/nancy/networks/sgrappe.yaml
index 103c2c7048e..7b2ffcf9629 100644
--- a/input/grid5000/sites/nancy/networks/sgrappe.yaml
+++ b/input/grid5000/sites/nancy/networks/sgrappe.yaml
@@ -60,10 +60,6 @@ sgrappe:
uid: grappe-15
16:
uid: grappe-16
- 17:
- uid: grouille-1
- 18:
- uid: grouille-2
25:
snmp_pattern: "ethernet1/%LINECARD%/%PORT%:1"
kind: node
--
GitLab