torpedo 1.0.19 → 2.1.0

data/CHANGELOG

@@ -1,3 +1,12 @@
+* Wed Oct 2 2013 Dan Prince <dprince@redhat.com> - 2.0.0
+  -Switch from openstack-compute to fog.
+  -Add 'network_namespace' option which can be used when testing
+   Neutron namespaces.
+  -Add support for volumes.
+  -Add support for keypairs.
+  -Add support for metering.
+  -Add support for orchestration.
+
 * Thu Feb 14 2013 Dan Prince <dprince@redhat.com> - 1.0.19
   -Added NETWORK_LABEL option. (defaults to 'public')
 

data/LICENSE.txt

@@ -1,4 +1,5 @@
-Copyright (c) 2011 Dan Prince
+Copyright (c) 2011-2012 Dan Prince
+Copyright (c) 2012-2013 Red Hat Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -11,7 +11,7 @@ Installation
 
 1. Install the Gem.
 2. Create the torpedo.conf file in your HOME directory.
-3. Source novarc for your OpenStack Compute account.
+3. Source the rc file for your OpenStack account (keystone credentials, etc).
 
 ```bash
 	gem install torpedo
@@ -54,7 +54,7 @@ Installation
 	#keyname: test
 	EOF_CAT
 
-	source $PATH_TO_YOUR/novarc
+	source $PATH_TO_YOUR/openstackrc
 ```
 
 Examples
@@ -108,4 +108,4 @@ Payload
 
 License
 -------
-Copyright (c) 2011-2012 Dan Prince. See LICENSE.txt for further details.
+Copyright (c) 2011-2013 Dan Prince. See LICENSE.txt for further details.

data/Rakefile

@@ -19,13 +19,14 @@ Jeweler::Tasks.new do |gem|
   gem.homepage = "http://github.com/dprince/torpedo"
   gem.license = "MIT"
   gem.summary = %Q{Fire when ready. Fast Ruby integration tests for OpenStack.}
-  gem.description = %Q{Fast integration tests OpenStack Compute.}
-  gem.email = "dan.prince@rackspace.com"
+  gem.description = %Q{Fast integration tests for OpenStack.}
+  gem.email = "dprince@redhat.com"
   gem.authors = ["Dan Prince"]
   # dependencies defined in Gemfile
-  gem.add_dependency 'thor', '~>0.14.6'
-  gem.add_dependency 'openstack-compute', '~>1.1.5'
-  gem.add_dependency('net-ssh', '~>2.2.1')
+  gem.add_dependency 'thor'
+  gem.add_dependency 'test-unit'
+  gem.add_dependency 'fog'
+  gem.add_dependency 'net-ssh'
 end
 Jeweler::RubygemsDotOrgTasks.new
 

data/VERSION

@@ -1 +1 @@
-1.0.19
+2.1.0

data/bin/torpedo

@@ -3,7 +3,6 @@
 require "rubygems"
 require "thor"
 
-# uncomment this for local testing
 #$:.unshift File.dirname(__FILE__) + "/../lib"
 STDOUT.sync = true
 

data/lib/torpedo.rb

@@ -1,6 +1,12 @@
 require 'rubygems'
 require 'torpedo/config'
 
+if RUBY_VERSION =~ /^1.9.*/ then
+  gem 'test-unit'
+end
+require 'test/unit'
+require 'test/unit/ui/console/testrunner'
+
 configs = Torpedo::Config.load_configs
 
 SSH_TIMEOUT=(configs['ssh_timeout'] || 30).to_i
@@ -9,6 +15,7 @@ PING_TIMEOUT=(configs['ping_timeout'] || 60).to_i
 TEST_PING=configs.fetch('test_ping', true)
 SERVER_BUILD_TIMEOUT=(configs['server_build_timeout'] || 60).to_i
 NETWORK_LABEL=(configs['network_label'] || 'public')
+NETWORK_NAMESPACE=configs['network_namespace']
 SLEEP_AFTER_IMAGE_CREATE=(configs['sleep_after_image_create'] || 0).to_i
 SSH_PRIVATE_KEY=configs['ssh_private_key'] || ENV['HOME'] + "/.ssh/id_rsa"
 SSH_PUBLIC_KEY=configs['ssh_public_key'] || ENV['HOME'] + "/.ssh/id_rsa.pub"
@@ -24,8 +31,8 @@ TEST_IP_TYPE=configs['test_ip_type'] || 4
 TEST_LIMITS=configs.fetch('test_limits', true)
 CLEAN_UP_SERVERS=configs.fetch('clean_up_servers', true)
 CLEAN_UP_IMAGES=configs.fetch('clean_up_images', true)
-KEYPAIR=configs['keypair']
-KEYNAME=configs['keyname']
+CLEAN_UP_KEYPAIRS=configs.fetch('clean_up_keypairs', true)
+KEYPAIR_ENABLED = configs.fetch('keypairs', false)
 
 IMAGE_REF=configs['image_ref']
 IMAGE_NAME=configs['image_name']
@@ -36,58 +43,160 @@ FLAVOR_NAME=configs['flavor_name']
 FLAVOR_REF_RESIZE=configs['flavor_ref_resize']
 FLAVOR_NAME_RESIZE=configs['flavor_name_resize']
 
-OPENSTACK_COMPUTE_VERSION=configs['openstack_compute_version']
+#volume opts
+volume_opts=configs['volumes'] || {}
+VOLUME_ENABLED = volume_opts.fetch('enabled', false)
+VOLUME_BUILD_TIMEOUT = (volume_opts['build_timeout'] || 120).to_i
+TEST_VOLUME_SNAPSHOTS = volume_opts.fetch('test_snapshots', false)
+CLEAN_UP_VOLUMES = volume_opts.fetch('cleanup', true)
+
+#metering opts
+metering_opts=configs['metering'] || {}
+METERING_ENABLED = metering_opts.fetch('enabled', false)
+METERING_SAMPLE_TIMEOUT = (metering_opts['sample_timeout'] || 360).to_i
+
+#orchestration opts
+orchestration_opts=configs['orchestration'] || {}
+ORCHESTRATION_ENABLED = orchestration_opts.fetch('enabled', false)
+STACK_CREATE_TIMEOUT = (orchestration_opts['stack_create_timeout'] || 120).to_i
+CLEAN_UP_STACKS = orchestration_opts.fetch('cleanup', true)
 
-require 'torpedo/compute/helper'
+FOG_VERSION=configs['fog_version']
 
+TORPEDO_TEST_SUITE = Test::Unit::TestSuite.new("Torpedo")
 module Torpedo
-class Tasks < Thor
+
+  class TorpedoTests
+    def self.suite
+      return TORPEDO_TEST_SUITE
+    end
+  end
+
+  class Tasks < Thor
 
     desc "flavors", "Run flavors tests for the OSAPI."
     def flavors
       require 'torpedo/compute/flavors'
+      TORPEDO_TEST_SUITE << Torpedo::Compute::Flavors.suite
+      exit Test::Unit::UI::Console::TestRunner.run(TorpedoTests).passed?
     end
 
     desc "limits", "Run limits tests for the OSAPI."
     def limits
       require 'torpedo/compute/limits'
+      TORPEDO_TEST_SUITE << Torpedo::Compute::Limits.suite
+      exit Test::Unit::UI::Console::TestRunner.run(TorpedoTests).passed?
     end
 
     desc "images", "Run images tests for the OSAPI."
     def images
       require 'torpedo/compute/images'
+      TORPEDO_TEST_SUITE << Torpedo::Compute::Images.suite
+      exit Test::Unit::UI::Console::TestRunner.run(TorpedoTests).passed?
     end
 
     desc "servers", "Run servers tests for the OSAPI."
     def servers
+      require 'torpedo/volume/volumes'
+      require 'torpedo/compute/keypairs'
       require 'torpedo/compute/servers'
+      require 'torpedo/metering/meters'
+      require 'torpedo/cleanup'
+      if VOLUME_ENABLED
+        TORPEDO_TEST_SUITE << Torpedo::Volume::Volumes.suite
+      end
+      if KEYPAIR_ENABLED
+        TORPEDO_TEST_SUITE << Torpedo::Compute::Keypairs.suite
+      end
+      TORPEDO_TEST_SUITE << Torpedo::Compute::Servers.suite
+      if METERING_ENABLED
+        TORPEDO_TEST_SUITE << Torpedo::Metering::Meters.suite
+      end
+      TORPEDO_TEST_SUITE << Torpedo::Cleanup.suite
+      exit Test::Unit::UI::Console::TestRunner.run(TorpedoTests).passed?
     end
 
-    desc "cleanup", "Clean up servers and images (not necessary normally)."
-    def cleanup
-      conn = Torpedo::Compute::Helper::get_connection
-      conn.servers.each do |server|
-        server = conn.server(server[:id])
-        if server.name == 'torpedo'
-          puts 'Deleting torpedo server'
-          server.delete!
-        end
-      end
-      conn.images.each do |image|
-        image = conn.image(image[:id])
-        if image.server and conn.server(image.server['id']).name == 'torpedo'
-          puts 'Deleting torpedo image'
-          image.delete!
-        end
+    desc "keypairs", "Run keypair tests for the OSAPI."
+    def keypairs
+      require 'torpedo/compute/keypairs'
+      require 'torpedo/cleanup'
+      TORPEDO_TEST_SUITE << Torpedo::Compute::Keypairs.suite
+      TORPEDO_TEST_SUITE << Torpedo::Cleanup.suite
+      exit Test::Unit::UI::Console::TestRunner.run(TorpedoTests).passed?
+    end
+
+    desc "volumes", "Run volume tests for the OSAPI."
+    def volumes
+      require 'torpedo/volume/volumes'
+      require 'torpedo/cleanup'
+      TORPEDO_TEST_SUITE << Torpedo::Volume::Volumes.suite
+      TORPEDO_TEST_SUITE << Torpedo::Cleanup.suite
+      exit Test::Unit::UI::Console::TestRunner.run(TorpedoTests).passed?
+    end
+
+    desc "orchestration", "Run orchestration tests for the OSAPI."
+    def orchestration
+      require 'torpedo/compute/keypairs'
+      require 'torpedo/orchestration/stacks'
+      require 'torpedo/cleanup'
+      if KEYPAIR_ENABLED
+        TORPEDO_TEST_SUITE << Torpedo::Compute::Keypairs.suite
       end
+      TORPEDO_TEST_SUITE << Torpedo::Orchestration::Stacks.suite
+      TORPEDO_TEST_SUITE << Torpedo::Cleanup.suite
+      exit Test::Unit::UI::Console::TestRunner.run(TorpedoTests).passed?
+    end
+
+    desc "cleanup", "Clean up servers, images, volumes, etc."
+    def cleanup
+      require 'torpedo/cleanup'
+      TORPEDO_TEST_SUITE << Torpedo::Cleanup.suite
+      exit Test::Unit::UI::Console::TestRunner.run(TorpedoTests).passed?
     end
 
     desc "all", "Run all tests."
     def all
+      require 'torpedo/compute/keypairs'
+      require 'torpedo/orchestration/stacks'
       require 'torpedo/compute/flavors'
       require 'torpedo/compute/limits'
       require 'torpedo/compute/images'
+      require 'torpedo/volume/volumes'
       require 'torpedo/compute/servers'
+      require 'torpedo/metering/meters'
+      require 'torpedo/cleanup'
+      if KEYPAIR_ENABLED
+        TORPEDO_TEST_SUITE << Torpedo::Compute::Keypairs.suite
+      end
+      if ORCHESTRATION_ENABLED
+        TORPEDO_TEST_SUITE << Torpedo::Orchestration::Stacks.suite
+      end
+      TORPEDO_TEST_SUITE << Torpedo::Compute::Flavors.suite
+      TORPEDO_TEST_SUITE << Torpedo::Compute::Limits.suite
+      TORPEDO_TEST_SUITE << Torpedo::Compute::Images.suite
+      if VOLUME_ENABLED
+        TORPEDO_TEST_SUITE << Torpedo::Volume::Volumes.suite
+      end
+      TORPEDO_TEST_SUITE << Torpedo::Compute::Servers.suite
+      if METERING_ENABLED
+        TORPEDO_TEST_SUITE << Torpedo::Metering::Meters.suite
+      end
+      TORPEDO_TEST_SUITE << Torpedo::Cleanup.suite
+      exit Test::Unit::UI::Console::TestRunner.run(TorpedoTests).passed?
+    end
+
+    desc "ssh", "Test ssh connectivity on a server."
+    method_options :ip_address => :string
+    method_options :test_command => :string
+    method_options :test_output => :string
+    method_options :admin_password => :string
+    def ssh(options=(options or {}))
+      require 'torpedo/net_util'
+      if Torpedo::NetUtil.ssh_test(options[:ip_address], nil, options[:test_command], options[:test_output], options[:admin_password]) then
+        exit 0
+      else
+        exit 1
+      end
     end
 
     desc "fire", "Fire away! (alias for all)"
@@ -95,5 +204,5 @@ class Tasks < Thor
        invoke :all
     end
 
-end
+  end
 end

data/lib/torpedo/cleanup.rb

@@ -0,0 +1,74 @@
+require 'torpedo'
+require 'torpedo/compute/helper'
+require 'torpedo/volume/helper'
+
+
+module Torpedo
+
+  class Cleanup < Test::Unit::TestCase
+
+    def test_999_cleanup
+      if ORCHESTRATION_ENABLED and CLEAN_UP_STACKS then
+        orchestration_conn = Torpedo::Orchestration::Helper::get_connection
+        orchestration_conn.stacks.each do |stack|
+          stack = orchestration_conn.stacks.get(stack.id)
+          if stack.stack_name == 'torpedo'
+            #puts 'Deleting torpedo stack'
+            assert(stack.destroy)
+            # We wait for the stack to be deleted here to avoid pulling
+            # the rug on heat (and causing a potential log ERROR)
+            begin
+              timeout(STACK_CREATE_TIMEOUT) do
+                until orchestration_conn.stacks.get(stack.id).nil? do
+                  sleep(1)
+                end
+              end
+            rescue Timeout::Error => te
+              fail('Timeout deleting stack.')
+            end
+
+          end
+        end
+      end
+      compute_conn = Torpedo::Compute::Helper::get_connection
+      if CLEAN_UP_SERVERS
+        compute_conn.servers.each do |server|
+          server = compute_conn.servers.get(server.id)
+          if server.name == 'torpedo'
+            #puts 'Deleting torpedo server'
+            assert(server.destroy)
+          end
+        end
+      end
+      if CLEAN_UP_IMAGES
+        compute_conn.images.each do |image|
+          image = compute_conn.images.get(image.id)
+          if image.name == 'torpedo'
+            #puts 'Deleting torpedo image'
+            assert(image.destroy)
+          end
+        end
+      end
+      if KEYPAIR_ENABLED and CLEAN_UP_KEYPAIRS then
+        compute_conn.key_pairs.each do |key_pair|
+          key_pair = compute_conn.key_pairs.get(key_pair.name)
+          if key_pair.name == 'torpedo'
+            #puts 'Deleting torpedo key_pair'
+            assert(key_pair.destroy)
+          end
+        end
+      end
+      if VOLUME_ENABLED and CLEAN_UP_VOLUMES then
+        volume_conn = Torpedo::Volume::Helper::get_connection
+        volume_conn.volumes.each do |volume|
+          volume = volume_conn.volumes.get(volume.id)
+          if volume.display_name == 'torpedo'
+            #puts 'Deleting torpedo volume'
+            assert(volume.destroy)
+          end
+        end
+      end
+    end
+
+  end
+end

data/lib/torpedo/compute/flavors.rb

@@ -1,34 +1,34 @@
 require File.dirname(__FILE__) + '/helper'
 
 module Torpedo
-module Compute
-class Flavors < Test::Unit::TestCase
+  module Compute
+    class Flavors < Test::Unit::TestCase
 
-  def setup
-    @conn=Helper::get_connection
-  end
+      def setup
+        @conn=Helper::get_connection
+      end
 
-  def test_list
+      def test_list
 
-    @conn.flavors.each do |flavor|
-      assert_not_nil(flavor[:id])
-      assert_not_nil(flavor[:name])
-      assert_not_nil(flavor[:ram])
-      assert_not_nil(flavor[:disk])
-    end
+        @conn.flavors.each do |flavor|
+          assert_not_nil(flavor.id)
+          assert_not_nil(flavor.name)
+          assert_not_nil(flavor.ram)
+          assert_not_nil(flavor.disk)
+        end
 
-  end
+      end
 
-  def test_get
+      def test_get
 
-    flavor = @conn.flavor(1)
-    assert_not_nil(flavor.id)
-    assert_not_nil(flavor.name)
-    assert_not_nil(flavor.ram)
-    assert_not_nil(flavor.disk)
+        flavor = @conn.flavors.get(1)
+        assert_not_nil(flavor.id)
+        assert_not_nil(flavor.name)
+        assert_not_nil(flavor.ram)
+        assert_not_nil(flavor.disk)
 
-  end
+      end
 
-end
-end
+    end
+  end
 end

data/lib/torpedo/compute/helper.rb

@@ -2,112 +2,106 @@ if RUBY_VERSION =~ /^1.9.*/ then
   gem 'test-unit'
 end
 require 'test/unit'
-if OPENSTACK_COMPUTE_VERSION
-  gem 'openstack-compute', OPENSTACK_COMPUTE_VERSION
+if FOG_VERSION
+  gem 'fog', FOG_VERSION
 end
-require 'openstack/compute'
+require 'fog'
 
 module Torpedo
-module Compute
-module Helper
+  module Compute
+    module Helper
 
-  def self.get_connection
-    debug = false
-    if ENV['DEBUG'] and ENV['DEBUG'] == 'true' then
-        debug = true
-    end
-
-    auth_method = 'password'
-    if ENV['NOVA_RAX_AUTH'] and ENV['NOVA_RAX_AUTH'] == '1' then
-      auth_method = 'rax-kskey'
-    end
+      def self.get_connection
 
-    auth_url = ENV['NOVA_URL'] || ENV['OS_AUTH_URL']
-    api_key = ENV['NOVA_API_KEY'] || ENV['OS_PASSWORD']
-    username = ENV['NOVA_USERNAME'] || ENV['OS_USERNAME']
-    authtenant = ENV['NOVA_PROJECT_ID'] || ENV['OS_TENANT_NAME']
-    region = ENV['NOVA_REGION_NAME'] || ENV['OS_AUTH_REGION']
-    service_type = ENV['NOVA_SERVICE_TYPE'] || "compute"
-    service_name = ENV['NOVA_SERVICE_NAME'] #nil by default
-
-    OpenStack::Compute::Connection.new(
-        :username     => username,
-        :api_key      => api_key,
-        :auth_url     => auth_url,
-        :region       => region,
-        :authtenant   => authtenant,
-        :is_debug     => debug,
-        :auth_method  => auth_method,
-        :service_name => service_name,
-        :service_type => service_type
-    )
-
-  end
+        if ENV['DEBUG'] and ENV['DEBUG'] == 'true' then
+          ENV['EXCON_DEBUG'] = 'true'
+        end
 
-  def self.get_image_ref(conn)
+        auth_url = ENV['NOVA_URL'] || ENV['OS_AUTH_URL']
+        api_key = ENV['NOVA_API_KEY'] || ENV['OS_PASSWORD']
+        username = ENV['NOVA_USERNAME'] || ENV['OS_USERNAME']
+        authtenant = ENV['NOVA_PROJECT_ID'] || ENV['OS_TENANT_NAME']
+        region = ENV['NOVA_REGION_NAME'] || ENV['OS_AUTH_REGION']
+        service_type = ENV['NOVA_SERVICE_TYPE'] || "compute"
+        service_name = ENV['NOVA_SERVICE_NAME'] #nil by default
+
+        Fog::Compute.new(
+          :provider           => :openstack,
+          :openstack_auth_url  => auth_url+'/tokens',
+          :openstack_username => username,
+          :openstack_tenant => authtenant,
+          :openstack_api_key => api_key,
+          :openstack_region => region,
+          :openstack_service_type => service_type,
+          :openstack_service_name => service_name
+        )
 
-    image_ref = IMAGE_REF
-    image_name = IMAGE_NAME
+      end
 
-    if image_name and not image_name.empty? then
-      images = conn.images.each do |image|
-        if image[:name] == image_name then
-          image_ref = image[:id]
+      def self.get_image_ref(conn)
+
+        image_ref = IMAGE_REF
+        image_name = IMAGE_NAME
+
+        if image_name and not image_name.empty? then
+          images = conn.images.each do |image|
+            if image.name == image_name then
+              image_ref = image.id
+            end
+          end
+        elsif image_ref.nil? or image_ref.empty? then
+          #take the last image if IMAGE_REF and or IMAGE_NAME aren't set
+          images = conn.images
+          raise "Image list is empty." if images.empty?
+          image_ref = images.last.id.to_s
         end
-      end
-    elsif image_ref.nil? or image_ref.empty? then
-      #take the last image if IMAGE_REF and or IMAGE_NAME aren't set
-      images = conn.images
-      raise "Image list is empty." if images.empty?
-      image_ref = images.last[:id].to_s
-    end
 
-    image_ref
+        image_ref
 
-  end
+      end
 
-  def self.get_flavor_ref(conn)
+      def self.get_flavor_ref(conn)
 
-    flavor_ref = FLAVOR_REF
-    flavor_name = FLAVOR_NAME
+        flavor_ref = FLAVOR_REF
+        flavor_name = FLAVOR_NAME
 
-    if flavor_name and not flavor_name.empty? then
-      flavors = conn.flavors.each do |flavor|
-        if flavor[:name] == flavor_name then
-          flavor_ref = flavor[:id]
+        if flavor_name and not flavor_name.empty? then
+          flavors = conn.flavors.each do |flavor|
+            if flavor.name == flavor_name then
+              flavor_ref = flavor.id
+            end
+          end
+        elsif not flavor_ref or flavor_ref.to_s.empty? then
+          # default to 2 (m1.small) if FLAVOR_REF and or FLAVOR_NAME aren't set
+          flavor_ref = 2
         end
-      end
-    elsif not flavor_ref or flavor_ref.to_s.empty? then
-      # default to 2 (m1.small) if FLAVOR_REF and or FLAVOR_NAME aren't set
-      flavor_ref = 2
-    end
 
-    flavor_ref.to_s
+        flavor_ref.to_s
 
-  end
+      end
 
-  #flavor ref used for resize
-  def self.get_flavor_ref_resize(conn)
+      #flavor ref used for resize
+      def self.get_flavor_ref_resize(conn)
+
+        flavor_ref_resize = FLAVOR_REF_RESIZE
+        flavor_name_resize = FLAVOR_NAME_RESIZE
+
+        if flavor_name_resize and not flavor_name_resize.empty? then
+          flavors = conn.flavors.each do |flavor|
+            if flavor.name == flavor_name_resize then
+              flavor_ref_resize = flavor.id
+            end
+          end
+        elsif not flavor_ref_resize or flavor_ref_resize.to_s.empty? then
+          # if no flavor ref is specified for resize add one to it
+          flavor_ref = Helper.get_flavor_ref(conn)
+          flavor_ref_resize = flavor_ref.to_i + 1
+        end
 
-    flavor_ref_resize = FLAVOR_REF_RESIZE
-    flavor_name_resize = FLAVOR_NAME_RESIZE
+        flavor_ref_resize.to_s
 
-    if flavor_name_resize and not flavor_name_resize.empty? then
-      flavors = conn.flavors.each do |flavor|
-        if flavor[:name] == flavor_name_resize then
-          flavor_ref_resize = flavor[:id]
-        end
       end
-    elsif not flavor_ref_resize or flavor_ref_resize.to_s.empty? then
-      # if no flavor ref is specified for resize add one to it
-      flavor_ref = Helper.get_flavor_ref(conn)
-      flavor_ref_resize = flavor_ref.to_i + 1
-    end
-
-    flavor_ref_resize.to_s
 
+    end
   end
-
-end
-end
 end