From 6eb14768e28c87dc285e994004aaf16223d605aa Mon Sep 17 00:00:00 2001
From: Clement Parisot <clement.parisot@inria.fr>
Date: Tue, 15 Mar 2016 17:16:30 +0100
Subject: [PATCH] [nancy] griffon - Remove myri0 interface from the API (see
bug #6490)
---
.../clusters/griffon/nodes/griffon-11.json | 6 +-
.../clusters/griffon/nodes/griffon-12.json | 6 +-
.../clusters/griffon/nodes/griffon-13.json | 6 +-
.../clusters/griffon/nodes/griffon-14.json | 6 +-
.../nancy/network_equipments/sgraoullyib.json | 108 ++++++++++++++++++
.../nancy/network_equipments/sgriffon1.json | 22 +---
.../sites/nancy/clusters/griffon/griffon.rb | 8 +-
.../sites/nancy/net-links/sgriffon1.yaml | 13 ---
8 files changed, 120 insertions(+), 55 deletions(-)
create mode 100644 data/grid5000/sites/nancy/network_equipments/sgraoullyib.json
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-11.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-11.json
index 81751187283..4b5b561c5b8 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-11.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-11.json
@@ -64,15 +64,13 @@
"bridged": false,
"device": "eth2",
"driver": "myri10ge",
- "enabled": true,
+ "enabled": false,
"interface": "Ethernet",
"mac": "00:60:dd:46:84:b7",
"management": false,
- "mountable": true,
+ "mountable": false,
"mounted": false,
"rate": 10000000000,
- "switch": "sgriffon1",
- "switch_port": "Ten-GigabitEthernet1/1/1",
"vendor": "myrinet",
"version": "Myri-10G"
},
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-12.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-12.json
index eba6a589be8..9a2f65af0fe 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-12.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-12.json
@@ -64,15 +64,13 @@
"bridged": false,
"device": "eth2",
"driver": "myri10ge",
- "enabled": true,
+ "enabled": false,
"interface": "Ethernet",
"mac": "00:60:dd:46:84:b9",
"management": false,
- "mountable": true,
+ "mountable": false,
"mounted": false,
"rate": 10000000000,
- "switch": "sgriffon1",
- "switch_port": "Ten-GigabitEthernet1/2/2",
"vendor": "myrinet",
"version": "Myri-10G"
},
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-13.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-13.json
index 221e340bc69..9d024351fa7 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-13.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-13.json
@@ -64,15 +64,13 @@
"bridged": false,
"device": "eth2",
"driver": "myri10ge",
- "enabled": true,
+ "enabled": false,
"interface": "Ethernet",
"mac": "00:60:dd:46:84:a8",
"management": false,
- "mountable": true,
+ "mountable": false,
"mounted": false,
"rate": 10000000000,
- "switch": null,
- "switch_port": null,
"vendor": "myrinet",
"version": "Myri-10G"
},
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-14.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-14.json
index 542dc77ca44..b5f72e6e665 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-14.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-14.json
@@ -64,15 +64,13 @@
"bridged": false,
"device": "eth2",
"driver": "myri10ge",
- "enabled": true,
+ "enabled": false,
"interface": "Ethernet",
"mac": "00:60:dd:46:84:b8",
"management": false,
- "mountable": true,
+ "mountable": false,
"mounted": false,
"rate": 10000000000,
- "switch": null,
- "switch_port": null,
"vendor": "myrinet",
"version": "Myri-10G"
},
diff --git a/data/grid5000/sites/nancy/network_equipments/sgraoullyib.json b/data/grid5000/sites/nancy/network_equipments/sgraoullyib.json
new file mode 100644
index 00000000000..ac91a2f9271
--- /dev/null
+++ b/data/grid5000/sites/nancy/network_equipments/sgraoullyib.json
@@ -0,0 +1,108 @@
+{
+ "backplane_bps": null,
+ "channels": {
+ "naming_pattern": "Po%CHANNELID%"
+ },
+ "kind": "switch",
+ "linecards": [
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+ "kind": "switch",
+ "naming_pattern": "%LINECARD%/%PORT%",
+ "ports": [
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+
+ },
+ {
+ "kind": "switch",
+ "uid": "sgriffonib"
+ }
+ ],
+ "rate": 20000000000,
+ "snmp_pattern": "%LINECARD%/%PORT%"
+ }
+ ],
+ "model": "Infiniband",
+ "mtu": null,
+ "routes": {
+
+ },
+ "site": "nancy",
+ "snmp_community": "public",
+ "type": "network_equipment",
+ "uid": "sgraoullyib",
+ "vlans": {
+ "naming_pattern": "Vlan%VLANID%"
+ },
+ "weathermap": {
+ "use_cacti": "no"
+ }
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/network_equipments/sgriffon1.json b/data/grid5000/sites/nancy/network_equipments/sgriffon1.json
index 32097011311..501da916934 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgriffon1.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgriffon1.json
@@ -163,9 +163,7 @@
},
{
- "kind": "node",
- "port": "eth2",
- "uid": "griffon-11"
+
},
{
"kind": "switch",
@@ -174,24 +172,6 @@
],
"rate": 10000000000,
"snmp_pattern": "Ten-GigabitEthernet1/%LINECARD%/%PORT%"
- },
- {
- "kind": "node",
- "naming_pattern": "Ten-GigabitEthernet1/%LINECARD%/%PORT%",
- "ports": [
- {
-
- },
- {
-
- },
- {
- "port": "eth2",
- "uid": "griffon-12"
- }
- ],
- "rate": 10000000000,
- "snmp_pattern": "Ten-GigabitEthernet1/%LINECARD%/%PORT%"
}
],
"model": "3com 4500g",
diff --git a/generators/input/sites/nancy/clusters/griffon/griffon.rb b/generators/input/sites/nancy/clusters/griffon/griffon.rb
index daaa801a0e4..53f8c0c58ad 100644
--- a/generators/input/sites/nancy/clusters/griffon/griffon.rb
+++ b/generators/input/sites/nancy/clusters/griffon/griffon.rb
@@ -102,16 +102,14 @@ site :nancy do |site_uid|
{
:interface => lookup('griffon_manual', node_uid, 'network_interfaces', 'eth2', 'interface'),
:rate => 10.G,
- :enabled => lookup('griffon_manual', node_uid, 'network_interfaces', 'eth2', 'enabled'),
+ :enabled => false, # see bug 6490,
:management => lookup('griffon_manual', node_uid, 'network_interfaces', 'eth2', 'management'),
- :mountable => lookup('griffon_manual', node_uid, 'network_interfaces', 'eth2', 'mountable'),
- :mounted => lookup('griffon_manual', node_uid, 'network_interfaces', 'eth2', 'mounted'),
+ :mountable => false, # see bug 6490,
+ :mounted => false, # see bug 6490,
:bridged => false,
:device => "eth2",
:vendor => "myrinet",
:version => "Myri-10G",
- :switch => net_switch_lookup('nancy','griffon', node_uid, 'eth2'),
- :switch_port => net_port_lookup('nancy','griffon', node_uid, 'eth2'),
:driver => lookup('griffon_manual', node_uid, 'network_interfaces', 'eth2', 'driver'),
:mac => lookup('griffon_manual', node_uid, 'network_interfaces', 'eth2', 'mac')
},
diff --git a/generators/input/sites/nancy/net-links/sgriffon1.yaml b/generators/input/sites/nancy/net-links/sgriffon1.yaml
index 0842fd71fc3..f5a1fb4ff14 100644
--- a/generators/input/sites/nancy/net-links/sgriffon1.yaml
+++ b/generators/input/sites/nancy/net-links/sgriffon1.yaml
@@ -70,22 +70,9 @@ sgriffon1:
kind: other
rate: 10000000000
ports:
- 1:
- uid: griffon-11
- port: eth2
- kind: node
2:
uid: sgravillon1
kind: switch
- 2:
- naming_pattern: "Ten-GigabitEthernet1/%LINECARD%/%PORT%"
- snmp_pattern: "Ten-GigabitEthernet1/%LINECARD%/%PORT%"
- kind: node
- rate: 10000000000
- ports:
- 2:
- uid: griffon-12
- port: eth2
channels:
naming_pattern: Po%CHANNELID%
--
GitLab