lib/testlab/container/clone.rb in testlab-1.6.5 vs lib/testlab/container/clone.rb in testlab-1.6.6

@@ -9,13 +9,11 @@
       #
       # @return [Boolean] True if successful.
       def ephemeral
         @ui.logger.debug { "Container Ephemeral: #{self.id}" }
 
-        please_wait(:ui => @ui, :message => format_object_action(self, 'Ephemeral', :yellow)) do
-          is_persistent? and self.to_ephemeral
-        end
+        is_persistent? and self.to_ephemeral
 
         true
       end
 
       # Put the container into a persistent state.
@@ -24,13 +22,11 @@
       #
       # @return [Boolean] True if successful.
       def persistent
         @ui.logger.debug { "Container Persistent: #{self.id}" }
 
-        please_wait(:ui => @ui, :message => format_object_action(self, 'Persistent', :yellow)) do
-          is_ephemeral? and self.to_persistent
-        end
+        is_ephemeral? and self.to_persistent
 
         true
       end
 
       # Persistent Operation Check
@@ -90,18 +86,20 @@
       # @return [Boolean] Returns true if successful.
       def to_persistent
         if self.is_ephemeral?
           self_state = self.state
 
-          configure
+          please_wait(:ui => @ui, :message => format_object_action(self, 'Persistent', :yellow)) do
+            configure
 
-          self.lxc.stop
-          self.lxc.destroy(%(-f))
+            self.lxc.stop
+            self.lxc.destroy(%(-f))
 
-          self.lxc_clone.stop
-          self.lxc_clone.clone(%W(-o #{self.lxc_clone.name} -n #{self.lxc.name}))
-          self.lxc_clone.destroy(%(-f))
+            self.lxc_clone.stop
+            self.lxc_clone.clone(%W(-o #{self.lxc_clone.name} -n #{self.lxc.name}))
+            self.lxc_clone.destroy(%(-f))
+          end
 
           # bring our container back online if it was running before the operation
           (self_state == :running) and self.up
         end
 
@@ -116,17 +114,19 @@
       # @return [Boolean] Returns true if successful.
       def to_ephemeral
         if self.is_persistent?
           self_state = self.state
 
-          configure
+          please_wait(:ui => @ui, :message => format_object_action(self, 'Ephemeral', :yellow)) do
+            configure
 
-          self.lxc_clone.stop
-          self.lxc_clone.destroy(%(-f))
+            self.lxc_clone.stop
+            self.lxc_clone.destroy(%(-f))
 
-          self.lxc.stop
-          self.lxc.clone(%W(-o #{self.lxc.name} -n #{self.lxc_clone.name}))
-          self.lxc.destroy(%(-f))
+            self.lxc.stop
+            self.lxc.clone(%W(-o #{self.lxc.name} -n #{self.lxc_clone.name}))
+            self.lxc.destroy(%(-f))
+          end
 
           # bring our container back online if it was running before the operation
           (self_state == :running) and self.up
         end