xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-31 01:56:39 +00:00
Code Issues Releases Wiki Activity

chvm is functionally done. just a little cleanup left

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@6373 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
cjhardee 2010-06-07 21:24:22 +00:00
parent ddd0b2e197
commit ca3ae776d0
1 changed files with 57 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -575,7 +575,29 @@ sub chvm {
if(@add) {
my $addSizes = join(',',@add);
push @devChanges, create_storage_devs($node,$hyphash{$hyp}->{datastoremap},$addSizes);
my $scsiCont;
my $scsiUnit;
my $ideCont;
my $ideUnit;
my $label;
foreach $device (@$devices) {
$label = $device->deviceInfo->label;
sendmsg("label=$label");
if($label =~ /^SCSI controller/) {
$scsiCont = $device;
}
if($label =~ /^IDE/) {
$ideCont = $device;
}
}
if($scsiCont) {
$scsiUnit = getHighestUnit($scsiCont->{key},$devices);
}
if($ideCont) {
$ideUnit = getHighestUnit($ideCont->{key},$devices);
}
unless ($hyphash{$hyp}->{datastoremap}) { validate_datastore_prereqs([],$hyp); }
push @devChanges, create_storage_devs($node,$hyphash{$hyp}->{datastoremap},$addSizes,$scsiCont,$scsiUnit,$ideCont,$ideUnit);
}
if(%resize) {
@ -620,6 +642,18 @@ sendmsg(Dumper(\%conargs));
}
sub getHighestUnit {
my $contKey = shift;
my $devices = shift;
my $highestUnit = 0;
for my $device (@$devices) {
if(($device->{controllerKey} eq $contKey) && ($device->{unitNumber} >= $highestUnit)) {
$highestUnit = $device->{unitNumber}+1;
}
}
return $highestUnit;
}
#given a device list from a vm and a label for a hard disk, returns the device object
sub getDiskByLabel {
my $cmdLabel = shift;
@ -1687,6 +1721,10 @@ sub create_storage_devs {
my $sdmap = shift;
my $sizes = shift;
my @sizes = split /[,:]/, $sizes;
my $existingScsiCont = shift;
my $scsiUnit = shift;
my $existingIdeCont = shift;
my $ideUnit = shift;
my $scsicontrollerkey=0;
my $idecontrollerkey=200; #IDE 'controllers' exist at 200 and 201 invariably, with no flexibility?
#Cannot find documentation that declares this absolute, but attempts to do otherwise
@ -1696,9 +1734,17 @@ sub create_storage_devs {
my @devs;
my $havescsidevs =0;
my $disktype = 'ide';
my $unitnum=1; #Going to make IDE controllers for now, aiming for
#lowest common denominator guest driver for
#changing hypervisor technology
my $ideunitnum=0;
my $scsiunitnum=0;
if (defined $existingScsiCont) {
$scsicontrollerkey = $existingScsiCont->{key};
$scsiunitnum = $scsiUnit;
}
if (defined $existingIdeCont) {
$idecontrollerkey = $existingIdeCont->{key};
$ideunitnum = $ideUnit;
}
my $unitnum;
my %disktocont;
my $dev;
my @storelocs = split /,/,$tablecfg{vm}->{$node}->[0]->{storage};
@ -1727,11 +1773,11 @@ sub create_storage_devs {
my $uri = "nfs://$server/$path";
$backingif = VirtualDiskFlatVer2BackingInfo->new(diskMode => 'persistent',
fileName => "[".$sdmap->{$uri}."]");
if ($disktype eq 'ide' and $idecontrollerkey eq 1 and $unitnum eq 0) { #reserve a spot for CD
$unitnum = 1;
} elsif ($disktype eq 'ide' and $unitnum eq 2) { #go from current to next ide 'controller'
if ($disktype eq 'ide' and $idecontrollerkey eq 1 and $ideunitnum eq 0) { #reserve a spot for CD
$ideunitnum = 1;
} elsif ($disktype eq 'ide' and $ideunitnum eq 2) { #go from current to next ide 'controller'
$idecontrollerkey++;
$unitnum=0;
$ideunitnum=0;
}
unless ($disktype eq 'ide') {
push @{$disktocont{$scsicontrollerkey}},$currkey;
@ -1739,15 +1785,17 @@ sub create_storage_devs {
my $controllerkey;
if ($disktype eq 'ide') {
$controllerkey = $idecontrollerkey;
$unitnum = $ideunitnum++;
} else {
$controllerkey = $scsicontrollerkey;
$unitnum = $scsiunitnum++;
$havescsidevs=1;
}
$dev =VirtualDisk->new(backing=>$backingif,
controllerKey => $controllerkey,
key => $currkey++,
unitNumber => $unitnum++,
unitNumber => $unitnum,
capacityInKB => $disksize);
push @devs,VirtualDeviceConfigSpec->new(device => $dev,
fileOperation => VirtualDeviceConfigSpecFileOperation->new('create'),