xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-10-31 03:12:30 +00:00
Code Issues Releases Wiki Activity

fix the issue of clone vm

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@13775 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
daniceexi
2012-09-12 08:25:07 +00:00
parent be8fea6a0e
commit c624d51c86
1 changed files with 49 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
xCAT-server/lib/xcat/plugins/rhevm.pm
View File

@@ -1119,7 +1119,7 @@ sub lsve {
displaysrc($callback, $ref_rhevm, $response, "networks", " ", "name=$obj");
}
} elsif ($type eq "tpl") {
my ($rc, $id, $stat, $response) = search_src($ref_rhevm, "templates", "$obj");
my ($rc, $id, $stat, $response) = search_src($ref_rhevm, "templates", "name%3D$obj");
unless ($rc) {
displaysrc($callback, $ref_rhevm, $response, "templates", "");
}
@@ -2003,7 +2003,7 @@ sub mkvm {
my $disele;
if ($myvment->{vidproto}) {
$disele = "<display><type>$myvment->{vidproto}</type></display>";
} elsif (!$hastpl) {
} else {
$disele = "<display><type>vnc</type></display>";
}
@@ -2029,7 +2029,10 @@ sub mkvm {
$hostele = "<host id=\"$hostid{$myvment->{host}}\"/>";
}
my $placement_policy = "<placement_policy>$hostele$affinity</placement_policy>";
my $placement_policy;
if ($affinity || $hostele) {
$placement_policy= "<placement_policy>$hostele$affinity</placement_policy>";
}
# set the cluster for the vm
my $clusterele;
@@ -2177,10 +2180,43 @@ sub mkvm {
next;
}
}
# if no installnic is specified, set the firstmac to mac.mac
my $firstmac;
# Search the nic
my %oldmac;
($rc, undef, $stat, $response) = search_src($ref_rhevm, "vms:nics", "/$vmid/nics");
unless ($rc) {
my $parser = XML::LibXML->new();
my $doc = $parser->parse_string($response);
my @nicnodes = $doc->findnodes("/nics/nic");
foreach my $nic (@nicnodes) {
if (defined($nic->findnodes("name"))) {
my $ethname = getAttr($nic, "name");
my $mac = getAttr($nic, "mac", "address");
$oldmac{$ethname} = $mac;
unless($firstmac) {
$firstmac = $mac;
}
}
}
}
foreach my $nic (@nics) {
$success = 0;
# format of nic: [networkname:ifname:installnic]
my ($nwname, $ifname, $instnic) = split(':', $nic);
if (defined($oldmac{$ifname})) {
# The nic has been defined, mostly by clone
if ($instnic) {
$upmac->{$node}->{mac} = $oldmac{$ifname};
}
next;
}
# start the configuring
$success = 0;
my $nwid;
($rc, $nwid, $stat) = search_src($ref_rhevm, "networks", "$nwname");
@@ -2190,6 +2226,7 @@ sub mkvm {
xCAT::MsgUtils->message("E", $rsp, $callback);
next;
}
$api = "/api/vms/$vmid/nics";
$method = "POST";
@@ -2226,7 +2263,10 @@ sub mkvm {
my $doc = $parser->parse_string($response);
if (defined($doc->findnodes("/nic/mac")->[0])) {
my $realmac = $doc->findnodes("/nic/mac")->[0]->getAttribute("address");
if (! $orgmac && $instnic) {
unless($firstmac) {
$firstmac = $realmac;
}
if ($instnic) {
$upmac->{$node}->{mac} = $realmac;
}
@@ -2246,6 +2286,10 @@ sub mkvm {
}
}
if (!$upmac->{$node}->{mac} && $firstmac) {
$upmac->{$node}->{mac} = $firstmac;
}
if ($success) {
my $rsp;
push @{$rsp->{data}}, "$node: Succeeded";