From 3251d37c5647ececd8ea13ca720729036bbfb2a7 Mon Sep 17 00:00:00 2001
From: bp-sawyers <bp-sawyers@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Thu, 23 Sep 2010 17:57:35 +0000
Subject: [PATCH] fix cage id calculation and update man page

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7595 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-client/pods/man8/xcatsetup.8.pod | 34 ++++++++++++++++++++++++++-
 xCAT-server/lib/xcat/plugins/setup.pm |  8 +++++--
 2 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/xCAT-client/pods/man8/xcatsetup.8.pod b/xCAT-client/pods/man8/xcatsetup.8.pod
index 28f250023..7210b9432 100644
--- a/xCAT-client/pods/man8/xcatsetup.8.pod
+++ b/xCAT-client/pods/man8/xcatsetup.8.pod
@@ -13,7 +13,39 @@ B<xcatsetup> [B<-?> | B<-h> | B<--help> | B<-v> | B<--version>]
 The B<xcatsetup> command reads the specified config file that contains general information about the cluster being set up,
 and naming conventions and IP addresses that you want to use.  It then defines the basic objects in the xCAT database
 representing this cluster configuration.  The B<xcatsetup> command prepares the database for the step of discovering
-the hardware that is connected to the service and cluster networks.
+the hardware that is connected to the service and cluster networks.  The typical steps of setting up a system p cluster are:
+
+=over 3
+
+=item *
+
+Install the xCAT software on the management node
+
+=item *
+
+Create the cluster config file and run xcatsetup
+
+=item *
+
+Put hardware control passwords in the ppchcp or ppcdirect database table
+
+=item *
+
+Run the discovery commands (lsslp, mkhwconn, rspconfig) as described in the System P Hardware Management cookbook.
+
+=item *
+
+Configure and start the services using makehosts, makedns, makedhcp, mkconserver.cf, etc.
+
+=item *
+
+Create the images that should be installed or booted on the nodes
+
+=item *
+
+Run nodeset and rpower/rnetboot to boot up the nodes.
+
+=back
 
 The B<xcatsetup> command is intended as a quick way to fill out the database for a cluster that has very regular
 naming patterns.  The only thing is done is fill in database attributes.  If your cluster does not follow consistent
diff --git a/xCAT-server/lib/xcat/plugins/setup.pm b/xCAT-server/lib/xcat/plugins/setup.pm
index 9a04d1859..4c34fdd2d 100644
--- a/xCAT-server/lib/xcat/plugins/setup.pm
+++ b/xCAT-server/lib/xcat/plugins/setup.pm
@@ -219,6 +219,9 @@ sub writesite {
 		$tables{'site'}->setAttribs({key => 'nameservers'}, {value => $ref->{value} });
 	}
 	$tables{'site'}->close();
+	
+	#todo: put dynamic range in networks table
+	#todo: set site.dhcpinterfaces
 }
 
 
@@ -365,7 +368,7 @@ sub writecec {
 	foreach my $k (sort keys %framesupers) {
 		my $f = $framesupers{$k};	# $f is a ptr to an array of super node numbers
 		if (!$f) { next; }		# in case some frame nums did not get filled in by user
-		my $cageid = 0;
+		my $cageid = 1;
 		foreach my $s (@$f) {	# loop thru the supernode nums in this frame
 			my $supernum = $s;
 			my $numnodes = 4;
@@ -373,7 +376,8 @@ sub writecec {
 			for (my $j=0; $j<$numnodes; $j++) {		# assign the next few nodes to this supernode num
 				my $nodename = $$nodes[$i++];
 				#print "Setting $nodename supernode attribute to $supernum,$j\n";
-				$nodehash{$nodename} = { supernode => "$supernum,$j", id => $cageid++, parent => $k };
+				$nodehash{$nodename} = { supernode => "$supernum,$j", id => $cageid, parent => $k };
+				$cageid += 2;
 			}
 		}
 	}