From 00eb10b66e1cfb0aab0d38aa36dbfaf70bc008c5 Mon Sep 17 00:00:00 2001
From: Baptiste Jonglez <baptiste.jonglez@imag.fr>
Date: Wed, 6 Jan 2021 16:56:20 +0100
Subject: [PATCH] [grenoble] Switch to new gateway as main router

---
 .../{gw-new.yaml => gw-grenoble.yaml}         |  73 ++++++++-
 .../grid5000/sites/grenoble/networks/gw.yaml  | 155 ------------------
 2 files changed, 70 insertions(+), 158 deletions(-)
 rename input/grid5000/sites/grenoble/networks/{gw-new.yaml => gw-grenoble.yaml} (67%)
 delete mode 100644 input/grid5000/sites/grenoble/networks/gw.yaml

diff --git a/input/grid5000/sites/grenoble/networks/gw-new.yaml b/input/grid5000/sites/grenoble/networks/gw-grenoble.yaml
similarity index 67%
rename from input/grid5000/sites/grenoble/networks/gw-new.yaml
rename to input/grid5000/sites/grenoble/networks/gw-grenoble.yaml
index 85abd79c8ca..ddda3ea8e8b 100644
--- a/input/grid5000/sites/grenoble/networks/gw-new.yaml
+++ b/input/grid5000/sites/grenoble/networks/gw-grenoble.yaml
@@ -1,14 +1,81 @@
 ---
-gw-new:
+gw:
   role: production
   model: Dell S5296F-ON
   serial: H47D9Z2
   warranty: "2027-11-03"
-  kind: switch
+  kind: router
+  alias:
+    - sw-imag
+    - gw-grenoble
   site: grenoble
   snmp_community: public
-  ip: 172.16.31.252
   backplane_bps: 6400000000000
+  metrics:
+    - name: network_ifacein_bytes_total
+      description: Input byte counter for the network device port
+      period: 1000
+      source:
+        protocol: snmp
+        id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+    - name: network_ifaceout_bytes_total
+      description: Output byte counter for the network device port
+      period: 1000
+      source:
+        protocol: snmp
+        id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+  ip: 172.16.31.254
+  vlans:
+    "vlan100":
+      administrative: yes
+      addresses:
+        - 172.16.31.254
+    "vlan101":
+      addresses:
+        - 172.17.31.254
+    "vlan500":
+      addresses:
+        - 192.168.4.15
+    "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.4.0.0/18
+    "vlan705":
+      name: kavlan-5
+      addresses:
+        - 10.4.64.0/18
+    "vlan706":
+      name: kavlan-6
+      addresses:
+        - 10.4.128.0/18
+    "vlan707":
+      name: kavlan-7
+      addresses:
+        - 10.4.192.0/18
+    "vlan708":
+      name: kavlan-8
+      addresses:
+        - 10.5.0.0/18
+    "vlan709":
+      name: kavlan-9
+      addresses:
+        - 10.5.64.0/18
+    "vlan711":
+      name: kavlan-11
+      addresses:
+        - 10.7.192.0/18
   linecards:
     0:
       snmp_pattern: "ethernet1/1/%PORT%:1"
diff --git a/input/grid5000/sites/grenoble/networks/gw.yaml b/input/grid5000/sites/grenoble/networks/gw.yaml
deleted file mode 100644
index 044f2d5580a..00000000000
--- a/input/grid5000/sites/grenoble/networks/gw.yaml
+++ /dev/null
@@ -1,155 +0,0 @@
----
-gw:
-  role: production
-  model: ExtremeNetworks
-  kind: router
-  alias:
-    - sw-imag
-    - gw-grenoble
-  site: grenoble
-  warranty: expired
-  backplane_bps: 800000000000
-  snmp_community: public
-  metrics:
-    - name: network_ifacein_bytes_total
-      description: Input byte counter for the network device port
-      period: 1000
-      source:
-        protocol: snmp
-        id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
-    - name: network_ifaceout_bytes_total
-      description: Output byte counter for the network device port
-      period: 1000
-      source:
-        protocol: snmp
-        id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
-  ip: 172.16.31.254
-  vlans:
-    "vlan100":
-      administrative: yes
-      addresses:
-        - 172.16.31.254
-    "vlan101":
-      addresses:
-        - 172.17.31.254
-    "vlan500":
-      addresses:
-        - 192.168.4.15
-    "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.4.0.0/18
-    "vlan705":
-      name: kavlan-5
-      addresses:
-        - 10.4.64.0/18
-    "vlan706":
-      name: kavlan-6
-      addresses:
-        - 10.4.128.0/18
-    "vlan707":
-      name: kavlan-7
-      addresses:
-        - 10.4.192.0/18
-    "vlan708":
-      name: kavlan-8
-      addresses:
-        - 10.5.0.0/18
-    "vlan709":
-      name: kavlan-9
-      addresses:
-        - 10.5.64.0/18
-    "vlan711":
-      name: kavlan-11
-      addresses:
-        - 10.7.192.0/18
-  linecards:
-    0:
-      snmp_pattern: "X670V-48x Port %PORT%"
-      kavlan_pattern: "%PORT%"
-      backplane_bps: 48000000000
-      kind: node
-      rate: 10000000000
-      ports:
-        1: dahu-1
-        2: dahu-2
-        3: dahu-3
-        4: dahu-4
-        5: dahu-5
-        6: dahu-6
-        7: dahu-7
-        8: dahu-8
-        9: dahu-9
-        10: dahu-10
-        11: dahu-11
-        12: dahu-12
-        13: dahu-13
-        14: dahu-14
-        15: dahu-15
-        16: dahu-16
-        17: dahu-17
-        18: dahu-18
-        19: dahu-19
-        20: dahu-20
-        21: dahu-21
-        22: dahu-22
-        23: dahu-23
-        24: dahu-24
-        25: dahu-25
-        26: dahu-26
-        27: dahu-27
-        28: dahu-28
-        29: dahu-29
-        30: dahu-30
-        31: dahu-31
-        32: dahu-32
-        33: yeti-1
-        34: yeti-2
-        35: yeti-3
-        36: yeti-4
-        37: troll-1
-        38: troll-2
-        39: troll-3
-        40: troll-4
-        41:
-          uid: dighyp1
-          kind: server
-        42:
-          uid: dighyp2
-          kind: server
-        43:
-          uid: X670V-48x Port 43
-          kind: channel
-        44:
-          uid: X670V-48x Port 43
-          kind: channel
-        45:
-          uid: X670V-48x Port 43
-          kind: channel
-        46:
-          uid: digwatt
-          kind: server
-        47:
-          uid: ACI-G5K-EXT
-          kind: other
-        48:
-          uid: renater5
-          kind: backbone
-  channels:
-    X670V-48x Port 43:
-      uid: sw-aci-333
-      port: TN-G5K-INT
-      kind: switch
-      rate: 30000000000
-- 
GitLab