From 6a55bc753daf8ca10a68db8ab41db3dea6a8849f Mon Sep 17 00:00:00 2001
From: Clement Parisot <clement.parisot@inria.fr>
Date: Mon, 30 May 2016 15:27:56 +0200
Subject: [PATCH] [nancy] network, graphique - Update of some links, move
 graphique on gw.nancy

---
 .../clusters/graphique/nodes/graphique-1.json |  4 +-
 .../clusters/graphique/nodes/graphique-2.json |  4 +-
 .../clusters/graphique/nodes/graphique-3.json |  4 +-
 .../clusters/graphique/nodes/graphique-4.json |  4 +-
 .../clusters/graphique/nodes/graphique-5.json |  4 +-
 .../clusters/graphique/nodes/graphique-6.json |  4 +-
 .../nancy/network_equipments/gw-nancy.json    | 26 ++++++---
 .../nancy/network_equipments/sgravillon1.json | 58 ++-----------------
 .../nancy/network_equipments/stalc1.json      | 20 -------
 .../sites/nancy/networks/gw-nancy.yaml        | 35 ++++++++---
 .../sites/nancy/networks/sgravillon1.yaml     | 53 +++--------------
 .../grid5000/sites/nancy/networks/stalc1.yaml | 18 ------
 12 files changed, 72 insertions(+), 162 deletions(-)

diff --git a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-1.json b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-1.json
index 49c1f76329f..d1d508ba027 100644
--- a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-1.json
+++ b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-1.json
@@ -42,8 +42,8 @@
       "mounted": true,
       "network_address": "graphique-1.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "gw-nancy",
+      "switch_port": "Ethernet1/21",
       "vendor": "Broadcom"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-2.json b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-2.json
index 171d75d081d..6a3439d184d 100644
--- a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-2.json
+++ b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-2.json
@@ -42,8 +42,8 @@
       "mounted": true,
       "network_address": "graphique-2.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "gw-nancy",
+      "switch_port": "Ethernet1/22",
       "vendor": "Broadcom"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-3.json b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-3.json
index 418948a07cc..b773f8dce20 100644
--- a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-3.json
+++ b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-3.json
@@ -42,8 +42,8 @@
       "mounted": true,
       "network_address": "graphique-3.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "gw-nancy",
+      "switch_port": "Ethernet1/23",
       "vendor": "Broadcom"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-4.json b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-4.json
index c652d4d8e95..81d835417aa 100644
--- a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-4.json
+++ b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-4.json
@@ -42,8 +42,8 @@
       "mounted": true,
       "network_address": "graphique-4.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "gw-nancy",
+      "switch_port": "Ethernet1/24",
       "vendor": "Broadcom"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-5.json b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-5.json
index f2f0ec40939..186fe1267cd 100644
--- a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-5.json
+++ b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-5.json
@@ -42,8 +42,8 @@
       "mounted": true,
       "network_address": "graphique-5.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "gw-nancy",
+      "switch_port": "Ethernet1/25",
       "vendor": "Broadcom"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-6.json b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-6.json
index c84c98178e1..693ef39ce8e 100644
--- a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-6.json
+++ b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-6.json
@@ -42,8 +42,8 @@
       "mounted": true,
       "network_address": "graphique-6.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "gw-nancy",
+      "switch_port": "Ethernet1/26",
       "vendor": "Broadcom"
     },
     {
diff --git a/data/grid5000/sites/nancy/network_equipments/gw-nancy.json b/data/grid5000/sites/nancy/network_equipments/gw-nancy.json
index 3fcdfee5442..eafafd54977 100644
--- a/data/grid5000/sites/nancy/network_equipments/gw-nancy.json
+++ b/data/grid5000/sites/nancy/network_equipments/gw-nancy.json
@@ -93,16 +93,28 @@
           "uid": "graphite-4"
         },
         {
+          "kind": "node",
+          "uid": "graphique-1"
         },
         {
+          "kind": "node",
+          "uid": "graphique-2"
         },
         {
+          "kind": "node",
+          "uid": "graphique-3"
         },
         {
+          "kind": "node",
+          "uid": "graphique-4"
         },
         {
+          "kind": "node",
+          "uid": "graphique-5"
         },
         {
+          "kind": "node",
+          "uid": "graphique-6"
         },
         {
           "kind": "node",
@@ -152,29 +164,29 @@
         },
         {
           "kind": "other",
-          "uid": "grigri"
+          "uid": "srv"
         },
         {
+          "kind": "other",
+          "uid": "srv2"
         },
         {
           "kind": "other",
           "uid": "talc-data"
         },
         {
+          "kind": "other",
+          "uid": "srv-data"
         },
         {
         },
         {
-          "kind": "switch",
-          "uid": "sbaie1-adm"
         },
         {
-          "kind": "switch",
-          "uid": "sbaie2-adm"
         },
         {
-          "kind": "switch",
-          "uid": "sgravillon1"
+          "kind": "virtual",
+          "uid": "LORIA"
         },
         {
         },
diff --git a/data/grid5000/sites/nancy/network_equipments/sgravillon1.json b/data/grid5000/sites/nancy/network_equipments/sgravillon1.json
index b473c3a6af1..07b802c51e8 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgravillon1.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgravillon1.json
@@ -1,30 +1,12 @@
 {
   "backplane_bps": 346000000000,
   "channels": {
-    "lacp1": [
-      {
-        "linecard": 1,
-        "port": 24
-      }
-    ],
-    "lacp2": [
-      {
-        "linecard": 1,
-        "port": 9
-      }
-    ],
     "lacp3": [
       {
         "linecard": 1,
         "port": 23
       }
     ],
-    "lacp4": [
-      {
-        "linecard": 1,
-        "port": 17
-      }
-    ],
     "naming_pattern": "Po%CHANNELID%",
     "snmp_pattern": "Trk%CHANNELID%"
   },
@@ -41,17 +23,12 @@
         {
         },
         {
-          "kind": "other",
-          "uid": "sgrapheneib"
         },
         {
-          "kind": "other",
-          "port": "bmc",
-          "uid": "fgriffon2"
         },
         {
-          "kind": "other",
-          "uid": "stalc1-ipmi"
+          "kind": "virtual",
+          "uid": "TALC-ADM"
         },
         {
           "kind": "switch",
@@ -62,6 +39,9 @@
         {
         },
         {
+          "kind": "other",
+          "port": "bmc",
+          "uid": "fgriffon2"
         },
         {
           "kind": "other",
@@ -86,32 +66,20 @@
         {
         },
         {
-          "kind": "other",
-          "uid": "sgraphene1-ipmi"
         },
         {
-          "kind": "other",
-          "uid": "sgraphene2-ipmi"
         },
         {
-          "kind": "other",
-          "uid": "sgraphene3-ipmi"
         },
         {
-          "kind": "other",
-          "uid": "sgraphene4-ipmi"
         },
         {
         },
         {
-          "kind": "virtual",
-          "uid": "LORIA"
         },
         {
         },
         {
-          "kind": "other",
-          "uid": "sgriffon1-ipmi"
         },
         {
         },
@@ -196,7 +164,7 @@
     },
     {
       "backplane_bps": 14400000000,
-      "kind": "other",
+      "kind": "router",
       "model": "J9538A",
       "naming_pattern": "%LINECARD:F%%PORT%",
       "ports": [
@@ -205,20 +173,6 @@
         {
           "kind": "router",
           "uid": "gw-nancy"
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-          "kind": "virtual",
-          "uid": "srv"
-        },
-        {
-          "kind": "virtual",
-          "uid": "srv"
         }
       ],
       "rate": 10000000000,
diff --git a/data/grid5000/sites/nancy/network_equipments/stalc1.json b/data/grid5000/sites/nancy/network_equipments/stalc1.json
index 74c597a5539..a65a8988c23 100644
--- a/data/grid5000/sites/nancy/network_equipments/stalc1.json
+++ b/data/grid5000/sites/nancy/network_equipments/stalc1.json
@@ -92,12 +92,8 @@
           "uid": "talc-18"
         },
         {
-          "port": "eth2",
-          "uid": "graphique-2"
         },
         {
-          "port": "eth2",
-          "uid": "graphique-6"
         },
         {
         },
@@ -176,22 +172,6 @@
         {
           "port": "eth0",
           "uid": "talc-37"
-        },
-        {
-          "port": "eth2",
-          "uid": "graphique-3"
-        },
-        {
-          "port": "eth2",
-          "uid": "graphique-4"
-        },
-        {
-          "port": "eth2",
-          "uid": "graphique-5"
-        },
-        {
-          "port": "eth2",
-          "uid": "graphique-1"
         }
       ],
       "rate": 1000000000,
diff --git a/input/grid5000/sites/nancy/networks/gw-nancy.yaml b/input/grid5000/sites/nancy/networks/gw-nancy.yaml
index 1431bf77d2e..e52d36776af 100644
--- a/input/grid5000/sites/nancy/networks/gw-nancy.yaml
+++ b/input/grid5000/sites/nancy/networks/gw-nancy.yaml
@@ -128,6 +128,24 @@ gw-nancy:
         20:
           uid: graphite-4
           kind: node
+        21:
+          uid: graphique-1
+          kind: node
+        22:
+          uid: graphique-2
+          kind: node
+        23:
+          uid: graphique-3
+          kind: node
+        24:
+          uid: graphique-4
+          kind: node
+        25:
+          uid: graphique-5
+          kind: node
+        26:
+          uid: graphique-6
+          kind: node
         27:
           uid: grisou-41
           kind: node
@@ -162,20 +180,23 @@ gw-nancy:
           uid: grisou-51
           kind: node
         39:
-          uid: grigri
+          uid: srv
+          kind: other
+        40:
+          uid: srv2
           kind: other
         41:
           uid: talc-data
           kind: other
-        44:
-          uid: sbaie1-adm
-          kind: switch
-        45:
-          uid: sbaie2-adm
-          kind: switch
+        42:
+          uid: srv-data
+          kind: other
         46:
           uid: sgravillon1
           kind: switch
+        46:
+          uid: LORIA
+          kind: virtual
         48:
           uid: renater-nancy
           kind: virtual
diff --git a/input/grid5000/sites/nancy/networks/sgravillon1.yaml b/input/grid5000/sites/nancy/networks/sgravillon1.yaml
index 7a1e4c29b0f..f047f75ae4f 100644
--- a/input/grid5000/sites/nancy/networks/sgravillon1.yaml
+++ b/input/grid5000/sites/nancy/networks/sgravillon1.yaml
@@ -68,19 +68,16 @@ sgravillon1:
       kind: other
       rate: 1000000000
       ports:
-        1:
-          kind: other
-          uid: sgrapheneib
-        2:
-          port: bmc
-          uid: fgriffon2
-          kind: other
         3:
-          uid: stalc1-ipmi
-          kind: other
+          uid: TALC-ADM
+          kind: virtual
         4:
           uid: stalc1
           kind: switch
+        7:
+          uid: fgriffon2
+          port: bmc
+          kind: other
         8:
           port: eth0
           uid: grog
@@ -97,24 +94,6 @@ sgravillon1:
           port: eth0
           uid: fgriffon1
           kind: other
-        13:
-          uid: sgraphene1-ipmi
-          kind: other
-        14:
-          uid: sgraphene2-ipmi
-          kind: other
-        15:
-          uid: sgraphene3-ipmi
-          kind: other
-        16:
-          uid: sgraphene4-ipmi
-          kind: other
-        18:
-          uid: LORIA
-          kind: virtual
-        20:
-          uid: sgriffon1-ipmi
-          kind: other
         23:
           port: eth1
           uid: fgriffon1
@@ -163,34 +142,16 @@ sgravillon1:
       snmp_pattern: "F%PORT%"
       backplane_bps: 14400000000
       model: J9538A
-      kind: other
+      kind: router
       rate: 10000000000
       ports:
         1:
           uid: gw-nancy
           kind: router
-        5:
-          uid: srv
-          kind: virtual
-        6:
-          uid: srv
-          kind: virtual
   channels:
     naming_pattern: Po%CHANNELID%
     snmp_pattern: Trk%CHANNELID%
-    "lacp1":
-        - linecard: 1
-          port: 22
-          port: 24
-    "lacp2":
-        - linecard: 1
-          port: 8
-          port: 9
     "lacp3":
         - linecard: 1
           port: 11
           port: 23
-    "lacp4":
-        - linecard: 1
-          port: 12
-          port: 17
diff --git a/input/grid5000/sites/nancy/networks/stalc1.yaml b/input/grid5000/sites/nancy/networks/stalc1.yaml
index a7053597b5d..8f6a99978f1 100644
--- a/input/grid5000/sites/nancy/networks/stalc1.yaml
+++ b/input/grid5000/sites/nancy/networks/stalc1.yaml
@@ -77,12 +77,6 @@ stalc1:
         21:
           uid: talc-18
           port: eth0
-        22:
-          uid: graphique-2
-          port: eth2
-        23:
-          uid: graphique-6
-          port: eth2
         25:
           uid: talc-19
           port: eth0
@@ -140,18 +134,6 @@ stalc1:
         43:
           uid: talc-37
           port: eth0
-        44:
-          uid: graphique-3
-          port: eth2
-        45:
-          uid: graphique-4
-          port: eth2
-        46:
-          uid: graphique-5
-          port: eth2
-        47:
-          uid: graphique-1
-          port: eth2
     1:
       naming_pattern: "Ten-GigabitEthernet1/%LINECARD%/%PORT%"
       snmp_pattern: "Ten-GigabitEthernet1/%LINECARD%/%PORT%"
-- 
GitLab