diff --git a/data/grid5000/sites/rennes/network_equipments/gw.json b/data/grid5000/sites/rennes/network_equipments/gw.json
new file mode 100644
index 0000000000000000000000000000000000000000..e253b08d68e58b4ddc46907d0dbf76ea9b7fb297
--- /dev/null
+++ b/data/grid5000/sites/rennes/network_equipments/gw.json
@@ -0,0 +1,943 @@
+{
+ "channels": {
+ "naming_pattern": "Po%CHANNELID%"
+ },
+ "kind": "switch",
+ "linecards": [
+ {
+
+ },
+ {
+
+ },
+ {
+ "kind": "node",
+ "naming_pattern": "Gi%LINECARD%/%PORT%",
+ "ports": [
+ {
+
+ },
+ {
+ "uid": "paramount-32"
+ },
+ {
+ "uid": "paramount-27"
+ },
+ {
+ "uid": "paramount-19"
+ },
+ {
+ "uid": "paramount-11"
+ },
+ {
+ "uid": "paramount-9"
+ },
+ {
+ "uid": "paramount-16"
+ },
+ {
+
+ },
+ {
+ "uid": "paramount-29"
+ },
+ {
+
+ },
+ {
+ "uid": "paramount-10"
+ },
+ {
+ "uid": "paradent-46"
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+ "uid": "paramount-7"
+ },
+ {
+
+ },
+ {
+ "uid": "paramount-8"
+ },
+ {
+ "uid": "paramount-20"
+ },
+ {
+ "uid": "paramount-2"
+ },
+ {
+ "uid": "paramount-4"
+ },
+ {
+ "uid": "paramount-5"
+ },
+ {
+ "uid": "paramount-1"
+ },
+ {
+ "uid": "paramount-3"
+ },
+ {
+ "uid": "paramount-6"
+ },
+ {
+ "uid": "parapluie-5"
+ },
+ {
+
+ },
+ {
+ "uid": "parapluie-10"
+ },
+ {
+ "uid": "parapluie-2"
+ },
+ {
+ "uid": "parapluie-8"
+ },
+ {
+ "uid": "parapluie-3"
+ },
+ {
+ "uid": "parapluie-9"
+ },
+ {
+ "uid": "parapluie-6"
+ },
+ {
+ "uid": "parapluie-13"
+ },
+ {
+ "uid": "parapluie-14"
+ },
+ {
+ "uid": "parapluie-15"
+ },
+ {
+ "uid": "parapluie-11"
+ },
+ {
+ "uid": "parapluie-12"
+ },
+ {
+ "uid": "parapluie-19"
+ },
+ {
+ "uid": "parapluie-20"
+ },
+ {
+ "uid": "parapluie-16"
+ },
+ {
+ "uid": "parapluie-18"
+ },
+ {
+ "uid": "parapluie-17"
+ },
+ {
+ "uid": "parapluie-25"
+ },
+ {
+ "uid": "parapluie-24"
+ }
+ ],
+ "rate": 1000
+ },
+ {
+ "kind": "node",
+ "naming_pattern": "Gi%LINECARD%/%PORT%",
+ "ports": [
+ {
+
+ },
+ {
+ "uid": "paramount-18"
+ },
+ {
+ "uid": "paramount-23"
+ },
+ {
+ "uid": "paramount-22"
+ },
+ {
+ "uid": "paramount-17"
+ },
+ {
+ "uid": "paramount-26"
+ },
+ {
+
+ },
+ {
+ "uid": "paramount-24"
+ },
+ {
+ "uid": "paramount-15"
+ },
+ {
+ "uid": "paramount-25"
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+ "uid": "paramount-12"
+ },
+ {
+ "uid": "paramount-13"
+ },
+ {
+ "uid": "paramount-33"
+ },
+ {
+ "uid": "paradent-42"
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+ "uid": "parapluie-1"
+ },
+ {
+
+ },
+ {
+ "uid": "parapluie-7"
+ },
+ {
+ "uid": "parapluie-4"
+ },
+ {
+ "uid": "parapluie-23"
+ },
+ {
+ "uid": "parapluie-21"
+ },
+ {
+ "uid": "parapluie-22"
+ }
+ ],
+ "rate": 1000
+ },
+ {
+ "kind": "node",
+ "naming_pattern": "Gi%LINECARD%/%PORT%",
+ "ports": [
+ {
+
+ },
+ {
+ "uid": "paradent-6"
+ },
+ {
+ "uid": "paradent-2"
+ },
+ {
+ "uid": "paradent-1"
+ },
+ {
+ "uid": "paradent-9"
+ },
+ {
+ "uid": "paradent-4"
+ },
+ {
+ "uid": "paradent-10"
+ },
+ {
+ "uid": "paradent-3"
+ },
+ {
+ "uid": "paradent-8"
+ },
+ {
+ "uid": "paradent-5"
+ },
+ {
+ "uid": "paradent-7"
+ },
+ {
+ "uid": "paradent-61"
+ },
+ {
+
+ },
+ {
+ "uid": "paradent-59"
+ },
+ {
+ "uid": "paradent-57"
+ },
+ {
+ "uid": "paradent-58"
+ },
+ {
+ "uid": "paradent-62"
+ },
+ {
+ "uid": "paradent-56"
+ },
+ {
+ "uid": "paradent-54"
+ },
+ {
+ "uid": "paradent-55"
+ },
+ {
+ "uid": "paradent-60"
+ },
+ {
+
+ },
+ {
+ "uid": "paradent-43"
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+ "uid": "parapluie-28"
+ },
+ {
+ "uid": "parapluie-27"
+ },
+ {
+ "uid": "parapluie-35"
+ },
+ {
+ "uid": "parapluie-38"
+ },
+ {
+ "uid": "parapluie-36"
+ },
+ {
+ "uid": "parapluie-39"
+ },
+ {
+ "uid": "parapluie-40"
+ },
+ {
+ "uid": "parapluie-37"
+ },
+ {
+ "uid": "parapluie-34"
+ },
+ {
+ "uid": "parapluie-32"
+ },
+ {
+ "uid": "parapluie-31"
+ },
+ {
+ "uid": "parapluie-30"
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+ "uid": "parapluie-26"
+ },
+ {
+
+ },
+ {
+ "uid": "parapluie-29"
+ }
+ ],
+ "rate": 1000
+ },
+ {
+
+ },
+ {
+ "kind": "node",
+ "naming_pattern": "Gi%LINECARD%/%PORT%",
+ "ports": [
+ {
+
+ },
+ {
+ "uid": "paradent-44"
+ },
+ {
+ "uid": "paradent-50"
+ },
+ {
+ "uid": "paradent-49"
+ },
+ {
+ "uid": "paradent-48"
+ },
+ {
+ "uid": "paradent-47"
+ },
+ {
+ "uid": "paradent-45"
+ },
+ {
+ "uid": "paradent-53"
+ },
+ {
+
+ },
+ {
+ "uid": "paradent-52"
+ },
+ {
+ "uid": "paradent-51"
+ },
+ {
+ "uid": "paradent-14"
+ },
+ {
+ "uid": "paradent-18"
+ },
+ {
+ "uid": "paradent-11"
+ },
+ {
+ "uid": "paradent-12"
+ },
+ {
+ "uid": "paradent-15"
+ },
+ {
+ "uid": "paradent-16"
+ },
+ {
+ "uid": "paradent-19"
+ },
+ {
+ "uid": "paradent-20"
+ },
+ {
+ "uid": "paradent-13"
+ },
+ {
+ "uid": "paradent-17"
+ },
+ {
+ "uid": "paradent-63"
+ },
+ {
+ "uid": "paradent-64"
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+ "uid": "parapluie-33"
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+ "uid": "parapide-24"
+ },
+ {
+ "uid": "parapide-22"
+ },
+ {
+ "uid": "parapide-18"
+ },
+ {
+ "uid": "parapide-19"
+ },
+ {
+ "uid": "parapide-17"
+ },
+ {
+ "uid": "parapide-16"
+ },
+ {
+ "uid": "parapide-20"
+ },
+ {
+ "uid": "parapide-14"
+ },
+ {
+ "uid": "parapide-11"
+ },
+ {
+ "uid": "parapide-15"
+ },
+ {
+ "uid": "parapide-13"
+ },
+ {
+ "uid": "parapide-12"
+ }
+ ],
+ "rate": 1000
+ },
+ {
+ "kind": "node",
+ "naming_pattern": "Gi%LINECARD%/%PORT%",
+ "ports": [
+ {
+
+ },
+ {
+ "uid": "paradent-26"
+ },
+ {
+ "uid": "paradent-29"
+ },
+ {
+ "uid": "paradent-23"
+ },
+ {
+ "uid": "paradent-25"
+ },
+ {
+ "uid": "paradent-28"
+ },
+ {
+ "uid": "paradent-24"
+ },
+ {
+ "uid": "paradent-21"
+ },
+ {
+ "uid": "paradent-30"
+ },
+ {
+ "uid": "paradent-27"
+ },
+ {
+ "uid": "paradent-22"
+ },
+ {
+ "uid": "paradent-36"
+ },
+ {
+ "uid": "paradent-39"
+ },
+ {
+ "uid": "paradent-38"
+ },
+ {
+ "uid": "paradent-40"
+ },
+ {
+ "uid": "paradent-31"
+ },
+ {
+ "uid": "paradent-32"
+ },
+ {
+ "uid": "paradent-35"
+ },
+ {
+ "uid": "paradent-37"
+ },
+ {
+ "uid": "paradent-34"
+ },
+ {
+ "uid": "paradent-33"
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+ "uid": "parapide-3"
+ },
+ {
+
+ },
+ {
+ "uid": "parapide-21"
+ },
+ {
+ "uid": "parapide-23"
+ },
+ {
+ "uid": "parapide-25"
+ },
+ {
+ "uid": "parapide-6"
+ },
+ {
+ "uid": "parapide-7"
+ },
+ {
+ "uid": "parapide-9"
+ },
+ {
+ "uid": "parapide-8"
+ },
+ {
+ "uid": "parapide-10"
+ },
+ {
+ "uid": "parapide-5"
+ },
+ {
+
+ },
+ {
+ "uid": "parapide-4"
+ },
+ {
+ "uid": "parapide-1"
+ },
+ {
+ "uid": "parapide-2"
+ }
+ ],
+ "rate": 1000
+ },
+ {
+ "kind": "node",
+ "naming_pattern": "Gi%LINECARD%/%PORT%",
+ "ports": [
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+ "uid": "paradent-41"
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+ "uid": "paramount-28"
+ }
+ ],
+ "rate": 1000
+ }
+ ],
+ "model": "cisco",
+ "routes": {
+
+ },
+ "site_uid": "rennes",
+ "snmp_community": "privkavlan",
+ "type": "network_equipment",
+ "uid": "gw",
+ "vlans": {
+ "naming_pattern": "Vlan%VLANID%"
+ }
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/rennes.json b/data/grid5000/sites/rennes/rennes.json
index c589b942030a5f1f4c3fa73ee71c2594d8235021..99ad5e450bdd3136f0f401dc599ebc33ba09d176 100755
--- a/data/grid5000/sites/rennes/rennes.json
+++ b/data/grid5000/sites/rennes/rennes.json
@@ -1,15 +1,4 @@
{
- "compilation_server": false,
- "description": "",
- "email_contact": "rennes-staff@lists.grid5000.fr",
- "latitude": 48.1,
- "location": "Rennes, France",
- "longitude": -1.6667,
- "name": "Rennes",
- "security_contact": "rennes-staff@lists.grid5000.fr",
- "sys_admin_contact": "rennes-staff@lists.grid5000.fr",
"type": "site",
- "uid": "rennes",
- "user_support_contact": "rennes-staff@lists.grid5000.fr",
- "web": "http://www.irisa.fr"
+ "uid": "rennes"
}
\ No newline at end of file
diff --git a/generators/input/rennes/net-links.yaml b/generators/input/rennes/net-links.yaml
index 0be7e547e5794a4e830603ad688fa4f3172f3584..d39f8ac82154f6b54879b702416985ea5a7dd5c4 100644
--- a/generators/input/rennes/net-links.yaml
+++ b/generators/input/rennes/net-links.yaml
@@ -2,19 +2,200 @@
gw:
model: cisco
kind: switch
- snmp_community: g5ksub
+ site: rennes
+ snmp_community: privkavlan
routes: {}
vlans:
naming_pattern: Vlan%VLANID%
linecards:
- 0:
- kind: switch
+ 2:
+ kind: node
naming_pattern: Gi%LINECARD%/%PORT%
- rate: 1000000
+ rate: 1000
ports:
- 44: sw-admin4
- 45: sw-admin3
+ 26: paramount-1
+ 10: paramount-10
+ 4: paramount-11
+ 6: paramount-16
+ 3: paramount-19
+ 23: paramount-2
+ 22: paramount-20
+ 2: paramount-27
+ 8: paramount-29
+ 27: paramount-3
+ 1: paramount-32
+ 24: paramount-4
+ 25: paramount-5
+ 28: paramount-6
+ 19: paramount-7
+ 21: paramount-8
+ 5: paramount-9
+ 31: parapluie-10
+ 40: parapluie-11
+ 41: parapluie-12
+ 37: parapluie-13
+ 38: parapluie-14
+ 39: parapluie-15
+ 44: parapluie-16
+ 46: parapluie-17
+ 45: parapluie-18
+ 42: parapluie-19
+ 32: parapluie-2
+ 43: parapluie-20
+ 48: parapluie-24
+ 47: parapluie-25
+ 34: parapluie-3
+ 29: parapluie-5
+ 36: parapluie-6
+ 33: parapluie-8
+ 35: parapluie-9
+ 11: paradent-46
+ 3:
+ kind: node
+ naming_pattern: Gi%LINECARD%/%PORT%
+ rate: 1000
+ ports:
+ 12: paramount-12
+ 13: paramount-13
+ 8: paramount-15
+ 4: paramount-17
+ 1: paramount-18
+ 3: paramount-22
+ 2: paramount-23
+ 7: paramount-24
+ 9: paramount-25
+ 5: paramount-26
+ 14: paramount-33
+ 42: parapluie-1
+ 47: parapluie-21
+ 48: parapluie-22
+ 46: parapluie-23
+ 45: parapluie-4
+ 44: parapluie-7
+ 15: paradent-42
+ 8:
+ kind: node
+ naming_pattern: Gi%LINECARD%/%PORT%
+ rate: 1000
+ ports:
+ 45: paramount-28
+ 16: paradent-41
+ 7:
+ kind: node
+ naming_pattern: Gi%LINECARD%/%PORT%
+ rate: 1000
+ ports:
+ 47: parapide-1
+ 43: parapide-10
+ 48: parapide-2
+ 36: parapide-21
+ 37: parapide-23
+ 38: parapide-25
+ 34: parapide-3
+ 46: parapide-4
+ 44: parapide-5
+ 39: parapide-6
+ 40: parapide-7
+ 42: parapide-8
+ 41: parapide-9
+ 7: paradent-21
+ 10: paradent-22
+ 3: paradent-23
+ 6: paradent-24
+ 4: paradent-25
+ 1: paradent-26
+ 9: paradent-27
+ 5: paradent-28
+ 2: paradent-29
+ 8: paradent-30
+ 15: paradent-31
+ 16: paradent-32
+ 20: paradent-33
+ 19: paradent-34
+ 17: paradent-35
+ 11: paradent-36
+ 18: paradent-37
+ 13: paradent-38
+ 12: paradent-39
+ 14: paradent-40
+ 6:
+ kind: node
+ naming_pattern: Gi%LINECARD%/%PORT%
+ rate: 1000
+ ports:
+ 45: parapide-11
+ 48: parapide-12
+ 47: parapide-13
+ 44: parapide-14
+ 46: parapide-15
+ 42: parapide-16
+ 41: parapide-17
+ 39: parapide-18
+ 40: parapide-19
+ 43: parapide-20
+ 38: parapide-22
+ 37: parapide-24
+ 33: parapluie-33
+ 13: paradent-11
+ 14: paradent-12
+ 19: paradent-13
+ 11: paradent-14
+ 15: paradent-15
+ 16: paradent-16
+ 20: paradent-17
+ 12: paradent-18
+ 17: paradent-19
+ 18: paradent-20
+ 1: paradent-44
+ 6: paradent-45
+ 5: paradent-47
+ 4: paradent-48
+ 3: paradent-49
+ 2: paradent-50
+ 10: paradent-51
+ 9: paradent-52
+ 7: paradent-53
+ 21: paradent-63
+ 22: paradent-64
+ 4:
+ kind: node
+ naming_pattern: Gi%LINECARD%/%PORT%
+ rate: 1000
+ ports:
+ 46: parapluie-26
+ 32: parapluie-27
+ 31: parapluie-28
+ 48: parapluie-29
+ 42: parapluie-30
+ 41: parapluie-31
+ 40: parapluie-32
+ 39: parapluie-34
+ 33: parapluie-35
+ 35: parapluie-36
+ 38: parapluie-37
+ 34: parapluie-38
+ 36: parapluie-39
+ 37: parapluie-40
+ 3: paradent-1
+ 6: paradent-10
+ 2: paradent-2
+ 7: paradent-3
+ 5: paradent-4
+ 22: paradent-43
+ 9: paradent-5
+ 18: paradent-54
+ 19: paradent-55
+ 17: paradent-56
+ 14: paradent-57
+ 15: paradent-58
+ 13: paradent-59
+ 1: paradent-6
+ 20: paradent-60
+ 11: paradent-61
+ 16: paradent-62
+ 10: paradent-7
+ 8: paradent-8
+ 4: paradent-9
channels:
naming_pattern: Po%CHANNELID%
-