lib/testlab/container/actions.rb in testlab-0.4.9 vs lib/testlab/container/actions.rb in testlab-0.4.10

@@ -69,18 +69,14 @@
         @ui.logger.debug { "Container Up: #{self.id} " }
 
         (self.lxc.state == :not_created) and return false #raise ContainerError, "We can not online a non-existant container!"
 
         please_wait(:ui => @ui, :message => format_object_action(self, 'Up', :green)) do
-          if self.lxc_clone.exists?
-            self.lxc.stop
-            self.lxc_clone.stop
-            self.lxc_clone.clone(%(-o #{self.id}-master), %(-n #{self.id}))
-            build_lxc_config(self.lxc.config)
-            self.lxc_clone.destroy(%(-f))
-          end
 
+          # ensure our container is in "static" mode
+          self.to_static
+
           self.lxc.start
           self.lxc.wait(:running)
 
           (self.lxc.state != :running) and raise ContainerError, "The container failed to online!"
 
@@ -120,17 +116,14 @@
         @ui.logger.debug { "Container Clone: #{self.id}" }
 
         self.down
 
         please_wait(:ui => @ui, :message => format_object_action(self, 'Clone', :yellow)) do
-          if self.lxc.exists?
-            self.lxc.stop
-            self.lxc.clone(%(-o #{self.id}), %(-n #{self.id}-master))
-            build_lxc_config(self.lxc_clone.config)
-            self.lxc.destroy(%(-f))
-          end
 
-          self.lxc_clone.start_ephemeral(%(-o #{self.id}-master -n #{self.id}), %(-d))
+          # ensure our container is in "ephemeral" mode
+          self.to_ephemeral
+
+          self.lxc_clone.start_ephemeral(%(-o #{self.id}-master), %(-n #{self.id}), %(-d))
         end
 
         true
       end