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

data/grid5000/sites/nantes/environments/wheezy-x64-min-1.4.json

+../../../../grid5000/environments/wheezy-x64-min-1.4.json
\ No newline at end of file

data/grid5000/sites/nantes/environments/wheezy-x64-nfs-1.3.json

+../../../../grid5000/environments/wheezy-x64-nfs-1.3.json
\ No newline at end of file

data/grid5000/sites/nantes/environments/wheezy-x64-xen-1.3.json

+../../../../grid5000/environments/wheezy-x64-xen-1.3.json
\ No newline at end of file

data/grid5000/sites/reims/environments/wheezy-x64-min-1.4.json

+../../../../grid5000/environments/wheezy-x64-min-1.4.json
\ No newline at end of file

data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-8.json

@@ -151,8 +151,8 @@
       "device": "sdc",
       "driver": "ahci",
       "interface": "SATA",
-      "model": "WD6001BKHG",
-      "rev": "D1S6",
+      "model": "WD6002BKTG",
+      "rev": "D1P3",
       "size": 600127266816,
       "storage": "HDD"
     },

data/grid5000/sites/rennes/environments/wheezy-x64-min-1.4.json

+../../../../grid5000/environments/wheezy-x64-min-1.4.json
\ No newline at end of file

data/grid5000/sites/sophia/environments/wheezy-x64-min-1.4.json

+../../../../grid5000/environments/wheezy-x64-min-1.4.json
\ No newline at end of file

data/grid5000/sites/sophia/network_equipments/gw-sophia.json

@@ -9,7 +9,21 @@
 
     },
     {
+      "backplane_bps": null,
+      "kind": "switch",
+      "naming_pattern": "ethernet%LINECARD%/%PORT%",
+      "ports": [
+        {
 
+        },
+        {
+          "kind": "renater",
+          "site": "virtual",
+          "uid": "renater-sophia"
+        }
+      ],
+      "rate": 10000000000,
+      "snmp_pattern": "10GigabitEthernet%LINECARD%/%PORT%"
     },
     {
       "backplane_bps": 20000000000,
@@ -498,9 +512,7 @@
 
         },
         {
-          "kind": "virtual",
-          "rate": 10000000000,
-          "uid": "renater-sophia"
+
         },
         {
           "port": "eth0",

data/grid5000/sites/toulouse/environments/wheezy-x64-min-1.4.json

+../../../../grid5000/environments/wheezy-x64-min-1.4.json
\ No newline at end of file

generators/input/environments/squeeze-x64-base-1.8.rb

@@ -2,8 +2,8 @@ environment 'squeeze-x64-base-1.8' do
   state "stable"
   file({:path => "/grid5000/images/squeeze-x64-base-1.8.tgz", :md5 => "2f4f9fcf23c2107f78ac698477e20b7b"})
   kernel "2.6.32-5"
-  available_on %w{grenoble lille luxembourg lyon nancy reims rennes sophia toulouse}
-  valid_on "adonis , edel , genepi , chimint , chinqchint , chirloute , granduc , petitprince , hercule, orion, sagittaire, taurus, graphene , griffon , stremi , paramount , parapide , parapluie , helios , sol , suno, pastel"
+  available_on %w{grenoble lille luxembourg lyon nancy nantes reims rennes sophia toulouse}
+  valid_on "adonis , edel , genepi , chimint , chinqchint , chirloute , granduc , petitprince , hercule, orion, sagittaire, taurus, graphene , griffon , econome, stremi , parapide , parapluie , paranoia, helios , sol , suno, pastel"
   based_on "Debian version squeeze for amd64"
   consoles [{:port => "ttyS0", :bps => 34800}]
   services []

generators/input/environments/squeeze-x64-big-1.10.rb

@@ -2,8 +2,8 @@ environment 'squeeze-x64-big-1.10' do
   state "stable"
   file({:path => "/grid5000/images/squeeze-x64-big-1.10.tgz", :md5 => "30db05a58d411632dd90f2e53f975e38"})
   kernel "2.6.32-5"
-  available_on %w{grenoble lille luxembourg lyon nancy reims rennes sophia toulouse}
-  valid_on "adonis , edel , genepi , chimint , chinqchint , chirloute , granduc , petitprince , hercule, orion, sagittaire, taurus, graphene , griffon , stremi , paramount , parapide , parapluie , helios , sol , suno, pastel"
+  available_on %w{grenoble lille luxembourg lyon nancy nantes reims rennes sophia toulouse}
+  valid_on "adonis , edel , genepi , chimint , chinqchint , chirloute , granduc , petitprince , hercule, orion, sagittaire, taurus, graphene , griffon , econome, stremi , parapide , parapluie , paranoia, helios , sol , suno, pastel"
   based_on "Debian version squeeze for amd64"
   consoles [{:port => "ttyS0", :bps => 34800}]
   services []

generators/input/environments/squeeze-x64-min-1.10.rb

@@ -2,8 +2,8 @@ environment 'squeeze-x64-min-1.10' do
   state "stable"
   file({:path => "/grid5000/images/squeeze-x64-min-1.10.tgz", :md5 => "cd391bacce38beaf2707c5b32111012c"})
   kernel "2.6.32-5"
-  available_on %w{grenoble lille luxembourg lyon nancy reims rennes sophia toulouse}
-  valid_on "adonis , edel , genepi , chimint , chinqchint , chirloute , granduc , petitprince , hercule, orion, sagittaire, taurus, graphene , griffon , stremi , paramount , parapide , parapluie , helios , sol , suno, pastel"
+  available_on %w{grenoble lille luxembourg lyon nancy nantes reims rennes sophia toulouse}
+  valid_on "adonis , edel , genepi , chimint , chinqchint , chirloute , granduc , petitprince , hercule, orion, sagittaire, taurus, graphene , griffon , econome, stremi , parapide , parapluie , paranoia, helios , sol , suno, pastel"
   based_on "Debian version squeeze for amd64"
   consoles [{:port => "ttyS0", :bps => 34800}]
   services []

generators/input/environments/squeeze-x64-nfs-1.10.rb

@@ -2,8 +2,8 @@ environment 'squeeze-x64-nfs-1.10' do
   state "stable"
   file({:path => "/grid5000/images/squeeze-x64-nfs-1.10.tgz", :md5 => "adf1dbd13591832451ffa9ab975b7bbb"})
   kernel "2.6.32-5"
-  available_on %w{grenoble lille luxembourg lyon nancy reims rennes sophia toulouse}
-  valid_on "adonis , edel , genepi , chimint , chinqchint , chirloute , granduc , petitprince , hercule, orion, sagittaire, taurus, graphene , griffon , stremi , paramount , parapide , parapluie , helios , sol , suno, pastel"
+  available_on %w{grenoble lille luxembourg lyon nancy nantes reims rennes sophia toulouse}
+  valid_on "adonis , edel , genepi , chimint , chinqchint , chirloute , granduc , petitprince , hercule, orion, sagittaire, taurus, graphene , griffon , econome, stremi , parapide , parapluie , paranoia, helios , sol , suno, pastel"
   based_on "Debian version squeeze for amd64"
   consoles [{:port => "ttyS0", :bps => 34800}]
   services []

generators/input/environments/wheezy-x64-base-1.3.rb

@@ -2,8 +2,8 @@ environment 'wheezy-x64-base-1.3' do
   state "stable"
   file({:path => "/grid5000/images/wheezy-x64-base-1.3.tgz", :md5 => "d1562fb20a4a787ed11936715450c9d1"})
   kernel "3.2.0-4"
-  available_on %w{grenoble lille luxembourg lyon nancy reims rennes sophia toulouse}
-  valid_on "adonis , edel , genepi , chicon , chimint , chinqchint , chirloute , granduc , petitprince , hercule, orion, sagittaire, taurus, graphene , griffon , stremi , paramount , parapide , parapluie , helios , sol , suno, pastel"
+  available_on %w{grenoble lille luxembourg lyon nancy nantes reims rennes sophia toulouse}
+  valid_on "adonis , edel , genepi , chimint , chinqchint , chirloute , granduc , petitprince , hercule, orion, sagittaire, taurus, graphene , griffon , stremi , paradent , paramount , parapide , parapluie , helios , sol , suno, pastel"
   based_on "Debian version wheezy for amd64"
   consoles [{:port => "ttyS0", :bps => 34800}]
   services []

generators/input/environments/wheezy-x64-big-1.3.rb

@@ -2,8 +2,8 @@ environment 'wheezy-x64-big-1.3' do
   state "stable"
   file({:path => "/grid5000/images/wheezy-x64-big-1.3.tgz", :md5 => "774bdf59cb2bdc478c4b420d738aae8d"})
   kernel "3.2.0-4"
-  available_on %w{grenoble lille luxembourg lyon nancy reims rennes sophia toulouse}
-  valid_on "adonis , edel , genepi , chicon , chimint , chinqchint , chirloute , granduc , petitprince , hercule, orion, sagittaire, taurus, graphene , griffon , stremi , paramount , parapide , parapluie , helios , sol , suno, pastel"
+  available_on %w{grenoble lille luxembourg lyon nancy nantes reims rennes sophia toulouse}
+  valid_on "adonis , edel , genepi , chimint , chinqchint , chirloute , granduc , petitprince , hercule, orion, sagittaire, taurus, graphene , griffon , stremi , paradent , paramount , parapide , parapluie , helios , sol , suno, pastel"
   based_on "Debian version wheezy for amd64"
   consoles [{:port => "ttyS0", :bps => 34800}]
   services []

generators/input/environments/wheezy-x64-min-1.4.rb

@@ -2,8 +2,8 @@ environment 'wheezy-x64-min-1.4' do
   state "stable"
   file({:path => "/grid5000/images/wheezy-x64-min-1.4.tgz", :md5 => "206ce5c1a3cd856a4463c0a48324377f"})
   kernel "3.2.0-4"
-  available_on %w{grenoble lille luxembourg lyon nancy reims rennes sophia toulouse}
-  valid_on "adonis , edel , genepi , chicon , chimint , chinqchint , chirloute , granduc , petitprince , hercule, orion, sagittaire, taurus, graphene , griffon , stremi , paramount , parapide , parapluie , helios , sol , suno, pastel"
+  available_on %w{grenoble lille luxembourg lyon nancy nantes reims rennes sophia toulouse}
+  valid_on "adonis , edel , genepi , chimint , chinqchint , chirloute , granduc , petitprince , hercule, orion, sagittaire, taurus, graphene , griffon , stremi , paradent , paramount , parapide , parapluie , helios , sol , suno, pastel"
   based_on "Debian version wheezy for amd64"
   consoles [{:port => "ttyS0", :bps => 34800}]
   services []

generators/input/environments/wheezy-x64-nfs-1.3.rb

@@ -2,8 +2,8 @@ environment 'wheezy-x64-nfs-1.3' do
   state "stable"
   file({:path => "/grid5000/images/wheezy-x64-nfs-1.3.tgz", :md5 => "b327d3150ef6f625f88ed65b08048cf9"})
   kernel "3.2.0-4"
-  available_on %w{grenoble lille luxembourg lyon nancy reims rennes sophia toulouse}
-  valid_on "adonis , edel , genepi , chicon , chimint , chinqchint , chirloute , granduc , petitprince , hercule, orion, sagittaire, taurus, graphene , griffon , stremi , paramount , parapide , parapluie , helios , sol , suno, pastel"
+  available_on %w{grenoble lille luxembourg lyon nancy nantes reims rennes sophia toulouse}
+  valid_on "adonis , edel , genepi , chimint , chinqchint , chirloute , granduc , petitprince , hercule, orion, sagittaire, taurus, graphene , griffon , stremi , paradent , paramount , parapide , parapluie , helios , sol , suno, pastel"
   based_on "Debian version wheezy for amd64"
   consoles [{:port => "ttyS0", :bps => 34800}]
   services []

generators/input/environments/wheezy-x64-xen-1.3.rb

@@ -2,8 +2,8 @@ environment 'wheezy-x64-xen-1.3' do
   state "stable"
   file({:path => "/grid5000/images/wheezy-x64-xen-1.3.tgz", :md5 => "fbd01f78fe52e06d8451017d9095ce89"})
   kernel "3.2.0-4"
-  available_on %w{grenoble lille luxembourg lyon nancy reims rennes sophia toulouse}
-  valid_on "adonis , edel , genepi , chicon , chimint , chinqchint , chirloute , granduc , petitprince , hercule, orion, sagittaire, taurus, graphene , griffon , stremi , paramount , parapide , parapluie , sol , suno, pastel"
+  available_on %w{grenoble lille luxembourg lyon nancy nantes reims rennes sophia toulouse}
+  valid_on "adonis , edel , genepi , chimint , chinqchint , chirloute , granduc , petitprince , hercule, orion, sagittaire, taurus, graphene , griffon , stremi , paradent , paramount , parapide , parapluie , helios , sol , suno, pastel"
   based_on "Debian version wheezy for amd64"
   consoles [{:port => "ttyS0", :bps => 34800}]
   services []

generators/input/sites/rennes/clusters/paranoia_generated.yaml

@@ -670,8 +670,8 @@ paranoia-8:
     sdc:
       device: sdc
       size: 600127266816
-      model: WD6001BKHG
-      rev: D1S6
+      model: WD6002BKTG
+      rev: D1P3
   processor:
     clock_speed: 2200000000
     instruction_set: x86-64

generators/input/sites/sophia/net-links/gw-sophia.yaml

@@ -11,7 +11,7 @@ gw-sophia:
     "vlan100":
       administrative: yes
       addresses:
-        - 172.16.143.254    
+        - 172.16.143.254
     "vlan101":
       addresses:
         - 172.17.143.254
@@ -52,7 +52,7 @@ gw-sophia:
     "vlan705":
       name: kavlan-5
       addresses:
-        - 10.32.64.0/18	
+        - 10.32.64.0/18
     "vlan706":
       name: kavlan-6
       addresses:
@@ -60,11 +60,11 @@ gw-sophia:
     "vlan707":
       name: kavlan-7
       addresses:
-        - 10.32.192.0/18	
+        - 10.32.192.0/18
     "vlan708":
       name: kavlan-8
       addresses:
-        - 10.33.0.0/18	
+        - 10.33.0.0/18
     "vlan709":
       name: kavlan-9
       addresses:
@@ -77,6 +77,17 @@ gw-sophia:
   backplane_bps: 900000000000
 
   linecards:
+    1:
+      naming_pattern: "ethernet%LINECARD%/%PORT%"
+      snmp_pattern: "10GigabitEthernet%LINECARD%/%PORT%"
+      kind: switch
+      backplane_bps:
+      rate: 10000000000
+      ports:
+        1:
+          uid: renater-sophia
+          kind: renater
+          site: virtual
     2:
       naming_pattern: "ethernet%LINECARD%/%PORT%"
       snmp_pattern: "10GigabitEthernet%LINECARD%/%PORT%"
@@ -195,10 +206,6 @@ gw-sophia:
           uid: sol-50
           kind: node
         6: sw-myrinet
-        9:
-          uid: renater-sophia
-          kind: virtual
-          rate: 10000000000
         10:
           uid: stock
           port: eth0