From a5ff5e2e8ec4de926ada9ec8310d1964823c35f7 Mon Sep 17 00:00:00 2001
From: Nicolas Michon <nicolas.michon@inria.fr>
Date: Thu, 5 Jul 2018 11:36:39 +0200
Subject: [PATCH] Generate data/ after omnipath merge
---
.../grenoble/clusters/dahu/nodes/dahu-10.json | 2 +-
.../grenoble/clusters/dahu/nodes/dahu-17.json | 2 +-
.../grenoble/clusters/dahu/nodes/dahu-30.json | 2 +-
.../grenoble/clusters/dahu/nodes/dahu-56.json | 2 +-
.../grenoble/clusters/dahu/nodes/dahu-66.json | 2 +-
.../network_equipments/ecotype-prod1.json | 2 +-
.../network_equipments/ecotype-prod2.json | 2 +-
grid5000-all.json | 74 +++++++++----------
8 files changed, 44 insertions(+), 44 deletions(-)
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-10.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-10.json
index 74ef56f9fdc..08b4cc289ba 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-10.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-10.json
@@ -185,4 +185,4 @@
},
"type": "node",
"uid": "dahu-10"
-}
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-17.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-17.json
index e815dd277b2..fe9b0b57e1d 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-17.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-17.json
@@ -185,4 +185,4 @@
},
"type": "node",
"uid": "dahu-17"
-}
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-30.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-30.json
index 4fc1231588d..f59ab3dc465 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-30.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-30.json
@@ -185,4 +185,4 @@
},
"type": "node",
"uid": "dahu-30"
-}
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-56.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-56.json
index 940f0a90e34..32836b9dd4f 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-56.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-56.json
@@ -185,4 +185,4 @@
},
"type": "node",
"uid": "dahu-56"
-}
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-66.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-66.json
index 41243202ea5..e2dfdeabb7e 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-66.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-66.json
@@ -185,4 +185,4 @@
},
"type": "node",
"uid": "dahu-66"
-}
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/nantes/network_equipments/ecotype-prod1.json b/data/grid5000/sites/nantes/network_equipments/ecotype-prod1.json
index c88eaa0a1cb..ef65b5eac9c 100644
--- a/data/grid5000/sites/nantes/network_equipments/ecotype-prod1.json
+++ b/data/grid5000/sites/nantes/network_equipments/ecotype-prod1.json
@@ -172,7 +172,7 @@
"snmp_pattern": "TenGigabitEthernet %LINECARD%/%PORT%"
}
],
- "model": "S4840-ON",
+ "model": "S4048-ON",
"mtu": 1500,
"sensors": {
"network": {
diff --git a/data/grid5000/sites/nantes/network_equipments/ecotype-prod2.json b/data/grid5000/sites/nantes/network_equipments/ecotype-prod2.json
index 8029c4ed03d..cd0a264aaba 100644
--- a/data/grid5000/sites/nantes/network_equipments/ecotype-prod2.json
+++ b/data/grid5000/sites/nantes/network_equipments/ecotype-prod2.json
@@ -172,7 +172,7 @@
"snmp_pattern": "TenGigabitEthernet %LINECARD%/%PORT%"
}
],
- "model": "S4840-ON",
+ "model": "S4048-ON",
"mtu": 1500,
"sensors": {
"network": {
diff --git a/grid5000-all.json b/grid5000-all.json
index 387f8fac12d..b36ef5a7255 100644
--- a/grid5000-all.json
+++ b/grid5000-all.json
@@ -121446,7 +121446,7 @@
"model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
"mountable": false,
"mounted": false,
- "name": "ib1",
+ "name": "ib0",
"rate": 10000000000,
"vendor": "Mellanox Technologies"
},
@@ -121462,7 +121462,7 @@
"model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
"mountable": false,
"mounted": false,
- "name": "ib0",
+ "name": "ib1",
"rate": 10000000000,
"vendor": "Mellanox Technologies"
},
@@ -121650,7 +121650,7 @@
"model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
"mountable": false,
"mounted": false,
- "name": "ib1",
+ "name": "ib0",
"rate": 10000000000,
"vendor": "Mellanox Technologies"
},
@@ -121667,7 +121667,7 @@
"model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
"mountable": false,
"mounted": false,
- "name": "ib0",
+ "name": "ib1",
"rate": 10000000000,
"vendor": "Mellanox Technologies"
},
@@ -121855,7 +121855,7 @@
"model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
"mountable": false,
"mounted": false,
- "name": "ib1",
+ "name": "ib0",
"rate": 10000000000,
"vendor": "Mellanox Technologies"
},
@@ -121872,7 +121872,7 @@
"model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
"mountable": false,
"mounted": false,
- "name": "ib0",
+ "name": "ib1",
"rate": 10000000000,
"vendor": "Mellanox Technologies"
},
@@ -122060,7 +122060,7 @@
"model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
"mountable": false,
"mounted": false,
- "name": "ib1",
+ "name": "ib0",
"rate": 10000000000,
"vendor": "Mellanox Technologies"
},
@@ -122077,7 +122077,7 @@
"model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
"mountable": false,
"mounted": false,
- "name": "ib0",
+ "name": "ib1",
"rate": 10000000000,
"vendor": "Mellanox Technologies"
},
@@ -122265,7 +122265,7 @@
"model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
"mountable": false,
"mounted": false,
- "name": "ib1",
+ "name": "ib0",
"rate": 10000000000,
"vendor": "Mellanox Technologies"
},
@@ -122282,7 +122282,7 @@
"model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
"mountable": false,
"mounted": false,
- "name": "ib0",
+ "name": "ib1",
"rate": 10000000000,
"vendor": "Mellanox Technologies"
},
@@ -122470,7 +122470,7 @@
"model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
"mountable": false,
"mounted": false,
- "name": "ib1",
+ "name": "ib0",
"rate": 10000000000,
"vendor": "Mellanox Technologies"
},
@@ -122487,7 +122487,7 @@
"model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
"mountable": false,
"mounted": false,
- "name": "ib0",
+ "name": "ib1",
"rate": 10000000000,
"vendor": "Mellanox Technologies"
},
@@ -122828,7 +122828,7 @@
"model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
"mountable": false,
"mounted": false,
- "name": "ib1",
+ "name": "ib0",
"rate": 10000000000,
"vendor": "Mellanox Technologies"
},
@@ -122844,7 +122844,7 @@
"model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
"mountable": false,
"mounted": false,
- "name": "ib0",
+ "name": "ib1",
"rate": 10000000000,
"vendor": "Mellanox Technologies"
},
@@ -123187,7 +123187,7 @@
"model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
"mountable": false,
"mounted": false,
- "name": "ib1",
+ "name": "ib0",
"rate": 10000000000,
"vendor": "Mellanox Technologies"
},
@@ -123203,7 +123203,7 @@
"model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
"mountable": false,
"mounted": false,
- "name": "ib0",
+ "name": "ib1",
"rate": 10000000000,
"vendor": "Mellanox Technologies"
},
@@ -123562,7 +123562,7 @@
"model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
"mountable": false,
"mounted": false,
- "name": "ib1",
+ "name": "ib0",
"rate": 10000000000,
"vendor": "Mellanox Technologies"
},
@@ -123579,7 +123579,7 @@
"model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
"mountable": false,
"mounted": false,
- "name": "ib0",
+ "name": "ib1",
"rate": 10000000000,
"vendor": "Mellanox Technologies"
},
@@ -123767,7 +123767,7 @@
"model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
"mountable": false,
"mounted": false,
- "name": "ib1",
+ "name": "ib0",
"rate": 10000000000,
"vendor": "Mellanox Technologies"
},
@@ -123784,7 +123784,7 @@
"model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
"mountable": false,
"mounted": false,
- "name": "ib0",
+ "name": "ib1",
"rate": 10000000000,
"vendor": "Mellanox Technologies"
},
@@ -123972,7 +123972,7 @@
"model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
"mountable": false,
"mounted": false,
- "name": "ib1",
+ "name": "ib0",
"rate": 10000000000,
"vendor": "Mellanox Technologies"
},
@@ -123989,7 +123989,7 @@
"model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
"mountable": false,
"mounted": false,
- "name": "ib0",
+ "name": "ib1",
"rate": 10000000000,
"vendor": "Mellanox Technologies"
},
@@ -124177,7 +124177,7 @@
"model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
"mountable": false,
"mounted": false,
- "name": "ib1",
+ "name": "ib0",
"rate": 10000000000,
"vendor": "Mellanox Technologies"
},
@@ -124194,7 +124194,7 @@
"model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
"mountable": false,
"mounted": false,
- "name": "ib0",
+ "name": "ib1",
"rate": 10000000000,
"vendor": "Mellanox Technologies"
},
@@ -124552,7 +124552,7 @@
"model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
"mountable": false,
"mounted": false,
- "name": "ib1",
+ "name": "ib0",
"rate": 10000000000,
"vendor": "Mellanox Technologies"
},
@@ -124569,7 +124569,7 @@
"model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
"mountable": false,
"mounted": false,
- "name": "ib0",
+ "name": "ib1",
"rate": 10000000000,
"vendor": "Mellanox Technologies"
},
@@ -125128,7 +125128,7 @@
"model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
"mountable": false,
"mounted": false,
- "name": "ib1",
+ "name": "ib0",
"rate": 10000000000,
"vendor": "Mellanox Technologies"
},
@@ -125144,7 +125144,7 @@
"model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
"mountable": false,
"mounted": false,
- "name": "ib0",
+ "name": "ib1",
"rate": 10000000000,
"vendor": "Mellanox Technologies"
},
@@ -125356,7 +125356,7 @@
"model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
"mountable": false,
"mounted": false,
- "name": "ib1",
+ "name": "ib0",
"rate": 10000000000,
"vendor": "Mellanox Technologies"
},
@@ -125373,7 +125373,7 @@
"model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
"mountable": false,
"mounted": false,
- "name": "ib0",
+ "name": "ib1",
"rate": 10000000000,
"vendor": "Mellanox Technologies"
},
@@ -125560,7 +125560,7 @@
"model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
"mountable": false,
"mounted": false,
- "name": "ib1",
+ "name": "ib0",
"rate": 10000000000,
"vendor": "Mellanox Technologies"
},
@@ -125576,7 +125576,7 @@
"model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
"mountable": false,
"mounted": false,
- "name": "ib0",
+ "name": "ib1",
"rate": 10000000000,
"vendor": "Mellanox Technologies"
},
@@ -126113,7 +126113,7 @@
"model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
"mountable": false,
"mounted": false,
- "name": "ib1",
+ "name": "ib0",
"rate": 10000000000,
"vendor": "Mellanox Technologies"
},
@@ -126129,7 +126129,7 @@
"model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
"mountable": false,
"mounted": false,
- "name": "ib0",
+ "name": "ib1",
"rate": 10000000000,
"vendor": "Mellanox Technologies"
},
@@ -175608,7 +175608,7 @@
"snmp_pattern": "TenGigabitEthernet %LINECARD%/%PORT%"
}
},
- "model": "S4840-ON",
+ "model": "S4048-ON",
"mtu": 1500,
"sensors": {
"network": {
@@ -175698,7 +175698,7 @@
"snmp_pattern": "TenGigabitEthernet %LINECARD%/%PORT%"
}
},
- "model": "S4840-ON",
+ "model": "S4048-ON",
"mtu": 1500,
"sensors": {
"network": {
@@ -238718,4 +238718,4 @@
},
"type": "grid",
"uid": "grid5000"
-}
+}
\ No newline at end of file
--
GitLab