Merge branch 'master' of ssh://git.grid5000.fr/srv/git/repos/reference-repository

Rakefile

@@ -10,10 +10,10 @@ $LOAD_PATH.unshift(LIB_DIR) unless $LOAD_PATH.include?(LIB_DIR)
 REFERENCE_REPOSITORY_DIR = File.expand_path(File.dirname(__FILE__))
 
 # Import dependency rake file
-IMPORTED_RAKEFILES ||= []
+IMPORTED_RAKEFILES = Array.new
 IMPORTED_RAKEFILES.push File.expand_path(__FILE__)
 %w(weathermap).each do |dependency|
-  Dir.glob(File.expand_path(File.join(REFERENCE_REPOSITORY_DIR,"..",dependency,"Rakefile"))).each do |rakefile| 
+  Dir.glob(File.expand_path(File.join(REFERENCE_REPOSITORY_DIR,"..",dependency,"Rakefile"))).each do |rakefile|
     import rakefile unless IMPORTED_RAKEFILES.include? rakefile
   end
 end
@@ -227,7 +227,7 @@ namespace :netlinks do
     sh command
   end
   desc "Display network links description amongst network equipments."
-  task :display do 
+  task :display do
     host=ENV["HOST"]
     abort "You must provide the HOST=" if host.nil?
     cmd = File.join(WEATHERMAP_DIR,"bin","weathermap-app.rb")

data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-28.json

@@ -21,7 +21,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.64.28",
-      "mac": "00:e0:81:d5:07:98",
+      "mac": "00:e0:81:d5:06:5c",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -35,7 +35,7 @@
     {
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:e0:81:d5:07:99",
+      "mac": "00:e0:81:d5:06:5d",
       "rate": 1000000000,
       "vendor": "intel",
       "version": "82574L"
@@ -43,7 +43,7 @@
     {
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:e0:81:d5:07:9a",
+      "mac": "00:e0:81:d5:06:5e",
       "rate": 1000000000,
       "vendor": "intel",
       "version": "82574L"
@@ -77,7 +77,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.64.28",
-      "mac": "00:e0:81:d5:07:9b",
+      "mac": "00:E0:81:d5:06:5f",
       "management": true,
       "mountable": false,
       "mounted": false,

data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-35.json

@@ -21,7 +21,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.64.35",
-      "mac": "00:e0:81:d5:08:1c",
+      "mac": "00:e0:81:ba:f6:e8",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -35,7 +35,7 @@
     {
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:e0:81:d5:08:1d",
+      "mac": "00:e0:81:ba:f6:e7",
       "rate": 1000000000,
       "vendor": "intel",
       "version": "82574L"
@@ -43,7 +43,7 @@
     {
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:e0:81:d5:08:1e",
+      "mac": "00:e0:81:ba:f6:e6",
       "rate": 1000000000,
       "vendor": "intel",
       "version": "82574L"
@@ -77,7 +77,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.64.35",
-      "mac": "00:e0:81:d5:08:1f",
+      "mac": "00:e0:81:ba:f6:e9",
       "management": true,
       "mountable": false,
       "mounted": false,

generators/input/sites/nancy/clusters/graphene.yaml

@@ -1049,16 +1049,16 @@ graphene-28:
     ib1:
       guid: 20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:92:8e
     eth0:
-      mac: 00:e0:81:d5:07:98
+      mac: 00:e0:81:d5:06:5c
       ip: 172.16.64.28
       switch_name: sgraphene1
       switch_port: Gi1/0/27
     eth1:
-      mac: 00:e0:81:d5:07:99
+      mac: 00:e0:81:d5:06:5d
     eth2:
-      mac: 00:e0:81:d5:07:9a
+      mac: 00:e0:81:d5:06:5e
     bmc:
-      mac: 00:e0:81:d5:07:9b
+      mac: 00:E0:81:d5:06:5f
       ip: 172.17.64.28
       switch_name: sgraphene1-ipmi
       switch_port: 1/0/8
@@ -1315,16 +1315,16 @@ graphene-35:
     ib1:
       guid: 20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:92:ca
     eth0:
-      mac: 00:e0:81:d5:08:1c
+      mac: 00:e0:81:ba:f6:e8
       ip: 172.16.64.35
       switch_name: sgraphene1
       switch_port: Gi1/0/36
     eth1:
-      mac: 00:e0:81:d5:08:1d
+      mac: 00:e0:81:ba:f6:e7
     eth2:
-      mac: 00:e0:81:d5:08:1e
+      mac: 00:e0:81:ba:f6:e6
     bmc:
-      mac: 00:e0:81:d5:08:1f
+      mac: 00:e0:81:ba:f6:e9
       ip: 172.17.64.35
       switch_name: sgraphene1-ipmi
       switch_port: 1/0/15