[grenoble] fix adonis-[11,12] interfaces

data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-1.json

@@ -31,7 +31,9 @@
       "mountable": true,
       "mounted": true,
       "network_address": "adonis-1-eth0.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10c9 (rev 01)"
     },
     {
       "device": "eth1",

data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.json

@@ -31,7 +31,9 @@
       "mountable": true,
       "mounted": true,
       "network_address": "adonis-10-eth0.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10c9 (rev 01)"
     },
     {
       "device": "eth1",

data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-11.json

@@ -10,11 +10,12 @@
   },
   "network_adapters": [
     {
+      "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.141",
       "management": false,
-      "mountable": false,
+      "mountable": true,
       "mounted": true,
       "network_address": "adonis-11.grenoble.grid5000.fr",
       "rate": 40000000000,
@@ -22,6 +23,7 @@
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT\/s"
     },
     {
+      "device": "eth0",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.141",
@@ -29,7 +31,9 @@
       "mountable": true,
       "mounted": true,
       "network_address": "adonis-11-eth0.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10c9 (rev 01)"
     }
   ],
   "operating_system": {

data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-12.json

@@ -10,11 +10,12 @@
   },
   "network_adapters": [
     {
+      "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.142",
       "management": false,
-      "mountable": false,
+      "mountable": true,
       "mounted": true,
       "network_address": "adonis-12.grenoble.grid5000.fr",
       "rate": 40000000000,
@@ -22,6 +23,7 @@
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT\/s"
     },
     {
+      "device": "eth0",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.142",
@@ -29,7 +31,9 @@
       "mountable": true,
       "mounted": true,
       "network_address": "adonis-12-eth0.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10c9 (rev 01)"
     }
   ],
   "operating_system": {

data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-2.json

@@ -31,7 +31,9 @@
       "mountable": true,
       "mounted": true,
       "network_address": "adonis-2-eth0.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10c9 (rev 01)"
     },
     {
       "device": "eth1",

data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-3.json

@@ -31,7 +31,9 @@
       "mountable": true,
       "mounted": true,
       "network_address": "adonis-3-eth0.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10c9 (rev 01)"
     },
     {
       "device": "eth1",

data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.json

@@ -31,7 +31,9 @@
       "mountable": true,
       "mounted": true,
       "network_address": "adonis-4-eth0.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10c9 (rev 01)"
     },
     {
       "device": "eth1",

data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-5.json

@@ -31,7 +31,9 @@
       "mountable": true,
       "mounted": true,
       "network_address": "adonis-5-eth0.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10c9 (rev 01)"
     },
     {
       "device": "eth1",

data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-6.json

@@ -31,7 +31,9 @@
       "mountable": true,
       "mounted": true,
       "network_address": "adonis-6-eth0.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10c9 (rev 01)"
     },
     {
       "device": "eth1",

data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-7.json

@@ -31,7 +31,9 @@
       "mountable": true,
       "mounted": true,
       "network_address": "adonis-7-eth0.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10c9 (rev 01)"
     },
     {
       "device": "eth1",

data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-8.json

@@ -31,7 +31,9 @@
       "mountable": true,
       "mounted": true,
       "network_address": "adonis-8-eth0.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10c9 (rev 01)"
     },
     {
       "device": "eth1",

data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.json

@@ -31,7 +31,9 @@
       "mountable": true,
       "mounted": true,
       "network_address": "adonis-9-eth0.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10c9 (rev 01)"
     },
     {
       "device": "eth1",

generators/input/grenoble.rb

@@ -147,6 +147,7 @@ site :grenoble do |site_uid|
           :mounted => true,
           :mountable => true,
           :management => false,
+	  :vendor => 'Intel', :version => "Device 10c9 (rev 01)",
           :network_address => "#{node_uid}-eth0.#{site_uid}.grid5000.fr",
           :ip => dns_lookup("#{node_uid}-eth0.#{site_uid}.grid5000.fr")
         },
@@ -207,9 +208,10 @@ site :grenoble do |site_uid|
         network_adapters [{
           :interface => 'InfiniBand',
           :rate => 40.G,
+          :device => "ib0",
           :enabled => true,
           :mounted => true,
-          :mountable => false,
+          :mountable => true,
           :management => false,
           :vendor => 'Mellanox', :version => "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
           :network_address => "#{node_uid}.#{site_uid}.grid5000.fr",
@@ -218,10 +220,12 @@ site :grenoble do |site_uid|
         {
           :interface => 'Ethernet',
           :rate => 1.G,
+          :device => "eth0",
           :enabled => true,
           :mountable => true,
           :mounted => true,
           :management => false,
+	  :vendor => 'Intel', :version => "Device 10c9 (rev 01)",
           :network_address => "#{node_uid}-eth0.#{site_uid}.grid5000.fr",
           :ip => dns_lookup("#{node_uid}-eth0.#{site_uid}.grid5000.fr")
         }]