From b3bf58c236440c475b8019a4ff056b28e0970d04 Mon Sep 17 00:00:00 2001
From: bp-sawyers <bp-sawyers@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Tue, 31 Jul 2012 18:37:25 +0000
Subject: [PATCH] Make the e1350 templates work with nodenames like n01, not
 just n1

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.7@13380 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT/templates/e1350/README    | 17 ++++++++---------
 xCAT/templates/e1350/hosts.csv | 10 +++++-----
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/xCAT/templates/e1350/README b/xCAT/templates/e1350/README
index fd07525f3..75a657a57 100644
--- a/xCAT/templates/e1350/README
+++ b/xCAT/templates/e1350/README
@@ -4,9 +4,9 @@ README for: /usr/share/xcat/templates/e1350 directory
 The set of *.csv files in this directory are sample xCAT table values that
 you may wish to use as templates for defining your xCAT cluster.
 The data is based on defining a cluster using the address scheme given in:
-ftp://ftp.software.ibm.com/eserver/xseries/1350FS_0507.pdf.
-Additional information on using xCAT 2.0 can be found in 
-/usr/share/doc/perl-xCAT-2.0/xCAT2.0.doc[pdf] on your system.
+http://download.boulder.ibm.com/ibmdl/pub/systems/support/system_x_pdf/intelligent_cluster_factory_settings_05.24.12b.pdf.
+Additional information on using xCAT 2.0 can be found at 
+http://sourceforge.net/apps/mediawiki/xcat/index.php?title=XCAT_iDataPlex_Cluster_Quick_Start.
 
 Check the 1350 default templates to see if they apply to your environment.
 If you decide to use some of these templates, modify them, or create your own,
@@ -25,16 +25,15 @@ For example:
 
 
 You can add nodes to the database by using the nodeadd command. 
-See the example below and details in /usr/share/doc/perl-xCAT-2.0/xCAT2.0.doc[pdf].  
+See the example below and details in http://sourceforge.net/apps/mediawiki/xcat/index.php?title=XCAT_iDataPlex_Cluster_Quick_Start.  
 
 For example, to add 2048 IPMI rackmount nodes which happen to start 
 at the first U of the first rack, with each rack having a 1U switch
-and 41 servers plugged into that switch, numbered 1-41 in order.
-Nodes named node1-node2048, and be members of groups named:
-  41nodeperrack,41perswitch,ipmi,compute,all 
+and 41 servers plugged into that switch, numbered 1-41 in order,
+with the nodes named node1-node2048, and members of groups named
+41nodeperrack,41perswitch,ipmi,compute,all, run the following:
 
-The run the following:
-nodeadd node1-node2048 groups=41nodeperrack,41perswitch,ipmi,compute,all
+  nodeadd node1-node2048 groups=41nodeperrack,41perswitch,ipmi,compute,all
 
 After that, other tables will setup according to that scheme:
 nodels node1235 nodepos.u nodepos.rack switch.switch switch.port ipmi.bmc hosts.ip
diff --git a/xCAT/templates/e1350/hosts.csv b/xCAT/templates/e1350/hosts.csv
index 24b095c1e..2df0e643a 100644
--- a/xCAT/templates/e1350/hosts.csv
+++ b/xCAT/templates/e1350/hosts.csv
@@ -6,8 +6,8 @@ idataplex-bmc,"|\D+(\d+).*$|172.29.(101+(($1-1)/84)).(($1-1)%84+1)|"
 42bmcperrack,"|\D+(\d+).*$|172.29.(101+(($1-1)/42)).(($1-1)%42+1)|"
 20bmcperrack,"|\D+(\d+).*$|172.29.(101+(($1-1)/20)).(($1-1)%20+1)|"
 21bmcperrack,"|\D+(\d+).*$|172.29.(101+(($1-1)/21)).(($1-1)%21+1)|"
-storagebmc,"|\D+(\d+).*$|172.29.1.($1)|"
-userbmc,"|\D+(\d+).*$|172.29.4.($1)|"
+storagebmc,"|\D+(\d+).*$|172.29.1.($1+0)|"
+userbmc,"|\D+(\d+).*$|172.29.4.($1+0)|"
 84nodeperrack,"|\D+(\d+).*$|172.20.(101+(($1-1)/84)).(($1-1)%84+1)|"
 idataplex,"|\D+(\d+).*$|172.20.(101+(($1-1)/84)).(($1-1)%84+1)|"
 56nodeperrack,"|\D+(\d+).*$|172.20.(101+(($1-1)/56)).(($1-1)%56+1)|"
@@ -16,7 +16,7 @@ idataplex,"|\D+(\d+).*$|172.20.(101+(($1-1)/84)).(($1-1)%84+1)|"
 42nodeperrack,"|\D+(\d+).*$|172.20.(101+(($1-1)/42)).(($1-1)%42+1)|"
 20nodeperrack,"|\D+(\d+).*$|172.20.(101+(($1-1)/20)).(($1-1)%20+1)|"
 21nodeperrack,"|\D+(\d+).*$|172.20.(101+(($1-1)/21)).(($1-1)%21+1)|"
-switch,"|\D+(\d+).*$|172.30.50.($1)|"
-bigswitch,"|\D+(\d+).*$|172.30.80.($1)|"
+switch,"|\D+(\d+).*$|172.30.50.($1+0)|"
+bigswitch,"|\D+(\d+).*$|172.30.80.($1+0)|"
 amm,"|\D+(\d+).*$|172.30.(101+(($1-1)/4)).(($1-1)%4+131)|"
-ts,"|\D+(\d+).*$|172.30.20.($1)|"
+ts,"|\D+(\d+).*$|172.30.20.($1+0)|"