[rennes] Move vlan descriptions on the router

data/grid5000/sites/rennes/network_equipments/c6509.json

@@ -892,92 +892,12 @@
   ],
   "model": "Cisco WS-C6509-E",
   "mtu": 9216,
-  "routes": {
-
-  },
+  "routes": null,
   "site": "rennes",
   "snmp_community": "privkavlan",
   "type": "network_equipment",
   "uid": "c6509",
-  "vlans": {
-    "naming_pattern": "Vlan%VLANID%",
-    "vlan100": {
-      "addresses": [
-        "172.16.111.254"
-      ],
-      "administrative": true
-    },
-    "vlan101": {
-      "addresses": [
-        "172.17.111.254"
-      ]
-    },
-    "vlan500": {
-      "addresses": [
-        "192.168.4.19"
-      ]
-    },
-    "vlan701": {
-      "addresses": [
-        "192.168.192.0/20"
-      ],
-      "name": "kavlan-1"
-    },
-    "vlan702": {
-      "addresses": [
-        "192.168.208.0/20"
-      ],
-      "name": "kavlan-2"
-    },
-    "vlan703": {
-      "addresses": [
-        "192.168.224.0/20"
-      ],
-      "name": "kavlan-3"
-    },
-    "vlan704": {
-      "addresses": [
-        "10.24.0.0/18"
-      ],
-      "name": "kavlan-4"
-    },
-    "vlan705": {
-      "addresses": [
-        "10.24.64.0/18"
-      ],
-      "name": "kavlan-5"
-    },
-    "vlan706": {
-      "addresses": [
-        "10.24.128.0/18"
-      ],
-      "name": "kavlan-6"
-    },
-    "vlan707": {
-      "addresses": [
-        "10.24.192.0/18"
-      ],
-      "name": "kavlan-7"
-    },
-    "vlan708": {
-      "addresses": [
-        "10.25.0.0/18"
-      ],
-      "name": "kavlan-8"
-    },
-    "vlan709": {
-      "addresses": [
-        "10.25.64.0/18"
-      ],
-      "name": "kavlan-9"
-    },
-    "vlan716": {
-      "addresses": [
-        "10.27.192.0/18"
-      ],
-      "name": "kavlan-16"
-    }
-  },
+  "vlans": null,
   "weathermap": {
 
   }

data/grid5000/sites/rennes/network_equipments/gw-rennes.json

@@ -391,7 +391,86 @@
   "snmp_community": "public",
   "type": "network_equipment",
   "uid": "gw-rennes",
-  "vlans": null,
+  "vlans": {
+    "naming_pattern": "Vlan%VLANID%",
+    "vlan100": {
+      "addresses": [
+        "172.16.111.254"
+      ],
+      "administrative": true
+    },
+    "vlan101": {
+      "addresses": [
+        "172.17.111.254"
+      ],
+      "administrative": true
+    },
+    "vlan500": {
+      "addresses": [
+        "192.168.4.19"
+      ]
+    },
+    "vlan701": {
+      "addresses": [
+        "192.168.192.0/20"
+      ],
+      "name": "kavlan-1"
+    },
+    "vlan702": {
+      "addresses": [
+        "192.168.208.0/20"
+      ],
+      "name": "kavlan-2"
+    },
+    "vlan703": {
+      "addresses": [
+        "192.168.224.0/20"
+      ],
+      "name": "kavlan-3"
+    },
+    "vlan704": {
+      "addresses": [
+        "10.24.0.0/18"
+      ],
+      "name": "kavlan-4"
+    },
+    "vlan705": {
+      "addresses": [
+        "10.24.64.0/18"
+      ],
+      "name": "kavlan-5"
+    },
+    "vlan706": {
+      "addresses": [
+        "10.24.128.0/18"
+      ],
+      "name": "kavlan-6"
+    },
+    "vlan707": {
+      "addresses": [
+        "10.24.192.0/18"
+      ],
+      "name": "kavlan-7"
+    },
+    "vlan708": {
+      "addresses": [
+        "10.25.0.0/18"
+      ],
+      "name": "kavlan-8"
+    },
+    "vlan709": {
+      "addresses": [
+        "10.25.64.0/18"
+      ],
+      "name": "kavlan-9"
+    },
+    "vlan716": {
+      "addresses": [
+        "10.27.192.0/18"
+      ],
+      "name": "kavlan-16"
+    }
+  },
   "weathermap": {
 
   }

generators/input/sites/rennes/net-links/c6509.yaml

@@ -6,61 +6,6 @@ c6509:
   snmp_community: privkavlan
   backplane_bps: 720000000000
   mtu: 9216
-  vlans:
-    naming_pattern: Vlan%VLANID%
-    "vlan100":
-      administrative: yes
-      addresses:
-        - 172.16.111.254
-    "vlan101":
-      addresses:
-        - 172.17.111.254
-    "vlan500":
-      addresses:
-        - 192.168.4.19
-    "vlan701":
-      name: kavlan-1
-      addresses:
-        - 192.168.192.0/20
-    "vlan702":
-      name: kavlan-2
-      addresses:
-        - 192.168.208.0/20
-    "vlan703":
-      name: kavlan-3
-      addresses:
-        - 192.168.224.0/20
-    "vlan704":
-      name: kavlan-4
-      addresses:
-        - 10.24.0.0/18
-    "vlan705":
-      name: kavlan-5
-      addresses:
-        - 10.24.64.0/18	
-    "vlan706":
-      name: kavlan-6
-      addresses:
-        - 10.24.128.0/18
-    "vlan707":
-      name: kavlan-7
-      addresses:
-        - 10.24.192.0/18	
-    "vlan708":
-      name: kavlan-8
-      addresses:
-        - 10.25.0.0/18	
-    "vlan709":
-      name: kavlan-9
-      addresses:
-        - 10.25.64.0/18
-    "vlan716":
-      name: kavlan-16
-      addresses:
-        - 10.27.192.0/18
-
-  routes: {}
-
   linecards:
     1:
       kind: virtual

generators/input/sites/rennes/net-links/gw-rennes.yaml

@@ -7,6 +7,60 @@ gw-rennes:
   routes: {}
   backplane_bps: 1440000000000
   mtu: 1500
+  vlans:
+    naming_pattern: Vlan%VLANID%
+    "vlan100":
+      administrative: yes
+      addresses:
+        - 172.16.111.254
+    "vlan101":
+      administrative: yes
+      addresses:
+        - 172.17.111.254
+    "vlan500":
+      addresses:
+        - 192.168.4.19
+    "vlan701":
+      name: kavlan-1
+      addresses:
+        - 192.168.192.0/20
+    "vlan702":
+      name: kavlan-2
+      addresses:
+        - 192.168.208.0/20
+    "vlan703":
+      name: kavlan-3
+      addresses:
+        - 192.168.224.0/20
+    "vlan704":
+      name: kavlan-4
+      addresses:
+        - 10.24.0.0/18
+    "vlan705":
+      name: kavlan-5
+      addresses:
+        - 10.24.64.0/18
+    "vlan706":
+      name: kavlan-6
+      addresses:
+        - 10.24.128.0/18
+    "vlan707":
+      name: kavlan-7
+      addresses:
+        - 10.24.192.0/18
+    "vlan708":
+      name: kavlan-8
+      addresses:
+        - 10.25.0.0/18
+    "vlan709":
+      name: kavlan-9
+      addresses:
+        - 10.25.64.0/18
+    "vlan716":
+      name: kavlan-16
+      addresses:
+        - 10.27.192.0/18
+  routes: {}
   linecards:
     1:
       naming_pattern: "Ethernet%LINECARD%/%PORT%"