From 1fc8fb8f36612f2f0a32ba95f15facf1a09d03f8 Mon Sep 17 00:00:00 2001
From: Simon Delamare <simon.delamare@ens-lyon.fr>
Date: Thu, 19 Mar 2015 18:15:34 +0100
Subject: [PATCH] [network] fix wrong linecard description in gw.nancy
---
.../sites/nancy/network_equipments/gw-nancy.json | 6 ++++--
generators/input/sites/nancy/net-links/gw-nancy.yaml | 10 +++++++---
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/data/grid5000/sites/nancy/network_equipments/gw-nancy.json b/data/grid5000/sites/nancy/network_equipments/gw-nancy.json
index 57f686f22eb..241428a09f2 100644
--- a/data/grid5000/sites/nancy/network_equipments/gw-nancy.json
+++ b/data/grid5000/sites/nancy/network_equipments/gw-nancy.json
@@ -259,7 +259,7 @@
},
{
"backplane_bps": 14400000000,
- "kind": "virtual",
+ "kind": "node",
"model": "J9538A",
"naming_pattern": "%LINECARD:F%%PORT%",
"ports": [
@@ -279,10 +279,12 @@
"uid": "graphite-4"
},
{
+ "kind": "virtual",
"uid": "srv"
},
{
- "uid": "srv-data"
+ "kind": "virtual",
+ "uid": "srv"
}
],
"rate": 10000000000,
diff --git a/generators/input/sites/nancy/net-links/gw-nancy.yaml b/generators/input/sites/nancy/net-links/gw-nancy.yaml
index 1bf3b07fda2..193dfad4974 100644
--- a/generators/input/sites/nancy/net-links/gw-nancy.yaml
+++ b/generators/input/sites/nancy/net-links/gw-nancy.yaml
@@ -204,15 +204,19 @@ gw-nancy:
snmp_pattern: "F%PORT%"
backplane_bps: 14400000000
model: J9538A
- kind: virtual
+ kind: node
rate: 10000000000
ports:
1: graphite-1
2: graphite-2
3: graphite-3
4: graphite-4
- 5: srv
- 6: srv-data
+ 5:
+ uid: srv
+ kind: virtual
+ 6:
+ uid: srv
+ kind: virtual
channels:
naming_pattern: Po%CHANNELID%
snmp_pattern: Trk%CHANNELID%
--
GitLab