diff --git a/data/grid5000/environments/squeeze-x64-base-1.8.json b/data/grid5000/environments/squeeze-x64-base-1.8.json
index a8b80d92b772f047004d7d0553c50dfcba42ab2a..6add4024f18d0fbf5c5b4ca8e27d6089a8d558e9 100644
--- a/data/grid5000/environments/squeeze-x64-base-1.8.json
+++ b/data/grid5000/environments/squeeze-x64-base-1.8.json
@@ -35,6 +35,6 @@
"tcp_bandwidth": 1000000000,
"type": "environment",
"uid": "squeeze-x64-base-1.8",
- "valid_on": "adonis , edel , genepi , chimint , chinqchint , chirloute , granduc , petitprince , hercule, orion, sagittaire, taurus, graphene , griffon , stremi , paramount , parapide , parapluie , helios , sol , suno, pastel",
+ "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",
"x11_forwarding": true
-}
+}
\ No newline at end of file
diff --git a/data/grid5000/environments/squeeze-x64-big-1.10.json b/data/grid5000/environments/squeeze-x64-big-1.10.json
index 39ce8a7e46ced22f50251d43122f888628c95e1d..90e071edc89b7887c8dd10829bd8188ef60cd11f 100644
--- a/data/grid5000/environments/squeeze-x64-big-1.10.json
+++ b/data/grid5000/environments/squeeze-x64-big-1.10.json
@@ -35,6 +35,6 @@
"tcp_bandwidth": 1000000000,
"type": "environment",
"uid": "squeeze-x64-big-1.10",
- "valid_on": "adonis , edel , genepi , chimint , chinqchint , chirloute , granduc , petitprince , hercule, orion, sagittaire, taurus, graphene , griffon , stremi , paramount , parapide , parapluie , helios , sol , suno, pastel",
+ "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",
"x11_forwarding": true
-}
+}
\ No newline at end of file
diff --git a/data/grid5000/environments/squeeze-x64-min-1.10.json b/data/grid5000/environments/squeeze-x64-min-1.10.json
index 5e45e4af93b8e7d77636afdcd1c6bff840b0fef9..35231a259cfadd6f954dded39707a53b01cd8687 100644
--- a/data/grid5000/environments/squeeze-x64-min-1.10.json
+++ b/data/grid5000/environments/squeeze-x64-min-1.10.json
@@ -29,6 +29,6 @@
"tcp_bandwidth": 1000000000,
"type": "environment",
"uid": "squeeze-x64-min-1.10",
- "valid_on": "adonis , edel , genepi , chimint , chinqchint , chirloute , granduc , petitprince , hercule, orion, sagittaire, taurus, graphene , griffon , stremi , paramount , parapide , parapluie , helios , sol , suno, pastel",
+ "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",
"x11_forwarding": true
-}
+}
\ No newline at end of file
diff --git a/data/grid5000/environments/squeeze-x64-nfs-1.10.json b/data/grid5000/environments/squeeze-x64-nfs-1.10.json
index a9adc3edd9b7b5da56babc2d091826d9bbf3b2df..23d0b4d946400411cb8ccbec356d30dabe5060e4 100644
--- a/data/grid5000/environments/squeeze-x64-nfs-1.10.json
+++ b/data/grid5000/environments/squeeze-x64-nfs-1.10.json
@@ -35,6 +35,6 @@
"tcp_bandwidth": 1000000000,
"type": "environment",
"uid": "squeeze-x64-nfs-1.10",
- "valid_on": "adonis , edel , genepi , chimint , chinqchint , chirloute , granduc , petitprince , hercule, orion, sagittaire, taurus, graphene , griffon , stremi , paramount , parapide , parapluie , helios , sol , suno, pastel",
+ "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",
"x11_forwarding": true
-}
+}
\ No newline at end of file
diff --git a/data/grid5000/environments/wheezy-x64-base-1.3.json b/data/grid5000/environments/wheezy-x64-base-1.3.json
index acd12f239c48e1e80fad8aaefc1d4168e26a1953..f838cefbd02b132fb718972d26c78a995032c37e 100644
--- a/data/grid5000/environments/wheezy-x64-base-1.3.json
+++ b/data/grid5000/environments/wheezy-x64-base-1.3.json
@@ -35,6 +35,6 @@
"tcp_bandwidth": 1000000000,
"type": "environment",
"uid": "wheezy-x64-base-1.3",
- "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",
+ "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",
"x11_forwarding": true
-}
+}
\ No newline at end of file
diff --git a/data/grid5000/environments/wheezy-x64-big-1.3.json b/data/grid5000/environments/wheezy-x64-big-1.3.json
index 6fc79f742e9d3de7ba1eaa3fa34edaef87945511..9aba17ec462d642d0f62833afcac9cd60c5c9c8e 100644
--- a/data/grid5000/environments/wheezy-x64-big-1.3.json
+++ b/data/grid5000/environments/wheezy-x64-big-1.3.json
@@ -35,6 +35,6 @@
"tcp_bandwidth": 1000000000,
"type": "environment",
"uid": "wheezy-x64-big-1.3",
- "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",
+ "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",
"x11_forwarding": true
-}
+}
\ No newline at end of file
diff --git a/data/grid5000/environments/wheezy-x64-min-1.4.json b/data/grid5000/environments/wheezy-x64-min-1.4.json
new file mode 100644
index 0000000000000000000000000000000000000000..6123bec584c35532ffb652d5da9807216dd31577
--- /dev/null
+++ b/data/grid5000/environments/wheezy-x64-min-1.4.json
@@ -0,0 +1,34 @@
+{
+ "accounts": [
+ {
+ "login": "root",
+ "password": "grid5000"
+ }
+ ],
+ "applications": [
+ "Vim",
+ "nano",
+ "Perl"
+ ],
+ "based_on": "Debian version wheezy for amd64",
+ "consoles": [
+ {
+ "bps": 34800,
+ "port": "ttyS0"
+ }
+ ],
+ "file": {
+ "md5": "206ce5c1a3cd856a4463c0a48324377f",
+ "path": "/grid5000/images/wheezy-x64-min-1.4.tgz"
+ },
+ "kernel": "3.2.0-4",
+ "services": [
+
+ ],
+ "state": "stable",
+ "tcp_bandwidth": 1000000000,
+ "type": "environment",
+ "uid": "wheezy-x64-min-1.4",
+ "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",
+ "x11_forwarding": true
+}
\ No newline at end of file
diff --git a/data/grid5000/environments/wheezy-x64-nfs-1.3.json b/data/grid5000/environments/wheezy-x64-nfs-1.3.json
index 0f3e85b2139e6a7aa234780e15227a8ddf89a6b0..d3316ac794f04aefc7fc6e7b9a2917a59b37fb37 100644
--- a/data/grid5000/environments/wheezy-x64-nfs-1.3.json
+++ b/data/grid5000/environments/wheezy-x64-nfs-1.3.json
@@ -35,6 +35,6 @@
"tcp_bandwidth": 1000000000,
"type": "environment",
"uid": "wheezy-x64-nfs-1.3",
- "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",
+ "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",
"x11_forwarding": true
-}
+}
\ No newline at end of file
diff --git a/data/grid5000/environments/wheezy-x64-xen-1.3.json b/data/grid5000/environments/wheezy-x64-xen-1.3.json
index 1c4416ea7e6cbed1fb5910469aefa7cd1fd8d3ff..6a78c5ecf12c3804e11d37fa1daf8fc7d9380ad9 100644
--- a/data/grid5000/environments/wheezy-x64-xen-1.3.json
+++ b/data/grid5000/environments/wheezy-x64-xen-1.3.json
@@ -35,6 +35,6 @@
"tcp_bandwidth": 1000000000,
"type": "environment",
"uid": "wheezy-x64-xen-1.3",
- "valid_on": "adonis , edel , genepi , chicon , chimint , chinqchint , chirloute , granduc , petitprince , hercule, orion, sagittaire, taurus, graphene , griffon , stremi , paramount , parapide , parapluie , sol , suno, pastel",
+ "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",
"x11_forwarding": true
-}
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/environments/wheezy-x64-min-1.4.json b/data/grid5000/sites/grenoble/environments/wheezy-x64-min-1.4.json
new file mode 120000
index 0000000000000000000000000000000000000000..29aa77b8b72a0c2b3de57351b9f9d5f7dc293d9c
--- /dev/null
+++ b/data/grid5000/sites/grenoble/environments/wheezy-x64-min-1.4.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/wheezy-x64-min-1.4.json
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/environments/wheezy-x64-min-1.4.json b/data/grid5000/sites/lille/environments/wheezy-x64-min-1.4.json
new file mode 120000
index 0000000000000000000000000000000000000000..29aa77b8b72a0c2b3de57351b9f9d5f7dc293d9c
--- /dev/null
+++ b/data/grid5000/sites/lille/environments/wheezy-x64-min-1.4.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/wheezy-x64-min-1.4.json
\ No newline at end of file
diff --git a/data/grid5000/sites/luxembourg/environments/wheezy-x64-min-1.4.json b/data/grid5000/sites/luxembourg/environments/wheezy-x64-min-1.4.json
new file mode 120000
index 0000000000000000000000000000000000000000..29aa77b8b72a0c2b3de57351b9f9d5f7dc293d9c
--- /dev/null
+++ b/data/grid5000/sites/luxembourg/environments/wheezy-x64-min-1.4.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/wheezy-x64-min-1.4.json
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/environments/wheezy-x64-min-1.4.json b/data/grid5000/sites/lyon/environments/wheezy-x64-min-1.4.json
new file mode 120000
index 0000000000000000000000000000000000000000..29aa77b8b72a0c2b3de57351b9f9d5f7dc293d9c
--- /dev/null
+++ b/data/grid5000/sites/lyon/environments/wheezy-x64-min-1.4.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/wheezy-x64-min-1.4.json
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/environments/wheezy-x64-min-1.4.json b/data/grid5000/sites/nancy/environments/wheezy-x64-min-1.4.json
new file mode 120000
index 0000000000000000000000000000000000000000..29aa77b8b72a0c2b3de57351b9f9d5f7dc293d9c
--- /dev/null
+++ b/data/grid5000/sites/nancy/environments/wheezy-x64-min-1.4.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/wheezy-x64-min-1.4.json
\ No newline at end of file
diff --git a/data/grid5000/sites/nantes/environments/squeeze-x64-base-1.8.json b/data/grid5000/sites/nantes/environments/squeeze-x64-base-1.8.json
new file mode 120000
index 0000000000000000000000000000000000000000..e0f02f1e05bb331899977c8cb516baf3a30e5b58
--- /dev/null
+++ b/data/grid5000/sites/nantes/environments/squeeze-x64-base-1.8.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/squeeze-x64-base-1.8.json
\ No newline at end of file
diff --git a/data/grid5000/sites/nantes/environments/squeeze-x64-big-1.10.json b/data/grid5000/sites/nantes/environments/squeeze-x64-big-1.10.json
new file mode 120000
index 0000000000000000000000000000000000000000..c48dbba880bf44c76e40d068afb536adb4fb8d3e
--- /dev/null
+++ b/data/grid5000/sites/nantes/environments/squeeze-x64-big-1.10.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/squeeze-x64-big-1.10.json
\ No newline at end of file
diff --git a/data/grid5000/sites/nantes/environments/squeeze-x64-min-1.10.json b/data/grid5000/sites/nantes/environments/squeeze-x64-min-1.10.json
new file mode 120000
index 0000000000000000000000000000000000000000..45372dc35ebae6f2b22465e007b594ffb1445965
--- /dev/null
+++ b/data/grid5000/sites/nantes/environments/squeeze-x64-min-1.10.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/squeeze-x64-min-1.10.json
\ No newline at end of file
diff --git a/data/grid5000/sites/nantes/environments/squeeze-x64-nfs-1.10.json b/data/grid5000/sites/nantes/environments/squeeze-x64-nfs-1.10.json
new file mode 120000
index 0000000000000000000000000000000000000000..0e785d83b16b32cf4185b4dfd779ab7df7c55bad
--- /dev/null
+++ b/data/grid5000/sites/nantes/environments/squeeze-x64-nfs-1.10.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/squeeze-x64-nfs-1.10.json
\ No newline at end of file
diff --git a/data/grid5000/sites/nantes/environments/wheezy-x64-base-1.3.json b/data/grid5000/sites/nantes/environments/wheezy-x64-base-1.3.json
new file mode 120000
index 0000000000000000000000000000000000000000..3fd75f327362d2f286fdb42d243bbd1cf66811ca
--- /dev/null
+++ b/data/grid5000/sites/nantes/environments/wheezy-x64-base-1.3.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/wheezy-x64-base-1.3.json
\ No newline at end of file
diff --git a/data/grid5000/sites/nantes/environments/wheezy-x64-big-1.3.json b/data/grid5000/sites/nantes/environments/wheezy-x64-big-1.3.json
new file mode 120000
index 0000000000000000000000000000000000000000..ea4b4aa57619ed137413bfc418c0156c9bf37155
--- /dev/null
+++ b/data/grid5000/sites/nantes/environments/wheezy-x64-big-1.3.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/wheezy-x64-big-1.3.json
\ No newline at end of file
diff --git a/data/grid5000/sites/nantes/environments/wheezy-x64-min-1.4.json b/data/grid5000/sites/nantes/environments/wheezy-x64-min-1.4.json
new file mode 120000
index 0000000000000000000000000000000000000000..29aa77b8b72a0c2b3de57351b9f9d5f7dc293d9c
--- /dev/null
+++ b/data/grid5000/sites/nantes/environments/wheezy-x64-min-1.4.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/wheezy-x64-min-1.4.json
\ No newline at end of file
diff --git a/data/grid5000/sites/nantes/environments/wheezy-x64-nfs-1.3.json b/data/grid5000/sites/nantes/environments/wheezy-x64-nfs-1.3.json
new file mode 120000
index 0000000000000000000000000000000000000000..97c6137286cb558f85ceba5b329b16375cd2a2b1
--- /dev/null
+++ b/data/grid5000/sites/nantes/environments/wheezy-x64-nfs-1.3.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/wheezy-x64-nfs-1.3.json
\ No newline at end of file
diff --git a/data/grid5000/sites/nantes/environments/wheezy-x64-xen-1.3.json b/data/grid5000/sites/nantes/environments/wheezy-x64-xen-1.3.json
new file mode 120000
index 0000000000000000000000000000000000000000..c843ebd19863f0edab5f42c78ce7b7942781444f
--- /dev/null
+++ b/data/grid5000/sites/nantes/environments/wheezy-x64-xen-1.3.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/wheezy-x64-xen-1.3.json
\ No newline at end of file
diff --git a/data/grid5000/sites/reims/environments/wheezy-x64-min-1.4.json b/data/grid5000/sites/reims/environments/wheezy-x64-min-1.4.json
new file mode 120000
index 0000000000000000000000000000000000000000..29aa77b8b72a0c2b3de57351b9f9d5f7dc293d9c
--- /dev/null
+++ b/data/grid5000/sites/reims/environments/wheezy-x64-min-1.4.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/wheezy-x64-min-1.4.json
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-8.json b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-8.json
index b996d5b230d1bf731fe049581c150d9d1b343bc8..499f46f804ba6c36ed8f63cfa5d1362cb2ff23f6 100644
--- a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-8.json
+++ b/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"
},
diff --git a/data/grid5000/sites/rennes/environments/wheezy-x64-min-1.4.json b/data/grid5000/sites/rennes/environments/wheezy-x64-min-1.4.json
new file mode 120000
index 0000000000000000000000000000000000000000..29aa77b8b72a0c2b3de57351b9f9d5f7dc293d9c
--- /dev/null
+++ b/data/grid5000/sites/rennes/environments/wheezy-x64-min-1.4.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/wheezy-x64-min-1.4.json
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/environments/wheezy-x64-min-1.4.json b/data/grid5000/sites/sophia/environments/wheezy-x64-min-1.4.json
new file mode 120000
index 0000000000000000000000000000000000000000..29aa77b8b72a0c2b3de57351b9f9d5f7dc293d9c
--- /dev/null
+++ b/data/grid5000/sites/sophia/environments/wheezy-x64-min-1.4.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/wheezy-x64-min-1.4.json
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/network_equipments/gw-sophia.json b/data/grid5000/sites/sophia/network_equipments/gw-sophia.json
index f55cb7cc424892b65e534808d5850b720bca8fbe..bf2d5facbc5e1d9586dac904313650e58cda1adb 100644
--- a/data/grid5000/sites/sophia/network_equipments/gw-sophia.json
+++ b/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",
diff --git a/data/grid5000/sites/toulouse/environments/wheezy-x64-min-1.4.json b/data/grid5000/sites/toulouse/environments/wheezy-x64-min-1.4.json
new file mode 120000
index 0000000000000000000000000000000000000000..29aa77b8b72a0c2b3de57351b9f9d5f7dc293d9c
--- /dev/null
+++ b/data/grid5000/sites/toulouse/environments/wheezy-x64-min-1.4.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/wheezy-x64-min-1.4.json
\ No newline at end of file
diff --git a/generators/input/environments/squeeze-x64-base-1.8.rb b/generators/input/environments/squeeze-x64-base-1.8.rb
index c76f9b643eb087442316efaab7af1b3813cc0969..b7ef8d3844a4aea5bdd8862a8c58585be819c307 100644
--- a/generators/input/environments/squeeze-x64-base-1.8.rb
+++ b/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 []
diff --git a/generators/input/environments/squeeze-x64-big-1.10.rb b/generators/input/environments/squeeze-x64-big-1.10.rb
index 4aafdd99c7110c5f091b9804e7e41ea0a6155ef3..f2bcbb29b21dfe6f7c3627a19442d2a2a5f139a2 100644
--- a/generators/input/environments/squeeze-x64-big-1.10.rb
+++ b/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 []
diff --git a/generators/input/environments/squeeze-x64-min-1.10.rb b/generators/input/environments/squeeze-x64-min-1.10.rb
index 2795e0ffea36d6354c6146d1c4332409985f8a72..879a7db49a327c41df5ef66021154da25a19ae8d 100644
--- a/generators/input/environments/squeeze-x64-min-1.10.rb
+++ b/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 []
diff --git a/generators/input/environments/squeeze-x64-nfs-1.10.rb b/generators/input/environments/squeeze-x64-nfs-1.10.rb
index 6cdc83a2e34f1339932228068665d972703daaac..5656ef4a5c458fda7b1a0a0da6a0734047ac187b 100644
--- a/generators/input/environments/squeeze-x64-nfs-1.10.rb
+++ b/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 []
diff --git a/generators/input/environments/wheezy-x64-base-1.3.rb b/generators/input/environments/wheezy-x64-base-1.3.rb
index 004a195b18a6b7c47a51a090ee0dedb378e0b406..fc5d81b2a8bc44cf3525a570e59f5355ec9bd1f0 100644
--- a/generators/input/environments/wheezy-x64-base-1.3.rb
+++ b/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 []
diff --git a/generators/input/environments/wheezy-x64-big-1.3.rb b/generators/input/environments/wheezy-x64-big-1.3.rb
index 9c6c2b51c94a099e789f75c671417689b03ef95b..f16ecdacc79f9ee26d3f00511a0d6ddbbc5dc710 100644
--- a/generators/input/environments/wheezy-x64-big-1.3.rb
+++ b/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 []
diff --git a/generators/input/environments/wheezy-x64-min-1.4.rb b/generators/input/environments/wheezy-x64-min-1.4.rb
index ddea0efbe8c1b12968ed952df35a3c55e039cf43..0e5ac0d5df6fe0d153905b67588617fa1bd8dcb9 100644
--- a/generators/input/environments/wheezy-x64-min-1.4.rb
+++ b/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 []
diff --git a/generators/input/environments/wheezy-x64-nfs-1.3.rb b/generators/input/environments/wheezy-x64-nfs-1.3.rb
index ff240b01be995be4d24ac6977d41bdf0c721e134..a40d77f8a85807d5d08962d90cf4d27baa2fc389 100644
--- a/generators/input/environments/wheezy-x64-nfs-1.3.rb
+++ b/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 []
diff --git a/generators/input/environments/wheezy-x64-xen-1.3.rb b/generators/input/environments/wheezy-x64-xen-1.3.rb
index 716b61e6608640e28c9d8f2f3bf8cc2845aafbc3..3547dcaac9adb39bd1589be4ba0997e072d50bf8 100644
--- a/generators/input/environments/wheezy-x64-xen-1.3.rb
+++ b/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 []
diff --git a/generators/input/sites/rennes/clusters/paranoia_generated.yaml b/generators/input/sites/rennes/clusters/paranoia_generated.yaml
index fa197e2e9d9537fb0e2a59a391b4ed4f0ade11c2..c2f1b02f291a4fe3baa3e3d476b892db56166ad6 100644
--- a/generators/input/sites/rennes/clusters/paranoia_generated.yaml
+++ b/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
diff --git a/generators/input/sites/sophia/net-links/gw-sophia.yaml b/generators/input/sites/sophia/net-links/gw-sophia.yaml
index e3981892710cb0533150717c6fd87a72034107c8..7440253b2a561b6ec26a42bd4c6fc32b5e280cf6 100644
--- a/generators/input/sites/sophia/net-links/gw-sophia.yaml
+++ b/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