diff --git a/data/grid5000/sites/grenoble/network_equipments/gw-new.json b/data/grid5000/sites/grenoble/network_equipments/gw-new.json index 5a3461967d315dc90784538eaeb445fecf221d2e..e9cb2d5ba949938e7f4e46c6603a56d94bf232a1 100644 --- a/data/grid5000/sites/grenoble/network_equipments/gw-new.json +++ b/data/grid5000/sites/grenoble/network_equipments/gw-new.json @@ -3,8 +3,6 @@ "ip": "172.16.31.252", "kind": "switch", "linecards": [ - { - }, { "kavlan_pattern": "ethernet1/1/%PORT%:1", "kind": "node", @@ -154,112 +152,6 @@ "port": "eth0", "snmp_name": "ethernet1/1/48:1", "uid": "drac-12" - } - ], - "rate": 10000000000, - "snmp_pattern": "ethernet1/1/%PORT%:1" - }, - { - "kavlan_pattern": "ethernet1/1/%PORT%:1", - "kind": "node", - "ports": [ - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { }, { }, diff --git a/input/grid5000/sites/grenoble/networks/gw-new.yaml b/input/grid5000/sites/grenoble/networks/gw-new.yaml index 0530bd8a217b16e832e6cd742df3425d8154ac37..91b3493f2c5243c78b7d8a53051d3190d46f6254 100644 --- a/input/grid5000/sites/grenoble/networks/gw-new.yaml +++ b/input/grid5000/sites/grenoble/networks/gw-new.yaml @@ -10,9 +10,9 @@ gw-new: ip: 172.16.31.252 backplane_bps: 6400000000000 linecards: - 1: # Les noeuds en 10Gb/s + 0: snmp_pattern: "ethernet1/1/%PORT%:1" - kavlan_pattern: "ethernet1/1/%PORT%:1" + kavlan_pattern: "ethernet1/1/%PORT%:1" # Pattern pour les noeuds en 10Gb/s kind: node rate: 10000000000 ports: @@ -64,28 +64,28 @@ gw-new: 46: drac-10 47: drac-11 48: drac-12 - #2: # Les noeuds en 25Gb/s et les serveurs en 25Gb/s - #snmp_pattern: "ethernet1/1/%PORT%" - #kavlan_pattern: "ethernet1/1/%PORT%" - #kind: node - #rate: 25000000000 - #ports: - #77: troll-1 - #78: troll-2 - #79: troll-3 - #80: troll-4 + #77: + # uid: troll-1 + # kavlan_pattern: "ethernet1/1/%PORT%" # Pattern pour les noeuds en 25Gb/s + # rate: 25000000000 + #78: + # uid: troll-2 + # kavlan_pattern: "ethernet1/1/%PORT%" + # rate: 25000000000 + #79: + # uid: troll-3 + # kavlan_pattern: "ethernet1/1/%PORT%" + # rate: 25000000000 + #80: + # uid: troll-4 + # kavlan_pattern: "ethernet1/1/%PORT%" + # rate: 25000000000 #83: # uid: port-channel10 # kind: channel #84: # uid: port-channel10 # kind: channel - 2: # 3 <----- Les serveurs en 10Gb/s et les uplinks - snmp_pattern: "ethernet1/1/%PORT%:1" - kavlan_pattern: "ethernet1/1/%PORT%:1" - kind: node - rate: 10000000000 - ports: #85: digsed-1 # lacp #86: digsed-2 # lacp #87: dighyp1 # lacp