testlab 0.4.9 → 0.4.10

data/lib/testlab/container/actions.rb

@@ -71,13 +71,9 @@ class TestLab
         (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)
@@ -122,14 +118,11 @@ class TestLab
         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

data/lib/testlab/container/lxc.rb

@@ -50,6 +50,42 @@ class TestLab
         @lxc_clone ||= self.node.lxc.container("#{self.id}-master")
       end
 
+      # Convert to Static Container
+      #
+      # If the current container is operating as an ephemeral container, this
+      # will convert it back to a static container, otherwise no changes will
+      # occur.
+      #
+      # @return [Boolean] Returns true if successful.
+      def to_static
+        if self.lxc_clone.exists?
+          self.lxc.stop
+          self.lxc_clone.stop
+          self.lxc_clone.clone(%(-o #{self.lxc_clone.name}), %(-n #{self.lxc.name}))
+          build_lxc_config(self.lxc.config)
+          self.lxc_clone.destroy(%(-f))
+        end
+
+        true
+      end
+
+      # Convert to Ephemeral Container
+      #
+      # If the current container is operating as a static ocntainer, this will
+      # convert it to a ephemeral container, otherwise no changes will occur.
+      #
+      # @return [Boolean] Returns true if successful.
+      def to_ephemeral
+        if (self.lxc.exists? && !self.lxc_clone.exists?)
+          self.lxc.stop
+          self.lxc.clone(%(-o #{self.lxc.name}), %(-n #{self.lxc_clone.name}))
+          build_lxc_config(self.lxc_clone.config)
+          self.lxc.destroy(%(-f))
+        end
+
+        true
+      end
+
       # ZTK:SSH object
       #
       # Returns a *ZTK:SSH* class instance configured for this container.

data/lib/testlab/version.rb

@@ -1,6 +1,6 @@
 class TestLab
   unless const_defined?(:VERSION)
     # TestLab Gem Version
-    VERSION = "0.4.9"
+    VERSION = "0.4.10"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: testlab
 version: !ruby/object:Gem::Version
-  version: 0.4.9
+  version: 0.4.10
   prerelease: 
 platform: ruby
 authors:
@@ -281,7 +281,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1069287922281155445
+      hash: -561292551195131094
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -290,7 +290,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1069287922281155445
+      hash: -561292551195131094
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25