testlab 0.4.8 → 0.4.9

data/bin/tl

@@ -336,6 +336,44 @@ EOF
     end
   end
 
+  # CONTAINER UP
+  ###############
+  c.desc 'Up a container'
+  c.long_desc <<-EOF
+Up a container.  The container is started and brought online.
+EOF
+  c.command :up do |up|
+    up.action do |global_options, options, args|
+      if options[:id].nil?
+        help_now!('id is required') if options[:id].nil?
+      else
+        container = @testlab.containers.select{ |c| c.id.to_sym == options[:id].to_sym }.first
+        container.nil? and raise TestLab::TestLabError, "We could not find the container you supplied!"
+
+        container.up
+      end
+    end
+  end
+
+  # CONTAINER DOWN
+  #################
+  c.desc 'Down a container'
+  c.long_desc <<-EOF
+Down a container.  The container is stopped taking it offline.
+EOF
+  c.command :down do |down|
+    down.action do |global_options, options, args|
+      if options[:id].nil?
+        help_now!('id is required') if options[:id].nil?
+      else
+        container = @testlab.containers.select{ |c| c.id.to_sym == options[:id].to_sym }.first
+        container.nil? and raise TestLab::TestLabError, "We could not find the container you supplied!"
+
+        container.down
+      end
+    end
+  end
+
   # CONTAINER SETUP
   ####################
   c.desc 'Setup a container'

data/lib/testlab/container.rb

@@ -58,7 +58,7 @@ class TestLab
     # An array of symbols of the various keys in our status hash.
     #
     # @see TestLab::Container::Status
-    STATUS_KEYS   = %w(node_id id fqdn state distro release interfaces provisioner).map(&:to_sym)
+    STATUS_KEYS   = %w(node_id id clone fqdn state distro release interfaces provisioner).map(&:to_sym)
 
     # Sub-Modules
     autoload :Actions,       'testlab/container/actions'

data/lib/testlab/container/actions.rb

@@ -16,11 +16,7 @@ class TestLab
           self.domain  ||= self.node.labfile.config[:domain]
           self.arch    ||= detect_arch
 
-          self.lxc.config.clear
-          self.lxc.config['lxc.utsname'] = self.fqdn
-          self.lxc.config['lxc.arch'] = self.arch
-          self.lxc.config.networks = build_lxc_network_conf(self.interfaces)
-          self.lxc.config.save
+          build_lxc_config(self.lxc.config)
 
           self.lxc.create(*create_args)
 
@@ -75,7 +71,14 @@ 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
-          self.lxc.lxc.exec(%(lxc-stop), %(-n #{self.id}-clone))
+          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
+
           self.lxc.start
           self.lxc.wait(:running)
 
@@ -99,25 +102,37 @@ class TestLab
         (self.lxc.state == :not_created) and return false # raise ContainerError, "We can not offline a non-existant container!"
 
         please_wait(:ui => @ui, :message => format_object_action(self, 'Down', :red)) do
-          self.lxc.lxc.exec(%(lxc-stop), %(-n #{self.id}-clone))
           self.lxc.stop
           self.lxc.wait(:stopped)
 
-          (self.lxc.state != :stopped) and raise ContainerError, "The container failed to offline!"
+          (self.lxc.state == :running) and raise ContainerError, "The container failed to offline!"
         end
 
         true
       end
 
+      # Clone the contaienr
+      #
+      # Prepares the container, if needed, for ephemeral cloning and clones it.
+      #
+      # @return [Boolean] True if successful.
       def clone
         @ui.logger.debug { "Container Clone: #{self.id}" }
 
         self.down
 
         please_wait(:ui => @ui, :message => format_object_action(self, 'Clone', :yellow)) do
-          self.lxc.start_ephemeral(%(-o #{self.id} -n #{self.id}-clone), %(-d))
+          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))
         end
 
+        true
       end
 
     end

data/lib/testlab/container/lxc.rb

@@ -39,6 +39,17 @@ class TestLab
         @lxc ||= self.node.lxc.container(self.id)
       end
 
+      # LXC::Container object
+      #
+      # Returns a *LXC::Container* class instance configured for the clone of
+      # this container.
+      #
+      # @return [LXC] An instance of LXC::Container configured for the clone of
+      #   this container.
+      def lxc_clone
+        @lxc_clone ||= self.node.lxc.container("#{self.id}-master")
+      end
+
       # ZTK:SSH object
       #
       # Returns a *ZTK:SSH* class instance configured for this container.
@@ -84,6 +95,21 @@ class TestLab
         end
       end
 
+      # LXC Container Configuration
+      #
+      # Builds the LXC container configuration data.
+      #
+      # @return [Boolean] True if successful.
+      def build_lxc_config(lxc_config)
+        lxc_config.clear
+        lxc_config['lxc.utsname'] = self.fqdn
+        lxc_config['lxc.arch'] = self.arch
+        lxc_config.networks = build_lxc_network_conf(self.interfaces)
+        lxc_config.save
+
+        true
+      end
+
       # LXC Network Configuration
       #
       # Builds an array of hashes containing the lxc configuration options for

data/lib/testlab/container/status.rb

@@ -53,6 +53,7 @@ class TestLab
 
         {
           :id => self.id,
+          :clone => self.lxc_clone.exists?,
           :fqdn => self.fqdn,
           :state => self.state,
           :distro => self.distro,

data/lib/testlab/version.rb

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

data/spec/container_spec.rb

@@ -52,6 +52,7 @@ describe TestLab::Container do
     describe "#status" do
       it "should return a hash of status information about the container" do
         subject.lxc.stub(:state) { :not_created }
+        subject.lxc_clone.stub(:exists?) { false }
         subject.status.should be_kind_of(Hash)
         subject.status.should_not be_empty
       end
@@ -165,6 +166,9 @@ describe TestLab::Container do
         subject.lxc.stub(:wait) { true }
         subject.lxc.stub(:state) { :running }
         subject.lxc.stub(:attach)
+
+        subject.lxc_clone.stub(:exists?) { false }
+
         subject.up
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: testlab
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.4.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-18 00:00:00.000000000 Z
+date: 2013-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -279,12 +279,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1069287922281155445
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1069287922281155445
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25