diff --git a/data/grid5000/sites/lille/network_equipments/sw-1.json b/data/grid5000/sites/lille/network_equipments/sw-1.json
index d113bbd44692f85bbc2ff4b9e535864dd302bbd4..884bc1608f6e5245a5e12753d1a371ca42c13ff3 100644
--- a/data/grid5000/sites/lille/network_equipments/sw-1.json
+++ b/data/grid5000/sites/lille/network_equipments/sw-1.json
@@ -6,6 +6,14 @@
}
],
"backplane_bps": 1440000000000,
+ "channels": {
+ "lag2": {
+ "kind": "switch",
+ "port": "port-channel1",
+ "rate": 200000000000,
+ "uid": "sw-chiclet-3"
+ }
+ },
"ip": "172.17.47.224",
"kind": "switch",
"linecards": [
@@ -219,9 +227,19 @@
"uid": "sw-admin6"
},
{
- "kind": "router",
+ "kind": "switch",
"snmp_name": "1/1/48",
"uid": "sw-chiclet-2"
+ },
+ {
+ "kind": "channel",
+ "snmp_name": "1/1/49",
+ "uid": "lag2"
+ },
+ {
+ "kind": "channel",
+ "snmp_name": "1/1/50",
+ "uid": "lag2"
}
],
"rate": 25000000000,
diff --git a/data/grid5000/sites/lille/network_equipments/sw-chiclet-1.json b/data/grid5000/sites/lille/network_equipments/sw-chiclet-1.json
index fd668ce9e08a0fafcb97b73aa97134c2ce2647ee..f83482d6c163374abd51addf2abd42b2ac87c31d 100644
--- a/data/grid5000/sites/lille/network_equipments/sw-chiclet-1.json
+++ b/data/grid5000/sites/lille/network_equipments/sw-chiclet-1.json
@@ -2,7 +2,7 @@
"backplane_bps": 36000000000000,
"channels": {
"port-channel1": {
- "kind": "router",
+ "kind": "switch",
"port": "port-channel1",
"rate": 200000000000,
"uid": "sw-chiclet-2"
diff --git a/data/grid5000/sites/lille/network_equipments/sw-chiclet-2.json b/data/grid5000/sites/lille/network_equipments/sw-chiclet-2.json
index 0dc7ce7c6cfb78875786adcfa9b96d5cf07ce5ae..a0bfaa13e926480979be1d6c772730cac2565b4f 100644
--- a/data/grid5000/sites/lille/network_equipments/sw-chiclet-2.json
+++ b/data/grid5000/sites/lille/network_equipments/sw-chiclet-2.json
@@ -1,15 +1,4 @@
{
- "alias": [
- {
- "ip": "172.16.47.254",
- "ip6": "2001:660:4406:200::ffff:ffff",
- "name": "gw"
- },
- {
- "ip": "172.17.47.254",
- "name": "gw-adm"
- }
- ],
"backplane_bps": 36000000000000,
"channels": {
"port-channel1": {
@@ -17,16 +6,10 @@
"port": "port-channel1",
"rate": 200000000000,
"uid": "sw-chiclet-1"
- },
- "port-channel2": {
- "kind": "switch",
- "port": "port-channel1",
- "rate": 200000000000,
- "uid": "sw-chiclet-3"
}
},
"ip": "172.17.47.222",
- "kind": "router",
+ "kind": "switch",
"linecards": [
{
},
@@ -102,9 +85,6 @@
{
},
{
- "kind": "backbone",
- "snmp_name": "Ethernet1/33",
- "uid": "renater-lille"
},
{
},
@@ -158,18 +138,6 @@
"rate": 100000000000,
"snmp_name": "Ethernet1/52",
"uid": "port-channel1"
- },
- {
- "kind": "channel",
- "rate": 100000000000,
- "snmp_name": "Ethernet1/53",
- "uid": "port-channel2"
- },
- {
- "kind": "channel",
- "rate": 100000000000,
- "snmp_name": "Ethernet1/54",
- "uid": "port-channel2"
}
],
"rate": 10000000000,
@@ -257,83 +225,5 @@
"snmp_community": "public",
"type": "network_equipment",
"uid": "sw-chiclet-2",
- "vlans": {
- "vlan100": {
- "addresses": [
- "172.16.47.254"
- ],
- "administrative": true
- },
- "vlan101": {
- "addresses": [
- "172.17.47.254"
- ]
- },
- "vlan500": {
- "addresses": [
- "192.168.4.18"
- ]
- },
- "vlan701": {
- "addresses": [
- "192.168.192.0/20"
- ],
- "name": "kavlan-1"
- },
- "vlan702": {
- "addresses": [
- "192.168.208.0/20"
- ],
- "name": "kavlan-2"
- },
- "vlan703": {
- "addresses": [
- "192.168.224.0/20"
- ],
- "name": "kavlan-3"
- },
- "vlan704": {
- "addresses": [
- "10.8.0.0/18"
- ],
- "name": "kavlan-4"
- },
- "vlan705": {
- "addresses": [
- "10.8.64.0/18"
- ],
- "name": "kavlan-5"
- },
- "vlan706": {
- "addresses": [
- "10.8.128.0/18"
- ],
- "name": "kavlan-6"
- },
- "vlan707": {
- "addresses": [
- "10.8.192.0/18"
- ],
- "name": "kavlan-7"
- },
- "vlan708": {
- "addresses": [
- "10.9.0.0/18"
- ],
- "name": "kavlan-8"
- },
- "vlan709": {
- "addresses": [
- "10.9.64.0/18"
- ],
- "name": "kavlan-9"
- },
- "vlan712": {
- "addresses": [
- "10.11.192.0/18"
- ],
- "name": "kavlan-12"
- }
- },
"warranty": "2025-10-24"
}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/network_equipments/sw-chiclet-3.json b/data/grid5000/sites/lille/network_equipments/sw-chiclet-3.json
index b517205cc68680839483f160b88c0b54398888a8..aa728f1c813c89f4c4022a4ee8f98b1571bdec97 100644
--- a/data/grid5000/sites/lille/network_equipments/sw-chiclet-3.json
+++ b/data/grid5000/sites/lille/network_equipments/sw-chiclet-3.json
@@ -1,22 +1,33 @@
{
+ "alias": [
+ {
+ "ip": "172.16.47.254",
+ "ip6": "2001:660:4406:200::ffff:ffff",
+ "name": "gw"
+ },
+ {
+ "ip": "172.17.47.254",
+ "name": "gw-adm"
+ }
+ ],
"backplane_bps": 36000000000000,
"channels": {
"port-channel1": {
- "kind": "router",
- "port": "port-channel2",
+ "kind": "switch",
+ "port": "lag2",
"rate": 200000000000,
- "uid": "sw-chiclet-2"
+ "uid": "sw-1"
}
},
"ip": "172.17.47.223",
- "kind": "switch",
+ "kind": "router",
"linecards": [
{
},
{
"backplane_bps": 36000000000000,
"kavlan_pattern": "Ethernet%LINECARD%/%PORT%",
- "kind": "node",
+ "kind": "other",
"ports": [
{
},
@@ -113,6 +124,9 @@
{
},
{
+ "kind": "backbone",
+ "snmp_name": "Ethernet1/47",
+ "uid": "renater-lille"
},
{
},
@@ -222,5 +236,83 @@
"snmp_community": "public",
"type": "network_equipment",
"uid": "sw-chiclet-3",
+ "vlans": {
+ "vlan100": {
+ "addresses": [
+ "172.16.47.254"
+ ],
+ "administrative": true
+ },
+ "vlan101": {
+ "addresses": [
+ "172.17.47.254"
+ ]
+ },
+ "vlan500": {
+ "addresses": [
+ "192.168.4.18"
+ ]
+ },
+ "vlan701": {
+ "addresses": [
+ "192.168.192.0/20"
+ ],
+ "name": "kavlan-1"
+ },
+ "vlan702": {
+ "addresses": [
+ "192.168.208.0/20"
+ ],
+ "name": "kavlan-2"
+ },
+ "vlan703": {
+ "addresses": [
+ "192.168.224.0/20"
+ ],
+ "name": "kavlan-3"
+ },
+ "vlan704": {
+ "addresses": [
+ "10.8.0.0/18"
+ ],
+ "name": "kavlan-4"
+ },
+ "vlan705": {
+ "addresses": [
+ "10.8.64.0/18"
+ ],
+ "name": "kavlan-5"
+ },
+ "vlan706": {
+ "addresses": [
+ "10.8.128.0/18"
+ ],
+ "name": "kavlan-6"
+ },
+ "vlan707": {
+ "addresses": [
+ "10.8.192.0/18"
+ ],
+ "name": "kavlan-7"
+ },
+ "vlan708": {
+ "addresses": [
+ "10.9.0.0/18"
+ ],
+ "name": "kavlan-8"
+ },
+ "vlan709": {
+ "addresses": [
+ "10.9.64.0/18"
+ ],
+ "name": "kavlan-9"
+ },
+ "vlan712": {
+ "addresses": [
+ "10.11.192.0/18"
+ ],
+ "name": "kavlan-12"
+ }
+ },
"warranty": "2025-10-24"
}
\ No newline at end of file
diff --git a/input/grid5000/sites/lille/networks/sw-1.yaml b/input/grid5000/sites/lille/networks/sw-1.yaml
index dd06cc8b73b597a518cb7cf8d71884e98f5e5979..573c42fa7a7f9d34b11dfdcf207cc53d9033c4ec 100644
--- a/input/grid5000/sites/lille/networks/sw-1.yaml
+++ b/input/grid5000/sites/lille/networks/sw-1.yaml
@@ -75,4 +75,16 @@ sw-1:
kind: switch
48:
uid: sw-chiclet-2
- kind: router
+ kind: switch
+ 49:
+ uid: lag2
+ kind: channel
+ 50:
+ uid: lag2
+ kind: channel
+ channels:
+ lag2:
+ port: port-channel1
+ uid: sw-chiclet-3
+ kind: switch
+ rate: 200000000000
diff --git a/input/grid5000/sites/lille/networks/sw-chiclet-1.yaml b/input/grid5000/sites/lille/networks/sw-chiclet-1.yaml
index 14ce8d51b9624a820e1ec68b2aadccbaa58dc425..41955e607d2b2d11a63d6a4fe5d21f28bf798ab8 100644
--- a/input/grid5000/sites/lille/networks/sw-chiclet-1.yaml
+++ b/input/grid5000/sites/lille/networks/sw-chiclet-1.yaml
@@ -142,5 +142,5 @@ sw-chiclet-1:
port-channel1:
port: port-channel1
uid: sw-chiclet-2
- kind: router
+ kind: switch
rate: 200000000000
diff --git a/input/grid5000/sites/lille/networks/sw-chiclet-2.yaml b/input/grid5000/sites/lille/networks/sw-chiclet-2.yaml
index 6b2a60ab49657b833619502ba66d5bd72e7e9401..dbc95f93580b2d81b0b812304b5b7ba72ae2e165 100644
--- a/input/grid5000/sites/lille/networks/sw-chiclet-2.yaml
+++ b/input/grid5000/sites/lille/networks/sw-chiclet-2.yaml
@@ -3,14 +3,8 @@ sw-chiclet-2:
model: cisco 93180YC-EX
serial: FDO20401LBV
warranty: 2025-10-24
- alias:
- - name: gw
- ip: 172.16.47.254
- ip6: 2001:660:4406:200::ffff:ffff
- - name: gw-adm
- ip: 172.17.47.254
ip: 172.17.47.222
- kind: router
+ kind: switch
managed_by_us: true
site: lille
snmp_community: public
@@ -64,57 +58,6 @@ sw-chiclet-2:
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% }}
- vlans:
- "vlan100":
- administrative: yes
- addresses:
- - 172.16.47.254
- "vlan101":
- addresses:
- - 172.17.47.254
- "vlan500":
- addresses:
- - 192.168.4.18
- "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.8.0.0/18
- "vlan705":
- name: kavlan-5
- addresses:
- - 10.8.64.0/18
- "vlan706":
- name: kavlan-6
- addresses:
- - 10.8.128.0/18
- "vlan707":
- name: kavlan-7
- addresses:
- - 10.8.192.0/18
- "vlan708":
- name: kavlan-8
- addresses:
- - 10.9.0.0/18
- "vlan709":
- name: kavlan-9
- addresses:
- - 10.9.64.0/18
- "vlan712":
- name: kavlan-12
- addresses:
- - 10.11.192.0/18
linecards:
1:
kind: other
@@ -123,9 +66,6 @@ sw-chiclet-2:
backplane_bps: 36000000000000
rate: 10000000000
ports:
- 33:
- uid: renater-lille
- kind: backbone
35:
uid: labo
kind: other
@@ -141,22 +81,9 @@ sw-chiclet-2:
uid: port-channel1
kind: channel
rate: 100000000000
- 53:
- uid: port-channel2
- kind: channel
- rate: 100000000000
- 54:
- uid: port-channel2
- kind: channel
- rate: 100000000000
channels:
port-channel1:
port: port-channel1
uid: sw-chiclet-1
kind: switch
rate: 200000000000
- port-channel2:
- port: port-channel1
- uid: sw-chiclet-3
- kind: switch
- rate: 200000000000
diff --git a/input/grid5000/sites/lille/networks/sw-chiclet-3.yaml b/input/grid5000/sites/lille/networks/sw-chiclet-3.yaml
index a7d2e4178361f019dd6c709a814034afc7c5ac75..d156729136887ddabdb8f1754ddbc1f8c23ebd61 100644
--- a/input/grid5000/sites/lille/networks/sw-chiclet-3.yaml
+++ b/input/grid5000/sites/lille/networks/sw-chiclet-3.yaml
@@ -3,8 +3,14 @@ sw-chiclet-3:
model: cisco 93180YC-EX
serial: FDO20392L7J
warranty: 2025-10-24
+ alias:
+ - name: gw
+ ip: 172.16.47.254
+ ip6: 2001:660:4406:200::ffff:ffff
+ - name: gw-adm
+ ip: 172.17.47.254
ip: 172.17.47.223
- kind: switch
+ kind: router
managed_by_us: true
site: lille
snmp_community: public
@@ -58,14 +64,68 @@ sw-chiclet-3:
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% }}
+ vlans:
+ "vlan100":
+ administrative: yes
+ addresses:
+ - 172.16.47.254
+ "vlan101":
+ addresses:
+ - 172.17.47.254
+ "vlan500":
+ addresses:
+ - 192.168.4.18
+ "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.8.0.0/18
+ "vlan705":
+ name: kavlan-5
+ addresses:
+ - 10.8.64.0/18
+ "vlan706":
+ name: kavlan-6
+ addresses:
+ - 10.8.128.0/18
+ "vlan707":
+ name: kavlan-7
+ addresses:
+ - 10.8.192.0/18
+ "vlan708":
+ name: kavlan-8
+ addresses:
+ - 10.9.0.0/18
+ "vlan709":
+ name: kavlan-9
+ addresses:
+ - 10.9.64.0/18
+ "vlan712":
+ name: kavlan-12
+ addresses:
+ - 10.11.192.0/18
linecards:
1:
- kind: node
+ kind: other
snmp_pattern: Ethernet%LINECARD%/%PORT%
kavlan_pattern: Ethernet%LINECARD%/%PORT%
backplane_bps: 36000000000000
rate: 10000000000
ports:
+ 47:
+ uid: renater-lille
+ kind: backbone
53:
uid: port-channel1
kind: channel
@@ -76,7 +136,7 @@ sw-chiclet-3:
rate: 100000000000
channels:
port-channel1:
- uid: sw-chiclet-2
- port: port-channel2
+ uid: sw-1
+ port: lag2
rate: 200000000000
- kind: router
+ kind: switch