Mentions légales du service

Skip to content
Snippets Groups Projects
Commit 6eb14768 authored by PARISOT Clement's avatar PARISOT Clement
Browse files

[nancy] griffon - Remove myri0 interface from the API (see bug #6490)

parent eff0aabf
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 120 additions and 55 deletions
data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-11.json
+ 2
− 4
View file @ 6eb14768
......@@ -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"
},
......
data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-12.json
+ 2
− 4
View file @ 6eb14768
......@@ -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"
},
......
data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-13.json
+ 2
− 4
View file @ 6eb14768
......@@ -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"
},
......
data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-14.json
+ 2
− 4
View file @ 6eb14768
......@@ -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"
},
......
data/grid5000/sites/nancy/network_equipments/sgraoullyib.json 0 → 100644
+ 108
− 0
View file @ 6eb14768
{
"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
data/grid5000/sites/nancy/network_equipments/sgriffon1.json
+ 1
− 21
View file @ 6eb14768
......@@ -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",
......
generators/input/sites/nancy/clusters/griffon/griffon.rb
+ 3
− 5
View file @ 6eb14768
......@@ -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')
},
......
generators/input/sites/nancy/net-links/sgriffon1.yaml
+ 0
− 13
View file @ 6eb14768
......@@ -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%
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment