diff --git a/data/grid5000/sites/nancy/network_equipments/gw-nancy.json b/data/grid5000/sites/nancy/network_equipments/gw-nancy.json index bc274e812be2b646842287a73920b68dabec8aac..18c4538e1a6886a4d61b1b464da9ef1f24617188 100644 --- a/data/grid5000/sites/nancy/network_equipments/gw-nancy.json +++ b/data/grid5000/sites/nancy/network_equipments/gw-nancy.json @@ -1,4 +1,5 @@ { + "backplane_bps": 346000000000, "channels": { "naming_pattern": "Po%CHANNELID%" }, @@ -8,7 +9,9 @@ }, { + "backplane_bps": 14400000000, "kind": "other", + "model": "J8702A", "naming_pattern": "%LINECARD:A%%PORT%", "ports": [ { @@ -124,7 +127,9 @@ "rate": 1000000000 }, { + "backplane_bps": 14400000000, "kind": "switch", + "model": "J8708A", "naming_pattern": "%LINECARD:A%%PORT%", "ports": [ { @@ -146,7 +151,9 @@ "rate": 1000000000 }, { + "backplane_bps": 14400000000, "kind": "switch", + "model": "J8708A", "naming_pattern": "%LINECARD:A%%PORT%", "ports": [ { @@ -168,7 +175,9 @@ "rate": 1000000000 }, { + "backplane_bps": 14400000000, "kind": "switch", + "model": "J8708A", "naming_pattern": "%LINECARD:A%%PORT%", "ports": [ { @@ -194,7 +203,9 @@ "rate": 1000000000 }, { + "backplane_bps": 14400000000, "kind": "virtual", + "model": "J8707A", "naming_pattern": "%LINECARD:A%%PORT%", "ports": [ { @@ -210,13 +221,14 @@ }, { + "kind": "virtual", "uid": "renater-nancy" } ], "rate": 10000000000 } ], - "model": "HP Procurve 5406zl", + "model": "HP Procurve 5406zl J8697A", "routes": { }, diff --git a/data/grid5000/sites/nancy/network_equipments/sgraphene1.json b/data/grid5000/sites/nancy/network_equipments/sgraphene1.json index 3558a94a639e3489cf7557e55a162a89f3353911..bd6b24c51edd1143c4ad1436e9c03f4cbaf9221a 100644 --- a/data/grid5000/sites/nancy/network_equipments/sgraphene1.json +++ b/data/grid5000/sites/nancy/network_equipments/sgraphene1.json @@ -1,4 +1,5 @@ { + "backplane_bps": 176000000000, "channels": { "naming_pattern": "Po%CHANNELID%" }, diff --git a/data/grid5000/sites/nancy/network_equipments/sgraphene2.json b/data/grid5000/sites/nancy/network_equipments/sgraphene2.json index 4bd41b1866c83c8b0d583a516b03601dd46029a8..68f626632e2b976da7af46513880014a1bf96dde 100644 --- a/data/grid5000/sites/nancy/network_equipments/sgraphene2.json +++ b/data/grid5000/sites/nancy/network_equipments/sgraphene2.json @@ -1,4 +1,5 @@ { + "backplane_bps": 176000000000, "channels": { "naming_pattern": "Po%CHANNELID%" }, diff --git a/data/grid5000/sites/nancy/network_equipments/sgraphene3.json b/data/grid5000/sites/nancy/network_equipments/sgraphene3.json index 59bc65e8b986d6a07825eed0186fe0e10d78ce59..62337a25428ee9a2829ef0e14d93587a4e3432c4 100644 --- a/data/grid5000/sites/nancy/network_equipments/sgraphene3.json +++ b/data/grid5000/sites/nancy/network_equipments/sgraphene3.json @@ -1,4 +1,5 @@ { + "backplane_bps": 176000000000, "channels": { "naming_pattern": "Po%CHANNELID%" }, diff --git a/data/grid5000/sites/nancy/network_equipments/sgraphene4.json b/data/grid5000/sites/nancy/network_equipments/sgraphene4.json index b9709aa41d6b5f177bc6b7c8373c631206c1fbd1..8ba62fc47ad6fc6658fc6087f2116c2f9b52dca4 100644 --- a/data/grid5000/sites/nancy/network_equipments/sgraphene4.json +++ b/data/grid5000/sites/nancy/network_equipments/sgraphene4.json @@ -1,4 +1,5 @@ { + "backplane_bps": 176000000000, "channels": { "naming_pattern": "Po%CHANNELID%" }, diff --git a/data/grid5000/sites/nancy/network_equipments/sgriffon1.json b/data/grid5000/sites/nancy/network_equipments/sgriffon1.json index 1cd6f430d75b9d677bf3c8ea2076cadb71b7b265..9fc730cec72606bffa2f435cd2d7957be65f6937 100644 --- a/data/grid5000/sites/nancy/network_equipments/sgriffon1.json +++ b/data/grid5000/sites/nancy/network_equipments/sgriffon1.json @@ -1,4 +1,5 @@ { + "backplane_bps": 176000000000, "channels": { "naming_pattern": "Po%CHANNELID%" }, diff --git a/data/grid5000/sites/nancy/network_equipments/sgriffon2.json b/data/grid5000/sites/nancy/network_equipments/sgriffon2.json index 0fe08603829667fe1120e85fc3c115b5eae30665..3c1e5a594d3155193f192595ff71d09f82b4dff9 100644 --- a/data/grid5000/sites/nancy/network_equipments/sgriffon2.json +++ b/data/grid5000/sites/nancy/network_equipments/sgriffon2.json @@ -1,4 +1,5 @@ { + "backplane_bps": 176000000000, "channels": { "naming_pattern": "Po%CHANNELID%" }, diff --git a/data/grid5000/sites/nancy/network_equipments/sgriffon3.json b/data/grid5000/sites/nancy/network_equipments/sgriffon3.json index 7b924a5575d2b8146218488a4e498e9501e5ada0..0f98ad6c431b8afe032d0885108ab6153e2fc85d 100644 --- a/data/grid5000/sites/nancy/network_equipments/sgriffon3.json +++ b/data/grid5000/sites/nancy/network_equipments/sgriffon3.json @@ -1,4 +1,5 @@ { + "backplane_bps": 176000000000, "channels": { "naming_pattern": "Po%CHANNELID%" }, diff --git a/data/grid5000/sites/nancy/network_equipments/stalc1.json b/data/grid5000/sites/nancy/network_equipments/stalc1.json index 02dfd40eee349b82f5cef6a90560e906038ecf72..3b91267584da70a8c5126e471a5082de017ab6ee 100644 --- a/data/grid5000/sites/nancy/network_equipments/stalc1.json +++ b/data/grid5000/sites/nancy/network_equipments/stalc1.json @@ -1,4 +1,5 @@ { + "backplane_bps": 176000000000, "channels": { "naming_pattern": "Po%CHANNELID%" }, diff --git a/data/grid5000/sites/nancy/network_equipments/stalc2.json b/data/grid5000/sites/nancy/network_equipments/stalc2.json index 27b394c4958791853b572bf1cf4939bcf2a2d8ba..5b80e526b4281214106c60cc0720f3a351154e8f 100644 --- a/data/grid5000/sites/nancy/network_equipments/stalc2.json +++ b/data/grid5000/sites/nancy/network_equipments/stalc2.json @@ -1,4 +1,5 @@ { + "backplane_bps": 176000000000, "channels": { "naming_pattern": "Po%CHANNELID%" }, diff --git a/data/grid5000/sites/nancy/network_equipments/stalc3.json b/data/grid5000/sites/nancy/network_equipments/stalc3.json index 1d08e8e0183ae3225981e5bd298475fd6b6d178b..644b29ed39e6274d09f031903363e381b2fa07a9 100644 --- a/data/grid5000/sites/nancy/network_equipments/stalc3.json +++ b/data/grid5000/sites/nancy/network_equipments/stalc3.json @@ -1,4 +1,5 @@ { + "backplane_bps": 176000000000, "channels": { "naming_pattern": "Po%CHANNELID%" }, diff --git a/data/grid5000/sites/nancy/network_equipments/stalc4.json b/data/grid5000/sites/nancy/network_equipments/stalc4.json index 912d2f208db8b626872fa2d203682ddad5c7c2ef..97bcafa876ad4ff52c97b61c10f4f5bab6130098 100644 --- a/data/grid5000/sites/nancy/network_equipments/stalc4.json +++ b/data/grid5000/sites/nancy/network_equipments/stalc4.json @@ -1,4 +1,5 @@ { + "backplane_bps": 176000000000, "channels": { "naming_pattern": "Po%CHANNELID%" }, diff --git a/generators/input/sites/nancy/net-links/gw-nancy.yaml b/generators/input/sites/nancy/net-links/gw-nancy.yaml index e68d3536db9eff196a84b2a7b0390ec6f87438b6..e5bc4c788ff682d2f95ffe43945a7c7f30dd71e3 100644 --- a/generators/input/sites/nancy/net-links/gw-nancy.yaml +++ b/generators/input/sites/nancy/net-links/gw-nancy.yaml @@ -1,6 +1,6 @@ --- gw-nancy: - model: HP Procurve 5406zl + model: HP Procurve 5406zl J8697A kind: router site: nancy snmp_community: public @@ -11,10 +11,12 @@ gw-nancy: addresses: - 172.16.79.254 routes: {} - + backplane_bps: 346000000000 linecards: 1: naming_pattern: "%LINECARD:A%%PORT%" + backplane_bps: 14400000000 + model: J8702A kind: other rate: 1000000000 ports: @@ -98,6 +100,8 @@ gw-nancy: uid: fgrelon1 2: naming_pattern: "%LINECARD:A%%PORT%" + backplane_bps: 14400000000 + model: J8708A kind: switch rate: 1000000000 ports: @@ -105,6 +109,8 @@ gw-nancy: 4: sgriffon2 3: naming_pattern: "%LINECARD:A%%PORT%" + backplane_bps: 14400000000 + model: J8708A kind: switch rate: 1000000000 ports: @@ -113,6 +119,8 @@ gw-nancy: 4: sgraphene4 4: naming_pattern: "%LINECARD:A%%PORT%" + backplane_bps: 14400000000 + model: J8708A kind: switch rate: 1000000000 ports: @@ -130,9 +138,13 @@ gw-nancy: uid: sgriffon1 5: naming_pattern: "%LINECARD:A%%PORT%" + backplane_bps: 14400000000 + model: J8707A kind: virtual rate: 10000000000 ports: - 4: renater-nancy + 4: + uid: renater-nancy + kind: virtual channels: naming_pattern: Po%CHANNELID% diff --git a/generators/input/sites/nancy/net-links/sgraphene1.yaml b/generators/input/sites/nancy/net-links/sgraphene1.yaml index 1822a4329bbd180d631421e3dd5c491ddd8c2a8b..679cbe1e4284c73f236fe6cfa455c36d8b3f2d9a 100644 --- a/generators/input/sites/nancy/net-links/sgraphene1.yaml +++ b/generators/input/sites/nancy/net-links/sgraphene1.yaml @@ -1,23 +1,23 @@ ---- -sgraphene1: +--- +sgraphene1: model: 3com 4510G kind: switch site: nancy snmp_community: public - vlans: + vlans: naming_pattern: Vlan-interface%VLANID% - "1": + "1": administrative: yes - addresses: + addresses: - 172.16.79.201 routes: {} - - linecards: - 0: + backplane_bps: 176000000000 + linecards: + 0: naming_pattern: "GigabitEthernet1/%LINECARD%/%PORT%" kind: node rate: 10000000000 - ports: + ports: 2: graphene-1 1: graphene-2 4: graphene-3 @@ -57,11 +57,11 @@ sgraphene1: 38: graphene-37 37: graphene-38 40: graphene-39 - 1: + 1: naming_pattern: "Ten-GigabitEthernet1/%LINECARD%/%PORT%" kind: router rate: 100000000 - ports: + ports: 2: gw-nancy - channels: + channels: naming_pattern: Po%CHANNELID% diff --git a/generators/input/sites/nancy/net-links/sgraphene2.yaml b/generators/input/sites/nancy/net-links/sgraphene2.yaml index 61ba1aab3188edeb4e9081b2743dc9b243a89959..cd2baa7255b8e53c0df0c180ff8595cd893e8a23 100644 --- a/generators/input/sites/nancy/net-links/sgraphene2.yaml +++ b/generators/input/sites/nancy/net-links/sgraphene2.yaml @@ -1,23 +1,23 @@ ---- -sgraphene2: +--- +sgraphene2: model: 3com 4510G kind: switch site: nancy snmp_community: public - vlans: + vlans: naming_pattern: Vlan-interface%VLANID% - "1": + "1": administrative: yes - addresses: + addresses: - 172.16.79.202 routes: {} - - linecards: - 0: + backplane_bps: 176000000000 + linecards: + 0: naming_pattern: "GigabitEthernet1/%LINECARD%/%PORT%" kind: node rate: 10000000000 - ports: + ports: 2: graphene-41 1: graphene-40 3: graphene-42 @@ -53,11 +53,11 @@ sgraphene2: 33: graphene-72 34: graphene-73 35: graphene-74 - 1: + 1: naming_pattern: "Ten-GigabitEthernet1/%LINECARD%/%PORT%" kind: router rate: 100000000 - ports: + ports: 2: gw-nancy - channels: + channels: naming_pattern: Po%CHANNELID% diff --git a/generators/input/sites/nancy/net-links/sgraphene3.yaml b/generators/input/sites/nancy/net-links/sgraphene3.yaml index 3e9df9f11945cdbce5419657fc7ca1b184557f60..b7cbec233f5a7ed97ae52e96c060c7e973163870 100644 --- a/generators/input/sites/nancy/net-links/sgraphene3.yaml +++ b/generators/input/sites/nancy/net-links/sgraphene3.yaml @@ -1,23 +1,23 @@ ---- -sgraphene3: +--- +sgraphene3: model: 3com 4510G kind: switch site: nancy snmp_community: public - vlans: + vlans: naming_pattern: Vlan-interface%VLANID% - "1": + "1": administrative: yes - addresses: + addresses: - 172.16.79.203 routes: {} - - linecards: - 0: + backplane_bps: 176000000000 + linecards: + 0: naming_pattern: "GigabitEthernet1/%LINECARD%/%PORT%" kind: node rate: 10000000000 - ports: + ports: 2: graphene-75 1: graphene-76 4: graphene-77 @@ -48,11 +48,11 @@ sgraphene3: 27: graphene-102 30: graphene-103 29: graphene-104 - 1: + 1: naming_pattern: "Ten-GigabitEthernet1/%LINECARD%/%PORT%" kind: router rate: 100000000 - ports: + ports: 2: gw-nancy - channels: + channels: naming_pattern: Po%CHANNELID% diff --git a/generators/input/sites/nancy/net-links/sgraphene4.yaml b/generators/input/sites/nancy/net-links/sgraphene4.yaml index 0cb228e21fab7e28e2c6c0a420abd38a2a29e8f2..2365527b221c4360a3eeae50b4840dbf60a8f7c8 100644 --- a/generators/input/sites/nancy/net-links/sgraphene4.yaml +++ b/generators/input/sites/nancy/net-links/sgraphene4.yaml @@ -1,23 +1,23 @@ ---- -sgraphene4: +--- +sgraphene4: model: 3com 4510G kind: switch site: nancy snmp_community: public - vlans: + vlans: naming_pattern: Vlan-interface%VLANID% - "1": + "1": administrative: yes - addresses: + addresses: - 172.16.79.204 routes: {} - - linecards: - 0: + backplane_bps: 176000000000 + linecards: + 0: naming_pattern: "GigabitEthernet1/%LINECARD%/%PORT%" kind: node rate: 10000000000 - ports: + ports: 2: graphene-106 1: graphene-105 3: graphene-107 @@ -58,11 +58,11 @@ sgraphene4: 38: graphene-142 39: graphene-143 40: graphene-144 - 1: + 1: naming_pattern: "Ten-GigabitEthernet1/%LINECARD%/%PORT%" kind: router rate: 100000000 - ports: + ports: 1: gw-nancy - channels: + channels: naming_pattern: Po%CHANNELID% diff --git a/generators/input/sites/nancy/net-links/sgriffon1.yaml b/generators/input/sites/nancy/net-links/sgriffon1.yaml index 4439474251b4eff4fbdc8638b2afcd558f5f4a31..18886665008f4df393a81772f78c6e0a2c70f055 100644 --- a/generators/input/sites/nancy/net-links/sgriffon1.yaml +++ b/generators/input/sites/nancy/net-links/sgriffon1.yaml @@ -1,23 +1,23 @@ ---- -sgriffon1: +--- +sgriffon1: model: 3com 4500g kind: switch site: nancy snmp_community: public - vlans: + vlans: naming_pattern: Vlan-interface%VLANID% - "1": + "1": administrative: yes - addresses: + addresses: - 172.16.79.205 routes: {} - - linecards: - 0: + backplane_bps: 176000000000 + linecards: + 0: naming_pattern: "GigabitEthernet1/%LINECARD%/%PORT%" kind: node rate: 10000000000 - ports: + ports: 2: griffon-2 1: griffon-1 3: griffon-3 @@ -50,11 +50,11 @@ sgriffon1: 11: griffon-58 12: griffon-59 13: griffon-60 - 1: + 1: naming_pattern: "Ten-GigabitEthernet1/%LINECARD%/%PORT%" kind: router rate: 100000000 - ports: + ports: 2: gw-nancy - channels: + channels: naming_pattern: Po%CHANNELID% diff --git a/generators/input/sites/nancy/net-links/sgriffon2.yaml b/generators/input/sites/nancy/net-links/sgriffon2.yaml index 920d70ae59af890cc686d47c86a58d412a1ec33e..5709b686fa431ccb7e4aaa6aeaeb0ca037b5457a 100644 --- a/generators/input/sites/nancy/net-links/sgriffon2.yaml +++ b/generators/input/sites/nancy/net-links/sgriffon2.yaml @@ -1,23 +1,23 @@ ---- -sgriffon2: +--- +sgriffon2: model: 3com 4500g kind: switch site: nancy snmp_community: public - vlans: + vlans: naming_pattern: Vlan-interface%VLANID% - "1": + "1": administrative: yes - addresses: + addresses: - 172.16.79.206 routes: {} - - linecards: - 0: + backplane_bps: 176000000000 + linecards: + 0: naming_pattern: "GigabitEthernet1/%LINECARD%/%PORT%" kind: node rate: 10000000000 - ports: + ports: 2: griffon-31 1: griffon-30 3: griffon-32 @@ -46,11 +46,11 @@ sgriffon2: 41: griffon-55 42: griffon-56 43: griffon-57 - 1: + 1: naming_pattern: "Ten-GigabitEthernet1/%LINECARD%/%PORT%" kind: router rate: 100000000 - ports: + ports: 1: gw-nancy - channels: + channels: naming_pattern: Po%CHANNELID% diff --git a/generators/input/sites/nancy/net-links/sgriffon3.yaml b/generators/input/sites/nancy/net-links/sgriffon3.yaml index ad19ff2230bd64a314a8274ed042df91949db959..656876312e54a0e4fb00d897f3373634563ff907 100644 --- a/generators/input/sites/nancy/net-links/sgriffon3.yaml +++ b/generators/input/sites/nancy/net-links/sgriffon3.yaml @@ -1,23 +1,23 @@ ---- -sgriffon3: +--- +sgriffon3: model: 3com 4500g kind: switch site: nancy snmp_community: public - vlans: + vlans: naming_pattern: Vlan-interface%VLANID% - "1": + "1": administrative: yes - addresses: + addresses: - 172.16.79.207 routes: {} - - linecards: - 0: + backplane_bps: 176000000000 + linecards: + 0: naming_pattern: "GigabitEthernet1/%LINECARD%/%PORT%" kind: node rate: 10000000000 - ports: + ports: 4: griffon-61 5: griffon-62 6: griffon-63 @@ -50,11 +50,11 @@ sgriffon3: 42: griffon-90 43: griffon-91 44: griffon-92 - 1: + 1: naming_pattern: "Ten-GigabitEthernet1/%LINECARD%/%PORT%" kind: router rate: 10000000000 - ports: + ports: 1: gw-nancy - channels: + channels: naming_pattern: Po%CHANNELID% diff --git a/generators/input/sites/nancy/net-links/stalc1.yaml b/generators/input/sites/nancy/net-links/stalc1.yaml index 89c4fdf04d3f9b51ca15b4381d1591ef5861b39b..8a98b7acb37fbbfee1e9c9f8f6f93eb98ea6db9d 100644 --- a/generators/input/sites/nancy/net-links/stalc1.yaml +++ b/generators/input/sites/nancy/net-links/stalc1.yaml @@ -11,7 +11,7 @@ stalc1: addresses: - 172.16.79.224 routes: {} - + backplane_bps: 176000000000 linecards: 0: naming_pattern: "GigabitEthernet1/%LINECARD%/%PORT%" diff --git a/generators/input/sites/nancy/net-links/stalc2.yaml b/generators/input/sites/nancy/net-links/stalc2.yaml index 2c922db1736e40a952fc91ded105b7db9d0542e3..8534a50d59de8f6a020a21068a235524d60e35b8 100644 --- a/generators/input/sites/nancy/net-links/stalc2.yaml +++ b/generators/input/sites/nancy/net-links/stalc2.yaml @@ -11,7 +11,7 @@ stalc2: addresses: - 172.16.79.225 routes: {} - + backplane_bps: 176000000000 linecards: 0: naming_pattern: "GigabitEthernet1/%LINECARD%/%PORT%" diff --git a/generators/input/sites/nancy/net-links/stalc3.yaml b/generators/input/sites/nancy/net-links/stalc3.yaml index ca42db96f10d75b878ceda754447ffc79f41e5ff..c34b1fa0b715aae4bde58e9ed270131fb03fdbb9 100644 --- a/generators/input/sites/nancy/net-links/stalc3.yaml +++ b/generators/input/sites/nancy/net-links/stalc3.yaml @@ -1,23 +1,23 @@ ---- -stalc3: +--- +stalc3: model: 3com 4500G kind: switch site: nancy snmp_community: public - vlans: + vlans: naming_pattern: Vlan-interface%VLANID% - "1": + "1": administrative: yes - addresses: + addresses: - 172.16.79.226 routes: {} - - linecards: - 0: + backplane_bps: 176000000000 + linecards: + 0: naming_pattern: "GigabitEthernet1/%LINECARD%/%PORT%" kind: node rate: 10000000000 - ports: + ports: 2: talc-69 1: talc-68 3: talc-70 @@ -56,12 +56,12 @@ stalc3: 40: talc-103 41: talc-104 42: talc-133 - 1: + 1: naming_pattern: "Ten-GigabitEthernet1/%LINECARD%/%PORT%" kind: switch rate: 10000000000 - ports: + ports: 1: stalc1 2: stalc4 - channels: + channels: naming_pattern: Po%CHANNELID% diff --git a/generators/input/sites/nancy/net-links/stalc4.yaml b/generators/input/sites/nancy/net-links/stalc4.yaml index c29e1d752c8356ea97149de78016bfad68d8e4af..f18a41246de09f81c7bf690f2eccc94c1d8d40fc 100644 --- a/generators/input/sites/nancy/net-links/stalc4.yaml +++ b/generators/input/sites/nancy/net-links/stalc4.yaml @@ -11,7 +11,7 @@ stalc4: addresses: - 172.16.79.227 routes: {} - + backplane_bps: 176000000000 linecards: 0: naming_pattern: "GigabitEthernet1/%LINECARD%/%PORT%"