Skip to content

GitLab

Attention une mise à jour du serveur va être effectuée le lundi 17 mai entre 13h et 13h30. Cette mise à jour va générer une interruption du service de quelques minutes.

Commit 36a25c33 authored by LOUP David's avatar LOUP David
Browse files
Options

[grenoble] Network description : grimage kind is 'other' (non-g5k)

parent 8a14105d
Hide whitespace changes
Inline Side-by-side
Showing with 42 additions and 3 deletions
data/grid5000/sites/grenoble/network_equipments/gw-grenoble.json
View file @ 36a25c33
...@@ -152,18 +152,22 @@ ...@@ -152,18 +152,22 @@
"uid": "digmgt" "uid": "digmgt"
}, },
{ {
"kind": "other",
"port": "eth0", "port": "eth0",
"uid": "grimage-9" "uid": "grimage-9"
}, },
{ {
"kind": "other",
"port": "eth1", "port": "eth1",
"uid": "grimage-9" "uid": "grimage-9"
}, },
{ {
"kind": "other",
"port": "eth0", "port": "eth0",
"uid": "grimage-10" "uid": "grimage-10"
}, },
{ {
"kind": "other",
"port": "eth1", "port": "eth1",
"uid": "grimage-10" "uid": "grimage-10"
}, },
...@@ -277,7 +281,7 @@ ...@@ -277,7 +281,7 @@
{ {
}, },
{ {
"kind": "switch", "kind": "other",
"uid": "summit-grimage" "uid": "summit-grimage"
}, },
{ {
...@@ -366,34 +370,42 @@ ...@@ -366,34 +370,42 @@
"uid": "alpes" "uid": "alpes"
}, },
{ {
"kind": "other",
"port": "eth0", "port": "eth0",
"uid": "grimage-1" "uid": "grimage-1"
}, },
{ {
"kind": "other",
"port": "eth0", "port": "eth0",
"uid": "grimage-2" "uid": "grimage-2"
}, },
{ {
"kind": "other",
"port": "eth0", "port": "eth0",
"uid": "grimage-3" "uid": "grimage-3"
}, },
{ {
"kind": "other",
"port": "eth0", "port": "eth0",
"uid": "grimage-4" "uid": "grimage-4"
}, },
{ {
"kind": "other",
"port": "eth0", "port": "eth0",
"uid": "grimage-5" "uid": "grimage-5"
}, },
{ {
"kind": "other",
"port": "eth0", "port": "eth0",
"uid": "grimage-6" "uid": "grimage-6"
}, },
{ {
"kind": "other",
"port": "eth0", "port": "eth0",
"uid": "grimage-7" "uid": "grimage-7"
}, },
{ {
"kind": "other",
"port": "eth0", "port": "eth0",
"uid": "grimage-8" "uid": "grimage-8"
} }
...@@ -419,6 +431,7 @@ ...@@ -419,6 +431,7 @@
{ {
}, },
{ {
"kind": "other",
"port": "eth2", "port": "eth2",
"rate": 10000000000, "rate": 10000000000,
"uid": "dignfs" "uid": "dignfs"
......
grid5000-all.json
View file @ 36a25c33
...@@ -21093,6 +21093,7 @@ ...@@ -21093,6 +21093,7 @@
"kind": "other", "kind": "other",
"ports": { "ports": {
"1": { "1": {
"kind": "other",
"port": "eth2", "port": "eth2",
"rate": 10000000000, "rate": 10000000000,
"uid": "dignfs" "uid": "dignfs"
...@@ -21293,18 +21294,22 @@ ...@@ -21293,18 +21294,22 @@
"uid": "genepi-2" "uid": "genepi-2"
}, },
"5": { "5": {
"kind": "other",
"port": "eth0", "port": "eth0",
"uid": "grimage-9" "uid": "grimage-9"
}, },
"6": { "6": {
"kind": "other",
"port": "eth1", "port": "eth1",
"uid": "grimage-9" "uid": "grimage-9"
}, },
"7": { "7": {
"kind": "other",
"port": "eth0", "port": "eth0",
"uid": "grimage-10" "uid": "grimage-10"
}, },
"8": { "8": {
"kind": "other",
"port": "eth1", "port": "eth1",
"uid": "grimage-10" "uid": "grimage-10"
} }
...@@ -21318,7 +21323,7 @@ ...@@ -21318,7 +21323,7 @@
"kind": "node", "kind": "node",
"ports": { "ports": {
"1": { "1": {
"kind": "switch", "kind": "other",
"uid": "summit-grimage" "uid": "summit-grimage"
}, },
"10": { "10": {
...@@ -21375,22 +21380,27 @@ ...@@ -21375,22 +21380,27 @@
"uid": "alpes" "uid": "alpes"
}, },
"25": { "25": {
"kind": "other",
"port": "eth0", "port": "eth0",
"uid": "grimage-1" "uid": "grimage-1"
}, },
"26": { "26": {
"kind": "other",
"port": "eth0", "port": "eth0",
"uid": "grimage-2" "uid": "grimage-2"
}, },
"27": { "27": {
"kind": "other",
"port": "eth0", "port": "eth0",
"uid": "grimage-3" "uid": "grimage-3"
}, },
"28": { "28": {
"kind": "other",
"port": "eth0", "port": "eth0",
"uid": "grimage-4" "uid": "grimage-4"
}, },
"29": { "29": {
"kind": "other",
"port": "eth0", "port": "eth0",
"uid": "grimage-5" "uid": "grimage-5"
}, },
...@@ -21399,14 +21409,17 @@ ...@@ -21399,14 +21409,17 @@
"uid": "genepi-29" "uid": "genepi-29"
}, },
"30": { "30": {
"kind": "other",
"port": "eth0", "port": "eth0",
"uid": "grimage-6" "uid": "grimage-6"
}, },
"31": { "31": {
"kind": "other",
"port": "eth0", "port": "eth0",
"uid": "grimage-7" "uid": "grimage-7"
}, },
"32": { "32": {
"kind": "other",
"port": "eth0", "port": "eth0",
"uid": "grimage-8" "uid": "grimage-8"
}, },
input/grid5000/sites/grenoble/networks/gw-grenoble.yaml
View file @ 36a25c33
...@@ -161,15 +161,19 @@ gw-grenoble: ...@@ -161,15 +161,19 @@ gw-grenoble:
5: 5:
uid: grimage-9 uid: grimage-9
port: eth0 port: eth0
kind: other
6: 6:
uid: grimage-9 uid: grimage-9
port: eth1 port: eth1
kind: other
7: 7:
uid: grimage-10 uid: grimage-10
port: eth0 port: eth0
kind: other
8: 8:
uid: grimage-10 uid: grimage-10
port: eth1 port: eth1
kind: other
11: 11:
12: 12:
13: 13:
...@@ -234,7 +238,7 @@ gw-grenoble: ...@@ -234,7 +238,7 @@ gw-grenoble:
ports: ports:
1: 1:
uid: summit-grimage uid: summit-grimage
kind: switch kind: other
3: 3:
uid: genepi-29 uid: genepi-29
port: eth1 port: eth1
...@@ -296,27 +300,35 @@ gw-grenoble: ...@@ -296,27 +300,35 @@ gw-grenoble:
25: 25:
uid: grimage-1 uid: grimage-1
port: eth0 port: eth0
kind: other
26: 26:
uid: grimage-2 uid: grimage-2
port: eth0 port: eth0
kind: other
27: 27:
uid: grimage-3 uid: grimage-3
port: eth0 port: eth0
kind: other
28: 28:
uid: grimage-4 uid: grimage-4
port: eth0 port: eth0
kind: other
29: 29:
uid: grimage-5 uid: grimage-5
port: eth0 port: eth0
kind: other
30: 30:
uid: grimage-6 uid: grimage-6
port: eth0 port: eth0
kind: other
31: 31:
uid: grimage-7 uid: grimage-7
port: eth0 port: eth0
kind: other
32: 32:
uid: grimage-8 uid: grimage-8
port: eth0 port: eth0
kind: other
10: 10:
snmp_pattern: "BD-8810 Port %LINECARD%:%PORT%" snmp_pattern: "BD-8810 Port %LINECARD%:%PORT%"
kavlan_pattern: "%LINECARD%:%PORT%" kavlan_pattern: "%LINECARD%:%PORT%"
...@@ -328,6 +340,7 @@ gw-grenoble: ...@@ -328,6 +340,7 @@ gw-grenoble:
uid: dignfs uid: dignfs
port: eth2 port: eth2
rate: 10000000000 rate: 10000000000
kind: other
3: 3:
kind: virtual kind: virtual
uid: renater-grenoble uid: renater-grenoble
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment