From 36a25c33dbd37231aacb41d244408aa87b2dfc59 Mon Sep 17 00:00:00 2001
From: David Loup <david.loup@inria.fr>
Date: Mon, 4 Dec 2017 11:08:58 +0100
Subject: [PATCH] [grenoble] Network description : grimage kind is 'other'
 (non-g5k)

---
 .../grenoble/network_equipments/gw-grenoble.json  | 15 ++++++++++++++-
 grid5000-all.json                                 | 15 ++++++++++++++-
 .../sites/grenoble/networks/gw-grenoble.yaml      | 15 ++++++++++++++-
 3 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/data/grid5000/sites/grenoble/network_equipments/gw-grenoble.json b/data/grid5000/sites/grenoble/network_equipments/gw-grenoble.json
index b38825339b..3ec90905bb 100644
--- a/data/grid5000/sites/grenoble/network_equipments/gw-grenoble.json
+++ b/data/grid5000/sites/grenoble/network_equipments/gw-grenoble.json
@@ -152,18 +152,22 @@
           "uid": "digmgt"
         },
         {
+          "kind": "other",
           "port": "eth0",
           "uid": "grimage-9"
         },
         {
+          "kind": "other",
           "port": "eth1",
           "uid": "grimage-9"
         },
         {
+          "kind": "other",
           "port": "eth0",
           "uid": "grimage-10"
         },
         {
+          "kind": "other",
           "port": "eth1",
           "uid": "grimage-10"
         },
@@ -277,7 +281,7 @@
         {
         },
         {
-          "kind": "switch",
+          "kind": "other",
           "uid": "summit-grimage"
         },
         {
@@ -366,34 +370,42 @@
           "uid": "alpes"
         },
         {
+          "kind": "other",
           "port": "eth0",
           "uid": "grimage-1"
         },
         {
+          "kind": "other",
           "port": "eth0",
           "uid": "grimage-2"
         },
         {
+          "kind": "other",
           "port": "eth0",
           "uid": "grimage-3"
         },
         {
+          "kind": "other",
           "port": "eth0",
           "uid": "grimage-4"
         },
         {
+          "kind": "other",
           "port": "eth0",
           "uid": "grimage-5"
         },
         {
+          "kind": "other",
           "port": "eth0",
           "uid": "grimage-6"
         },
         {
+          "kind": "other",
           "port": "eth0",
           "uid": "grimage-7"
         },
         {
+          "kind": "other",
           "port": "eth0",
           "uid": "grimage-8"
         }
@@ -419,6 +431,7 @@
         {
         },
         {
+          "kind": "other",
           "port": "eth2",
           "rate": 10000000000,
           "uid": "dignfs"
diff --git a/grid5000-all.json b/grid5000-all.json
index 7390cad306..e234eb8284 100644
--- a/grid5000-all.json
+++ b/grid5000-all.json
@@ -21093,6 +21093,7 @@
               "kind": "other",
               "ports": {
                 "1": {
+                  "kind": "other",
                   "port": "eth2",
                   "rate": 10000000000,
                   "uid": "dignfs"
@@ -21293,18 +21294,22 @@
                   "uid": "genepi-2"
                 },
                 "5": {
+                  "kind": "other",
                   "port": "eth0",
                   "uid": "grimage-9"
                 },
                 "6": {
+                  "kind": "other",
                   "port": "eth1",
                   "uid": "grimage-9"
                 },
                 "7": {
+                  "kind": "other",
                   "port": "eth0",
                   "uid": "grimage-10"
                 },
                 "8": {
+                  "kind": "other",
                   "port": "eth1",
                   "uid": "grimage-10"
                 }
@@ -21318,7 +21323,7 @@
               "kind": "node",
               "ports": {
                 "1": {
-                  "kind": "switch",
+                  "kind": "other",
                   "uid": "summit-grimage"
                 },
                 "10": {
@@ -21375,22 +21380,27 @@
                   "uid": "alpes"
                 },
                 "25": {
+                  "kind": "other",
                   "port": "eth0",
                   "uid": "grimage-1"
                 },
                 "26": {
+                  "kind": "other",
                   "port": "eth0",
                   "uid": "grimage-2"
                 },
                 "27": {
+                  "kind": "other",
                   "port": "eth0",
                   "uid": "grimage-3"
                 },
                 "28": {
+                  "kind": "other",
                   "port": "eth0",
                   "uid": "grimage-4"
                 },
                 "29": {
+                  "kind": "other",
                   "port": "eth0",
                   "uid": "grimage-5"
                 },
@@ -21399,14 +21409,17 @@
                   "uid": "genepi-29"
                 },
                 "30": {
+                  "kind": "other",
                   "port": "eth0",
                   "uid": "grimage-6"
                 },
                 "31": {
+                  "kind": "other",
                   "port": "eth0",
                   "uid": "grimage-7"
                 },
                 "32": {
+                  "kind": "other",
                   "port": "eth0",
                   "uid": "grimage-8"
                 },
diff --git a/input/grid5000/sites/grenoble/networks/gw-grenoble.yaml b/input/grid5000/sites/grenoble/networks/gw-grenoble.yaml
index eaa0b8f371..94b7821485 100644
--- a/input/grid5000/sites/grenoble/networks/gw-grenoble.yaml
+++ b/input/grid5000/sites/grenoble/networks/gw-grenoble.yaml
@@ -161,15 +161,19 @@ gw-grenoble:
         5:
           uid: grimage-9
           port: eth0
+          kind: other
         6:
           uid: grimage-9
           port: eth1
+          kind: other
         7:
           uid: grimage-10
           port: eth0
+          kind: other
         8:
           uid: grimage-10
           port: eth1
+          kind: other
         11:
         12:
         13:
@@ -234,7 +238,7 @@ gw-grenoble:
       ports:
         1:
           uid: summit-grimage
-          kind: switch
+          kind: other
         3:
           uid: genepi-29
           port: eth1
@@ -296,27 +300,35 @@ gw-grenoble:
         25:
           uid: grimage-1
           port: eth0
+          kind: other
         26:
           uid: grimage-2
           port: eth0
+          kind: other
         27:
           uid: grimage-3
           port: eth0
+          kind: other
         28:
           uid: grimage-4
           port: eth0
+          kind: other
         29:
           uid: grimage-5
           port: eth0
+          kind: other
         30:
           uid: grimage-6
           port: eth0
+          kind: other
         31:
           uid: grimage-7
           port: eth0
+          kind: other
         32:
           uid: grimage-8
           port: eth0
+          kind: other
     10:
       snmp_pattern: "BD-8810 Port %LINECARD%:%PORT%"
       kavlan_pattern: "%LINECARD%:%PORT%"
@@ -328,6 +340,7 @@ gw-grenoble:
           uid: dignfs
           port: eth2
           rate: 10000000000
+          kind: other
         3:
           kind: virtual
           uid: renater-grenoble
-- 
GitLab