From 6b69a57866288b0f53757e0d7d06542ffd83653c Mon Sep 17 00:00:00 2001
From: Clement Parisot <clement.parisot@inria.fr>
Date: Tue, 15 Mar 2016 17:52:12 +0100
Subject: [PATCH] [nancy] grimoire - Remove null switch/port on non connected
interfaces
---
.../sites/nancy/clusters/grimoire/nodes/grimoire-1.json | 4 ----
.../sites/nancy/clusters/grimoire/nodes/grimoire-2.json | 4 ----
.../sites/nancy/clusters/grimoire/nodes/grimoire-3.json | 4 ----
.../sites/nancy/clusters/grimoire/nodes/grimoire-4.json | 4 ----
.../sites/nancy/clusters/grimoire/nodes/grimoire-5.json | 4 ----
.../sites/nancy/clusters/grimoire/nodes/grimoire-6.json | 4 ----
.../sites/nancy/clusters/grimoire/nodes/grimoire-7.json | 4 ----
.../sites/nancy/clusters/grimoire/nodes/grimoire-8.json | 4 ----
generators/input/sites/nancy/clusters/grimoire/grimoire.rb | 4 ----
9 files changed, 36 deletions(-)
diff --git a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-1.json b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-1.json
index 0dea6f080f2..a66abe42f0f 100644
--- a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-1.json
+++ b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-1.json
@@ -103,8 +103,6 @@
"mountable": false,
"mounted": false,
"rate": 1000000000,
- "switch": null,
- "switch_port": null,
"vendor": "Intel Corporation"
},
{
@@ -119,8 +117,6 @@
"mountable": false,
"mounted": false,
"rate": 1000000000,
- "switch": null,
- "switch_port": null,
"vendor": "Intel Corporation"
},
{
diff --git a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.json b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.json
index d084fc8813b..6afbb5d2fab 100644
--- a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.json
+++ b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.json
@@ -103,8 +103,6 @@
"mountable": false,
"mounted": false,
"rate": 1000000000,
- "switch": null,
- "switch_port": null,
"vendor": "Intel Corporation"
},
{
@@ -119,8 +117,6 @@
"mountable": false,
"mounted": false,
"rate": 1000000000,
- "switch": null,
- "switch_port": null,
"vendor": "Intel Corporation"
},
{
diff --git a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.json b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.json
index cc20208eb10..085e7a38703 100644
--- a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.json
+++ b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.json
@@ -103,8 +103,6 @@
"mountable": false,
"mounted": false,
"rate": 1000000000,
- "switch": null,
- "switch_port": null,
"vendor": "Intel Corporation"
},
{
@@ -119,8 +117,6 @@
"mountable": false,
"mounted": false,
"rate": 1000000000,
- "switch": null,
- "switch_port": null,
"vendor": "Intel Corporation"
},
{
diff --git a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-4.json b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-4.json
index 54ab2c4755f..c6a4e8c9a37 100644
--- a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-4.json
+++ b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-4.json
@@ -103,8 +103,6 @@
"mountable": false,
"mounted": false,
"rate": 1000000000,
- "switch": null,
- "switch_port": null,
"vendor": "Intel Corporation"
},
{
@@ -119,8 +117,6 @@
"mountable": false,
"mounted": false,
"rate": 1000000000,
- "switch": null,
- "switch_port": null,
"vendor": "Intel Corporation"
},
{
diff --git a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.json b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.json
index 8c55f8bf9dd..71b6fc87353 100644
--- a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.json
+++ b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.json
@@ -103,8 +103,6 @@
"mountable": false,
"mounted": false,
"rate": 1000000000,
- "switch": null,
- "switch_port": null,
"vendor": "Intel Corporation"
},
{
@@ -119,8 +117,6 @@
"mountable": false,
"mounted": false,
"rate": 1000000000,
- "switch": null,
- "switch_port": null,
"vendor": "Intel Corporation"
},
{
diff --git a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.json b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.json
index d71802c65a9..31d9d073b2f 100644
--- a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.json
+++ b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.json
@@ -103,8 +103,6 @@
"mountable": false,
"mounted": false,
"rate": 1000000000,
- "switch": null,
- "switch_port": null,
"vendor": "Intel Corporation"
},
{
@@ -119,8 +117,6 @@
"mountable": false,
"mounted": false,
"rate": 1000000000,
- "switch": null,
- "switch_port": null,
"vendor": "Intel Corporation"
},
{
diff --git a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.json b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.json
index caab67383ef..81100563ace 100644
--- a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.json
+++ b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.json
@@ -103,8 +103,6 @@
"mountable": false,
"mounted": false,
"rate": 1000000000,
- "switch": null,
- "switch_port": null,
"vendor": "Intel Corporation"
},
{
@@ -119,8 +117,6 @@
"mountable": false,
"mounted": false,
"rate": 1000000000,
- "switch": null,
- "switch_port": null,
"vendor": "Intel Corporation"
},
{
diff --git a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.json b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.json
index d5001b7ef28..c04768dc0bf 100644
--- a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.json
+++ b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.json
@@ -103,8 +103,6 @@
"mountable": false,
"mounted": false,
"rate": 1000000000,
- "switch": null,
- "switch_port": null,
"vendor": "Intel Corporation"
},
{
@@ -119,8 +117,6 @@
"mountable": false,
"mounted": false,
"rate": 1000000000,
- "switch": null,
- "switch_port": null,
"vendor": "Intel Corporation"
},
{
diff --git a/generators/input/sites/nancy/clusters/grimoire/grimoire.rb b/generators/input/sites/nancy/clusters/grimoire/grimoire.rb
index 67ba4e06a6f..96d476097df 100644
--- a/generators/input/sites/nancy/clusters/grimoire/grimoire.rb
+++ b/generators/input/sites/nancy/clusters/grimoire/grimoire.rb
@@ -193,8 +193,6 @@ site :nancy do |site_uid|
:model => 'I350 Gigabit Network Connection',
:driver => lookup(node_uid, node_uid, 'network_interfaces', 'eth4', 'driver'),
:mac => lookup(node_uid, node_uid, 'network_interfaces', 'eth4', 'mac'),
- :switch => net_switch_lookup('nancy', 'grimoire', node_uid, 'eth4'),
- :switch_port => net_port_lookup('nancy', 'grimoire', node_uid, 'eth4'),
},
{
:interface => lookup(node_uid, node_uid, 'network_interfaces', 'eth5', 'interface'),
@@ -209,8 +207,6 @@ site :nancy do |site_uid|
:model => 'I350 Gigabit Network Connection',
:driver => lookup(node_uid, node_uid, 'network_interfaces', 'eth5', 'driver'),
:mac => lookup(node_uid, node_uid, 'network_interfaces', 'eth5', 'mac'),
- :switch => net_switch_lookup('nancy', 'grimoire', node_uid, 'eth5'),
- :switch_port => net_port_lookup('nancy', 'grimoire', node_uid, 'eth5'),
},
{
:interface => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'interface'),
--
GitLab