From 406ab315609ebe1edb93390d57720379048c2264 Mon Sep 17 00:00:00 2001
From: Sebastien Badia <sebastien.badia@inria.fr>
Date: Wed, 29 Jun 2011 11:13:42 +0200
Subject: [PATCH] [Nancy] Split cluster for generation

---
 generators/input/nancy-graphene.rb | 149 ++++++++++++++++
 generators/input/nancy-griffon.rb  | 129 ++++++++++++++
 generators/input/nancy.rb          | 274 -----------------------------
 3 files changed, 278 insertions(+), 274 deletions(-)
 create mode 100644 generators/input/nancy-graphene.rb
 create mode 100644 generators/input/nancy-griffon.rb

diff --git a/generators/input/nancy-graphene.rb b/generators/input/nancy-graphene.rb
new file mode 100644
index 0000000000..37d6f8f0d9
--- /dev/null
+++ b/generators/input/nancy-graphene.rb
@@ -0,0 +1,149 @@
+site :nancy do |site_uid|
+
+  cluster :graphene do |cluster_uid|
+    model "Carri System 5393"
+    created_at Time.parse("2011-01-20").httpdate
+
+    144.times do |i|
+      node "#{cluster_uid}-#{i+1}" do |node_uid|
+        serial lookup('nancy-graphene', node_uid, 'serial')
+        supported_job_types({:deploy => true, :besteffort => true, :virtual => "ivt"})
+        architecture({
+          :smp_size => 1,
+          :smt_size => 4,
+          :platform_type => "x86_64"
+          })
+        processor({
+          :vendor => "Intel",
+          :model => "Intel Xeon",
+          :version => "X3440",
+          :clock_speed => 2.53.G,
+          :instruction_set => "",
+          :other_description => "",
+          :cache_l1 => nil,
+          :cache_l1i => nil,
+          :cache_l1d => nil,
+          :cache_l2 => 8.MiB
+        })
+        main_memory({
+          :ram_size => 16.GiB,
+          :virtual_size => nil
+        })
+        operating_system({
+          :name => "Debian",
+          :release => "5.0",
+          :version => nil,
+          :kernel => "2.6.26"
+        })
+        storage_devices [{
+          :interface => 'SATA II',
+          :size => 320.GB,
+          :driver => "ahci",
+          :device => "sda",
+          :model => lookup('nancy-graphene', node_uid, 'disk_model'),
+          :rev => lookup('nancy-graphene', node_uid, 'disk_rev')
+        }]
+        network_adapters [{
+          :interface => 'Ethernet',
+          :rate => 1.G,
+          :device => "eth0",
+          :enabled => true,
+          :mounted => true,
+          :mountable => true,
+          :management => false,
+          :switch => lookup('nancy-graphene', "#{node_uid}", 'switch_eth0'),
+          :mac => lookup('nancy-graphene', "#{node_uid}", 'mac_eth0'),
+          :switch_port => lookup('nancy-graphene', "#{node_uid}", 'switch_pos_eth0'),
+          :network_address => "#{node_uid}.#{site_uid}.grid5000.fr",
+          #:ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
+          :ip => lookup('nancy-graphene', node_uid, 'ip_eth0'),
+          :driver => "e1000e",
+          :vendor => "intel",
+          :version => "82574L"
+        },
+        {
+          :interface => 'Ethernet',
+          :rate => 1.G,
+          #:device => "eth1",
+          :enabled => false,
+          #:mounted => false,
+          :mac => lookup('nancy-graphene', "#{node_uid}", 'mac_eth1'),
+          #:management => false,
+          #:driver => "e1000e",
+          :vendor => "intel",
+          :version => "82574L"
+        },
+        {
+          :interface => 'Ethernet',
+          :rate => 1.G,
+          #:device => "eth2",
+          :enabled => false,
+          #:mounted => false,
+          :mac => lookup('nancy-graphene', "#{node_uid}", 'mac_eth2'),
+          #:management => false,
+          #:driver => "e1000e",
+          :vendor => "intel",
+          :version => "82574L"
+        },
+	{
+          :interface => 'InfiniBand',
+          :rate => 20.G,
+          :device => "ib0",
+          :enabled => true,
+          :mounted => true,
+          :mountable => true,
+          :management => false,
+          :ip => lookup('nancy-graphene', "#{node_uid}", 'ip_ib'),
+          :network_address => "#{node_uid}-ib0.#{site_uid}.grid5000.fr",
+	  :switch => "sgrapheneib",
+          #:ib_switch_card => lookup('nancy',"#{node_uid}", 'switch_ib_card'),
+          #:ib_switch_card_pos => lookup('nancy',"#{node_uid}", 'switch_ib_card_pos'),
+          :driver => "mlx4_core",
+          :vendor => "Mellanox",
+          :version => "MT26418",
+	  :mac  => lookup('nancy-graphene', node_uid, 'guidib0')
+        },
+        {
+          :interface => 'InfiniBand',
+          :rate => 20.G,
+          :enabled => false,
+          #:device => "ib1",
+          #:driver => "mlx4_core",
+          :vendor => "Mellanox",
+          :version => "MT26418",
+          #:mountable => false,
+          #:mounted => false,
+          #:management => false
+          :mac	=> lookup('nancy-graphene', node_uid, 'guidib1')
+        },
+        {
+          :interface => 'Ethernet',
+          :rate => 100.M,
+          :enabled => true,
+          :mounted => false,
+          :mountable => false,
+          :management => true,
+          :vendor => "Tyan",
+          :version => "AST2050",
+          :device => "bmc",
+          :ip => lookup('nancy-graphene', "#{node_uid}", 'ip_mgt'),
+          :network_address => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
+          :switch => lookup('nancy-graphene', "#{node_uid}", 'switch_ipmi'),
+          :switch_port => lookup('nancy-graphene', "#{node_uid}", 'switch_ipmi_pos'),
+          :mac => lookup('nancy-graphene', "#{node_uid}", 'mac_mgt'),
+        }]
+        pdu({
+          :vendor => "American Power Conversion",
+          :pdu => lookup('nancy-graphene', "#{node_uid}", 'pdu'),
+          :pdu_port => lookup('nancy-graphene', "#{node_uid}", 'pdu_pos')
+        })
+        bios({
+          :version	=> lookup('nancy-graphene', node_uid, 'bios_ver'),
+          :vendor	=> "American Megatrends Inc.",
+          :release_date	=> lookup('nancy-graphene', node_uid, 'bios_release')
+        })
+
+      end
+    end
+  end # cluster graphene
+end
diff --git a/generators/input/nancy-griffon.rb b/generators/input/nancy-griffon.rb
new file mode 100644
index 0000000000..b77a9eb89f
--- /dev/null
+++ b/generators/input/nancy-griffon.rb
@@ -0,0 +1,129 @@
+site :nancy do |site_uid|
+
+  cluster :griffon do |cluster_uid|
+    model "Carri System CS-5393B"
+    created_at Time.parse("2009-04-10").httpdate
+    92.times do |i|
+      node "#{cluster_uid}-#{i+1}" do |node_uid|
+        serial lookup('nancy-griffon', node_uid, 'serial')
+        supported_job_types({:deploy => true, :besteffort => true, :virtual => "ivt"})
+        architecture({
+          :smp_size => 2,
+          :smt_size => 8,
+          :platform_type => "x86_64"
+          })
+        processor({
+          :vendor => "Intel",
+          :model => "Intel Xeon",
+          :version => "L5420",
+          :clock_speed => 2.5.G,
+          :instruction_set => "",
+          :other_description => "",
+          :cache_l1 => nil,
+          :cache_l1i => nil,
+          :cache_l1d => nil,
+          :cache_l2 => 12.MiB
+        })
+        main_memory({
+          :ram_size => 16.GiB,
+          :virtual_size => nil
+        })
+        operating_system({
+          :name => "Debian",
+          :release => "5.0",
+          :version => nil,
+	  :kernel => "2.6.26"
+        })
+        storage_devices [{
+          :interface => 'SATA II',
+          :size => 320.GB,
+          :driver => "ata_piix",
+	  :device => "sda",
+	  :model => lookup('nancy-griffon', node_uid, 'disk_model'),
+	  :rev => lookup('nancy-griffon', node_uid, 'disk_rev')
+        }]
+        network_adapters [{
+          :interface => 'Ethernet',
+          :rate => 1.G,
+          :device => "eth0",
+          :enabled => true,
+          :mounted => true,
+          :mountable => true,
+          :management => false,
+          :switch => lookup('nancy-griffon', "#{node_uid}", 'switch_eth0'),
+          :mac => lookup('nancy-griffon', "#{node_uid}", 'mac_eth0'),
+          :switch_port => lookup('nancy-griffon', "#{node_uid}", 'switch_pos_eth0'),
+          :network_address => "#{node_uid}.#{site_uid}.grid5000.fr",
+          #:ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
+          :ip => lookup('nancy-griffon', node_uid, 'ip_eth0'),
+          :driver => "e1000e",
+	  :vendor => "intel",
+	  :version => "80003ES2LAN"
+        },
+        {
+          :interface => 'Ethernet',
+          :rate => 1.G,
+          :enabled => false,
+          #:mounted => false,
+          :mac => lookup('nancy-griffon', "#{node_uid}", 'mac_eth1'),
+          #:mountable => false,
+          #:management => false,
+          #:driver => "e1000e",
+	  :vendor => "intel",
+	  :version => "BCM5721"
+        },
+	{
+          :interface => 'InfiniBand',
+          :rate => 20.G,
+          :device => "ib0",
+          :enabled => true,
+          :mounted => true,
+          :mountable => true,
+          :management => false,
+          :ip => lookup('nancy-griffon', "#{node_uid}", 'ip_ib'),
+          :network_address => "#{node_uid}-ib0.#{site_uid}.grid5000.fr",
+	  :switch => "sgriffonib",
+          :ib_switch_card => lookup('nancy-griffon',"#{node_uid}", 'switch_ib_card'),
+          :ib_switch_card_pos => lookup('nancy-griffon',"#{node_uid}", 'switch_ib_card_pos'),
+          :driver => "mlx4_core", :vendor => "Mellanox", :version => "MT26418",
+	  :mac  => lookup('nancy-griffon', node_uid, 'guidib0')
+        },
+        {
+          :interface => 'InfiniBand',
+          :rate => 20.G,
+          :enabled => false,
+          #:mountable => false,
+          #:mounted => false,
+          #:management => false,
+          :vendor => "Mellanox",
+	  :version => "MT26418",
+	  :mac	=> lookup('nancy-griffon', node_uid, 'guidib1')
+        },
+        {
+          :interface => 'Ethernet',
+          :rate => 100.M,
+          :enabled => true,
+          :mounted => false,
+          :mountable => false,
+          :management => true,
+          :vendor => "Tyan", :version => "M3296",
+          :ip => lookup('nancy-griffon', "#{node_uid}", 'ip_ipmi'),
+          :network_address => "#{node_uid}-ipmi.#{site_uid}.grid5000.fr",
+          :switch => lookup('nancy-griffon', "#{node_uid}", 'switch_ipmi'),
+          :switch_port => lookup('nancy-griffon', "#{node_uid}", 'switch_ipmi_pos'),
+          :mac => lookup('nancy-griffon', "#{node_uid}", 'mac_ipmi'),
+        }]
+	pdu({
+	  :vendor => "American Power Conversion",
+          :pdu => lookup('nancy-griffon', "#{node_uid}", 'pdu'),
+	  :pdu_port => lookup('nancy-griffon', "#{node_uid}", 'pdu_pos')
+	})
+	bios({
+	  :version	=> lookup('nancy-griffon', node_uid, 'bios_ver'),
+	  :vendor	=> "Phoenix Technologies LTD",
+	  :release_date	=> lookup('nancy-griffon', node_uid, 'bios_release')
+	})
+      end
+    end
+  end # cluster griffon
+end
diff --git a/generators/input/nancy.rb b/generators/input/nancy.rb
index cfd601b747..a810219b64 100755
--- a/generators/input/nancy.rb
+++ b/generators/input/nancy.rb
@@ -10,278 +10,4 @@ site :nancy do |site_uid|
   user_support_contact "nancy-staff@lists.grid5000.fr"
   compilation_server false
 
-  cluster :griffon do |cluster_uid|
-    model "Carri System CS-5393B"
-    created_at Time.parse("2009-04-10").httpdate
-    92.times do |i|
-      node "#{cluster_uid}-#{i+1}" do |node_uid|
-        serial lookup('nancy-griffon', node_uid, 'serial')
-        supported_job_types({:deploy => true, :besteffort => true, :virtual => "ivt"})
-        architecture({
-          :smp_size => 2,
-          :smt_size => 8,
-          :platform_type => "x86_64"
-          })
-        processor({
-          :vendor => "Intel",
-          :model => "Intel Xeon",
-          :version => "L5420",
-          :clock_speed => 2.5.G,
-          :instruction_set => "",
-          :other_description => "",
-          :cache_l1 => nil,
-          :cache_l1i => nil,
-          :cache_l1d => nil,
-          :cache_l2 => 12.MiB
-        })
-        main_memory({
-          :ram_size => 16.GiB,
-          :virtual_size => nil
-        })
-        operating_system({
-          :name => "Debian",
-          :release => "5.0",
-          :version => nil,
-	  :kernel => "2.6.26"
-        })
-        storage_devices [{
-          :interface => 'SATA II',
-          :size => 320.GB,
-          :driver => "ata_piix",
-	  :device => "sda",
-	  :model => lookup('nancy-griffon', node_uid, 'disk_model'),
-	  :rev => lookup('nancy-griffon', node_uid, 'disk_rev')
-        }]
-        network_adapters [{
-          :interface => 'Ethernet',
-          :rate => 1.G,
-          :device => "eth0",
-          :enabled => true,
-          :mounted => true,
-          :mountable => true,
-          :management => false,
-          :switch => lookup('nancy-griffon', "#{node_uid}", 'switch_eth0'),
-          :mac => lookup('nancy-griffon', "#{node_uid}", 'mac_eth0'),
-          :switch_port => lookup('nancy-griffon', "#{node_uid}", 'switch_pos_eth0'),
-          :network_address => "#{node_uid}.#{site_uid}.grid5000.fr",
-          #:ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
-          :ip => lookup('nancy-griffon', node_uid, 'ip_eth0'),
-          :driver => "e1000e",
-	  :vendor => "intel",
-	  :version => "80003ES2LAN"
-        },
-        {
-          :interface => 'Ethernet',
-          :rate => 1.G,
-          :enabled => false,
-          #:mounted => false,
-          :mac => lookup('nancy-griffon', "#{node_uid}", 'mac_eth1'),
-          #:mountable => false,
-          #:management => false,
-          #:driver => "e1000e",
-	  :vendor => "intel",
-	  :version => "BCM5721"
-        },
-	{
-          :interface => 'InfiniBand',
-          :rate => 20.G,
-          :device => "ib0",
-          :enabled => true,
-          :mounted => true,
-          :mountable => true,
-          :management => false,
-          :ip => lookup('nancy-griffon', "#{node_uid}", 'ip_ib'),
-          :network_address => "#{node_uid}-ib0.#{site_uid}.grid5000.fr",
-	  :switch => "sgriffonib",
-          :ib_switch_card => lookup('nancy-griffon',"#{node_uid}", 'switch_ib_card'),
-          :ib_switch_card_pos => lookup('nancy-griffon',"#{node_uid}", 'switch_ib_card_pos'),
-          :driver => "mlx4_core", :vendor => "Mellanox", :version => "MT26418",
-	  :mac  => lookup('nancy-griffon', node_uid, 'guidib0')
-        },
-        {
-          :interface => 'InfiniBand',
-          :rate => 20.G,
-          :enabled => false,
-          #:mountable => false,
-          #:mounted => false,
-          #:management => false,
-          :vendor => "Mellanox",
-	  :version => "MT26418",
-	  :mac	=> lookup('nancy-griffon', node_uid, 'guidib1')
-        },
-        {
-          :interface => 'Ethernet',
-          :rate => 100.M,
-          :enabled => true,
-          :mounted => false,
-          :mountable => false,
-          :management => true,
-          :vendor => "Tyan", :version => "M3296",
-          :ip => lookup('nancy-griffon', "#{node_uid}", 'ip_ipmi'),
-          :network_address => "#{node_uid}-ipmi.#{site_uid}.grid5000.fr",
-          :switch => lookup('nancy-griffon', "#{node_uid}", 'switch_ipmi'),
-          :switch_port => lookup('nancy-griffon', "#{node_uid}", 'switch_ipmi_pos'),
-          :mac => lookup('nancy-griffon', "#{node_uid}", 'mac_ipmi'),
-        }]
-	pdu({
-	  :vendor => "American Power Conversion",
-          :pdu => lookup('nancy-griffon', "#{node_uid}", 'pdu'),
-	  :pdu_port => lookup('nancy-griffon', "#{node_uid}", 'pdu_pos')
-	})
-	bios({
-	  :version	=> lookup('nancy-griffon', node_uid, 'bios_ver'),
-	  :vendor	=> "Phoenix Technologies LTD",
-	  :release_date	=> lookup('nancy-griffon', node_uid, 'bios_release')
-	})
-      end
-    end
-  end # cluster griffon
-
-  cluster :graphene do |cluster_uid|
-    model "Carri System 5393"
-    created_at Time.parse("2011-01-20").httpdate
-
-    144.times do |i|
-      node "#{cluster_uid}-#{i+1}" do |node_uid|
-        serial lookup('nancy-graphene', node_uid, 'serial')
-        supported_job_types({:deploy => true, :besteffort => true, :virtual => "ivt"})
-        architecture({
-          :smp_size => 1,
-          :smt_size => 4,
-          :platform_type => "x86_64"
-          })
-        processor({
-          :vendor => "Intel",
-          :model => "Intel Xeon",
-          :version => "X3440",
-          :clock_speed => 2.53.G,
-          :instruction_set => "",
-          :other_description => "",
-          :cache_l1 => nil,
-          :cache_l1i => nil,
-          :cache_l1d => nil,
-          :cache_l2 => 8.MiB
-        })
-        main_memory({
-          :ram_size => 16.GiB,
-          :virtual_size => nil
-        })
-        operating_system({
-          :name => "Debian",
-          :release => "5.0",
-          :version => nil,
-          :kernel => "2.6.26"
-        })
-        storage_devices [{
-          :interface => 'SATA II',
-          :size => 320.GB,
-          :driver => "ahci",
-          :device => "sda",
-          :model => lookup('nancy-graphene', node_uid, 'disk_model'),
-          :rev => lookup('nancy-graphene', node_uid, 'disk_rev')
-        }]
-        network_adapters [{
-          :interface => 'Ethernet',
-          :rate => 1.G,
-          :device => "eth0",
-          :enabled => true,
-          :mounted => true,
-          :mountable => true,
-          :management => false,
-          :switch => lookup('nancy-graphene', "#{node_uid}", 'switch_eth0'),
-          :mac => lookup('nancy-graphene', "#{node_uid}", 'mac_eth0'),
-          :switch_port => lookup('nancy-graphene', "#{node_uid}", 'switch_pos_eth0'),
-          :network_address => "#{node_uid}.#{site_uid}.grid5000.fr",
-          #:ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
-          :ip => lookup('nancy-graphene', node_uid, 'ip_eth0'),
-          :driver => "e1000e",
-          :vendor => "intel",
-          :version => "82574L"
-        },
-        {
-          :interface => 'Ethernet',
-          :rate => 1.G,
-          #:device => "eth1",
-          :enabled => false,
-          #:mounted => false,
-          :mac => lookup('nancy-graphene', "#{node_uid}", 'mac_eth1'),
-          #:management => false,
-          #:driver => "e1000e",
-          :vendor => "intel",
-          :version => "82574L"
-        },
-        {
-          :interface => 'Ethernet',
-          :rate => 1.G,
-          #:device => "eth2",
-          :enabled => false,
-          #:mounted => false,
-          :mac => lookup('nancy-graphene', "#{node_uid}", 'mac_eth2'),
-          #:management => false,
-          #:driver => "e1000e",
-          :vendor => "intel",
-          :version => "82574L"
-        },
-	{
-          :interface => 'InfiniBand',
-          :rate => 20.G,
-          :device => "ib0",
-          :enabled => true,
-          :mounted => true,
-          :mountable => true,
-          :management => false,
-          :ip => lookup('nancy-graphene', "#{node_uid}", 'ip_ib'),
-          :network_address => "#{node_uid}-ib0.#{site_uid}.grid5000.fr",
-	  :switch => "sgrapheneib",
-          #:ib_switch_card => lookup('nancy',"#{node_uid}", 'switch_ib_card'),
-          #:ib_switch_card_pos => lookup('nancy',"#{node_uid}", 'switch_ib_card_pos'),
-          :driver => "mlx4_core",
-          :vendor => "Mellanox",
-          :version => "MT26418",
-	  :mac  => lookup('nancy-graphene', node_uid, 'guidib0')
-        },
-        {
-          :interface => 'InfiniBand',
-          :rate => 20.G,
-          :enabled => false,
-          #:device => "ib1",
-          #:driver => "mlx4_core",
-          :vendor => "Mellanox",
-          :version => "MT26418",
-          #:mountable => false,
-          #:mounted => false,
-          #:management => false
-          :mac	=> lookup('nancy-graphene', node_uid, 'guidib1')
-        },
-        {
-          :interface => 'Ethernet',
-          :rate => 100.M,
-          :enabled => true,
-          :mounted => false,
-          :mountable => false,
-          :management => true,
-          :vendor => "Tyan",
-          :version => "AST2050",
-          :device => "bmc",
-          :ip => lookup('nancy-graphene', "#{node_uid}", 'ip_mgt'),
-          :network_address => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
-          :switch => lookup('nancy-graphene', "#{node_uid}", 'switch_ipmi'),
-          :switch_port => lookup('nancy-graphene', "#{node_uid}", 'switch_ipmi_pos'),
-          :mac => lookup('nancy-graphene', "#{node_uid}", 'mac_mgt'),
-        }]
-        pdu({
-          :vendor => "American Power Conversion",
-          :pdu => lookup('nancy-graphene', "#{node_uid}", 'pdu'),
-          :pdu_port => lookup('nancy-graphene', "#{node_uid}", 'pdu_pos')
-        })
-        bios({
-          :version	=> lookup('nancy-graphene', node_uid, 'bios_ver'),
-          :vendor	=> "American Megatrends Inc.",
-          :release_date	=> lookup('nancy-graphene', node_uid, 'bios_release')
-        })
-
-      end
-    end
-  end # cluster graphene
-
 end
-- 
GitLab