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

-Add selection by scsi id for disk deletion/resize

Browse Source 
-Report scsi id in rinv output for disks


git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@6401 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jbjohnso 2010-06-08 20:56:51 +00:00
parent 79fe5c73ec
commit 42ac6c627c
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
xCAT-server/lib/xcat/plugins/esx.pm
View File

@ -462,9 +462,9 @@ sub inv {
$label = $device->deviceInfo->label;
if($label =~ /^Hard disk/) {
$label .= " (d".$device->unitNumber.")";
$size = $device->capacityInKB / 1024;
$fileName = $device->backing->fileName;
sendmsg("$label: $size MB @ $fileName",$node);
} elsif ($label =~ /Network/) {
sendmsg("$label: ".$device->macAddress,$node);
@ -474,7 +474,7 @@ sub inv {
#changes the memory, number of cpus and device size
#can also add and remove disks
#can also add,resize and remove disks
sub chvm {
my %args = @_;
my $node = $args{node};
@ -684,7 +684,12 @@ sub getDiskByLabel {
if($cmdLabel eq $label) {
return $device;
} elsif (($label =~ /^Hard disk/) and ($cmdLabel =~ /^d(\d+)/)) {
if ($device->unitNumber == $1) {
return $device;
}
}
}
return undef;
}
@ -692,7 +697,7 @@ sub getDiskByLabel {
#takes a label for a hard disk and prepends "Hard disk " if it's not there already
sub commandLabel {
my $label = shift;
if($label =~ /^Hard disk/) {
if(($label =~ /^Hard disk/) or ($label =~ /^d\d+/)) {
return $label;
}
return "Hard disk ".$label;