Skip to content

GitLab

Commit 6587bf1a authored by Simon Delamare's avatar Simon Delamare
Browse files

[nantes] Use network lookup functions (Florentin work)

parent 23902ad1
Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 21 deletions
data/grid5000/sites/nantes/clusters/econome/econome.json
View file @ 6587bf1a
......@@ -2,7 +2,7 @@
"created_at": "Tue, 15 Apr 2014 22:00:00 GMT",
"kavlan": true,
"model": "Dell PowerEdge C6220",
"production": false,
"production": true,
"type": "cluster",
"uid": "econome"
}
\ No newline at end of file
data/grid5000/sites/nantes/clusters/econome/nodes/econome-1.json
View file @ 6587bf1a
......@@ -39,7 +39,7 @@
"network_address": "econome-1.nantes.grid5000.fr",
"rate": 10000000000,
"switch": "gw-nantes",
"switch_port": "Te0/45",
"switch_port": "TenGigabitEthernet 0/45",
"vendor": "Intel",
"version": "82599EB 10-Gigabit SFI/SFP+ Network Connection"
},
......
data/grid5000/sites/nantes/clusters/econome/nodes/econome-10.json
View file @ 6587bf1a
......@@ -39,7 +39,7 @@
"network_address": "econome-10.nantes.grid5000.fr",
"rate": 10000000000,
"switch": "gw-nantes",
"switch_port": "Te0/40",
"switch_port": "TenGigabitEthernet 0/40",
"vendor": "Intel",
"version": "82599EB 10-Gigabit SFI/SFP+ Network Connection"
},
......
data/grid5000/sites/nantes/clusters/econome/nodes/econome-11.json
View file @ 6587bf1a
......@@ -39,7 +39,7 @@
"network_address": "econome-11.nantes.grid5000.fr",
"rate": 10000000000,
"switch": "gw-nantes",
"switch_port": "Te0/19",
"switch_port": "TenGigabitEthernet 0/19",
"vendor": "Intel",
"version": "82599EB 10-Gigabit SFI/SFP+ Network Connection"
},
......
data/grid5000/sites/nantes/clusters/econome/nodes/econome-12.json
View file @ 6587bf1a
......@@ -39,7 +39,7 @@
"network_address": "econome-12.nantes.grid5000.fr",
"rate": 10000000000,
"switch": "gw-nantes",
"switch_port": "Te0/18",
"switch_port": "TenGigabitEthernet 0/18",
"vendor": "Intel",
"version": "82599EB 10-Gigabit SFI/SFP+ Network Connection"
},
......
data/grid5000/sites/nantes/clusters/econome/nodes/econome-13.json
View file @ 6587bf1a
......@@ -39,7 +39,7 @@
"network_address": "econome-13.nantes.grid5000.fr",
"rate": 10000000000,
"switch": "gw-nantes",
"switch_port": "Te0/39",
"switch_port": "TenGigabitEthernet 0/39",
"vendor": "Intel",
"version": "82599EB 10-Gigabit SFI/SFP+ Network Connection"
},
......
data/grid5000/sites/nantes/clusters/econome/nodes/econome-14.json
View file @ 6587bf1a
......@@ -39,7 +39,7 @@
"network_address": "econome-14.nantes.grid5000.fr",
"rate": 10000000000,
"switch": "gw-nantes",
"switch_port": "Te0/38",
"switch_port": "TenGigabitEthernet 0/38",
"vendor": "Intel",
"version": "82599EB 10-Gigabit SFI/SFP+ Network Connection"
},
......
data/grid5000/sites/nantes/clusters/econome/nodes/econome-15.json
View file @ 6587bf1a
......@@ -39,7 +39,7 @@
"network_address": "econome-15.nantes.grid5000.fr",
"rate": 10000000000,
"switch": "gw-nantes",
"switch_port": "Te0/21",
"switch_port": "TenGigabitEthernet 0/21",
"vendor": "Intel",
"version": "82599EB 10-Gigabit SFI/SFP+ Network Connection"
},
......
data/grid5000/sites/nantes/clusters/econome/nodes/econome-16.json
View file @ 6587bf1a
......@@ -39,7 +39,7 @@
"network_address": "econome-16.nantes.grid5000.fr",
"rate": 10000000000,
"switch": "gw-nantes",
"switch_port": "Te0/20",
"switch_port": "TenGigabitEthernet 0/20",
"vendor": "Intel",
"version": "82599EB 10-Gigabit SFI/SFP+ Network Connection"
},
......
data/grid5000/sites/nantes/clusters/econome/nodes/econome-17.json
View file @ 6587bf1a
......@@ -39,7 +39,7 @@
"network_address": "econome-17.nantes.grid5000.fr",
"rate": 10000000000,
"switch": "gw-nantes",
"switch_port": "Te0/13",
"switch_port": "TenGigabitEthernet 0/13",
"vendor": "Intel",
"version": "82599EB 10-Gigabit SFI/SFP+ Network Connection"
},
......
data/grid5000/sites/nantes/clusters/econome/nodes/econome-18.json
View file @ 6587bf1a
......@@ -39,7 +39,7 @@
"network_address": "econome-18.nantes.grid5000.fr",
"rate": 10000000000,
"switch": "gw-nantes",
"switch_port": "Te0/22",
"switch_port": "TenGigabitEthernet 0/22",
"vendor": "Intel",
"version": "82599EB 10-Gigabit SFI/SFP+ Network Connection"
},
......
data/grid5000/sites/nantes/clusters/econome/nodes/econome-2.json
View file @ 6587bf1a
......@@ -39,7 +39,7 @@
"network_address": "econome-2.nantes.grid5000.fr",
"rate": 10000000000,
"switch": "gw-nantes",
"switch_port": "Te0/44",
"switch_port": "TenGigabitEthernet 0/44",
"vendor": "Intel",
"version": "82599EB 10-Gigabit SFI/SFP+ Network Connection"
},
......
data/grid5000/sites/nantes/clusters/econome/nodes/econome-3.json
View file @ 6587bf1a
......@@ -39,7 +39,7 @@
"network_address": "econome-3.nantes.grid5000.fr",
"rate": 10000000000,
"switch": "gw-nantes",
"switch_port": "Te0/15",
"switch_port": "TenGigabitEthernet 0/15",
"vendor": "Intel",
"version": "82599EB 10-Gigabit SFI/SFP+ Network Connection"
},
......
data/grid5000/sites/nantes/clusters/econome/nodes/econome-4.json
View file @ 6587bf1a
......@@ -39,7 +39,7 @@
"network_address": "econome-4.nantes.grid5000.fr",
"rate": 10000000000,
"switch": "gw-nantes",
"switch_port": "Te0/14",
"switch_port": "TenGigabitEthernet 0/14",
"vendor": "Intel",
"version": "82599EB 10-Gigabit SFI/SFP+ Network Connection"
},
......
data/grid5000/sites/nantes/clusters/econome/nodes/econome-5.json
View file @ 6587bf1a
......@@ -39,7 +39,7 @@
"network_address": "econome-5.nantes.grid5000.fr",
"rate": 10000000000,
"switch": "gw-nantes",
"switch_port": "Te0/43",
"switch_port": "TenGigabitEthernet 0/43",
"vendor": "Intel",
"version": "82599EB 10-Gigabit SFI/SFP+ Network Connection"
},
......
data/grid5000/sites/nantes/clusters/econome/nodes/econome-6.json
View file @ 6587bf1a
......@@ -39,7 +39,7 @@
"network_address": "econome-6.nantes.grid5000.fr",
"rate": 10000000000,
"switch": "gw-nantes",
"switch_port": "Te0/42",
"switch_port": "TenGigabitEthernet 0/42",
"vendor": "Intel",
"version": "82599EB 10-Gigabit SFI/SFP+ Network Connection"
},
......
data/grid5000/sites/nantes/clusters/econome/nodes/econome-7.json
View file @ 6587bf1a
......@@ -39,7 +39,7 @@
"network_address": "econome-7.nantes.grid5000.fr",
"rate": 10000000000,
"switch": "gw-nantes",
"switch_port": "Te0/17",
"switch_port": "TenGigabitEthernet 0/17",
"vendor": "Intel",
"version": "82599EB 10-Gigabit SFI/SFP+ Network Connection"
},
......
data/grid5000/sites/nantes/clusters/econome/nodes/econome-8.json
View file @ 6587bf1a
......@@ -39,7 +39,7 @@
"network_address": "econome-8.nantes.grid5000.fr",
"rate": 10000000000,
"switch": "gw-nantes",
"switch_port": "Te0/16",
"switch_port": "TenGigabitEthernet 0/16",
"vendor": "Intel",
"version": "82599EB 10-Gigabit SFI/SFP+ Network Connection"
},
......
data/grid5000/sites/nantes/clusters/econome/nodes/econome-9.json
View file @ 6587bf1a
......@@ -39,7 +39,7 @@
"network_address": "econome-9.nantes.grid5000.fr",
"rate": 10000000000,
"switch": "gw-nantes",
"switch_port": "Te0/41",
"switch_port": "TenGigabitEthernet 0/41",
"vendor": "Intel",
"version": "82599EB 10-Gigabit SFI/SFP+ Network Connection"
},
......
generators/input/sites/nantes/clusters/econome.rb
View file @ 6587bf1a
......@@ -76,8 +76,8 @@ site :nantes do |site_uid|
:version => '82599EB 10-Gigabit SFI/SFP+ Network Connection',
:driver => lookup('econome_generated', node_uid, 'network_interfaces', 'eth0', 'driver'),
:mac => lookup('econome_generated', node_uid, 'network_interfaces', 'eth0', 'mac'),
:switch_port => lookup('econome_manual', node_uid, 'network_interfaces', 'eth0', 'switch_port'),
:switch => lookup('econome_manual', node_uid, 'network_interfaces', 'eth0', 'switch_name')
:switch_port => net_port_lookup('nantes', 'econome', node_uid, 'eth0'),
:switch => net_switch_lookup('nantes', 'econome', node_uid, 'eth0'),
},
{
:interface => lookup('econome_generated', node_uid, 'network_interfaces', 'eth1', 'interface'),
......
generators/input/sites/nantes/net-links/gw-nantes.yaml
View file @ 6587bf1a
......@@ -63,6 +63,7 @@ gw-nantes:
linecards:
0:
naming_pattern: "TenGigabitEthernet %LINECARD%/%PORT%"
snmp_pattern: "TenGigabitEthernet %LINECARD%/%PORT%"
kind: node
rate: 10000000000
port: eth0
......
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