From a3fbba8c08888f02608fc0c3fc45646f846c199e Mon Sep 17 00:00:00 2001
From: Sebastien Badia <sebastien.badia@inria.fr>
Date: Fri, 29 Jul 2011 10:00:21 +0200
Subject: [PATCH] [Bordeaux] Correct ib/mx ip of borderline

---
 .../borderline/nodes/borderline-1.json        |  2 +-
 .../borderline/nodes/borderline-10.json       |  2 +-
 .../borderline/nodes/borderline-2.json        |  2 +-
 .../borderline/nodes/borderline-3.json        |  2 +-
 .../borderline/nodes/borderline-4.json        |  2 +-
 .../borderline/nodes/borderline-5.json        |  2 +-
 .../borderline/nodes/borderline-6.json        |  2 +-
 .../borderline/nodes/borderline-7.json        |  2 +-
 .../borderline/nodes/borderline-8.json        |  2 +-
 .../borderline/nodes/borderline-9.json        |  2 +-
 generators/input/bordeaux-borderline.yaml     | 20 +++++++++----------
 11 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-1.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-1.json
index 61351d28e50..f71dcd0511d 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-1.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-1.json
@@ -77,7 +77,7 @@
       "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
-      "ip": "172.18.2.1",
+      "ip": "172.18.2.11",
       "mac": "00:60:dd:47:b6:e9",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-10.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-10.json
index aa24391943c..6b90746c9fe 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-10.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-10.json
@@ -77,7 +77,7 @@
       "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
-      "ip": "172.18.2.10",
+      "ip": "172.18.2.20",
       "mac": "00:60:dd:47:b7:28",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-2.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-2.json
index d474cb45550..f91c2e1d96c 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-2.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-2.json
@@ -77,7 +77,7 @@
       "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
-      "ip": "172.18.2.2",
+      "ip": "172.18.2.12",
       "mac": "00:60:dd:47:b6:7a",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-3.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-3.json
index ad1da96cc5d..36cc50b510e 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-3.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-3.json
@@ -77,7 +77,7 @@
       "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
-      "ip": "172.18.2.3",
+      "ip": "172.18.2.13",
       "mac": "00:60:dd:47:b5:69",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-4.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-4.json
index 826da66f8c8..6530d25d13f 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-4.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-4.json
@@ -77,7 +77,7 @@
       "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
-      "ip": "172.18.2.4",
+      "ip": "172.18.2.14",
       "mac": "00:60:dd:47:b7:6e",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-5.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-5.json
index d765111f431..d61bf5dd815 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-5.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-5.json
@@ -77,7 +77,7 @@
       "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
-      "ip": "172.18.2.5",
+      "ip": "172.18.2.15",
       "mac": "00:60:dd:47:b6:50",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-6.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-6.json
index a823ce3cb38..eb52bce1130 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-6.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-6.json
@@ -77,7 +77,7 @@
       "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
-      "ip": "172.18.2.6",
+      "ip": "172.18.2.16",
       "mac": "00:60:dd:47:b6:7d",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-7.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-7.json
index b3ab6b17dc4..62ed27cb5fc 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-7.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-7.json
@@ -77,7 +77,7 @@
       "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
-      "ip": "172.18.2.7",
+      "ip": "172.18.2.17",
       "mac": "00:60:dd:47:86:96",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-8.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-8.json
index e739911ccdf..f2fb7bbf297 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-8.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-8.json
@@ -77,7 +77,7 @@
       "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
-      "ip": "172.18.2.8",
+      "ip": "172.18.2.18",
       "mac": "00:60:dd:47:b5:14",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-9.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-9.json
index bf2760ce348..3005d7c5bfd 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-9.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-9.json
@@ -77,7 +77,7 @@
       "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
-      "ip": "172.18.2.9",
+      "ip": "172.18.2.19",
       "mac": "00:60:dd:47:7d:8c",
       "management": false,
       "mountable": true,
diff --git a/generators/input/bordeaux-borderline.yaml b/generators/input/bordeaux-borderline.yaml
index 8833efe9e4b..55b51c2215a 100644
--- a/generators/input/bordeaux-borderline.yaml
+++ b/generators/input/bordeaux-borderline.yaml
@@ -21,7 +21,7 @@ borderline-1:
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:1d:5e
     myri0:
       mac: 00:60:dd:47:b6:e9
-      ip: 172.18.2.1
+      ip: 172.18.2.11
     eth0:
       mac: 00:14:5e:57:67:04
       ip: 172.16.2.1
@@ -54,7 +54,7 @@ borderline-2:
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:1d:86
     myri0:
       mac: 00:60:dd:47:b6:7a
-      ip: 172.18.2.2
+      ip: 172.18.2.12
     eth0:
       mac: 00:14:5e:57:cc:3e
       ip: 172.16.2.2
@@ -87,7 +87,7 @@ borderline-3:
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:1d:ee
     myri0:
       mac: 00:60:dd:47:b5:69
-      ip: 172.18.2.3
+      ip: 172.18.2.13
     eth0:
       mac: 00:14:5e:57:6d:a0
       ip: 172.16.2.3
@@ -120,7 +120,7 @@ borderline-4:
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:1e:86
     myri0:
       mac: 00:60:dd:47:b7:6e
-      ip: 172.18.2.4
+      ip: 172.18.2.14
     eth0:
       mac: 00:14:5e:57:c4:d0
       ip: 172.16.2.4
@@ -153,7 +153,7 @@ borderline-5:
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:20:4e
     myri0:
       mac: 00:60:dd:47:b6:50
-      ip: 172.18.2.5
+      ip: 172.18.2.15
     eth0:
       mac: 00:14:5e:57:6d:46
       ip: 172.16.2.5
@@ -186,7 +186,7 @@ borderline-6:
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:20:2e
     myri0:
       mac: 00:60:dd:47:b6:7d
-      ip: 172.18.2.6
+      ip: 172.18.2.16
     eth0:
       mac: 00:14:5e:57:82:a6
       ip: 172.16.2.6
@@ -219,7 +219,7 @@ borderline-7:
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:20:3e
     myri0:
       mac: 00:60:dd:47:86:96
-      ip: 172.18.2.7
+      ip: 172.18.2.17
     eth0:
       mac: 00:14:5e:57:cc:02
       ip: 172.16.2.7
@@ -252,7 +252,7 @@ borderline-8:
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:20:4a
     myri0:
       mac: 00:60:dd:47:b5:14
-      ip: 172.18.2.8
+      ip: 172.18.2.18
     eth0:
       mac: 00:14:5e:57:cb:d8
       ip: 172.16.2.8
@@ -285,7 +285,7 @@ borderline-9:
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:1f:86
     myri0:
       mac: 00:60:dd:47:7d:8c
-      ip: 172.18.2.9
+      ip: 172.18.2.19
     eth0:
       mac: 00:14:5e:57:cb:ae
       ip: 172.16.2.9
@@ -318,7 +318,7 @@ borderline-10:
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:1d:fe
     myri0:
       mac: 00:60:dd:47:b7:28
-      ip: 172.18.2.10
+      ip: 172.18.2.20
     eth0:
       mac: 00:14:5e:57:cb:f6
       ip: 172.16.2.10
-- 
GitLab