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
...@@ -64,15 +64,13 @@ ...@@ -64,15 +64,13 @@
"bridged": false, "bridged": false,
"device": "eth2", "device": "eth2",
"driver": "myri10ge", "driver": "myri10ge",
"enabled": true, "enabled": false,
"interface": "Ethernet", "interface": "Ethernet",
"mac": "00:60:dd:46:84:b7", "mac": "00:60:dd:46:84:b7",
"management": false, "management": false,
"mountable": true, "mountable": false,
"mounted": false, "mounted": false,
"rate": 10000000000, "rate": 10000000000,
"switch": "sgriffon1",
"switch_port": "Ten-GigabitEthernet1/1/1",
"vendor": "myrinet", "vendor": "myrinet",
"version": "Myri-10G" "version": "Myri-10G"
}, },
......
...@@ -64,15 +64,13 @@ ...@@ -64,15 +64,13 @@
"bridged": false, "bridged": false,
"device": "eth2", "device": "eth2",
"driver": "myri10ge", "driver": "myri10ge",
"enabled": true, "enabled": false,
"interface": "Ethernet", "interface": "Ethernet",
"mac": "00:60:dd:46:84:b9", "mac": "00:60:dd:46:84:b9",
"management": false, "management": false,
"mountable": true, "mountable": false,
"mounted": false, "mounted": false,
"rate": 10000000000, "rate": 10000000000,
"switch": "sgriffon1",
"switch_port": "Ten-GigabitEthernet1/2/2",
"vendor": "myrinet", "vendor": "myrinet",
"version": "Myri-10G" "version": "Myri-10G"
}, },
......
...@@ -64,15 +64,13 @@ ...@@ -64,15 +64,13 @@
"bridged": false, "bridged": false,
"device": "eth2", "device": "eth2",
"driver": "myri10ge", "driver": "myri10ge",
"enabled": true, "enabled": false,
"interface": "Ethernet", "interface": "Ethernet",
"mac": "00:60:dd:46:84:a8", "mac": "00:60:dd:46:84:a8",
"management": false, "management": false,
"mountable": true, "mountable": false,
"mounted": false, "mounted": false,
"rate": 10000000000, "rate": 10000000000,
"switch": null,
"switch_port": null,
"vendor": "myrinet", "vendor": "myrinet",
"version": "Myri-10G" "version": "Myri-10G"
}, },
......
...@@ -64,15 +64,13 @@ ...@@ -64,15 +64,13 @@
"bridged": false, "bridged": false,
"device": "eth2", "device": "eth2",
"driver": "myri10ge", "driver": "myri10ge",
"enabled": true, "enabled": false,
"interface": "Ethernet", "interface": "Ethernet",
"mac": "00:60:dd:46:84:b8", "mac": "00:60:dd:46:84:b8",
"management": false, "management": false,
"mountable": true, "mountable": false,
"mounted": false, "mounted": false,
"rate": 10000000000, "rate": 10000000000,
"switch": null,
"switch_port": null,
"vendor": "myrinet", "vendor": "myrinet",
"version": "Myri-10G" "version": "Myri-10G"
}, },
......
{
"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
...@@ -163,9 +163,7 @@ ...@@ -163,9 +163,7 @@
}, },
{ {
"kind": "node",
"port": "eth2",
"uid": "griffon-11"
}, },
{ {
"kind": "switch", "kind": "switch",
...@@ -174,24 +172,6 @@ ...@@ -174,24 +172,6 @@
], ],
"rate": 10000000000, "rate": 10000000000,
"snmp_pattern": "Ten-GigabitEthernet1/%LINECARD%/%PORT%" "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", "model": "3com 4500g",
......
...@@ -102,16 +102,14 @@ site :nancy do |site_uid| ...@@ -102,16 +102,14 @@ site :nancy do |site_uid|
{ {
:interface => lookup('griffon_manual', node_uid, 'network_interfaces', 'eth2', 'interface'), :interface => lookup('griffon_manual', node_uid, 'network_interfaces', 'eth2', 'interface'),
:rate => 10.G, :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'), :management => lookup('griffon_manual', node_uid, 'network_interfaces', 'eth2', 'management'),
:mountable => lookup('griffon_manual', node_uid, 'network_interfaces', 'eth2', 'mountable'), :mountable => false, # see bug 6490,
:mounted => lookup('griffon_manual', node_uid, 'network_interfaces', 'eth2', 'mounted'), :mounted => false, # see bug 6490,
:bridged => false, :bridged => false,
:device => "eth2", :device => "eth2",
:vendor => "myrinet", :vendor => "myrinet",
:version => "Myri-10G", :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'), :driver => lookup('griffon_manual', node_uid, 'network_interfaces', 'eth2', 'driver'),
:mac => lookup('griffon_manual', node_uid, 'network_interfaces', 'eth2', 'mac') :mac => lookup('griffon_manual', node_uid, 'network_interfaces', 'eth2', 'mac')
}, },
......
...@@ -70,22 +70,9 @@ sgriffon1: ...@@ -70,22 +70,9 @@ sgriffon1:
kind: other kind: other
rate: 10000000000 rate: 10000000000
ports: ports:
1:
uid: griffon-11
port: eth2
kind: node
2: 2:
uid: sgravillon1 uid: sgravillon1
kind: switch 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: channels:
naming_pattern: Po%CHANNELID% naming_pattern: Po%CHANNELID%
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment