arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Allow "mkvm -i id -n noderange" to take a noderange istead of a single node to create

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@1234 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
sakolish 2008-04-30 19:16:23 +00:00
parent a00ac782d7
commit 4cd11cb706
1 changed files with 48 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
perl-xCAT-2.0/xCAT/PPCvm.pm
View File

@ -6,6 +6,7 @@ use Getopt::Long;
use xCAT::PPCcli qw(SUCCESS EXPECT_ERROR RC_ERROR NR_ERROR);
use xCAT::PPCdb;
use xCAT::Usage;
use xCAT::NodeRange;
##############################################
@ -174,6 +175,16 @@ sub mkvm_parse_args {
return(usage( "Invalid Argument: $ARGV[0]" ));
}
####################################
# Expand -n noderange
####################################
if ( exists( $opt{n} )) {
my @noderange = xCAT::NodeRange::noderange( $opt{n},0 );
if ( !defined( @noderange )) {
return(usage( "Invalid noderange: '$opt{n}'" ));
}
$opt{n} = \@noderange;
}
####################################
# No operands - add command name
####################################
$request->{method} = $cmd;
@ -795,42 +806,45 @@ sub create {
# Get command-line options
#####################################
my $id = $opt->{i};
my $name = $opt->{n};
my $cfgdata = @$prof[0];
my $cfgdata = strip_profile( @$prof[0], $hwtype );
#####################################
# Modify read-back profile.
# See HMC or IVM mksyscfg man
# page for valid attributes.
#
#####################################
if ( $hwtype eq "hmc" ) {
$cfgdata =~ s/^name=[^,]+|$/profile_name=$name/;
$cfgdata =~ s/lpar_name=[^,]+|$/name=$name/;
$cfgdata =~ s/lpar_id=[^,]+|$/lpar_id=$id/;
}
elsif ( $hwtype eq "ivm" ) {
$cfgdata =~ s/^name=[^,]+|$/name=$name/;
$cfgdata =~ s/lpar_id=[^,]+|$/lpar_id=$id/;
}
$cfgdata = strip_profile( $cfgdata, $hwtype );
#####################################
# Create new LPAR
#####################################
$result = xCAT::PPCcli::mksyscfg( $exp, $d, $cfgdata );
$Rc = shift(@$result);
#####################################
# Add new LPAR to database
#####################################
if ( $Rc == SUCCESS ) {
my $err = xCATdB( "mkvm", $name, $id, $d, $hwtype, $lpar );
if ( defined( $err )) {
return( [[$name,$err,RC_ERROR]] );
foreach my $name ( @{$opt->{n}} ) {
#################################
# Modify read-back profile.
# See HMC or IVM mksyscfg man
# page for valid attributes.
#
#################################
if ( $hwtype eq "hmc" ) {
$cfgdata =~ s/^name=[^,]+|$/profile_name=$name/;
$cfgdata =~ s/lpar_name=[^,]+|$/name=$name/;
$cfgdata =~ s/lpar_id=[^,]+|$/lpar_id=$id/;
}
elsif ( $hwtype eq "ivm" ) {
$cfgdata =~ s/^name=[^,]+|$/name=$name/;
$cfgdata =~ s/lpar_id=[^,]+|$/lpar_id=$id/;
}
#################################
# Create new LPAR
#################################
$result = xCAT::PPCcli::mksyscfg( $exp, $d, $cfgdata );
$Rc = shift(@$result);
#################################
# Add new LPAR to database
#################################
if ( $Rc == SUCCESS ) {
my $err = xCATdB( "mkvm", $name, $id, $d, $hwtype, $lpar );
if ( defined( $err )) {
push @values, [$name,$err,RC_ERROR];
$id++;
next;
}
}
push @values, [$name,@$result[0],$Rc];
$id++;
}
return( [[$name,@$result[0],$Rc]] );
return( \@values );
}
@ -979,3 +993,4 @@ sub lsvm {