testlab 1.1.0 → 1.2.0

data/README.md

@@ -22,17 +22,37 @@ TestLab can be run via the command-line or can be interfaced with directly via R
 
 # Using TestLab Interactively
 
-The TestLab command-line program `tl` follows in the style of git:
-
-    $ tl help
+    $ tl
     NAME
         tl - TestLab - A toolkit for building virtual computer labs
 
+        TestLab is based around the abstraction of three main components: nodes, networks and containers. Nodes represent a system
+        (bare-metal or virtualized) that hosts containers. Networks repesent a Linux bridge on a node. Containers simply represent a
+        Linux Container (LXC) running on its parent node which is typically connected to a network on the node.
+
+        In addition to the core component abstractions, TestLab shares a series of core tasks that are universal across all of the
+        components. These are create and destroy, up and down, provision and deprovision. Several other core tasks, such as build,
+        demolish, recycle and bounce encapsulate the previously mentioned tasks and simply act as convenience tasks.
+
+        You can execute almost all of the tasks against the entire lab, or individual lab components.
+
+        When building a lab from scratch, you will typically run 'tl build'. To breakdown your lab, destroying all the components, you
+        will typically run 'tl demolish'. If you want to re-build the lab you can run 'tl recycle' which will run the demolish task
+        followed by the build task against all the lab components. If you want to power-cycle the entire lab you can run 'tl bounce'
+        which will run the down task followed by the up task against all the lab components. Again these tasks can be run against the
+        lab as a whole or individual components.
+
+        You can view the status of the entire lab using 'tl status', or view the status of individual components using 'tl node status',
+        'tl network status' or 'tl container status'.
+
+        You can easily get help for any of the component tasks using the syntax 'tl help <component>'. This can be extended to the
+        following syntax 'tl help <task>' or 'tl help <component> <task>' for more in-depth help.
+
     SYNOPSIS
         tl [global options] command [command options] [arguments...]
 
     VERSION
-        0.9.1
+        1.1.0
 
     GLOBAL OPTIONS
         -l, --labfile=path/to/file     - Path to Labfile: ${REPO}/Labfile (default: none)
@@ -48,28 +68,18 @@ The TestLab command-line program `tl` follows in the style of git:
         container   - Manage lab containers
         network     - Manage lab networks
         node        - Manage lab nodes
+        build       - Build the lab (create->up->provision)
+        demolish    - Demolish the lab (deprovision->down->destroy)
+        bounce      - Bounce the lab (down->up)
+        recycle     - Recycle the lab (demolish->build)
         create      - Create the lab components
         destroy     - Destroy the lab components
         up          - On-line the lab components
         down        - Off-line the lab components
         provision   - Provision the lab components
         deprovision - De-provision the lab components
-        build       - Build the lab
-        demolish    - Demolish the lab
         status      - Display the lab status
 
-You stand up your lab with the following command:
-
-    tl build
-
-You can down the entire lab (this would only down the containers and networks on the Local provider for example):
-
-    tl down
-
-You can also demolish it (only works for VM backed providers; this would be a NO-OP on the Local provider for example):
-
-    tl demolish
-
 ## Getting Help
 
 TestLab uses the GLI RubyGem, which gives us a command line pattern similar to that of Git.  Therefore help is easy to get:
@@ -79,6 +89,59 @@ TestLab uses the GLI RubyGem, which gives us a command line pattern similar to t
     tl help container
     tl help network
 
+## Container Help
+
+Here is a sample of the help output for the container tasks:
+
+    $ tl help container
+    NAME
+        container - Manage lab containers
+
+    SYNOPSIS
+        tl [global options] container [command options]  bounce
+        tl [global options] container [command options]  build
+        tl [global options] container [command options]  console
+        tl [global options] container [command options] [-t container|--to container] copy
+        tl [global options] container [command options]  create
+        tl [global options] container [command options]  demolish
+        tl [global options] container [command options]  deprovision
+        tl [global options] container [command options]  destroy
+        tl [global options] container [command options]  down
+        tl [global options] container [command options]  ephemeral
+        tl [global options] container [command options] [--output filename] [-c level|--compression level] export
+        tl [global options] container [command options] [--input filename] import
+        tl [global options] container [command options]  persistent
+        tl [global options] container [command options]  provision
+        tl [global options] container [command options]  recycle
+        tl [global options] container [command options] [-i filename|--identity filename] [-u username|--user username] ssh
+        tl [global options] container [command options]  ssh-config
+        tl [global options] container [command options]  status
+        tl [global options] container [command options]  up
+
+    COMMAND OPTIONS
+        -n, --name=container[,container,...] - Optional container ID or comma separated list of container IDs (default: none)
+
+    COMMANDS
+        build       - Build containers (create->up->provision)
+        demolish    - Demolish containers (deprovision->down->destroy)
+        recycle     - Recycle containers (demolish->build)
+        bounce      - Bounce containers (down->up)
+        create      - Initialize containers
+        destroy     - Terminate containers
+        up          - On-line containers
+        down        - Off-line containers
+        provision   - Provision containers
+        deprovision - De-provision containers
+        status      - Display containers status
+        ssh         - Container SSH console
+        ssh-config  - Container SSH configuration
+        console     - Container console
+        ephemeral   - Enable ephemeral mode for containers
+        persistent  - Enable persistent mode for containers
+        copy        - Copy containers
+        export      - Export containers
+        import      - Import containers
+
 ## Interacting with Containers
 
 Almost all commands dealing will containers will take this argument:
@@ -109,75 +172,61 @@ You can pass an optional username and/or identity to use.  By default TestLab wi
         -u, --user=username - Specify an SSH Username to use (default: none)
         -i, --identity=key  - Specify an SSH Identity Key to use (default: none)
 
-You can individually online, offline, create or destroy containers:
+You can individually create or destroy, online or offline and provision or deprovision containers:
+
+    tl container create -n server-www-1
+    tl container destroy -n server-www-1
 
-    tl container down -n server-www-1
     tl container up -n server-www-1
+    tl container down -n server-www-1
+
     tl container provision -n server-www-1
     tl container deprovision -n server-www-1
 
-You can recycle a container, effectively destroying then creating it again, provisioning it back to a "pristine" condition.
+You can recycle a container, destroying then creating it again, provisioning it back to a "pristine" condition based on the `Labfile`:
 
     tl container recycle -n server-www-1
 
-## Ephemeral Container Cloning
+You can bounce a container, offlining then onlining it again:
 
-As it stands attempting to iterate infrastructure with Vagrant is a slow and painful process.  Enter LXC and ephemeral cloning.  The idea here is that you have a container that is provisioned to a "pristine" state according to the `Labfile`.  You then clone this container and run actions against the container.  After running your actions against the container you want to maybe tweak your Chef cookbook, for example, and re-run it against the container.  Running an ever changing cookbook in development against the same system over and over again causes drift and problems.  With the cloning you can instantly reinstate the container as it was when you first cloned it.
+    tl container bounce -n server-www-1
 
-Here we are cloning the container for the first time.  It takes a bit longer than normal because TestLab is actually shutting down the container so it can be retained as the "pristine" copy of it, and starting up a ephemeral container in its place.  Subsequent calls to clone are very fast.
+## Ephemeral Container Cloning
 
-    $ tl container clone -n server-www-1
-    [TL] TestLab v0.6.1 Loaded
-    [TL] container server-www-1 clone                            # Completed in 13.0116 seconds!
-    $ tl container clone -n server-www-1
-    [TL] TestLab v0.6.1 Loaded
-    [TL] container server-www-1 clone                            # Completed in 0.9169 seconds!
-    $ tl container clone -n server-www-1
-    [TL] TestLab v0.6.1 Loaded
-    [TL] container server-www-1 clone                            # Completed in 1.0794 seconds!
-    $ tl container clone -n server-www-1
-    [TL] TestLab v0.6.1 Loaded
-    [TL] container server-www-1 clone                            # Completed in 1.0281 seconds!
+As it stands attempting to iterate infrastructure with Vagrant is a slow and painful process.  Enter LXC and ephemeral cloning.  The idea here is that you have a container that is provisioned to a "pristine" state according to the `Labfile`.  You then clone this container and run actions against the container.  After running your actions against the container you want to maybe tweak your Chef cookbook, for example, and re-run it against the container.  Running an ever changing cookbook in development against the same system over and over again causes drift and problems.  With the cloning you can instantly reinstate the container as it was when you first cloned it.
 
-The idea in the above example is that you run the initial clone command to put your container into an ephemeral clone state.  You would then modify the container in some fashion, test, etc.  When you where done with that iteration you would run the clone command again, losing all the changes you did to the container, replacing it with a new clean cloned copy of your original container.  RRP (Rinse, Repeat, Profit)
+In order to use the ephemeral cloning in LXC, we first need to put our container or containers into an ephemeral mode.  This allows TestLab to do certain operations on the backend to prepare the container for ephemeral cloning.  Then when you are finished, you can easily return the container to a persistent mode.
 
-We can also see the containers status reflects that it is a clone currently:
+For example, to put the container into the ephemeral mode:
 
-    $ tl container status -n server-www-1
-    [TL] TestLab v0.6.1 Loaded
-    +----------------------------------------------+
-    |       NODE_ID: vagrant                       |
-    |            ID: server-www-1                  |
-    |         CLONE: true                          |
-    |          FQDN: server-www-1.default.zone     |
-    |         STATE: running                       |
-    |        DISTRO: ubuntu                        |
-    |       RELEASE: precise                       |
-    |    INTERFACES: labnet:eth0:10.10.0.21/16     |
-    |  PROVISIONERS: Resolv/AptCacherNG/Apt/Shell  |
-    +----------------------------------------------+
+    $ tl container ephemeral -n chef-client
+    [TL] TestLab v1.1.0 Loaded
+    [TL] container chef-client ephemeral                         # Completed in 17.3453 seconds!
+    [TL] TestLab v1.1.0 Finished (17.8546 seconds)
 
-We can easily revert it back to a full container if we want to make "permanent" changes to it:
+Now with our container in the ephemeral mode, we can run all of the normal container tasks against it with one simple caveat.  When you offline the container and bring it back online, it will be reverted to the original state it was in before you put it into the ephemeral mode.  The short of all this is, you can do what you will to the container, but the moment you bounce it (offline then online it) it reverts.  This, as you can imagine, is extremely useful for developing applications and infrastructure as code.
 
-    $ tl container up -n server-www-1
+You can quickly revert that chef node back to it's previous state in the event the cookbook you are developing has wrecked the node.  For web developers, imagine having a mysql server running in an ephemeral container; you can quickly roll back all database operations just by bouncing the container.
 
-We can even recycle it while it is in a cloned state:
+This is effectively transactions for infrastructure.
 
-    $ tl container recycle -n server-www-1
+To put the container back into the default, persistent mode:
 
-We can run provision against a clone as well (note: running `build`, calls `up`, which would revert us back to a non-cloned container and we would not want this to happen):
+    $ tl container persistent -n chef-client
+    [TL] TestLab v1.1.0 Loaded
+    [TL] container chef-client persistent                        # Completed in 17.3692 seconds!
+    [TL] TestLab v1.1.0 Finished (17.8692 seconds)
 
-    $ tl container provision -n server-www-1
 
 ## Network Routes
 
 TestLab will add network routes for any networks defined in the `Labfile` witch have the `TestLab::Provisioner::Route` provisioner class specified for them.  This will allow you to directly interact with containers over the network.  Here is an example of the routes added with the multi-network `Labfile`.
 
-    $ tl network route show -n labnet
-    [TL] TestLab v0.6.1 Loaded
+    $ tl network route show
+    [TL] TestLab v1.1.0 Loaded
     TestLab routes:
-    10.10.0.0       192.168.33.239  255.255.0.0     UG        0 0          0 vboxnet0
-    10.11.0.0       192.168.33.239  255.255.0.0     UG        0 0          0 vboxnet0
+    172.16.0.0      192.168.33.2    255.255.255.0   UG        0 0          0 vboxnet0
+    [TL] TestLab v1.1.0 Finished (0.5063 seconds)
 
 These routes can be manually manipulated as well (regardless of if you have specified the `TestLab::Provisioner::Route` provisioner class for the networks via the `Labfile`):
 
@@ -186,9 +235,9 @@ These routes can be manually manipulated as well (regardless of if you have spec
         route - Manage routes
 
     SYNOPSIS
-        tl [global options] network route [command options]  add
-        tl [global options] network route [command options]  del
-        tl [global options] network route [command options]  show
+        tl [global options] network route  add
+        tl [global options] network route  del
+        tl [global options] network route  show
 
     COMMANDS
         add  - Add routes to lab networks

data/bin/tl

@@ -28,7 +28,39 @@ include TestLab::Utility::Misc
 version TestLab::VERSION
 
 program_desc %(TestLab - A toolkit for building virtual computer labs)
-# program_long_desc %(Program Long Description)
+program_long_desc <<-EOF
+TestLab is based around the abstraction of three main components: nodes,
+networks and containers.  Nodes represent a system (bare-metal or virtualized)
+that hosts containers.  Networks repesent a Linux bridge on a node.  Containers
+simply represent a Linux Container (LXC) running on its parent node which is
+typically connected to a network on the node.
+
+In addition to the core component abstractions, TestLab shares a series of core
+tasks that are universal across all of the components.  These are create and
+destroy, up and down, provision and deprovision.  Several other core tasks,
+such as build, demolish, recycle and bounce encapsulate the previously mentioned
+tasks and simply act as convenience tasks.
+
+You can execute almost all of the tasks against the entire lab, or individual
+lab components.
+
+When building a lab from scratch, you will typically run 'tl build'.  To
+breakdown your lab, destroying all the components, you will typically run
+'tl demolish'.  If you want to re-build the lab you can run 'tl recycle' which
+will run the demolish task followed by the build task against all the lab
+components.  If you want to power-cycle the entire lab you can run 'tl bounce'
+which will run the down task followed by the up task against all the lab
+components.  Again these tasks can be run against the lab as a whole or
+individual components.
+
+You can view the status of the entire lab using 'tl status', or view the status
+of individual components using 'tl node status', 'tl network status' or
+'tl container status'.
+
+You can easily get help for any of the component tasks using the syntax
+'tl help <component>'.  This can be extended to the following syntax
+'tl help <task>' or 'tl help <component> <task>' for more in-depth help.
+EOF
 
 sort_help :manually
 default_command :help

data/features/step_definitions/container_steps.rb

@@ -14,14 +14,26 @@ When /^I down the containers with "([^"]*)"$/ do |app_name|
   container_cmd(app_name, %W(down -n test-server))
 end
 
-When /^I clone the containers with "([^"]*)"$/ do |app_name|
-  container_cmd(app_name, %W(clone -n test-server))
+When /^I put the containers in a ephemeral state with "([^"]*)"$/ do |app_name|
+  container_cmd(app_name, %W(ephemeral -n test-server))
+end
+
+When /^I put the containers in a persistent state with "([^"]*)"$/ do |app_name|
+  container_cmd(app_name, %W(persistent -n test-server))
 end
 
 When /^I build the containers with "([^"]*)"$/ do |app_name|
   container_cmd(app_name, %W(build -n test-server))
 end
 
+When /^I bounce the containers with "([^"]*)"$/ do |app_name|
+  container_cmd(app_name, %W(bounce -n test-server))
+end
+
+When /^I recycle the containers with "([^"]*)"$/ do |app_name|
+  container_cmd(app_name, %W(recycle -n test-server))
+end
+
 When /^I export the containers with "([^"]*)"$/ do |app_name|
   container_cmd(app_name, %W(export -n test-server --output=/tmp/test-server.sc))
 end

data/features/testlab.feature

@@ -39,21 +39,52 @@ Feature: TestLab command-line
   Scenario: TestLab clone
     When I build the lab with "tl"
     Then the exit status should be 0
-    When I clone the containers with "tl"
+
+    When I put the containers in a ephemeral state with "tl"
     Then the exit status should be 0
-    When I build the containers with "tl"
+
+    When I bounce the containers with "tl"
     Then the exit status should be 0
-    When I clone the containers with "tl"
+
+    When I bounce the containers with "tl"
     Then the exit status should be 0
+
     When I build the containers with "tl"
     Then the exit status should be 0
-    When I down the containers with "tl"
+
+    When I bounce the containers with "tl"
+    Then the exit status should be 0
+
+    When I recycle the containers with "tl"
+    Then the exit status should be 0
+
+    When I bounce the containers with "tl"
+    Then the exit status should be 0
+
+    When I export the containers with "tl"
+    Then the exit status should be 1
+
+    When I put the containers in a persistent state with "tl"
+    Then the exit status should be 0
+
+    When I bounce the containers with "tl"
     Then the exit status should be 0
-    When I up the containers with "tl"
+
+    When I bounce the containers with "tl"
     Then the exit status should be 0
+
     When I build the containers with "tl"
     Then the exit status should be 0
 
+    When I bounce the containers with "tl"
+    Then the exit status should be 0
+
+    When I recycle the containers with "tl"
+    Then the exit status should be 0
+
+    When I bounce the containers with "tl"
+    Then the exit status should be 0
+
 
   Scenario: TestLab Demolish
     When I demolish the lab with "tl"

data/lib/commands/container.rb

@@ -99,42 +99,28 @@ EOF
     end
   end
 
-  # CONTAINER RECYCLE
-  ####################
-  c.desc 'Recycle containers'
-  c.long_desc <<-EOF
-Recycles a container.  The container is taken through a series of state changes to ensure it is pristine.
+  # CONTAINER EPHEMERAL
+  ######################
+  c.desc 'Enable ephemeral mode for containers'
+  c.long_desc 'Put the container into a ephemeral clone state.'
 
-The container is cycled in this order:
-
-Deprovision -> Down -> Destroy -> Create -> Up -> Provision
-EOF
-  c.command :recycle do |recycle|
-    recycle.action do |global_options, options, args|
+  c.command :ephemeral do |ephemeral|
+    ephemeral.action do |global_options, options, args|
       iterate_objects_by_name(options[:name], TestLab::Container) do |container|
-        container.deprovision
-        container.down
-        container.destroy
-
-        container.create
-        container.up
-        container.provision
+        container.ephemeral
       end
     end
   end
 
-  # CONTAINER CLONE
-  ##################
-  c.desc 'Clone containers'
-  c.long_desc <<-EOF
-An ephemeral copy of the container is started.
+  # CONTAINER PERSISTENT
+  #######################
+  c.desc 'Enable persistent mode for containers'
+  c.long_desc 'Put the container into a persistent state.'
 
-NOTE: There is a small delay incured during the first clone operation.
-EOF
-  c.command :clone do |clone|
-    clone.action do |global_options, options, args|
+  c.command :persistent do |persistent|
+    persistent.action do |global_options, options, args|
       iterate_objects_by_name(options[:name], TestLab::Container) do |container|
-        container.clone
+        container.persistent
       end
     end
   end

data/lib/commands/testlab.rb

@@ -18,6 +18,86 @@
 #
 ################################################################################
 
+# LAB BUILD
+############
+desc 'Build the lab (create->up->provision)'
+long_desc <<-EOF
+Attempts to build the defined lab.  TestLab will attempt to create, online and provision the lab components.
+
+The components are built in the following order:
+
+Nodes -> Networks -> Containers
+
+TestLab will then attempt to build the components, executing the following tasks for each:
+
+Create -> Up -> Provision
+EOF
+command :build do |build|
+  build.action do |global_options,options,args|
+    @testlab.build
+  end
+end
+
+# LAB DEMOLISH
+###############
+desc 'Demolish the lab (deprovision->down->destroy)'
+long_desc <<-EOF
+Attempts to demolish the defined lab.  TestLab will attempt to deprovision, offline and destroy the lab components.
+
+The components are demolished in the following order:
+
+Containers -> Networks -> Nodes
+
+TestLab will then attempt to demolish the components, executing the following tasks for each:
+
+Deprovision -> Down -> Destroy
+EOF
+command :demolish do |demolish|
+  demolish.action do |global_options,options,args|
+    @testlab.demolish
+  end
+end
+
+# LAB BOUNCE
+#############
+desc 'Bounce the lab (down->up)'
+long_desc <<-EOF
+Attempts to bounce the lab.  TestLab will attempt to offline, then online the lab components.
+
+The components are offlined in the following order:
+
+Containers -> Networks -> Nodes
+
+Then components are onlined in the following order:
+
+Nodes -> Networks -> Containers
+EOF
+command :bounce do |bounce|
+  bounce.action do |global_options,options,args|
+    @testlab.bounce
+  end
+end
+
+# LAB RECYCLE
+##############
+desc 'Recycle the lab (demolish->build)'
+long_desc <<-EOF
+Attempts to recycle the lab.  TestLab will attempt to demolish, then build the lab components.
+
+The components are demolished in the following order:
+
+Containers -> Networks -> Nodes
+
+Then components are built in the following order:
+
+Nodes -> Networks -> Containers
+EOF
+command :recycle do |recycle|
+  recycle.action do |global_options,options,args|
+    @testlab.recycle
+  end
+end
+
 # LAB CREATE
 #############
 desc 'Create the lab components'
@@ -114,46 +194,6 @@ command :deprovision do |deprovision|
   end
 end
 
-# LAB BUILD
-############
-desc 'Build the lab'
-long_desc <<-EOF
-Attempts to build the defined lab.  TestLab will attempt to create, online and provision the lab components.
-
-The components are built in the following order:
-
-Nodes -> Networks -> Containers
-
-TestLab will then attempt to build the components, executing the following tasks for each:
-
-Create -> Up -> Provision
-EOF
-command :build do |build|
-  build.action do |global_options,options,args|
-    @testlab.build
-  end
-end
-
-# LAB DEMOLISH
-###############
-desc 'Demolish the lab'
-long_desc <<-EOF
-Attempts to demolish the defined lab.  TestLab will attempt to deprovision, offline and destroy the lab components.
-
-The components are demolished in the following order:
-
-Containers -> Networks -> Nodes
-
-TestLab will then attempt to demolish the components, executing the following tasks for each:
-
-Deprovision -> Down -> Destroy
-EOF
-command :demolish do |demolish|
-  demolish.action do |global_options,options,args|
-    @testlab.demolish
-  end
-end
-
 # LAB STATUS
 #############
 desc 'Display the lab status'

data/lib/testlab/container/actions.rb

@@ -15,6 +15,9 @@ class TestLab
         (self.node.state != :running) and return false
         (self.lxc.state != :not_created) and return false
 
+        # If we are in ephemeral mode do not attempt to create the container.
+        self.lxc_clone.exists? and return false
+
         please_wait(:ui => @ui, :message => format_object_action(self, 'Create', :green)) do
           configure
 
@@ -37,9 +40,11 @@ class TestLab
         (self.node.state != :running) and return false
         (self.lxc.state == :not_created) and return false
 
+        # If we are in ephemeral mode do not attempt to destroy the container.
+        self.lxc_clone.exists? and return false
+
         please_wait(:ui => @ui, :message => format_object_action(self, 'Destroy', :red)) do
           self.lxc.destroy(%(-f))
-          self.lxc_clone.destroy(%(-f))
 
           do_provisioner_callbacks(self, :destroy, @ui)
         end
@@ -61,17 +66,28 @@ class TestLab
         please_wait(:ui => @ui, :message => format_object_action(self, 'Up', :green)) do
           configure
 
-          # ensure our container is in "static" mode
-          self.to_static
+          # Remove any existing ARP entries for our container from the node.
+          self.interfaces.each do |interface|
+            self.node.exec(%(sudo arp --verbose --delete #{interface.ip}), :ignore_exit_status => true)
+          end
 
-          self.lxc.start(%(--daemon))
+          if self.lxc_clone.exists?
+            self.lxc_clone.start_ephemeral(clone_args)
+          else
+            self.lxc.start(%(--daemon))
+          end
 
           (self.lxc.state != :running) and raise ContainerError, "The container failed to online!"
 
-          self.users.each do |user|
-            user.provision
+          # If we are not in ephemeral mode we should attempt to provision our
+          # defined users.
+          if !self.lxc_clone.exists?
+            self.users.each do |user|
+              user.provision
+            end
           end
 
+          # Ensure the hostname is set
           self.exec(%(sudo hostname #{self.fqdn}))
 
           do_provisioner_callbacks(self, :up, @ui)
@@ -92,8 +108,23 @@ class TestLab
         (self.lxc.state != :running) and return false
 
         please_wait(:ui => @ui, :message => format_object_action(self, 'Down', :red)) do
+
           self.lxc.stop
 
+          # If we are in ephemeral mode...
+          if self.lxc_clone.exists?
+
+            # IMPORTANT NOTE:
+            #
+            # If we are using a non-memory backed COW filesystem for the
+            # ephemeral clones we should destroy the container.
+            #
+            # If we are using a memory backed COW filesystem for the ephemeral
+            # clones then it will be released when the container is stopped.
+
+            self.persist and self.lxc.destroy(%(-f))
+          end
+
           (self.lxc.state == :running) and raise ContainerError, "The container failed to offline!"
 
           do_provisioner_callbacks(self, :down, @ui)

data/lib/testlab/container/clone.rb

@@ -3,22 +3,31 @@ class TestLab
 
     module Clone
 
-      # Clone the container
+      # Put the container into an ephemeral state.
       #
-      # Prepares the container, if needed, for ephemeral cloning and clones it.
+      # Prepares the container, if needed, for ephemeral cloning.
       #
       # @return [Boolean] True if successful.
-      def clone
-        @ui.logger.debug { "Container Clone: #{self.id}" }
+      def ephemeral
+        @ui.logger.debug { "Container Ephemeral: #{self.id}" }
 
-        please_wait(:ui => @ui, :message => format_object_action(self, 'Clone', :yellow)) do
-
-          # ensure our container is in "ephemeral" mode
+        please_wait(:ui => @ui, :message => format_object_action(self, 'Ephemeral', :yellow)) do
           self.to_ephemeral
+        end
+
+        true
+      end
 
-          self.node.exec(%(sudo arp --verbose --delete #{self.ip}), :ignore_exit_status => true)
+      # Put the container into a persistent state.
+      #
+      # Prepares the container, if needed, for persistance.
+      #
+      # @return [Boolean] True if successful.
+      def persistent
+        @ui.logger.debug { "Container Persistent: #{self.id}" }
 
-          self.lxc_clone.start_ephemeral(clone_args)
+        please_wait(:ui => @ui, :message => format_object_action(self, 'Persistent', :yellow)) do
+          self.to_static
         end
 
         true

data/lib/testlab/container/io.rb

@@ -13,6 +13,11 @@ class TestLab
 
         (self.lxc.state == :not_created) and return false
 
+        # Throw an exception if we are attempting to export a container in a
+        # ephemeral state.
+        self.lxc_clone.exists? and raise ContainerError, 'You can not export ephemeral containers!'
+
+        # Ensure the container is stopped before we attempt to export it.
         self.down
 
         export_tempfile = Tempfile.new('export')
@@ -57,6 +62,9 @@ EOF
       def import(local_file)
         @ui.logger.debug { "Container Import: #{self.id} " }
 
+        # Ensure we are not in ephemeral mode.
+        self.to_static
+
         self.down
         self.destroy
         self.create

data/lib/testlab/container.rb

@@ -82,7 +82,6 @@ class TestLab
     autoload :Generators,    'testlab/container/generators'
     autoload :Interface,     'testlab/container/interface'
     autoload :IO,            'testlab/container/io'
-    autoload :Lifecycle,     'testlab/container/lifecycle'
     autoload :LXC,           'testlab/container/lxc'
     autoload :MethodMissing, 'testlab/container/method_missing'
     autoload :Provision,     'testlab/container/provision'
@@ -97,7 +96,6 @@ class TestLab
     include TestLab::Container::Generators
     include TestLab::Container::Interface
     include TestLab::Container::IO
-    include TestLab::Container::Lifecycle
     include TestLab::Container::LXC
     include TestLab::Container::MethodMissing
     include TestLab::Container::Provision
@@ -109,6 +107,7 @@ class TestLab
     extend  TestLab::Container::ClassMethods
 
     include TestLab::Support::Execution
+    include TestLab::Support::Lifecycle
 
     include TestLab::Utility::Misc
 

data/lib/testlab/network/actions.rb

@@ -62,7 +62,7 @@ brctl delbr #{self.bridge}
         @ui.logger.debug { "Network Up: #{self.id} " }
 
         (self.node.state != :running) and return false
-        (self.state == :running) and return false
+        # (self.state == :running) and return false
 
         please_wait(:ui => @ui, :message => format_object_action(self, 'Up', :green)) do
           self.node.bootstrap(<<-EOF, :ignore_exit_status => true)
@@ -81,7 +81,7 @@ ifconfig #{self.bridge} #{self.ip} netmask #{self.netmask} broadcast #{self.broa
         @ui.logger.debug { "Network Down: #{self.id} " }
 
         (self.node.state != :running) and return false
-        (self.state != :running) and return false
+        # (self.state != :running) and return false
 
         please_wait(:ui => @ui, :message => format_object_action(self, 'Down', :red)) do
           self.node.bootstrap(<<-EOF, :ignore_exit_status => true)

data/lib/testlab/network.rb

@@ -13,18 +13,18 @@ class TestLab
     autoload :Actions,      'testlab/network/actions'
     autoload :Bind,         'testlab/network/bind'
     autoload :ClassMethods, 'testlab/network/class_methods'
-    autoload :Lifecycle,    'testlab/network/lifecycle'
     autoload :Provision,    'testlab/network/provision'
     autoload :Status,       'testlab/network/status'
 
     include TestLab::Network::Actions
     include TestLab::Network::Bind
-    include TestLab::Network::Lifecycle
     include TestLab::Network::Provision
     include TestLab::Network::Status
 
     extend  TestLab::Network::ClassMethods
 
+    include TestLab::Support::Lifecycle
+
     include TestLab::Utility::Misc
 
     # Associations and Attributes

data/lib/testlab/node.rb

@@ -12,7 +12,6 @@ class TestLab
     # Sub-Modules
     autoload :Actions,       'testlab/node/actions'
     autoload :ClassMethods,  'testlab/node/class_methods'
-    autoload :Lifecycle,     'testlab/node/lifecycle'
     autoload :LXC,           'testlab/node/lxc'
     autoload :MethodMissing, 'testlab/node/method_missing'
     autoload :Provision,     'testlab/node/provision'
@@ -20,7 +19,6 @@ class TestLab
     autoload :Status,        'testlab/node/status'
 
     include TestLab::Node::Actions
-    include TestLab::Node::Lifecycle
     include TestLab::Node::LXC
     include TestLab::Node::MethodMissing
     include TestLab::Node::Provision
@@ -30,6 +28,7 @@ class TestLab
     extend  TestLab::Node::ClassMethods
 
     include TestLab::Support::Execution
+    include TestLab::Support::Lifecycle
 
     include TestLab::Utility::Misc
 
@@ -66,7 +65,7 @@ class TestLab
 
     def domain
       self.config[:bind] ||= Hash.new
-      self.config[:bind][:domain]
+      self.config[:bind][:domain] ||= 'tld.invalid'
     end
 
   end

data/lib/testlab/provisioners/bind.rb

@@ -48,7 +48,7 @@ class TestLab
 
       # Bind: Container Up
       #
-      # @param [TestLab::Node] node The container which just came online.
+      # @param [TestLab::Container] container The container which just came online.
       # @return [Boolean] True if successful.
       def on_container_up(container)
         @ui.logger.debug { "BIND Provisioner: Container #{container.id}" }
@@ -69,7 +69,6 @@ class TestLab
 
         true
       end
-      alias :on_network_create :on_network_up
 
       # Builds the main bind configuration sections
       def build_bind_main_partial(file)

data/lib/testlab/provisioners/raring.rb

@@ -29,7 +29,6 @@ class TestLab
 
         node.bootstrap(ZTK::Template.render(provision_template, @config))
       end
-      alias :on_node_up :on_node_provision
 
     private
 

data/lib/testlab/provisioners/route.rb

@@ -21,20 +21,18 @@ class TestLab
       end
 
       # Route: Network Provision
-      def on_network_provision(network)
+      def on_network_up(network)
         manage_route(:add, network)
 
         true
       end
-      alias :on_network_up :on_network_provision
 
       # Route: Network Deprovision
-      def on_network_deprovision(network)
+      def on_network_down(network)
         manage_route(:del, network)
 
         true
       end
-      alias :on_network_down :on_network_deprovision
 
     private
 

data/lib/testlab/support/lifecycle.rb

@@ -0,0 +1,43 @@
+class TestLab
+  module Support
+
+    module Lifecycle
+
+      # Build the object
+      def build
+        create
+        up
+        provision
+
+        true
+      end
+
+      # Demolish the object
+      def demolish
+        deprovision
+        down
+        destroy
+
+        true
+      end
+
+      # Recycle the object
+      def recycle
+        demolish
+        build
+
+        true
+      end
+
+      # Bounce the object
+      def bounce
+        down
+        up
+
+        true
+      end
+
+    end
+
+  end
+end

data/lib/testlab/support.rb

@@ -12,6 +12,7 @@ class TestLab
   # @author Zachary Patten <zachary AT jovelabs DOT com>
   module Support
     autoload :Execution, 'testlab/support/execution'
+    autoload :Lifecycle, 'testlab/support/lifecycle'
   end
 
 end

data/lib/testlab/utility/gli.rb

@@ -7,7 +7,7 @@ class TestLab
     module GLI
       require 'ztk'
 
-      LAB_ACTION_ORDER = %W(build demolish create destroy up down provision deprovision).map(&:to_sym)
+      LAB_ACTION_ORDER = %W(build demolish recycle bounce create destroy up down provision deprovision).map(&:to_sym)
 
       LAB_ACTIONS = {
         :create      => ["Initialize %s",   "Attempts to create the <%= @component %>."],
@@ -16,19 +16,33 @@ class TestLab
         :down        => ["Off-line %s",     "Attempts to offline the <%= @component %>."],
         :provision   => ["Provision %s",    "Attempts to provision the <%= @component %>."],
         :deprovision => ["De-provision %s", "Attempts to deprovision the <%= @component %>."],
-        :build       => ["Build %s", <<-EOF],
+        :bounce      => ["Bounce %s (down->up)", <<-EOF],
+          Attempts to bounce the <%= @component %>.  TestLab will attempt to offline, then online the <%= @component %>.
+
+          The <%= @component %> are taken through the following states:
+
+          Current -> Down -> Up
+          EOF
+        :recycle     => ["Recycle %s (demolish->build)", <<-EOF],
+          Attempts to recycle the <%= @component %>.  TestLab will attempt to demolish, then build the <%= @component %>.
+
+          The <%= @component %> are taken through the following states:
+
+          Current -> Demolish -> Build
+          EOF
+        :build       => ["Build %s (create->up->provision)", <<-EOF],
           Attempts to build the <%= @component %>.  TestLab will attempt to create, online and provision the <%= @component %>.
 
           The <%= @component %> are taken through the following states:
 
-          Create -> Up -> Provision
+          Current -> Create -> Up -> Provision
           EOF
-        :demolish => ["Demolish %s", <<-EOF]
+        :demolish    => ["Demolish %s (deprovision->down->destroy)", <<-EOF]
           Attempts to demolish the <%= @component %>.  TestLab will attempt to deprovision, offline and destroy the <%= @component %>.
 
           The <%= @component %> are taken through the following states:
 
-          Deprovision -> Down -> Destroy
+          Current -> Deprovision -> Down -> Destroy
           EOF
       }
 

data/lib/testlab/version.rb

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

data/lib/testlab.rb

@@ -322,6 +322,32 @@ class TestLab
     true
   end
 
+  # Test Lab Bounce
+  #
+  # Attempts to bounce our lab topology.  This calls various methods on
+  # all of our nodes, networks and containers.
+  #
+  # @return [Boolean] True if successful.
+  def bounce
+    self.down
+    self.up
+
+    true
+  end
+
+  # Test Lab Recycle
+  #
+  # Attempts to recycle our lab topology.  This calls various methods on
+  # all of our nodes, networks and containers.
+  #
+  # @return [Boolean] True if successful.
+  def recycle
+    self.demolish
+    self.build
+
+    true
+  end
+
   # Node Method Proxy
   #
   # Iterates all of the lab nodes, sending the supplied method name and arguments

data/spec/container_spec.rb

@@ -151,7 +151,9 @@ describe TestLab::Container do
         subject.stub(:detect_arch) { "amd64" }
         subject.lxc.stub(:create) { true }
         subject.lxc.stub(:state) { :not_created }
+        subject.lxc_clone.stub(:exists?) { false }
         subject.node.ssh.stub(:exec)
+
         subject.create
       end
     end
@@ -162,7 +164,8 @@ describe TestLab::Container do
         subject.lxc.stub(:exists?) { true }
         subject.lxc.stub(:state) { :stopped }
         subject.lxc.stub(:destroy) { true }
-        subject.lxc_clone.stub(:destroy) { true }
+        subject.lxc_clone.stub(:exists?) { false }
+
         subject.destroy
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: testlab
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-20 00:00:00.000000000 Z
+date: 2013-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -245,7 +245,6 @@ files:
 - lib/testlab/container/generators.rb
 - lib/testlab/container/interface.rb
 - lib/testlab/container/io.rb
-- lib/testlab/container/lifecycle.rb
 - lib/testlab/container/lxc.rb
 - lib/testlab/container/method_missing.rb
 - lib/testlab/container/provision.rb
@@ -260,13 +259,11 @@ files:
 - lib/testlab/network/actions.rb
 - lib/testlab/network/bind.rb
 - lib/testlab/network/class_methods.rb
-- lib/testlab/network/lifecycle.rb
 - lib/testlab/network/provision.rb
 - lib/testlab/network/status.rb
 - lib/testlab/node.rb
 - lib/testlab/node/actions.rb
 - lib/testlab/node/class_methods.rb
-- lib/testlab/node/lifecycle.rb
 - lib/testlab/node/lxc.rb
 - lib/testlab/node/method_missing.rb
 - lib/testlab/node/provision.rb
@@ -306,6 +303,7 @@ files:
 - lib/testlab/provisioners/templates/resolv/resolv.conf.erb
 - lib/testlab/support.rb
 - lib/testlab/support/execution.rb
+- lib/testlab/support/lifecycle.rb
 - lib/testlab/user.rb
 - lib/testlab/user/lifecycle.rb
 - lib/testlab/utility.rb
@@ -339,12 +337,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4166259606909951281
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4166259606909951281
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25

data/lib/testlab/container/lifecycle.rb

@@ -1,27 +0,0 @@
-class TestLab
-  class Container
-
-    module Lifecycle
-
-      # Build the container
-      def build
-        self.create
-        self.up
-        self.provision
-
-        true
-      end
-
-      # Demolish the container
-      def demolish
-        self.deprovision
-        self.down
-        self.destroy
-
-        true
-      end
-
-    end
-
-  end
-end

data/lib/testlab/network/lifecycle.rb

@@ -1,27 +0,0 @@
-class TestLab
-  class Network
-
-    module Lifecycle
-
-      # Build the network
-      def build
-        self.create
-        self.up
-        self.provision
-
-        true
-      end
-
-      # Demolish the network
-      def demolish
-        self.deprovision
-        self.down
-        self.destroy
-
-        true
-      end
-
-    end
-
-  end
-end

data/lib/testlab/node/lifecycle.rb

@@ -1,26 +0,0 @@
-class TestLab
-  class Node
-
-    module Lifecycle
-
-      # Build the node
-      def build
-        self.create
-        self.up
-        self.provision
-
-        true
-      end
-
-      # Demolish the node
-      def demolish
-        self.deprovision
-        self.down
-        self.destroy
-
-        true
-      end
-
-    end
-  end
-end