testlab 0.6.9 → 0.6.10

data/README.md

@@ -18,20 +18,25 @@ The TestLab command-line program `tl` follows in the style of git (using the GLI
 
     $ tl help
     NAME
-        tl - A framework for building lightweight virtual infrastructure using LXC
+        tl - TestLab - A toolkit for building virtual computer labs
 
     SYNOPSIS
         tl [global options] command [command options] [arguments...]
 
     VERSION
-        0.6.5
+        0.6.9
 
     GLOBAL OPTIONS
-        --version -
-        --help    - Show this message
+        --version          -
+        -v, --[no-]verbose - Show verbose output
+        -q, --[no-]quiet   - Quiet mode
+        --help             - Show this message
 
     COMMANDS
         help      - Shows a list of commands or help for one command
+        container - Manage containers
+        network   - Manage networks
+        node      - Manage nodes
         create    - Create the test lab
         destroy   - Destroy the test lab
         up        - Online the test lab
@@ -40,9 +45,6 @@ The TestLab command-line program `tl` follows in the style of git (using the GLI
         teardown  - Teardown the test lab infrastructure
         build     - Build the test lab infrastructure
         status    - Display information on the status of the test lab
-        node      - Manage nodes
-        network   - Manage networks
-        container - Manage containers
 
 You stand up your lab with the following command:
 

data/lib/testlab/container/lxc.rb

@@ -17,9 +17,12 @@ class TestLab
         ZTK::RescueRetry.try(:tries => 3, :on => ContainerError) do
           tempfile = Tempfile.new("bootstrap")
           remote_tempfile = File.join("/tmp", File.basename(tempfile.path))
-          self.node.ssh.file(:target => File.join(self.lxc.fs_root, remote_tempfile), :chmod => '0777', :chown => 'root:root') do |file|
+          target_file = File.join(self.fs_root, remote_tempfile)
+
+          self.node.ssh.file(:target => target_file, :chmod => '0777', :chown => 'root:root') do |file|
             file.puts(content)
           end
+
           output = self.lxc.attach(%(--), %(/bin/bash), remote_tempfile)
           if output =~ /No such file or directory/
             raise ContainerError, "We could not find the bootstrap file!"
@@ -105,6 +108,13 @@ class TestLab
         self.lxc.exists?
       end
 
+      # Container root filesystem path
+      #
+      # @return [String] The path to the containers root filesystem.
+      def fs_root
+        self.lxc.fs_root(self.lxc_clone.exists?)
+      end
+
       # Returns arguments for lxc-create based on our distro
       #
       # @return [Array<String>] An array of arguments for lxc-create
@@ -138,9 +148,11 @@ class TestLab
       # @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['lxc.arch']    = self.arch
+        lxc_config.networks       = build_lxc_network_conf(self.interfaces)
+
         lxc_config.save
 
         true
@@ -158,12 +170,12 @@ class TestLab
 
         interfaces.each do |interface|
           networks << Hash[
-            'lxc.network.type'         => :veth,
-            'lxc.network.flags'        => :up,
-            'lxc.network.link'         => interface.network.bridge,
-            'lxc.network.name'         => interface.name,
-            'lxc.network.hwaddr'       => interface.mac,
-            'lxc.network.ipv4'         => "#{interface.ip}/#{interface.cidr} #{interface.netmask}"
+            'lxc.network.type'   => :veth,
+            'lxc.network.flags'  => :up,
+            'lxc.network.link'   => interface.network.bridge,
+            'lxc.network.name'   => interface.name,
+            'lxc.network.hwaddr' => interface.mac,
+            'lxc.network.ipv4'   => "#{interface.ip}/#{interface.cidr} #{interface.netmask}"
           ]
           if (interface.primary == true) || (interfaces.count == 1)
             networks.last.merge!('lxc.network.ipv4.gateway' => :auto)

data/lib/testlab/provisioners/apt_cacher_ng.rb

@@ -60,7 +60,7 @@ class TestLab
 
         # Ensure the container APT calls use apt-cacher-ng on the node
         gateway_ip                     = container.primary_interface.network.ip
-        apt_conf_d_proxy_file          = File.join(container.lxc.fs_root, "etc", "apt", "apt.conf.d", "00proxy")
+        apt_conf_d_proxy_file          = File.join(container.fs_root, "etc", "apt", "apt.conf.d", "00proxy")
 
         @config[:apt][:cacher_ng] = { :proxy_url => "http://#{gateway_ip}:3142" }.merge(@config[:apt][:cacher_ng])
 
@@ -69,7 +69,7 @@ class TestLab
         end
 
         # Fix the APT sources since LXC mudges them when using apt-cacher-ng
-        apt_conf_sources_file = File.join(container.lxc.fs_root, "etc", "apt", "sources.list")
+        apt_conf_sources_file = File.join(container.fs_root, "etc", "apt", "sources.list")
         container.node.ssh.exec(%(sudo sed -i 's/127.0.0.1:3142\\///g' #{apt_conf_sources_file}))
       end
 

data/lib/testlab/user/lifecycle.rb

@@ -13,12 +13,12 @@ class TestLab
         node_authkeys = File.join(node_home_dir, ".ssh", "authorized_keys")
 
         # ensure the container user exists
-        container_passwd_file = File.join(self.container.lxc.fs_root, "etc", "passwd")
+        container_passwd_file = File.join(self.container.fs_root, "etc", "passwd")
         if self.container.node.ssh.exec(%(sudo grep "#{self.id}" #{container_passwd_file}), :ignore_exit_status => true).exit_code != 0
 
           if !self.gid.nil?
             groupadd_command = %(groupadd --gid #{self.gid} #{self.id})
-            self.container.node.ssh.exec(%(sudo chroot #{self.container.lxc.fs_root} /bin/bash -c '#{groupadd_command}'))
+            self.container.node.ssh.exec(%(sudo chroot #{self.container.fs_root} /bin/bash -c '#{groupadd_command}'))
           end
 
           useradd_command = %W(useradd --create-home --shell /bin/bash --groups sudo --password #{self.password})
@@ -27,11 +27,11 @@ class TestLab
           useradd_command << self.id
           useradd_command = useradd_command.flatten.compact.join(' ')
 
-          self.container.node.ssh.exec(%(sudo chroot #{self.container.lxc.fs_root} /bin/bash -c '#{useradd_command}'))
+          self.container.node.ssh.exec(%(sudo chroot #{self.container.fs_root} /bin/bash -c '#{useradd_command}'))
         end
 
         # ensure the user user gets our node user key
-        user_home_dir = File.join(self.container.lxc.fs_root, ((self.id == "root") ? %(/root) : %(/home/#{self.id})))
+        user_home_dir = File.join(self.container.fs_root, ((self.id == "root") ? %(/root) : %(/home/#{self.id})))
         user_authkeys = File.join(user_home_dir, ".ssh", "authorized_keys")
         user_authkeys2 = File.join(user_home_dir, ".ssh", "authorized_keys2")
 
@@ -57,6 +57,20 @@ class TestLab
         true
       end
 
+      # User Home Directory
+      #
+      # Returns the path to the users home directory.
+      #
+      # @return [String] The users home directory.
+      def home_dir(name=nil)
+        username = (name || self.id)
+        if (username == "root")
+          "/root"
+        else
+          "/home/#{username}"
+        end
+      end
+
     end
 
   end

data/lib/testlab/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: testlab
 version: !ruby/object:Gem::Version
-  version: 0.6.9
+  version: 0.6.10
   prerelease: 
 platform: ruby
 authors:
@@ -300,7 +300,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 805915972640888804
+      hash: 3377457757681379174
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -309,7 +309,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 805915972640888804
+      hash: 3377457757681379174
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25