WebSVN – havirt – Diff – /trunk/domain.pm

+}
 sub list {
    &main::readDB();
-   print Dumper( $main::statusDB->{'nodePopulation'} ) if $main::DEBUG > 2;
+   print Dumper( $main::statusDB->{'nodePopulation'} ) if $main::config->{'flags'}->{'debug'} > 2;
    my @header;
    my @data;
    my @found;
    &main::readDB(1); # loading it for write, so lock
    unless ( @_ ) {
       # they didn't pass in anything, so do everything
       @_ = keys %{ $main::statusDB->{'virt'} }
    } # unless
-   print "Preparing to update " . join( "\n", @_ ) . "\n" if $main::DEBUG > 1;
+   print "Preparing to update " . join( "\n", @_ ) . "\n" if $main::config->{'flags'}->{'debug'} > 1;
    while ( my $virt = shift ) {
       &parseDomain( $virt );
       foreach my $field ( @requiredFields ) {
          $main::statusDB->{'virt'}->{$virt}->{$field} = ''
             unless defined ( $main::statusDB->{'virt'}->{$virt}->{$field} );
 # finds one xml value in file.
 # since libvirt does not use good xml which can be parsed by
 # several libraries, we must do it manually with regex's
 sub getXMLValue {
    my ( $key, $string ) = @_;
-   print "getXMLValue: looking for [$key] $string\n" if $main::DEBUG > 2;
+   print "getXMLValue: looking for [$key] $string\n" if $main::config->{'flags'}->{'debug'} > 2;
    my $start = "<$key";
    my $end = "</$key>";
    $string =~ m/$start([^>]*)>([^<]+)$end/;
    return ($1,$2);
+}
 # if config file exists in conf, just read it. If it does not
 # exist, or if force is set, do a dumpxml on the running
 # domain, put it into conf/ and load it.
 sub parseDomain {
    my ($virt, $nodePopulations ) = @_;
+   print "Parsing domain $virt in domain.pm:parseDomain\n" if $main::config->{'flags'}->{'debug'};
    my @keysToSave = ( 'uuid', 'memory', 'vcpu','vnc' );
-   my $filename = "$main::confDir/$virt.xml";
+   my $filename = "$main::config->{'conf dir'}/$virt.xml";
    my $xml = &getVirtConfig( $virt, $filename );
    my ($param,$value) = &getXMLValue( 'uuid', $xml );
    $main::statusDB->{'virt'}->{$virt}->{'uuid'} = $value;
    ($param,$value) = &getXMLValue( 'memory', $xml );
    $main::statusDB->{'virt'}->{$virt}->{'memory'} = $value;
    ($param,$value) = &getXMLValue( 'vcpu', $xml );
    $main::statusDB->{'virt'}->{$virt}->{'vcpu'} = $value;
    $xml =~ m/type='vnc' port='(\d+)'/;
    $main::statusDB->{'virt'}->{$virt}->{'vnc'} = $1;
+   print "After Parsing $virt in domain.pm:parseDomain\n" . Dumper($main::statusDB->{'virt'}->{$virt}) . "\n"  if $main::config->{'flags'}->{'debug'} > 2;
+}
 # returns xml definition of a domain
 # if the definition exists in conf/, simply open and read
 # if the definition file does not exist, or if $force is set, find the
 # running domain, perform an xml dump of it, save it to conf/, then
 # return it.
 sub getVirtConfig {
    my ($virt,$filename) = @_;
    my $return;
-   print "In getVirtConfig looking for $virt with file $filename, force is $main::force\n" if $main::DEBUG;
+   print "In getVirtConfig looking for $virt with file $filename, force is $main::config->{'flags'}->{'yes'}\n" if $main::config->{'flags'}->{'debug'};
-   if ( -f $filename && ! $main::force) {
+   if ( -f $filename && ! $main::config->{'flags'}->{'yes'}) {
       open XML, "<$filename" or die "Could not read from $filename: $!\n";
       $return = join( '', <XML> );
       close XML;
    } else {
       &main::readDB();
       foreach my $node ( keys %{$main::statusDB->{'nodePopulation'}} ) {
-         print "getVirtConfig Looking on $node for $virt\n" if $main::DEBUG > 1;;
+         print "getVirtConfig Looking on $node for $virt\n" if $main::config->{'flags'}->{'debug'} > 1;;
          if ( exists( $main::statusDB->{'nodePopulation'}->{$node}->{'running'}->{$virt} ) ) { # we found it
-            print "Found $virt on node $node\n" if $main::DEBUG;;
+            print "Found $virt on node $node\n" if $main::config->{'flags'}->{'debug'};;
-            $return = `ssh $node 'virsh dumpxml $virt'`;
+            my $command = &main::makeCommand($node, "virsh dumpxml $virt");
+            $return = `$command`;
-            print "Writing config for $virt from $node into $filename\n" if $main::DEBUG;
+            print "Writing config for $virt from $node into $filename\n" if $main::config->{'flags'}->{'debug'};
             open XML,">$filename" or die "Could not write to $filename: $!\n";
             print XML $return;
             close XML;
          } # if
       } # foreach
    #&main::readDB();
    if ( my $foundNode = &main::findDomain( $virt ) ) {
       die "$virt already running on $foundNode, not starting\n";
+   }
    die "I do not have a definition for $virt\n" unless exists( $main::statusDB->{'virt'}->{$virt} );
-   print Dumper( $main::statusDB->{'nodePopulation'} ) if $main::DEBUG > 2;
+   print Dumper( $main::statusDB->{'nodePopulation'} ) if $main::config->{'flags'}->{'debug'} > 2;
+   if ( my $error = &main::validateResources( $node, $virt ) ) {
+      die $error;
+   }
-   my $filename = "$main::confDir/$virt.xml";
+   my $filename = "$main::config->{'conf dir'}/$virt.xml";
    my $command = &main::makeCommand( $node, "virsh create $filename" );
-   if ( $main::force ) { # we'll actually do it
+   if ( $main::config->{'flags'}->{'yes'} ) { # we'll actually do it
       $return = ( &main::executeAndWait( $command, $node, $virt, 1 ) ? 'Success' : 'Can not start');
       &main::forceScan();
    } else {
       $return =  $command;;
+   }
    # these are replaced by the safer findDomain
    #&main::forceScan();
    #&main::readDB();
    $node = &main::findDomain( $virt );
    die "I could not find the domain $virt running\n" unless $node;
-   print Dumper( $main::statusDB->{'nodePopulation'} ) if $main::DEBUG > 2;
+   print Dumper( $main::statusDB->{'nodePopulation'} ) if $main::config->{'flags'}->{'debug'} > 2;
    die "I can not find $virt on any node\n" unless $node;
    my $command = &main::makeCommand( $node, "virsh shutdown $virt" );
-   if ( $main::force ) { # they want us to actually do it
+   if ( $main::config->{'flags'}->{'yes'} ) { # they want us to actually do it
       $return = ( &main::executeAndWait( $command, $node, $virt, 0 ) ? 'Success' : 'Time Out waiting for shutdown');
       &main::forceScan();
    } else {
       $return = $command;
+   }
    return "$return\n";
+}
 sub migrate {
-   my ( $virt, $target ) = @_;
+   my ( $domain, $target ) = @_;
-   my $return;
-   my $node;
-   # these are replaced by the safer findDomain
-   #&main::forceScan();
-   #&main::readDB();
-   $node = &main::findDomain( $virt );
-   print Dumper( $main::statusDB->{'nodePopulation'} ) if $main::DEBUG > 2;
-   die "I can not find $virt on any node\n" unless $node;
-   die "Domain $virt in maintenance mode, can not migrate it\n" if $main::statusDB->{'virt'}->{$virt}->{'maintenance'};
-   die "Node $target in maintenance mode, can not migrate anything to it\n" if $main::statusDB->{'node'}->{$target}->{'maintenance'};
-   die "$virt already on $target\n" if $target eq $node;
+   if ( my $error = &main::validateResources( $target, $domain ) ) {
-   my $command = &main::makeCommand( $node, "virsh migrate --live --persistent --verbose  $virt qemu+ssh://$target/system" );
-   if ( $main::force ) { # they want us to actually do it
-      $return = ( &main::executeAndWait( $command, $node, $virt, 0 ) ? 'Success' : 'Time Out waiting for shutdown');
-      &main::forceScan();
-   } else {
-      $return = $command;
+      die $error;
+   }
-   return "$return\n";
+   return &main::migrate( $domain, $target );
+}
 # find an unused VNC port
 sub findVNCPort {
    my $currentPorts = shift;
 # generate a virt-install statement, verifying things are not already being used
 sub new {
    my %config;
    $config{'name'} = shift;
    my $return;
-   my $template = $main::scriptDir . '/virt-install.template';
+   my $template = $main::config->{'script dir'} . '/virt-install.template';
    &main::readDB();
    my %current;
    foreach my $virt ( keys %{$main::statusDB->{'virt'} } ) {
       $current{'vnc'}{$main::statusDB->{'virt'}->{$virt}->{'vnc'}} = 1;
       #$current{'mac'}{'null'} = 1;

Subversion Repositories havirt

(root)/trunk/domain.pm – Rev 19 → 25