testlab 1.11.3 → 1.11.4

data/lib/testlab/container/status.rb

@@ -58,6 +58,7 @@ class TestLab
           :state => self.state,
           :memory_usage => "#{self.memory_usage}M",
           :cpu_time => "#{self.cpu_usage}s",
+          :disk_usage => "#{self.disk_usage}MB",
           :distro => self.distro,
           :release => self.release,
           :interfaces => interfaces,
@@ -85,6 +86,15 @@ class TestLab
         end
       end
 
+      # Container Disk Usage
+      def disk_usage
+        if self.node.dead?
+          0
+        else
+          self.lxc.disk_usage / (1024 * 1024)
+        end
+      end
+
       # Container State
       #
       # What state the container is in.

data/lib/testlab/container.rb

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

data/lib/testlab/node/status.rb

@@ -33,6 +33,22 @@ class TestLab
           result = false
         end
 
+        my_container_names = self.containers.map(&:id)
+        node_container_names = self.lxc.containers.map(&:name)
+
+        unknown_container_names = (node_container_names - my_container_names)
+        unknown_running_container_names = self.lxc.containers.select{ |c| (unknown_container_names.include?(c.name) && (c.state == :running)) }.map(&:name)
+
+        if unknown_container_names.count > 0
+          if unknown_running_container_names.count > 0
+            @ui.stderr.puts(format_message("WARNING: You have *running* containers on your TestLab node which are not defined in your Labfile!".red.bold))
+            @ui.stderr.puts(format_message("WARNING: You may need to manually stop the following containers: #{unknown_running_container_names.join(', ')}".red))
+          end
+
+          @ui.stderr.puts(format_message("WARNING: You have containers on your TestLab node which are not defined in your Labfile!".yellow.bold))
+          @ui.stderr.puts(format_message("WARNING: You may need to manually remove the following containers: #{unknown_container_names.join(', ')}".yellow))
+        end
+
         result
       end
 

data/lib/testlab/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: testlab
 version: !ruby/object:Gem::Version
-  version: 1.11.3
+  version: 1.11.4
   prerelease: 
 platform: ruby
 authors:
@@ -348,12 +348,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2336780269824604665
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2336780269824604665
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25