Skip to content

GitLab

Une MAJ de sécurité est nécessaire sur notre version actuelle. Elle sera effectuée lundi 02/08 entre 12h30 et 13h. L'interruption de service devrait durer quelques minutes (probablement moins de 5 minutes).

Commit cc2c870b authored by Tina Rakotoarivelo's avatar Tina Rakotoarivelo
Browse files

[net-links] Toulouse - Add changes for weathermap

parent 7cc30598
Hide whitespace changes
Inline Side-by-side
Showing with 622 additions and 50 deletions
data/grid5000/sites/toulouse/network_equipments/c6500-grid5000.json
View file @ cc2c870b
......@@ -8,63 +8,218 @@
},
{
"kind": "switch",
"kind": "renater",
"naming_pattern": "Te%LINECARD%/%PORT%",
"ports": [
{
},
{
"uid": "gw-g5k"
"uid": "RENATER"
},
{
"kind": "router",
"uid": "r4.toulouse.grid5000.fr"
}
],
"rate": 1000000000
"rate": 10000000000
},
{
"kind": "node",
"naming_pattern": "Gi%LINECARD%/%PORT%",
"ports": [
{
},
{
"uid": "pastel-81"
},
{
"uid": "pastel-82"
},
{
"uid": "pastel-83"
},
{
"uid": "pastel-84"
},
{
"uid": "pastel-85"
},
{
"uid": "pastel-86"
},
{
"uid": "pastel-87"
},
{
"uid": "pastel-88"
},
{
"uid": "pastel-89"
},
{
"uid": "pastel-90"
},
{
"uid": "pastel-91"
},
{
"uid": "pastel-92"
},
{
"uid": "pastel-93"
},
{
"uid": "pastel-94"
},
{
"uid": "pastel-95"
},
{
"uid": "pastel-96"
},
{
"uid": "pastel-97"
},
{
"uid": "pastel-98"
},
{
"uid": "pastel-99"
},
{
"uid": "pastel-100"
},
{
"uid": "pastel-121"
},
{
"uid": "pastel-122"
},
{
"uid": "pastel-123"
},
{
"uid": "pastel-124"
},
{
"uid": "pastel-125"
},
{
"uid": "pastel-126"
},
{
"uid": "pastel-127"
},
{
"uid": "pastel-128"
},
{
"uid": "pastel-129"
},
{
"uid": "pastel-101"
},
{
"uid": "pastel-102"
},
{
"uid": "pastel-103"
},
{
"uid": "pastel-104"
},
{
"uid": "pastel-105"
},
{
"uid": "pastel-106"
},
{
"uid": "pastel-107"
},
{
"uid": "pastel-108"
},
{
"uid": "pastel-109"
},
{
"uid": "pastel-110"
},
{
"uid": "pastel-111"
},
{
"uid": "pastel-112"
},
{
"uid": "pastel-113"
},
{
"uid": "pastel-114"
},
{
"uid": "pastel-115"
},
{
"uid": "pastel-116"
},
{
"uid": "pastel-117"
},
{
"uid": "pastel-118"
},
{
"uid": "pastel-119"
}
],
"rate": 1000000000
},
{
"kind": "switch",
"kind": "node",
"naming_pattern": "Gi%LINECARD%/%PORT%",
"ports": [
{
},
{
"uid": "pastel-120"
},
{
"uid": "pastel-130"
},
{
"uid": "pastel-131"
},
{
"uid": "pastel-132"
},
{
"uid": "pastel-133"
},
{
"uid": "pastel-134"
},
{
"uid": "pastel-135"
},
{
"uid": "pastel-136"
},
{
"uid": "pastel-137"
},
{
"uid": "pastel-138"
},
{
"uid": "pastel-139"
},
{
"uid": "pastel-140"
},
{
......@@ -136,10 +291,13 @@
},
{
"kind": "switch",
"uid": "CICT"
},
{
"kind": "switch",
"port": "bmc",
"uid": "spastel1-ipmi"
},
{
......@@ -163,17 +321,20 @@
},
{
"kind": "other",
"uid": "g5kservices2"
},
{
"kind": "other",
"uid": "g5kservices3"
},
{
"kind": "other",
"uid": "g5kservices1"
},
{
"kind": "other",
"uid": "nfs-violette"
"uid": "nfs-g5k"
}
],
"rate": 1000000000
......
data/grid5000/sites/toulouse/network_equipments/r4.json
View file @ cc2c870b
......@@ -2,13 +2,140 @@
"channels": {
"naming_pattern": "Po%CHANNELID%"
},
"kind": "switch",
"kind": "router",
"linecards": [
{
},
{
"kind": "node",
"naming_pattern": "Gi%LINECARD%/%PORT%",
"ports": [
{
},
{
"uid": "pastel-1"
},
{
"uid": "pastel-2"
},
{
"uid": "pastel-3"
},
{
"uid": "pastel-4"
},
{
"uid": "pastel-5"
},
{
"uid": "pastel-6"
},
{
"uid": "pastel-7"
},
{
"uid": "pastel-8"
},
{
"uid": "pastel-9"
},
{
"uid": "pastel-10"
},
{
"uid": "pastel-11"
},
{
"uid": "pastel-12"
},
{
"uid": "pastel-13"
},
{
"uid": "pastel-14"
},
{
"uid": "pastel-15"
},
{
"uid": "pastel-16"
},
{
"uid": "pastel-17"
},
{
"uid": "pastel-18"
},
{
"uid": "pastel-19"
},
{
"uid": "pastel-20"
},
{
"uid": "pastel-21"
},
{
"uid": "pastel-22"
},
{
"uid": "pastel-23"
},
{
"uid": "pastel-24"
},
{
"uid": "pastel-25"
},
{
"uid": "pastel-26"
},
{
"uid": "pastel-27"
},
{
"uid": "pastel-28"
},
{
"uid": "pastel-29"
},
{
"uid": "pastel-30"
},
{
"uid": "pastel-31"
},
{
"uid": "pastel-32"
},
{
"uid": "pastel-33"
},
{
"uid": "pastel-34"
},
{
"uid": "pastel-36"
},
{
"uid": "pastel-37"
},
{
"uid": "pastel-35"
},
{
"uid": "pastel-38"
},
{
"uid": "pastel-39"
},
{
"uid": "pastel-40"
}
],
"rate": 1000000000
},
{
"kind": "router",
......@@ -18,29 +145,140 @@
},
{
"uid": "gw-g5k"
"uid": "gw"
}
],
"rate": 1000000000
"rate": 10000000000
},
{
"kind": "switch",
"naming_pattern": "Te%LINECARD%/%PORT%",
},
{
"kind": "node",
"naming_pattern": "Gi%LINECARD%/%PORT%",
"ports": [
{
},
{
"uid": "bb1"
"uid": "pastel-41"
},
{
"uid": "pastel-42"
},
{
"uid": "pastel-43"
},
{
"uid": "pastel-44"
},
{
"uid": "pastel-45"
},
{
"uid": "pastel-46"
},
{
"uid": "pastel-47"
},
{
"uid": "pastel-48"
},
{
"uid": "pastel-49"
},
{
"uid": "pastel-50"
},
{
"uid": "pastel-51"
},
{
"uid": "pastel-52"
},
{
"uid": "pastel-53"
},
{
"uid": "pastel-54"
},
{
"uid": "pastel-55"
},
{
"uid": "pastel-56"
},
{
"uid": "pastel-57"
},
{
"uid": "pastel-58"
},
{
"uid": "r1"
"uid": "pastel-59"
},
{
"uid": "r2"
"uid": "pastel-60"
},
{
"uid": "r3"
"uid": "pastel-61"
},
{
"uid": "pastel-62"
},
{
"uid": "pastel-63"
},
{
"uid": "pastel-64"
},
{
"uid": "pastel-65"
},
{
"uid": "pastel-66"
},
{
"uid": "pastel-67"
},
{
"uid": "pastel-68"
},
{
"uid": "pastel-69"
},
{
"uid": "pastel-70"
},
{
"uid": "pastel-71"
},
{
"uid": "pastel-72"
},
{
"uid": "pastel-73"
},
{
"uid": "pastel-74"
},
{
"uid": "pastel-75"
},
{
"uid": "pastel-76"
},
{
"uid": "pastel-77"
},
{
"uid": "pastel-78"
},
{
"uid": "pastel-79"
},
{
"uid": "pastel-80"
}
],
"rate": 1000000000
......@@ -55,9 +293,15 @@
"type": "network_equipment",
"uid": "r4",
"vlans": {
"100": {
"addresses": [
"172.16.127.201"
],
"administrative": true
},
"naming_pattern": "Vlan%VLANID%"
},
"weathermap": {
"use_cacti": "no"
}
}
\ No newline at end of file
generators/input/sites/toulouse/net-links/c6500-grid5000.yaml
View file @ cc2c870b
......@@ -14,18 +14,102 @@ c6500-grid5000:
- 172.16.127.254
linecards:
1:
kind: switch
kind: renater
naming_pattern: Te%LINECARD%/%PORT%
rate: 1000000000
rate: 10000000000
ports:
1: gw-g5k
1: RENATER
2:
kind: router
uid: r4.toulouse.grid5000.fr
2:
kind: node
naming_pattern: Gi%LINECARD%/%PORT%
rate: 1000000000
ports:
1: pastel-81
2: pastel-82
3: pastel-83