From fb11397e0040c51d79dd90f85504339dbccd5397 Mon Sep 17 00:00:00 2001
From: BERARD Benjamin <benjamin.berard@inria.fr>
Date: Tue, 8 Feb 2022 18:08:04 +0100
Subject: [PATCH] [grenoble/servan] Add kavlan information
---
.../clusters/servan/nodes/servan-1.json | 44 ++++++++++++++++++-
.../clusters/servan/nodes/servan-2.json | 44 ++++++++++++++++++-
.../grenoble/clusters/servan/servan.json | 2 +-
.../sites/grenoble/network_equipments/gw.json | 2 +
.../grenoble/clusters/servan/servan.yaml | 2 +-
.../sites/grenoble/networks/gw-grenoble.yaml | 8 +++-
input/grid5000/vlans.yaml | 3 ++
7 files changed, 99 insertions(+), 6 deletions(-)
diff --git a/data/grid5000/sites/grenoble/clusters/servan/nodes/servan-1.json b/data/grid5000/sites/grenoble/clusters/servan/nodes/servan-1.json
index 76331c4b582..6fa274f6525 100644
--- a/data/grid5000/sites/grenoble/clusters/servan/nodes/servan-1.json
+++ b/data/grid5000/sites/grenoble/clusters/servan/nodes/servan-1.json
@@ -18,6 +18,48 @@
"serial": "CK3R3L3"
},
"exotic": true,
+ "kavlan": {
+ "eth0": {
+ "kavlan-1": "192.168.196.1",
+ "kavlan-11": "10.7.227.1",
+ "kavlan-12": "10.11.227.1",
+ "kavlan-13": "10.15.227.1",
+ "kavlan-14": "10.19.227.1",
+ "kavlan-16": "10.27.227.1",
+ "kavlan-18": "10.35.227.1",
+ "kavlan-2": "192.168.212.1",
+ "kavlan-20": "10.43.227.1",
+ "kavlan-21": "10.47.227.1",
+ "kavlan-3": "192.168.228.1",
+ "kavlan-4": "10.4.4.1",
+ "kavlan-5": "10.4.68.1",
+ "kavlan-6": "10.4.132.1",
+ "kavlan-7": "10.4.196.1",
+ "kavlan-8": "10.5.4.1",
+ "kavlan-9": "10.5.68.1"
+ }
+ },
+ "kavlan6": {
+ "eth0": {
+ "kavlan-1": "2001:660:4406:180:8::1",
+ "kavlan-11": "2001:660:4406:1a0:108::1",
+ "kavlan-12": "2001:660:4406:2a0:108::1",
+ "kavlan-13": "2001:660:4406:4a0:108::1",
+ "kavlan-14": "2001:660:4406:5a0:108::1",
+ "kavlan-16": "2001:660:4406:7a0:108::1",
+ "kavlan-18": "2001:660:4406:8a0:108::1",
+ "kavlan-2": "2001:660:4406:181:8::1",
+ "kavlan-20": "2001:660:4406:3a0:108::1",
+ "kavlan-21": "2001:660:4406:6a0:108::1",
+ "kavlan-3": "2001:660:4406:182:8::1",
+ "kavlan-4": "2001:660:4406:190:8::1",
+ "kavlan-5": "2001:660:4406:191:8::1",
+ "kavlan-6": "2001:660:4406:192:8::1",
+ "kavlan-7": "2001:660:4406:193:8::1",
+ "kavlan-8": "2001:660:4406:194:8::1",
+ "kavlan-9": "2001:660:4406:195:8::1"
+ }
+ },
"main_memory": {
"ram_size": 137438953472
},
@@ -78,7 +120,7 @@
"interface": "Ethernet",
"ip": "172.16.23.1",
"ip6": "2001:660:4406:100:8::1",
- "kavlan": false,
+ "kavlan": true,
"mac": "40:a6:b7:6b:1d:b0",
"management": false,
"model": "Ethernet Controller E810-C for SFP",
diff --git a/data/grid5000/sites/grenoble/clusters/servan/nodes/servan-2.json b/data/grid5000/sites/grenoble/clusters/servan/nodes/servan-2.json
index 8b405edf719..bc9ce68de66 100644
--- a/data/grid5000/sites/grenoble/clusters/servan/nodes/servan-2.json
+++ b/data/grid5000/sites/grenoble/clusters/servan/nodes/servan-2.json
@@ -18,6 +18,48 @@
"serial": "BK3R3L3"
},
"exotic": true,
+ "kavlan": {
+ "eth0": {
+ "kavlan-1": "192.168.196.2",
+ "kavlan-11": "10.7.227.2",
+ "kavlan-12": "10.11.227.2",
+ "kavlan-13": "10.15.227.2",
+ "kavlan-14": "10.19.227.2",
+ "kavlan-16": "10.27.227.2",
+ "kavlan-18": "10.35.227.2",
+ "kavlan-2": "192.168.212.2",
+ "kavlan-20": "10.43.227.2",
+ "kavlan-21": "10.47.227.2",
+ "kavlan-3": "192.168.228.2",
+ "kavlan-4": "10.4.4.2",
+ "kavlan-5": "10.4.68.2",
+ "kavlan-6": "10.4.132.2",
+ "kavlan-7": "10.4.196.2",
+ "kavlan-8": "10.5.4.2",
+ "kavlan-9": "10.5.68.2"
+ }
+ },
+ "kavlan6": {
+ "eth0": {
+ "kavlan-1": "2001:660:4406:180:8::2",
+ "kavlan-11": "2001:660:4406:1a0:108::2",
+ "kavlan-12": "2001:660:4406:2a0:108::2",
+ "kavlan-13": "2001:660:4406:4a0:108::2",
+ "kavlan-14": "2001:660:4406:5a0:108::2",
+ "kavlan-16": "2001:660:4406:7a0:108::2",
+ "kavlan-18": "2001:660:4406:8a0:108::2",
+ "kavlan-2": "2001:660:4406:181:8::2",
+ "kavlan-20": "2001:660:4406:3a0:108::2",
+ "kavlan-21": "2001:660:4406:6a0:108::2",
+ "kavlan-3": "2001:660:4406:182:8::2",
+ "kavlan-4": "2001:660:4406:190:8::2",
+ "kavlan-5": "2001:660:4406:191:8::2",
+ "kavlan-6": "2001:660:4406:192:8::2",
+ "kavlan-7": "2001:660:4406:193:8::2",
+ "kavlan-8": "2001:660:4406:194:8::2",
+ "kavlan-9": "2001:660:4406:195:8::2"
+ }
+ },
"main_memory": {
"ram_size": 137438953472
},
@@ -78,7 +120,7 @@
"interface": "Ethernet",
"ip": "172.16.23.2",
"ip6": "2001:660:4406:100:8::2",
- "kavlan": false,
+ "kavlan": true,
"mac": "40:a6:b7:6b:13:40",
"management": false,
"model": "Ethernet Controller E810-C for SFP",
diff --git a/data/grid5000/sites/grenoble/clusters/servan/servan.json b/data/grid5000/sites/grenoble/clusters/servan/servan.json
index ea68137c9bc..db2a0a5357c 100644
--- a/data/grid5000/sites/grenoble/clusters/servan/servan.json
+++ b/data/grid5000/sites/grenoble/clusters/servan/servan.json
@@ -2,7 +2,7 @@
"boot_type": "uefi",
"created_at": "Wed, 15 Dec 2021 00:00:00 GMT",
"exotic": true,
- "kavlan": false,
+ "kavlan": true,
"metrics": [
{
"description": "Input byte counter for the network device port",
diff --git a/data/grid5000/sites/grenoble/network_equipments/gw.json b/data/grid5000/sites/grenoble/network_equipments/gw.json
index 9828d99e5ef..53ebacf43bd 100644
--- a/data/grid5000/sites/grenoble/network_equipments/gw.json
+++ b/data/grid5000/sites/grenoble/network_equipments/gw.json
@@ -413,12 +413,14 @@
{
"kind": "node",
"port": "eth0",
+ "rate": 25000000000,
"snmp_name": "ethernet1/1/81:1",
"uid": "servan-1"
},
{
"kind": "node",
"port": "eth0",
+ "rate": 25000000000,
"snmp_name": "ethernet1/1/82:1",
"uid": "servan-2"
},
diff --git a/input/grid5000/sites/grenoble/clusters/servan/servan.yaml b/input/grid5000/sites/grenoble/clusters/servan/servan.yaml
index af10adec7b4..67ffa0388b5 100644
--- a/input/grid5000/sites/grenoble/clusters/servan/servan.yaml
+++ b/input/grid5000/sites/grenoble/clusters/servan/servan.yaml
@@ -1,6 +1,6 @@
model: Dell PowerEdge R7525
created_at: 2021-12-15
-kavlan: false
+kavlan: true
boot_type: uefi
exotic: true
queues:
diff --git a/input/grid5000/sites/grenoble/networks/gw-grenoble.yaml b/input/grid5000/sites/grenoble/networks/gw-grenoble.yaml
index d7a7e8ade26..cf8c99c4e5b 100644
--- a/input/grid5000/sites/grenoble/networks/gw-grenoble.yaml
+++ b/input/grid5000/sites/grenoble/networks/gw-grenoble.yaml
@@ -187,8 +187,12 @@ gw:
snmp_pattern: "ethernet1/1/%PORT%"
kavlan_pattern: "ethernet1/1/%PORT%"
rate: 25000000000
- 81: servan-1
- 82: servan-2
+ 81:
+ uid: servan-1
+ rate: 25000000000
+ 82:
+ uid: servan-2
+ rate: 25000000000
83:
uid: port-channel10
kind: channel
diff --git a/input/grid5000/vlans.yaml b/input/grid5000/vlans.yaml
index 662f0b6a474..b32967ef9f2 100644
--- a/input/grid5000/vlans.yaml
+++ b/input/grid5000/vlans.yaml
@@ -65,6 +65,7 @@ vlans:
local grenoble dahu eth0 0 0 1 0
local grenoble troll eth0 0 0 2 0
local grenoble drac eth0 0 0 3 0
+ local grenoble servan eth0 0 0 4 0
local lille chetemi eth0 0 0 0 0
local lille chetemi eth1 0 0 1 0
local lille chifflet eth0 0 0 2 0
@@ -166,6 +167,7 @@ vlans:
global rennes paranoia eth0 0 0 34 0
global rennes paranoia eth1 0 0 34 100
global rennes paranoia eth2 0 0 34 200
+ global grenoble servan eth0 0 0 35 0
global sophia uvb eth0 0 0 40 0
global nancy gruss eth2 0 0 41 0
global luxembourg petitprince eth0 0 0 46 0
@@ -177,6 +179,7 @@ vlans:
routed grenoble dahu eth0 0 4 1 0
routed grenoble troll eth0 0 4 2 0
routed grenoble drac eth0 0 4 3 0
+ routed grenoble servan eth0 0 4 4 0
routed lille chetemi eth0 0 8 0 0
routed lille chetemi eth1 0 8 1 0
routed lille chifflet eth0 0 8 2 0
--
GitLab