Changeset 599

Timestamp:

06/21/07 16:23:54 (1 year ago)

Author:

kindlund

Message:

sc: merging branch using tags svn+ssh://kindlund@www.honeyclient.org/home/svn/honeyclient/honeyclient/tags/exp/UP8-mbriggs-db and svn+ssh://kindlund@www.honeyclient.org/home/svn/honeyclient/honeyclient/trunk

Files:

• honeyclient/branches/exp/mbriggs-db/lib/HoneyClient/Agent/Integrity/Filesystem.pm (modified) (1 diff)
• honeyclient/branches/exp/mbriggs-db/lib/HoneyClient/Manager/VM/Clone.pm (modified) (2 diffs)

honeyclient/branches/exp/mbriggs-db/lib/HoneyClient/Agent/Integrity/Filesystem.pm

@@ -936 +936 @@
-
-                # If the entry is a symlink.
-fh
+newEntry->{'name'}
-                    $type = "symlink";
-                    undef $fh;

honeyclient/branches/exp/mbriggs-db/lib/HoneyClient/Manager/VM/Clone.pm

@@ -329 +329 @@
-    # should never be modified externally.)
-    _vm_handle => undef,
+
+    # A variable containing the absolute path to the cloned VM.  (This
+    # internal variable should never be modified externally.)
+    _clone_vm_config => undef,
-);
-
@@ -601 +605 @@
-    my $som = undef;
-
+    # Temporary variable to hold return message data.
+    my $ret = undef;
+
-    # Perform the quick clone operation.
-    $LOG->info("Quick cloning master VM (" . $self->{'master_vm_config'} . ").");
-    $som = $self->{'_vm_handle'}->quickCloneVM(src_config => $self->{'master_vm_config'});
-
+
+
-        $LOG->fatal("Unable to quick clone master VM (" . $self->{'master_vm_config'} . ").");
-        Carp::croak "Unable to quick clone master VM (" . $self->{'master_vm_config'} . ").";
-    }
+    # Set the cloned VM configuration.
+    $self->{'_clone_vm_config'} = $ret;
+
+    # Wait until the VM gets registered, before proceeding.
+    $LOG->info("Checking if clone VM (" . $self->{'_clone_vm_config'} . ") is registered.");
+    $ret = undef;
+    while (!defined($ret) or !$ret) {
+        $som = $self->{'_vm_handle'}->isRegisteredVM(config => $self->{'_clone_vm_config'});
+        $ret = $som->result();
+
+        # If the VM isn't registered yet, wait before trying again.
+        if (!defined($ret) or !$ret) {
+            sleep (2);
+        }
+    }
+
+    # Once registered, check if the VM is ON yet.
+    $ret = undef;
-}
-