From f79b2850ad9925856c79a027162d318302060763 Mon Sep 17 00:00:00 2001
From: zhaoertao <zhaoertao@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Thu, 6 Jun 2013 05:24:08 +0000
Subject: [PATCH] adding predefined groups based on hardware types

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@16565 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT/templates/e1350/mp.csv       |  7 +++++--
 xCAT/templates/e1350/nodehm.csv   | 17 ++++++++++++-----
 xCAT/templates/e1350/nodetype.csv |  7 +++++++
 xCAT/templates/power/nodehm.csv   |  4 ++++
 xCAT/templates/power/nodetype.csv |  4 ++++
 xCAT/templates/power/ppc.csv      |  4 ++++
 6 files changed, 36 insertions(+), 7 deletions(-)
 create mode 100644 xCAT/templates/power/nodehm.csv
 create mode 100644 xCAT/templates/power/nodetype.csv
 create mode 100644 xCAT/templates/power/ppc.csv

diff --git a/xCAT/templates/e1350/mp.csv b/xCAT/templates/e1350/mp.csv
index eb3d9a10c..4c030d222 100644
--- a/xCAT/templates/e1350/mp.csv
+++ b/xCAT/templates/e1350/mp.csv
@@ -1,2 +1,5 @@
-#node,mpa,id,comments,disable
-"blade","|\D+(\d+).*$|amm(($1-1)/14+1)|","|\D+(\d+).*$|(($1-1)%14+1)|",,
+#node,mpa,id,nodetype,comments,disable
+"blade","|\D+(\d+).*$|amm(($1-1)/14+1)|","|\D+(\d+).*$|(($1-1)%14+1)|",,,
+"x220",,,"blade",,
+"x240",,,"blade",,
+"x440",,,"blade",,
diff --git a/xCAT/templates/e1350/nodehm.csv b/xCAT/templates/e1350/nodehm.csv
index e8ea222e8..4bbbb7c25 100644
--- a/xCAT/templates/e1350/nodehm.csv
+++ b/xCAT/templates/e1350/nodehm.csv
@@ -1,5 +1,12 @@
-#node,power,mgt,cons,termserver,termport,conserver,serialspeed,serialflow,getmac,comments,disable
-"ipmi",,"ipmi",,,,,,,,,
-"blade",,"blade",,,,,,,,,
-"cyclades",,,"cyclades",,,,,,,,
-"mrv",,,"mrv",,,,,,,,
+#node,power,mgt,cons,termserver,termport,conserver,serialport,serialspeed,serialflow,getmac,comments,disable
+"ipmi",,"ipmi",,,,,,,,,,
+"blade",,"blade",,,,,,,,,,
+"cyclades",,,"cyclades",,,,,,,,,
+"mrv",,,"mrv",,,,,,,,,
+"x3250",,"ipmi","ipmi",,,,"0","115200",,,,
+"x3550",,"ipmi","ipmi",,,,"0","115200",,,,
+"x3650",,"ipmi","ipmi",,,,"0","115200",,,,
+"dx360",,"ipmi","ipmi",,,,"0","115200",,,,
+"x220",,"ipmi","ipmi",,,,"0","115200",,,,
+"x240",,"ipmi","ipmi",,,,"0","115200",,,,
+"x440",,"ipmi","ipmi",,,,"0","115200",,,,
diff --git a/xCAT/templates/e1350/nodetype.csv b/xCAT/templates/e1350/nodetype.csv
index 2183b8b9a..90523ab44 100644
--- a/xCAT/templates/e1350/nodetype.csv
+++ b/xCAT/templates/e1350/nodetype.csv
@@ -1,2 +1,9 @@
 #node,os,arch,profile,provmethod,supportedarchs,nodetype,comments,disable
 "compute",,,"compute",,
+"x3250",,,,,,"osi",,
+"x3550",,,,,,"osi",,
+"x3650",,,,,,"osi",,
+"dx360",,,,,,"osi",,
+"x220",,,,,,"mp",,
+"x240",,,,,,"mp",,
+"x440",,,,,,"mp",,
diff --git a/xCAT/templates/power/nodehm.csv b/xCAT/templates/power/nodehm.csv
new file mode 100644
index 000000000..b4e2351f5
--- /dev/null
+++ b/xCAT/templates/power/nodehm.csv
@@ -0,0 +1,4 @@
+#node,power,mgt,cons,termserver,termport,conserver,serialport,serialspeed,serialflow,getmac,cmdmapping,comments,disable
+"p260",,"fsp","fsp",,,,,,,"blade",,,
+"p460",,"fsp","fsp",,,,,,,"blade",,,
+"p470",,"fsp","fsp",,,,,,,"blade",,,
diff --git a/xCAT/templates/power/nodetype.csv b/xCAT/templates/power/nodetype.csv
new file mode 100644
index 000000000..a09ea4b41
--- /dev/null
+++ b/xCAT/templates/power/nodetype.csv
@@ -0,0 +1,4 @@
+#node,os,arch,profile,provmethod,supportedarchs,nodetype,comments,disable
+"p260",,,,,,"ppc,osi",,
+"p460",,,,,,"ppc,osi",,
+"p470",,,,,,"ppc,osi",,
diff --git a/xCAT/templates/power/ppc.csv b/xCAT/templates/power/ppc.csv
new file mode 100644
index 000000000..e8327b644
--- /dev/null
+++ b/xCAT/templates/power/ppc.csv
@@ -0,0 +1,4 @@
+#node,hcp,id,pprofile,parent,nodetype,supernode,sfp,comments,disable
+"p260",,"1",,,"blade",,,,
+"p460",,"1",,,"blade",,,,
+"p470",,"1",,,"blade",,,,