From ce96e2ff10c7496031a87f766e82b2c8db86f49b Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Sun, 1 May 2011 12:58:24 +0000
Subject: [PATCH] Fix various mistakes in last checkin

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@9447 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/lib/xcat/plugins/esx.pm | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/esx.pm b/xCAT-server/lib/xcat/plugins/esx.pm
index 3a19af41f..f249b27ef 100644
--- a/xCAT-server/lib/xcat/plugins/esx.pm
+++ b/xCAT-server/lib/xcat/plugins/esx.pm
@@ -2103,7 +2103,10 @@ sub clone_vms_from_master {
 	my $clonespec = VirtualMachineCloneSpec->new(%clonespecargs);
         my $vmfolder = $vmhash{$node}->{vmfolder};
         my $task = $masterview->CloneVM_Task(folder=>$vmfolder,name=>$node,spec=>$clonespec);
-        $running_tasks{$task}->{data} = { node => $node, conn=>$conn, successtext => 'Successfully cloned from '.$args{mastername}, mastername=>$args{mastername}, nodetypeent=>$nodetypeent,vment=>$vment };
+        $running_tasks{$task}->{data} = { node => $node, conn=>$conn, successtext => 'Successfully cloned from '.$args{mastername}, 
+					  mastername=>$args{mastername}, nodetypeent=>$nodetypeent,vment=>$vment, 
+					  hyp=>$args{hyp},
+	};
         $running_tasks{$task}->{task} = $task;
         $running_tasks{$task}->{callback} = \&clone_task_callback;
         $running_tasks{$task}->{hyp} = $args{hyp}; #$hyp_conns->{$hyp};
@@ -2152,7 +2155,7 @@ sub clone_task_callback {
 	
         $nodetype->setAttribs({node=>$node},$parms->{nodetypeent});
 	foreach (keys %{$parms->{vment}}) {
-	  $tablecfg->{vm}->{$node}->[0]->{$_}=$parms->{vment}->{$_};
+	  $tablecfg{vm}->{$node}->[0]->{$_}=$parms->{vment}->{$_};
 	}
 	
 	my @networks = split /,/,$tablecfg{vm}->{$node}->[0]->{nics};
@@ -2163,7 +2166,7 @@ sub clone_task_callback {
 	my $nodeviews = $conn->find_entity_views(view_type => 'VirtualMachine',filter=>{'config.name'=>$regex});
 	unless (scalar @$nodeviews == 1) { die "this should be impossible"; }
 	my $vpdtab=xCAT::Table->new('vpd',-create=>1);
-	$vpdtab->setAttribs({node=>$node},{uuid=>$nodeview->[0]->config->uuid});
+	$vpdtab->setAttribs({node=>$node},{uuid=>$nodeviews->[0]->config->uuid});
 	my $ndev;
 	my @devstochange;
 	foreach $ndev ($nodeviews->[0]->config->hardware->device) {
@@ -2175,11 +2178,11 @@ sub clone_task_callback {
 	}
 	if (@devstochange) {
 	  my $reconfigspec = VirtualMachineConfigSpec->new(deviceChange=>\@devstochange);
-	  my $task = $vmview->ReconfigVM_Task(spec=>$reconfigspec);
+	  my $task = $nodeviews->[0]->ReconfigVM_Task(spec=>$reconfigspec);
 	  $running_tasks{$task}->{task} = $task;
 	  $running_tasks{$task}->{callback} = \&generic_task_callback;
-	  $running_tasks{$task}->{hyp} = $hyp;
-	  $running_tasks{$task}->{data} = { node => $node, successtext => $intent,cpus=>$cpuCount,mem=>$memory };
+	  $running_tasks{$task}->{hyp} = $parms->{hyp};
+	  $running_tasks{$task}->{data} = { node => $node, successtext => $intent};
 	}