From 180574132b57146b1a8c47cf4cd7882413448f0a Mon Sep 17 00:00:00 2001
From: Pierre Jacquot <pierre.jacquot@inria.fr>
Date: Wed, 5 Jun 2024 08:26:17 +0200
Subject: [PATCH] [strasbourg][kavlan] Remove every mention of kavlan for
strasbourg.
---
input/grid5000/ipv6.yaml | 1 -
.../strasbourg/networks/gw-strasbourg.yml | 51 -------------------
.../grid5000/sites/strasbourg/strasbourg.yaml | 45 ----------------
input/grid5000/vlans.yaml | 12 -----
4 files changed, 109 deletions(-)
diff --git a/input/grid5000/ipv6.yaml b/input/grid5000/ipv6.yaml
index 36435059c81..5ee339399fa 100644
--- a/input/grid5000/ipv6.yaml
+++ b/input/grid5000/ipv6.yaml
@@ -22,4 +22,3 @@ ipv6:
rennes: 16
toulouse: 17
sophia: 18
- strasbourg: 19
diff --git a/input/grid5000/sites/strasbourg/networks/gw-strasbourg.yml b/input/grid5000/sites/strasbourg/networks/gw-strasbourg.yml
index 915f6e41173..b606fec6e74 100644
--- a/input/grid5000/sites/strasbourg/networks/gw-strasbourg.yml
+++ b/input/grid5000/sites/strasbourg/networks/gw-strasbourg.yml
@@ -8,57 +8,6 @@ gw-strasbourg:
managed_by_us: true
site: strasbourg
snmp_community: Unknown
- vlans:
- "vlan100":
- administrative: yes
- addresses:
- - 172.16.175.254
- "vlan101":
- addresses:
- - 172.17.175.254
- "vlan500":
- addresses:
- - 192.168.4.23
- "vlan701":
- name: kavlan-1
- addresses:
- - 192.168.192.0/20
- "vlan702":
- name: kavlan-2
- addresses:
- - 192.168.208.0/20
- "vlan703":
- name: kavlan-3
- addresses:
- - 192.168.224.0/20
- "vlan704":
- name: kavlan-4
- addresses:
- - 10.36.0.0/18
- "vlan705":
- name: kavlan-5
- addresses:
- - 10.36.64.0/18
- "vlan706":
- name: kavlan-6
- addresses:
- - 10.36.128.0/18
- "vlan707":
- name: kavlan-7
- addresses:
- - 10.36.192.0/18
- "vlan708":
- name: kavlan-8
- addresses:
- - 10.37.0.0/18
- "vlan709":
- name: kavlan-9
- addresses:
- - 10.37.64.0/18
- "vlan719":
- name: kavlan-19
- addresses:
- - 10.39.192.0/18
linecards:
1:
rate: 25000000000
diff --git a/input/grid5000/sites/strasbourg/strasbourg.yaml b/input/grid5000/sites/strasbourg/strasbourg.yaml
index eda53e87e9a..52d0c542aa7 100644
--- a/input/grid5000/sites/strasbourg/strasbourg.yaml
+++ b/input/grid5000/sites/strasbourg/strasbourg.yaml
@@ -10,7 +10,6 @@ sys_admin_contact: support-staff@lists.grid5000.fr
security_contact: support-staff@lists.grid5000.fr
user_support_contact: support-staff@lists.grid5000.fr
compilation_server: false
-kavlan_ip_range: 10.36.0.0/14
virt_ip_range: 10.168.0.0/14
renater_ip: 192.168.4.23
production: true
@@ -20,47 +19,3 @@ g5ksubnet:
network: 10.160.0.0/14
gateway: 10.163.255.254
-kavlans:
- default:
- network: 172.16.160.0/20
- gateway: 172.16.175.254
-
- 1:
- network: 192.168.192.0/20
- gateway: 192.168.207.254
-
- 2:
- network: 192.168.208.0/20
- gateway: 192.168.223.254
-
- 3:
- network: 192.168.224.0/20
- gateway: 192.168.239.254
-
- 4:
- network: 10.36.0.0/18
- gateway: 10.36.63.254
-
- 5:
- network: 10.36.64.0/18
- gateway: 10.36.127.254
-
- 6:
- network: 10.36.128.0/18
- gateway: 10.36.191.254
-
- 7:
- network: 10.36.192.0/18
- gateway: 10.36.255.254
-
- 8:
- network: 10.37.0.0/18
- gateway: 10.37.63.254
-
- 9:
- network: 10.37.64.0/18
- gateway: 10.37.127.254
-
- 19:
- network: 10.39.192.0/18
- gateway: 10.39.255.254
\ No newline at end of file
diff --git a/input/grid5000/vlans.yaml b/input/grid5000/vlans.yaml
index 18114f20274..bd2670066a9 100644
--- a/input/grid5000/vlans.yaml
+++ b/input/grid5000/vlans.yaml
@@ -51,9 +51,6 @@ vlans:
18:
address: 10.35.192.0
type: global
- 19:
- address: 10.39.192.0
- type: global
20:
address: 10.43.192.0
type: global
@@ -116,9 +113,6 @@ vlans:
local rennes parasilo eth1 0 0 8 0
local rennes paradoxe eth0 0 0 9 0
local sophia uvb eth0 0 0 1 0
- local strasbourg fleckenstein eth0 0 0 0 0
- local strasbourg fleckenstein eth1 0 0 0 10
- local strasbourg fleckenstein eth2 0 0 0 20
local toulouse montcalm eth0 0 0 0 0
local toulouse estats eth0 0 0 1 0
global grenoble yeti eth0 0 0 0 0
@@ -172,9 +166,6 @@ vlans:
global nantes ecotype eth1 0 0 49 100
global toulouse montcalm eth0 0 0 50 0
global toulouse estats eth0 0 0 51 0
- global strasbourg fleckenstein eth0 0 0 52 0
- global strasbourg fleckenstein eth1 0 0 52 10
- global strasbourg fleckenstein eth2 0 0 52 20
routed grenoble yeti eth0 0 4 0 0
routed grenoble dahu eth0 0 4 1 0
routed grenoble troll eth0 0 4 2 0
@@ -221,9 +212,6 @@ vlans:
routed toulouse montcalm eth0 0 28 0 0
routed toulouse estats eth0 0 29 0 0
routed sophia uvb eth0 0 32 1 0
- routed strasbourg fleckenstein eth0 0 36 0 0
- routed strasbourg fleckenstein eth1 0 36 1 0
- routed strasbourg fleckenstein eth2 0 36 2 0
routed luxembourg petitprince eth0 0 40 2 0
routed luxembourg petitprince eth1 0 40 3 0
routed nantes econome eth0 0 44 0 0
--
GitLab