torpedo 1.0.1 → 1.0.18
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/CHANGELOG +72 -0
- data/Gemfile.lock +1 -1
- data/README.md +53 -15
- data/Rakefile +5 -4
- data/VERSION +1 -1
- data/bin/torpedo +2 -1
- data/lib/torpedo/compute/helper.rb +35 -5
- data/lib/torpedo/compute/images.rb +1 -1
- data/lib/torpedo/compute/limits.rb +1 -1
- data/lib/torpedo/compute/servers.rb +234 -96
- data/lib/torpedo.rb +36 -7
- data/torpedo.gemspec +13 -11
- metadata +88 -86
- data/test/test_torpedo.rb +0 -7
data/CHANGELOG
CHANGED
|
@@ -1,3 +1,75 @@
|
|
|
1
|
+
* Mon Nov 12 2012 Dan Prince <dprince@redhat.com> - 1.0.18
|
|
2
|
+
-Fixes to host_id validation on resize/resize_revert tests.
|
|
3
|
+
|
|
4
|
+
* Mon Apr 9 2012 Dan Prince <dprince@redhat.com> - 1.0.17
|
|
5
|
+
-Adding SLEEP_AFTER_IMAGE_CREATE env option.
|
|
6
|
+
-Added 'test_limits' option.
|
|
7
|
+
-Added 'test_ip_type' Set to '4' (for IPv4) or '6' (for IPv6).
|
|
8
|
+
|
|
9
|
+
* Mon Apr 2 2012 Dan Prince <dprince@redhat.com> - 1.0.16
|
|
10
|
+
-Add NOVA_SERVICE_NAME env setting (defaults is nil)
|
|
11
|
+
-Add NOVA_SERVICE_TYPE env setting (default is 'compute')
|
|
12
|
+
|
|
13
|
+
* Fri Mar 16 2012 Dan Prince <dprince@redhat.com> - 1.0.15
|
|
14
|
+
-Set auth_method = 'rax-kskey' if NOVA_RAX_AUTH is set.
|
|
15
|
+
|
|
16
|
+
* Fri Feb 24 2012 Dan Prince <dprince@redhat.com> - 1.0.14
|
|
17
|
+
-Update OS_ variables to match Openstack standard.
|
|
18
|
+
OS_AUTH_KEY is now OS_PASSWORD
|
|
19
|
+
OS_AUTH_USER is now OS_USERNAME
|
|
20
|
+
OS_AUTH_TENANT is now OS_TENANT_NAME
|
|
21
|
+
|
|
22
|
+
* Fri Jan 6 2012 Dan Prince <dan.prince@rackspace.com> - 1.0.13
|
|
23
|
+
-Update image check to allow a status other than 'ACTIVE'. Fixes
|
|
24
|
+
issues when running concurrent Torpedo jobs.
|
|
25
|
+
|
|
26
|
+
* Fri Dec 30 2011 Dan Prince <dan.prince@rackspace.com> - 1.0.12
|
|
27
|
+
-Retry ssh on Errno::ECONNRESET.
|
|
28
|
+
-Added cleanup task.
|
|
29
|
+
|
|
30
|
+
* Wed Dec 14 2011 Dan Prince <dan.prince@rackspace.com> - 1.0.11
|
|
31
|
+
-Set paranoid to false for ssh connection tests. (net-ssh)
|
|
32
|
+
-Add options to disable server and image cleanup.
|
|
33
|
+
-Remove sort on image id (we now use UUID's)
|
|
34
|
+
-Add setup test to initialize image and flavor refs.
|
|
35
|
+
|
|
36
|
+
* Wed Dec 7 2011 Dan Prince <dan.prince@rackspace.com> - 1.0.10
|
|
37
|
+
-Add admin password and change password tests.
|
|
38
|
+
-Add revert resize test.
|
|
39
|
+
-Add hard and soft reboot tests.
|
|
40
|
+
|
|
41
|
+
* Wed Nov 16 2011 Dan Prince <dan.prince@rackspace.com> - 1.0.9
|
|
42
|
+
-Add options to disable ssh and ping tests.
|
|
43
|
+
|
|
44
|
+
* Fri Nov 11 2011 Dan Prince <dan.prince@rackspace.com> - 1.0.8
|
|
45
|
+
-Use the latest version of the openstack-compute unless a specific
|
|
46
|
+
version is specified in the config file.
|
|
47
|
+
|
|
48
|
+
* Wed Nov 2 2011 Dan Prince <dan.prince@rackspace.com> - 1.0.7
|
|
49
|
+
-Add support for NOVA_REGION_NAME and NOVA_PROJECT_ID.
|
|
50
|
+
-Remove dependency on test-unit-ext.
|
|
51
|
+
-Add support for OS_AUTH_? style variables.
|
|
52
|
+
|
|
53
|
+
* Tue Nov 1 2011 Dan Prince <dan.prince@rackspace.com> - 1.0.6
|
|
54
|
+
-Minor metadata test updates.
|
|
55
|
+
-Don't require test-unit (breaks Ruby 1.8.7)
|
|
56
|
+
|
|
57
|
+
* Tue Nov 1 2011 Dan Prince <dan.prince@rackspace.com> - 1.0.5
|
|
58
|
+
-Require test-unit if using Ruby 1.9.2.
|
|
59
|
+
-Disable test-unit-ext if using Ruby 1.9.2 (currently supports Ruby 1.8.x)
|
|
60
|
+
|
|
61
|
+
* Sat Oct 29 2011 Dan Prince <dan.prince@rackspace.com> - 1.0.4
|
|
62
|
+
-Run image metadata tests last because they make the snapshot un-bootable.
|
|
63
|
+
-Fixes to the resize tests.
|
|
64
|
+
|
|
65
|
+
* Sat Oct 29 2011 Dan Prince <dan.prince@rackspace.com> - 1.0.3
|
|
66
|
+
- Fix issues boolean config file issue with test_create_image,
|
|
67
|
+
test_rebuild_server, and test_resize_server config options.
|
|
68
|
+
- Fix a syntax issue in the get_flavor_ref_resize method.
|
|
69
|
+
|
|
70
|
+
* Sat Oct 29 2011 Dan Prince <dan.prince@rackspace.com> - 1.0.2
|
|
71
|
+
- Add missing dependency to gemspec for test-unit-ext.
|
|
72
|
+
|
|
1
73
|
* Sat Oct 29 2011 Dan Prince <dan.prince@rackspace.com> - 1.0.1
|
|
2
74
|
- Add config options to support custom flavor settings.
|
|
3
75
|
|
data/Gemfile.lock
CHANGED
data/README.md
CHANGED
|
@@ -4,43 +4,58 @@ Torpedo
|
|
|
4
4
|
Description
|
|
5
5
|
-----------
|
|
6
6
|
|
|
7
|
-
|
|
7
|
+
Fire when ready. Fast Ruby integration tests for OpenStack.
|
|
8
8
|
|
|
9
9
|
Installation
|
|
10
10
|
------------
|
|
11
11
|
|
|
12
|
+
1. Install the Gem.
|
|
13
|
+
2. Create the torpedo.conf file in your HOME directory.
|
|
14
|
+
3. Source novarc for your OpenStack Compute account.
|
|
15
|
+
|
|
16
|
+
```bash
|
|
12
17
|
gem install torpedo
|
|
13
18
|
|
|
14
|
-
#create the torpedo YAML config in your $HOME dir:
|
|
15
19
|
cat > ~/.torpedo.conf <<"EOF_CAT"
|
|
16
20
|
# YAML config file for torpedo
|
|
17
21
|
|
|
22
|
+
# timeouts
|
|
23
|
+
server_build_timeout: 420
|
|
24
|
+
ping_timeout: 60
|
|
25
|
+
ssh_timeout: 60
|
|
26
|
+
|
|
18
27
|
# SERVER test settings
|
|
19
28
|
test_create_image: false
|
|
20
29
|
test_rebuild_server: false
|
|
21
30
|
test_resize_server: false
|
|
31
|
+
test_revert_resize_server: false
|
|
32
|
+
test_admin_password: false
|
|
33
|
+
test_soft_reboot_server: false
|
|
34
|
+
test_hard_reboot_server: false
|
|
22
35
|
|
|
23
36
|
# IMAGES (Set one of the following)
|
|
24
|
-
|
|
37
|
+
image_name: Ubuntu Natty (11.04)
|
|
25
38
|
#image_ref:
|
|
26
39
|
|
|
27
40
|
# FLAVORS (Set one of the following)
|
|
28
41
|
#flavor_name:
|
|
29
42
|
flavor_ref: 4
|
|
30
43
|
|
|
31
|
-
#
|
|
32
|
-
#
|
|
33
|
-
#
|
|
44
|
+
# SSH/PING test options
|
|
45
|
+
#test_ssh: true
|
|
46
|
+
#test_ping: true
|
|
34
47
|
|
|
35
|
-
# SSH KEYS (used to verify
|
|
36
|
-
#ssh_private_key:
|
|
37
|
-
#ssh_public_key:
|
|
48
|
+
# SSH KEYS (used to verify installations which support personalities)
|
|
49
|
+
#ssh_private_key: <your home dir>/.ssh/id_rsa
|
|
50
|
+
#ssh_public_key: <your home dir>/.ssh/id_rsa.pub
|
|
38
51
|
|
|
39
|
-
# KEYPAIRS (used to verify
|
|
40
|
-
keypair: test.pem
|
|
41
|
-
keyname: test
|
|
52
|
+
# KEYPAIRS (used to verify images that support keypairs)
|
|
53
|
+
#keypair: test.pem
|
|
54
|
+
#keyname: test
|
|
42
55
|
EOF_CAT
|
|
43
56
|
|
|
57
|
+
source $PATH_TO_YOUR/novarc
|
|
58
|
+
```
|
|
44
59
|
|
|
45
60
|
Examples
|
|
46
61
|
--------
|
|
@@ -64,10 +79,33 @@ Run all tests with debug HTTP request response output:
|
|
|
64
79
|
|
|
65
80
|
DEBUG=true torpedo fire
|
|
66
81
|
|
|
67
|
-
|
|
82
|
+
Payload
|
|
83
|
+
--------
|
|
68
84
|
|
|
69
|
-
|
|
85
|
+
* list flavors
|
|
86
|
+
* get flavor
|
|
87
|
+
* list images
|
|
88
|
+
* get image
|
|
89
|
+
* list limits
|
|
90
|
+
* create server (ping and ssh test w/ admin password and personality)
|
|
91
|
+
* delete server metadata items
|
|
92
|
+
* update one server metadata item
|
|
93
|
+
* update multiple server metadata items
|
|
94
|
+
* set server metadata items
|
|
95
|
+
* clear server metadata
|
|
96
|
+
* create image
|
|
97
|
+
* rebuild server (ping and ssh test)
|
|
98
|
+
* resize server (ping and ssh test)
|
|
99
|
+
* resize confirm (ping and ssh test)
|
|
100
|
+
* resize revert (ping and ssh test)
|
|
101
|
+
* soft reboot (ping and ssh test)
|
|
102
|
+
* hard reboot (ping and ssh test)
|
|
103
|
+
* delete image metadata
|
|
104
|
+
* update one image metadata item
|
|
105
|
+
* update multiple image metadata items
|
|
106
|
+
* set image metadata items
|
|
107
|
+
* clear image metadata
|
|
70
108
|
|
|
71
109
|
License
|
|
72
110
|
-------
|
|
73
|
-
Copyright (c) 2011 Dan Prince. See LICENSE.txt for further details.
|
|
111
|
+
Copyright (c) 2011-2012 Dan Prince. See LICENSE.txt for further details.
|
data/Rakefile
CHANGED
|
@@ -18,13 +18,14 @@ Jeweler::Tasks.new do |gem|
|
|
|
18
18
|
gem.executables = "torpedo"
|
|
19
19
|
gem.homepage = "http://github.com/dprince/torpedo"
|
|
20
20
|
gem.license = "MIT"
|
|
21
|
-
gem.summary = %Q{
|
|
22
|
-
gem.description = %Q{
|
|
21
|
+
gem.summary = %Q{Fire when ready. Fast Ruby integration tests for OpenStack.}
|
|
22
|
+
gem.description = %Q{Fast integration tests OpenStack Compute.}
|
|
23
23
|
gem.email = "dan.prince@rackspace.com"
|
|
24
24
|
gem.authors = ["Dan Prince"]
|
|
25
25
|
# dependencies defined in Gemfile
|
|
26
|
-
gem.add_dependency 'thor'
|
|
27
|
-
gem.add_dependency 'openstack-compute', '
|
|
26
|
+
gem.add_dependency 'thor', '~>0.14.6'
|
|
27
|
+
gem.add_dependency 'openstack-compute', '~>1.1.5'
|
|
28
|
+
gem.add_dependency('net-ssh', '~>2.2.1')
|
|
28
29
|
end
|
|
29
30
|
Jeweler::RubygemsDotOrgTasks.new
|
|
30
31
|
|
data/VERSION
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
1.0.
|
|
1
|
+
1.0.18
|
data/bin/torpedo
CHANGED
|
@@ -1,6 +1,10 @@
|
|
|
1
|
-
|
|
1
|
+
if RUBY_VERSION =~ /^1.9.*/ then
|
|
2
|
+
gem 'test-unit'
|
|
3
|
+
end
|
|
2
4
|
require 'test/unit'
|
|
3
|
-
|
|
5
|
+
if OPENSTACK_COMPUTE_VERSION
|
|
6
|
+
gem 'openstack-compute', OPENSTACK_COMPUTE_VERSION
|
|
7
|
+
end
|
|
4
8
|
require 'openstack/compute'
|
|
5
9
|
|
|
6
10
|
module Torpedo
|
|
@@ -12,7 +16,32 @@ module Helper
|
|
|
12
16
|
if ENV['DEBUG'] and ENV['DEBUG'] == 'true' then
|
|
13
17
|
debug = true
|
|
14
18
|
end
|
|
15
|
-
|
|
19
|
+
|
|
20
|
+
auth_method = 'password'
|
|
21
|
+
if ENV['NOVA_RAX_AUTH'] and ENV['NOVA_RAX_AUTH'] == '1' then
|
|
22
|
+
auth_method = 'rax-kskey'
|
|
23
|
+
end
|
|
24
|
+
|
|
25
|
+
auth_url = ENV['NOVA_URL'] || ENV['OS_AUTH_URL']
|
|
26
|
+
api_key = ENV['NOVA_API_KEY'] || ENV['OS_PASSWORD']
|
|
27
|
+
username = ENV['NOVA_USERNAME'] || ENV['OS_USERNAME']
|
|
28
|
+
authtenant = ENV['NOVA_PROJECT_ID'] || ENV['OS_TENANT_NAME']
|
|
29
|
+
region = ENV['NOVA_REGION_NAME'] || ENV['OS_AUTH_REGION']
|
|
30
|
+
service_type = ENV['NOVA_SERVICE_TYPE'] || "compute"
|
|
31
|
+
service_name = ENV['NOVA_SERVICE_NAME'] #nil by default
|
|
32
|
+
|
|
33
|
+
OpenStack::Compute::Connection.new(
|
|
34
|
+
:username => username,
|
|
35
|
+
:api_key => api_key,
|
|
36
|
+
:auth_url => auth_url,
|
|
37
|
+
:region => region,
|
|
38
|
+
:authtenant => authtenant,
|
|
39
|
+
:is_debug => debug,
|
|
40
|
+
:auth_method => auth_method,
|
|
41
|
+
:service_name => service_name,
|
|
42
|
+
:service_type => service_type
|
|
43
|
+
)
|
|
44
|
+
|
|
16
45
|
end
|
|
17
46
|
|
|
18
47
|
def self.get_image_ref(conn)
|
|
@@ -28,7 +57,8 @@ module Helper
|
|
|
28
57
|
end
|
|
29
58
|
elsif image_ref.nil? or image_ref.empty? then
|
|
30
59
|
#take the last image if IMAGE_REF and or IMAGE_NAME aren't set
|
|
31
|
-
images = conn.images
|
|
60
|
+
images = conn.images
|
|
61
|
+
raise "Image list is empty." if images.empty?
|
|
32
62
|
image_ref = images.last[:id].to_s
|
|
33
63
|
end
|
|
34
64
|
|
|
@@ -71,7 +101,7 @@ module Helper
|
|
|
71
101
|
elsif not flavor_ref_resize or flavor_ref_resize.to_s.empty? then
|
|
72
102
|
# if no flavor ref is specified for resize add one to it
|
|
73
103
|
flavor_ref = Helper.get_flavor_ref(conn)
|
|
74
|
-
flavor_ref_resize = flavor_ref.
|
|
104
|
+
flavor_ref_resize = flavor_ref.to_i + 1
|
|
75
105
|
end
|
|
76
106
|
|
|
77
107
|
flavor_ref_resize.to_s
|
|
@@ -1,5 +1,6 @@
|
|
|
1
|
-
require
|
|
1
|
+
require 'torpedo/compute/helper'
|
|
2
2
|
require 'tempfile'
|
|
3
|
+
require 'net/ssh'
|
|
3
4
|
|
|
4
5
|
module Torpedo
|
|
5
6
|
module Compute
|
|
@@ -7,9 +8,12 @@ class Servers < Test::Unit::TestCase
|
|
|
7
8
|
|
|
8
9
|
@@servers = []
|
|
9
10
|
@@images = []
|
|
10
|
-
@@image_ref =
|
|
11
|
-
@@flavor_ref =
|
|
11
|
+
@@image_ref = nil
|
|
12
|
+
@@flavor_ref = nil
|
|
13
|
+
@@flavor_ref_resize = nil
|
|
12
14
|
@@server = nil #ref to last created server
|
|
15
|
+
@@hostname = "torpedo"
|
|
16
|
+
@@host_id = nil
|
|
13
17
|
|
|
14
18
|
def setup
|
|
15
19
|
@conn=Helper::get_connection
|
|
@@ -18,6 +22,7 @@ class Servers < Test::Unit::TestCase
|
|
|
18
22
|
def create_server(server_opts)
|
|
19
23
|
@@server = @conn.create_server(server_opts)
|
|
20
24
|
@@servers << @@server
|
|
25
|
+
@@admin_pass = @@server.adminPass #original admin_pass
|
|
21
26
|
@@server
|
|
22
27
|
end
|
|
23
28
|
|
|
@@ -28,20 +33,43 @@ class Servers < Test::Unit::TestCase
|
|
|
28
33
|
image
|
|
29
34
|
end
|
|
30
35
|
|
|
31
|
-
def
|
|
36
|
+
def get_personalities
|
|
37
|
+
if TEST_ADMIN_PASSWORD then
|
|
38
|
+
tmp_file=Tempfile.new "server_tests"
|
|
39
|
+
tmp_file.write("yo")
|
|
40
|
+
tmp_file.flush
|
|
41
|
+
{tmp_file.path => "/tmp/foo/bar"}
|
|
42
|
+
else
|
|
43
|
+
# NOTE: if admin_pass is disabled we inject the public key so we still
|
|
44
|
+
# can still login. This would only matter if KEYPAIR was disabled as well.
|
|
45
|
+
{SSH_PUBLIC_KEY => "/root/.ssh/authorized_keys"}
|
|
46
|
+
end
|
|
47
|
+
end
|
|
48
|
+
|
|
49
|
+
def ssh_test(ip_addr, test_cmd="hostname", test_output=@@hostname, admin_pass=@@admin_pass)
|
|
50
|
+
|
|
51
|
+
ssh_opts = {:paranoid => false}
|
|
52
|
+
if TEST_ADMIN_PASSWORD then
|
|
53
|
+
ssh_opts.store(:password, admin_pass)
|
|
54
|
+
else
|
|
55
|
+
ssh_identity=SSH_PRIVATE_KEY
|
|
56
|
+
if KEYPAIR and not KEYPAIR.empty? then
|
|
57
|
+
ssh_identity=KEYPAIR
|
|
58
|
+
end
|
|
59
|
+
ssh_opts.store(:keys, ssh_identity)
|
|
60
|
+
end
|
|
61
|
+
|
|
32
62
|
begin
|
|
33
63
|
Timeout::timeout(SSH_TIMEOUT) do
|
|
34
|
-
|
|
35
64
|
while(1) do
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
65
|
+
begin
|
|
66
|
+
Net::SSH.start(ip_addr, 'root', ssh_opts) do |ssh|
|
|
67
|
+
return ssh.exec!(test_cmd) == test_output
|
|
68
|
+
end
|
|
69
|
+
rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Errno::ECONNRESET, Net::SSH::Exception
|
|
70
|
+
next
|
|
42
71
|
end
|
|
43
72
|
end
|
|
44
|
-
|
|
45
73
|
end
|
|
46
74
|
rescue Timeout::Error => te
|
|
47
75
|
fail("Timeout trying to ssh to server: #{ip_addr}")
|
|
@@ -53,17 +81,15 @@ class Servers < Test::Unit::TestCase
|
|
|
53
81
|
|
|
54
82
|
def ping_test(ip_addr)
|
|
55
83
|
begin
|
|
84
|
+
ping = TEST_IP_TYPE == 6 ? 'ping6' : 'ping'
|
|
85
|
+
ping_command = "#{ping} -c 1 #{ip_addr} > /dev/null 2>&1"
|
|
56
86
|
Timeout::timeout(PING_TIMEOUT) do
|
|
57
|
-
|
|
58
87
|
while(1) do
|
|
59
|
-
if system(
|
|
60
|
-
return true
|
|
61
|
-
end
|
|
88
|
+
return true if system(ping_command)
|
|
62
89
|
end
|
|
63
|
-
|
|
64
90
|
end
|
|
65
91
|
rescue Timeout::Error => te
|
|
66
|
-
fail("Timeout pinging server: #{
|
|
92
|
+
fail("Timeout pinging server: #{ping_command}")
|
|
67
93
|
end
|
|
68
94
|
|
|
69
95
|
return false
|
|
@@ -75,14 +101,14 @@ class Servers < Test::Unit::TestCase
|
|
|
75
101
|
assert_not_nil(server.hostId)
|
|
76
102
|
assert_equal(flavor_ref, server.flavor['id'])
|
|
77
103
|
assert_equal(image_ref.to_s, server.image['id'])
|
|
78
|
-
assert_equal(
|
|
104
|
+
assert_equal(@@hostname, server.name)
|
|
79
105
|
server = @conn.server(server.id)
|
|
80
106
|
|
|
81
107
|
begin
|
|
82
108
|
timeout(SERVER_BUILD_TIMEOUT) do
|
|
83
109
|
until server.status == check_status do
|
|
84
110
|
if server.status == "ERROR" then
|
|
85
|
-
fail('Server ERROR state detected when booting
|
|
111
|
+
fail('Server ERROR state detected when booting server!')
|
|
86
112
|
end
|
|
87
113
|
server = @conn.server(server.id)
|
|
88
114
|
sleep 1
|
|
@@ -92,31 +118,51 @@ class Servers < Test::Unit::TestCase
|
|
|
92
118
|
fail('Timeout creating server.')
|
|
93
119
|
end
|
|
94
120
|
|
|
95
|
-
# lookup the first
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
121
|
+
# lookup the first public IP address and use that for verification
|
|
122
|
+
addresses = server.addresses[:public].select {|a| a.version == TEST_IP_TYPE}
|
|
123
|
+
address = addresses[0].address
|
|
124
|
+
ping_test(address) if TEST_PING
|
|
125
|
+
if TEST_SSH
|
|
126
|
+
if TEST_ADMIN_PASSWORD
|
|
127
|
+
ssh_test(address, "cat /tmp/foo/bar", "yo")
|
|
128
|
+
else
|
|
129
|
+
ssh_test(address)
|
|
130
|
+
end
|
|
131
|
+
end
|
|
99
132
|
|
|
100
133
|
server
|
|
101
134
|
|
|
102
135
|
end
|
|
103
136
|
|
|
137
|
+
def test_000_setup
|
|
138
|
+
begin
|
|
139
|
+
@@image_ref = Helper::get_image_ref(Helper::get_connection)
|
|
140
|
+
rescue Exception => e
|
|
141
|
+
fail("Failed get image ref: #{e.message}")
|
|
142
|
+
end
|
|
143
|
+
begin
|
|
144
|
+
@@flavor_ref = Helper::get_flavor_ref(Helper::get_connection)
|
|
145
|
+
rescue Exception => e
|
|
146
|
+
fail("Failed get flavor ref: #{e.message}")
|
|
147
|
+
end
|
|
148
|
+
begin
|
|
149
|
+
@@flavor_ref_resize = Helper::get_flavor_ref_resize(@conn)
|
|
150
|
+
rescue Exception => e
|
|
151
|
+
fail("Failed get flavor ref resize: #{e.message}")
|
|
152
|
+
end
|
|
153
|
+
end
|
|
154
|
+
|
|
104
155
|
def test_001_create_server
|
|
105
156
|
|
|
106
|
-
# NOTE: When using AMI style images we rely on keypairs for SSH access.
|
|
107
|
-
|
|
108
|
-
# NOTE: injecting two or more files doesn't work for now due to XenStore
|
|
109
|
-
# limitations
|
|
110
|
-
personalities={SSH_PUBLIC_KEY => "/root/.ssh/authorized_keys"}
|
|
111
157
|
metadata={ "key1" => "value1", "key2" => "value2" }
|
|
112
|
-
options = {:name =>
|
|
158
|
+
options = {:name => @@hostname, :imageRef => @@image_ref, :flavorRef => @@flavor_ref, :personality => get_personalities, :metadata => metadata}
|
|
113
159
|
if KEYNAME and not KEYNAME.empty? then
|
|
114
160
|
options[:key_name] = KEYNAME
|
|
115
161
|
end
|
|
116
162
|
server = create_server(options)
|
|
117
|
-
assert_not_nil(
|
|
163
|
+
assert_not_nil(server.adminPass)
|
|
118
164
|
|
|
119
|
-
#boot
|
|
165
|
+
#boot a server and check it
|
|
120
166
|
check_server(server, @@image_ref, @@flavor_ref)
|
|
121
167
|
|
|
122
168
|
assert_equal "value1", @@server.metadata['key1']
|
|
@@ -141,12 +187,12 @@ class Servers < Test::Unit::TestCase
|
|
|
141
187
|
def test_003_update_one_server_metadata_item
|
|
142
188
|
|
|
143
189
|
metadata = @@server.metadata
|
|
144
|
-
metadata['
|
|
145
|
-
assert metadata.update('
|
|
190
|
+
metadata['foo0'] = 'bar0'
|
|
191
|
+
assert metadata.update('foo0')
|
|
146
192
|
|
|
147
193
|
metadata.refresh
|
|
148
194
|
|
|
149
|
-
assert_equal '
|
|
195
|
+
assert_equal 'bar0', metadata['foo0']
|
|
150
196
|
|
|
151
197
|
assert_equal 1, metadata.size
|
|
152
198
|
|
|
@@ -155,22 +201,25 @@ class Servers < Test::Unit::TestCase
|
|
|
155
201
|
def test_004_update_some_server_metadata_items
|
|
156
202
|
|
|
157
203
|
metadata = @@server.metadata
|
|
204
|
+
metadata.clear
|
|
158
205
|
metadata['foo1'] = 'bar1'
|
|
159
206
|
metadata['foo2'] = 'bar2'
|
|
160
|
-
assert metadata.update(
|
|
207
|
+
assert metadata.update()
|
|
161
208
|
|
|
162
209
|
metadata.refresh
|
|
163
210
|
|
|
211
|
+
assert_equal 'bar0', metadata['foo0']
|
|
164
212
|
assert_equal 'bar1', metadata['foo1']
|
|
165
213
|
assert_equal 'bar2', metadata['foo2']
|
|
166
214
|
|
|
167
|
-
assert_equal
|
|
215
|
+
assert_equal 3, metadata.size
|
|
168
216
|
|
|
169
217
|
end
|
|
170
218
|
|
|
171
219
|
def test_005_set_server_metadata_items
|
|
172
220
|
|
|
173
221
|
metadata = @@server.metadata
|
|
222
|
+
metadata.clear
|
|
174
223
|
metadata['foo1'] = 'better'
|
|
175
224
|
metadata['foo2'] = 'watch'
|
|
176
225
|
metadata['foo3'] = 'out!'
|
|
@@ -200,9 +249,9 @@ class Servers < Test::Unit::TestCase
|
|
|
200
249
|
def test_020_create_image
|
|
201
250
|
|
|
202
251
|
#snapshot the image
|
|
203
|
-
image = create_image(@@server, :name => "
|
|
252
|
+
image = create_image(@@server, :name => "torpedo", :metadata => {"key1" => "value1"})
|
|
204
253
|
assert_equal('SAVING', image.status)
|
|
205
|
-
assert_equal('
|
|
254
|
+
assert_equal('torpedo', image.name)
|
|
206
255
|
assert_equal(25, image.progress)
|
|
207
256
|
#FIXME: server id should be a uuid string
|
|
208
257
|
assert_equal(@@server.id.to_s, image.server['id'])
|
|
@@ -221,12 +270,139 @@ class Servers < Test::Unit::TestCase
|
|
|
221
270
|
fail('Timeout creating image snapshot.')
|
|
222
271
|
end
|
|
223
272
|
|
|
273
|
+
sleep SLEEP_AFTER_IMAGE_CREATE
|
|
274
|
+
|
|
224
275
|
# Overwrite image_ref to make all subsequent tests use this snapshot
|
|
225
276
|
@@image_ref = image.id.to_s
|
|
226
277
|
|
|
227
|
-
end if TEST_CREATE_IMAGE
|
|
278
|
+
end if TEST_CREATE_IMAGE
|
|
279
|
+
|
|
280
|
+
def test_030_rebuild
|
|
281
|
+
# NOTE: this will use the snapshot if TEST_CREATE_IMAGE is enabled
|
|
282
|
+
@@server.rebuild!(:adminPass => @@admin_pass, :imageRef => @@image_ref, :personality => get_personalities)
|
|
283
|
+
server = @conn.server(@@server.id)
|
|
284
|
+
sleep 15 # sleep a couple seconds until rebuild starts
|
|
285
|
+
check_server(server, @@image_ref, @@flavor_ref)
|
|
228
286
|
|
|
229
|
-
|
|
287
|
+
end if TEST_REBUILD_SERVER
|
|
288
|
+
|
|
289
|
+
def test_035_soft_reboot
|
|
290
|
+
# make sure our snapshot boots
|
|
291
|
+
@@server.reboot(type='SOFT')
|
|
292
|
+
server = @conn.server(@@server.id)
|
|
293
|
+
assert_equal('REBOOT', server.status)
|
|
294
|
+
check_server(server, @@image_ref, @@flavor_ref)
|
|
295
|
+
end if TEST_SOFT_REBOOT_SERVER
|
|
296
|
+
|
|
297
|
+
def test_036_hard_reboot
|
|
298
|
+
# make sure our snapshot boots
|
|
299
|
+
@@server.reboot(type='HARD')
|
|
300
|
+
server = @conn.server(@@server.id)
|
|
301
|
+
assert_equal('HARD_REBOOT', server.status)
|
|
302
|
+
check_server(server, @@image_ref, @@flavor_ref)
|
|
303
|
+
end if TEST_HARD_REBOOT_SERVER
|
|
304
|
+
|
|
305
|
+
def test_037_change_password
|
|
306
|
+
@@admin_pass = "AnGrYbIrD$"
|
|
307
|
+
@@server.change_password!(@@admin_pass)
|
|
308
|
+
server = @conn.server(@@server.id)
|
|
309
|
+
begin
|
|
310
|
+
timeout(60) do
|
|
311
|
+
until server.status == 'ACTIVE' do
|
|
312
|
+
server = @conn.server(server.id)
|
|
313
|
+
sleep 1
|
|
314
|
+
end
|
|
315
|
+
end
|
|
316
|
+
rescue Timeout::Error => te
|
|
317
|
+
fail('Timeout changing server password.')
|
|
318
|
+
end
|
|
319
|
+
check_server(server, @@image_ref, @@flavor_ref)
|
|
320
|
+
end if TEST_ADMIN_PASSWORD
|
|
321
|
+
|
|
322
|
+
def test_040_resize_revert
|
|
323
|
+
|
|
324
|
+
# before resizing obtain host_id
|
|
325
|
+
server = @conn.server(@@server.id)
|
|
326
|
+
@@host_id = server.hostId #original host ID
|
|
327
|
+
|
|
328
|
+
@@server.resize!(@@flavor_ref_resize)
|
|
329
|
+
server = @conn.server(@@server.id)
|
|
330
|
+
assert_equal('RESIZE', server.status)
|
|
331
|
+
|
|
332
|
+
begin
|
|
333
|
+
timeout(SERVER_BUILD_TIMEOUT) do
|
|
334
|
+
until server.status == 'VERIFY_RESIZE' do
|
|
335
|
+
if server.status == "ERROR" then
|
|
336
|
+
fail('Server ERROR state detected when resizing server!')
|
|
337
|
+
end
|
|
338
|
+
server = @conn.server(server.id)
|
|
339
|
+
sleep 1
|
|
340
|
+
end
|
|
341
|
+
end
|
|
342
|
+
rescue Timeout::Error => te
|
|
343
|
+
fail('Timeout resizing server.')
|
|
344
|
+
end
|
|
345
|
+
|
|
346
|
+
check_server(server, @@image_ref, @@flavor_ref_resize, 'VERIFY_RESIZE')
|
|
347
|
+
|
|
348
|
+
@@server.revert_resize!
|
|
349
|
+
server = @conn.server(@@server.id)
|
|
350
|
+
begin
|
|
351
|
+
timeout(60) do
|
|
352
|
+
until server.status == 'ACTIVE' do
|
|
353
|
+
server = @conn.server(server.id)
|
|
354
|
+
sleep 1
|
|
355
|
+
end
|
|
356
|
+
end
|
|
357
|
+
rescue Timeout::Error => te
|
|
358
|
+
fail('Timeout waiting for revert resize.')
|
|
359
|
+
end
|
|
360
|
+
|
|
361
|
+
check_server(server, @@image_ref, @@flavor_ref)
|
|
362
|
+
assert_equal(@@host_id, server.hostId)
|
|
363
|
+
|
|
364
|
+
end if TEST_REVERT_RESIZE_SERVER
|
|
365
|
+
|
|
366
|
+
def test_041_resize
|
|
367
|
+
|
|
368
|
+
# before resizing obtain host_id
|
|
369
|
+
server = @conn.server(@@server.id)
|
|
370
|
+
@@host_id = server.hostId #original host ID
|
|
371
|
+
|
|
372
|
+
@@server.resize!(@@flavor_ref_resize)
|
|
373
|
+
server = @conn.server(@@server.id)
|
|
374
|
+
assert_equal('RESIZE', server.status)
|
|
375
|
+
|
|
376
|
+
begin
|
|
377
|
+
timeout(SERVER_BUILD_TIMEOUT) do
|
|
378
|
+
until server.status == 'VERIFY_RESIZE' do
|
|
379
|
+
if server.status == "ERROR" then
|
|
380
|
+
fail('Server ERROR state detected when resizing server!')
|
|
381
|
+
end
|
|
382
|
+
server = @conn.server(server.id)
|
|
383
|
+
sleep 1
|
|
384
|
+
end
|
|
385
|
+
end
|
|
386
|
+
rescue Timeout::Error => te
|
|
387
|
+
fail('Timeout resizing server.')
|
|
388
|
+
end
|
|
389
|
+
|
|
390
|
+
check_server(server, @@image_ref, @@flavor_ref_resize, 'VERIFY_RESIZE')
|
|
391
|
+
assert_not_equal(@@host_id, server.hostId) if TEST_HOSTID_ON_RESIZE
|
|
392
|
+
|
|
393
|
+
end if TEST_RESIZE_SERVER
|
|
394
|
+
|
|
395
|
+
def test_042_resize_confirm
|
|
396
|
+
|
|
397
|
+
@@server.confirm_resize!
|
|
398
|
+
server = @conn.server(@@server.id)
|
|
399
|
+
assert_equal('ACTIVE', server.status)
|
|
400
|
+
|
|
401
|
+
check_server(server, @@image_ref, @@flavor_ref_resize)
|
|
402
|
+
|
|
403
|
+
end if TEST_RESIZE_SERVER
|
|
404
|
+
|
|
405
|
+
def test_051_delete_image_metadata_items
|
|
230
406
|
|
|
231
407
|
metadata = @conn.image(@@image_ref).metadata
|
|
232
408
|
metadata.each_pair do |key, value|
|
|
@@ -237,9 +413,9 @@ class Servers < Test::Unit::TestCase
|
|
|
237
413
|
|
|
238
414
|
assert_equal 0, metadata.size
|
|
239
415
|
|
|
240
|
-
end if TEST_CREATE_IMAGE
|
|
416
|
+
end if TEST_CREATE_IMAGE
|
|
241
417
|
|
|
242
|
-
def
|
|
418
|
+
def test_052_update_one_image_metadata_item
|
|
243
419
|
|
|
244
420
|
metadata = @conn.image(@@image_ref).metadata
|
|
245
421
|
metadata['foo1'] = 'bar1'
|
|
@@ -251,9 +427,9 @@ class Servers < Test::Unit::TestCase
|
|
|
251
427
|
|
|
252
428
|
assert_equal 1, metadata.size
|
|
253
429
|
|
|
254
|
-
end if TEST_CREATE_IMAGE
|
|
430
|
+
end if TEST_CREATE_IMAGE
|
|
255
431
|
|
|
256
|
-
def
|
|
432
|
+
def test_053_update_some_image_metadata_items
|
|
257
433
|
|
|
258
434
|
metadata = @conn.image(@@image_ref).metadata
|
|
259
435
|
metadata['foo1'] = 'bar1'
|
|
@@ -267,9 +443,9 @@ class Servers < Test::Unit::TestCase
|
|
|
267
443
|
|
|
268
444
|
assert_equal 2, metadata.size
|
|
269
445
|
|
|
270
|
-
end if TEST_CREATE_IMAGE
|
|
446
|
+
end if TEST_CREATE_IMAGE
|
|
271
447
|
|
|
272
|
-
def
|
|
448
|
+
def test_054_set_image_metadata_items
|
|
273
449
|
|
|
274
450
|
metadata = @conn.image(@@image_ref).metadata
|
|
275
451
|
metadata['foo1'] = 'that'
|
|
@@ -285,9 +461,9 @@ class Servers < Test::Unit::TestCase
|
|
|
285
461
|
|
|
286
462
|
assert_equal 3, metadata.size
|
|
287
463
|
|
|
288
|
-
end if TEST_CREATE_IMAGE
|
|
464
|
+
end if TEST_CREATE_IMAGE
|
|
289
465
|
|
|
290
|
-
def
|
|
466
|
+
def test_055_clear_image_metadata
|
|
291
467
|
|
|
292
468
|
metadata = @conn.image(@@image_ref).metadata
|
|
293
469
|
assert metadata.clear!
|
|
@@ -296,56 +472,18 @@ class Servers < Test::Unit::TestCase
|
|
|
296
472
|
|
|
297
473
|
assert_equal 0, metadata.size
|
|
298
474
|
|
|
299
|
-
end if TEST_CREATE_IMAGE
|
|
300
|
-
|
|
301
|
-
def test_030_rebuild_instance
|
|
302
|
-
# make sure our snapshot boots
|
|
303
|
-
personalities={SSH_PUBLIC_KEY => "/root/.ssh/authorized_keys"}
|
|
304
|
-
@@server.rebuild!(:imageRef => @@image_ref, :personality => personalities)
|
|
305
|
-
server = @conn.server(@@server.id)
|
|
306
|
-
sleep 15 # sleep a couple seconds until rebuild starts
|
|
307
|
-
check_server(server, @@image_ref, @@flavor_ref)
|
|
308
|
-
|
|
309
|
-
end if TEST_REBUILD_SERVER == "true"
|
|
310
|
-
|
|
311
|
-
def test_040_resize_instance
|
|
312
|
-
|
|
313
|
-
flavor_ref_resize = Helper::get_flavor_ref_resize(@conn)
|
|
314
|
-
|
|
315
|
-
@@server.resize!(flavor_ref_resize)
|
|
316
|
-
server = @conn.server(@@server.id)
|
|
317
|
-
assert_equal('RESIZE', @@server.status)
|
|
318
|
-
|
|
319
|
-
begin
|
|
320
|
-
timeout(SERVER_BUILD_TIMEOUT) do
|
|
321
|
-
until server.status == 'VERIFY_RESIZE' do
|
|
322
|
-
if server.status == "ERROR" then
|
|
323
|
-
fail('Server ERROR state detected when resizing instance!')
|
|
324
|
-
end
|
|
325
|
-
server = @conn.server(@@server.id)
|
|
326
|
-
sleep 1
|
|
327
|
-
end
|
|
328
|
-
end
|
|
329
|
-
rescue Timeout::Error => te
|
|
330
|
-
fail('Timeout resizing server.')
|
|
331
|
-
end
|
|
332
|
-
|
|
333
|
-
check_server(server, @@image_ref, flavor_ref_resize, 'VERIFY_RESIZE')
|
|
334
|
-
|
|
335
|
-
server.confirm_resize!
|
|
336
|
-
server = @conn.server(@@server.id)
|
|
337
|
-
assert_equal('ACTIVE', @@server.status)
|
|
338
|
-
|
|
339
|
-
check_server(server, @@image_ref, flavor_ref_resize)
|
|
340
|
-
|
|
341
|
-
end if TEST_RESIZE_SERVER == "true"
|
|
475
|
+
end if TEST_CREATE_IMAGE
|
|
342
476
|
|
|
343
477
|
def test_999_teardown
|
|
344
|
-
|
|
345
|
-
|
|
478
|
+
if CLEAN_UP_SERVERS
|
|
479
|
+
@@servers.each do |server|
|
|
480
|
+
assert_equal(true, server.delete!)
|
|
481
|
+
end
|
|
346
482
|
end
|
|
347
|
-
|
|
348
|
-
|
|
483
|
+
if CLEAN_UP_IMAGES
|
|
484
|
+
@@images.each do |image|
|
|
485
|
+
assert_equal(true, image.delete!)
|
|
486
|
+
end
|
|
349
487
|
end
|
|
350
488
|
end
|
|
351
489
|
|
data/lib/torpedo.rb
CHANGED
|
@@ -4,13 +4,25 @@ require 'torpedo/config'
|
|
|
4
4
|
configs = Torpedo::Config.load_configs
|
|
5
5
|
|
|
6
6
|
SSH_TIMEOUT=(configs['ssh_timeout'] || 30).to_i
|
|
7
|
+
TEST_SSH=configs.fetch('test_ssh', true)
|
|
7
8
|
PING_TIMEOUT=(configs['ping_timeout'] || 60).to_i
|
|
9
|
+
TEST_PING=configs.fetch('test_ping', true)
|
|
8
10
|
SERVER_BUILD_TIMEOUT=(configs['server_build_timeout'] || 60).to_i
|
|
11
|
+
SLEEP_AFTER_IMAGE_CREATE=(configs['sleep_after_image_create'] || 0).to_i
|
|
9
12
|
SSH_PRIVATE_KEY=configs['ssh_private_key'] || ENV['HOME'] + "/.ssh/id_rsa"
|
|
10
13
|
SSH_PUBLIC_KEY=configs['ssh_public_key'] || ENV['HOME'] + "/.ssh/id_rsa.pub"
|
|
11
|
-
TEST_CREATE_IMAGE=configs['test_create_image'] ||
|
|
12
|
-
TEST_REBUILD_SERVER=configs['test_rebuild_server'] ||
|
|
13
|
-
|
|
14
|
+
TEST_CREATE_IMAGE=configs['test_create_image'] || false
|
|
15
|
+
TEST_REBUILD_SERVER=configs['test_rebuild_server'] || false
|
|
16
|
+
TEST_SOFT_REBOOT_SERVER=configs['test_soft_reboot_server'] || false
|
|
17
|
+
TEST_HARD_REBOOT_SERVER=configs['test_hard_reboot_server'] || false
|
|
18
|
+
TEST_RESIZE_SERVER=configs['test_resize_server'] || false
|
|
19
|
+
TEST_REVERT_RESIZE_SERVER=configs['test_revert_resize_server'] || false
|
|
20
|
+
TEST_ADMIN_PASSWORD=configs['test_admin_password'] || false
|
|
21
|
+
TEST_HOSTID_ON_RESIZE=configs['test_hostid_on_resize'] || false
|
|
22
|
+
TEST_IP_TYPE=configs['test_ip_type'] || 4
|
|
23
|
+
TEST_LIMITS=configs.fetch('test_limits', true)
|
|
24
|
+
CLEAN_UP_SERVERS=configs.fetch('clean_up_servers', true)
|
|
25
|
+
CLEAN_UP_IMAGES=configs.fetch('clean_up_images', true)
|
|
14
26
|
KEYPAIR=configs['keypair']
|
|
15
27
|
KEYNAME=configs['keyname']
|
|
16
28
|
|
|
@@ -23,11 +35,9 @@ FLAVOR_NAME=configs['flavor_name']
|
|
|
23
35
|
FLAVOR_REF_RESIZE=configs['flavor_ref_resize']
|
|
24
36
|
FLAVOR_NAME_RESIZE=configs['flavor_name_resize']
|
|
25
37
|
|
|
26
|
-
OPENSTACK_COMPUTE_VERSION=configs['openstack_compute_version']
|
|
38
|
+
OPENSTACK_COMPUTE_VERSION=configs['openstack_compute_version']
|
|
27
39
|
|
|
28
|
-
|
|
29
|
-
API_KEY=ENV['NOVA_API_KEY']
|
|
30
|
-
API_URL=ENV['NOVA_URL']
|
|
40
|
+
require 'torpedo/compute/helper'
|
|
31
41
|
|
|
32
42
|
module Torpedo
|
|
33
43
|
class Tasks < Thor
|
|
@@ -52,6 +62,25 @@ class Tasks < Thor
|
|
|
52
62
|
require 'torpedo/compute/servers'
|
|
53
63
|
end
|
|
54
64
|
|
|
65
|
+
desc "cleanup", "Clean up servers and images (not necessary normally)."
|
|
66
|
+
def cleanup
|
|
67
|
+
conn = Torpedo::Compute::Helper::get_connection
|
|
68
|
+
conn.servers.each do |server|
|
|
69
|
+
server = conn.server(server[:id])
|
|
70
|
+
if server.name == 'torpedo'
|
|
71
|
+
puts 'Deleting torpedo server'
|
|
72
|
+
server.delete!
|
|
73
|
+
end
|
|
74
|
+
end
|
|
75
|
+
conn.images.each do |image|
|
|
76
|
+
image = conn.image(image[:id])
|
|
77
|
+
if image.server and conn.server(image.server['id']).name == 'torpedo'
|
|
78
|
+
puts 'Deleting torpedo image'
|
|
79
|
+
image.delete!
|
|
80
|
+
end
|
|
81
|
+
end
|
|
82
|
+
end
|
|
83
|
+
|
|
55
84
|
desc "all", "Run all tests."
|
|
56
85
|
def all
|
|
57
86
|
require 'torpedo/compute/flavors'
|
data/torpedo.gemspec
CHANGED
|
@@ -5,13 +5,13 @@
|
|
|
5
5
|
|
|
6
6
|
Gem::Specification.new do |s|
|
|
7
7
|
s.name = %q{torpedo}
|
|
8
|
-
s.version = "1.0.
|
|
8
|
+
s.version = "1.0.13"
|
|
9
9
|
|
|
10
10
|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
|
11
11
|
s.authors = ["Dan Prince"]
|
|
12
|
-
s.date = %q{
|
|
12
|
+
s.date = %q{2012-01-06}
|
|
13
13
|
s.default_executable = %q{torpedo}
|
|
14
|
-
s.description = %q{
|
|
14
|
+
s.description = %q{Fast integration tests OpenStack Compute.}
|
|
15
15
|
s.email = %q{dan.prince@rackspace.com}
|
|
16
16
|
s.executables = ["torpedo"]
|
|
17
17
|
s.extra_rdoc_files = [
|
|
@@ -36,14 +36,13 @@ Gem::Specification.new do |s|
|
|
|
36
36
|
"lib/torpedo/compute/servers.rb",
|
|
37
37
|
"lib/torpedo/config.rb",
|
|
38
38
|
"test/helper.rb",
|
|
39
|
-
"test/test_torpedo.rb",
|
|
40
39
|
"torpedo.gemspec"
|
|
41
40
|
]
|
|
42
41
|
s.homepage = %q{http://github.com/dprince/torpedo}
|
|
43
42
|
s.licenses = ["MIT"]
|
|
44
43
|
s.require_paths = ["lib"]
|
|
45
44
|
s.rubygems_version = %q{1.3.7}
|
|
46
|
-
s.summary = %q{
|
|
45
|
+
s.summary = %q{Fire when ready. Fast Ruby integration tests for OpenStack.}
|
|
47
46
|
|
|
48
47
|
if s.respond_to? :specification_version then
|
|
49
48
|
current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
|
|
@@ -52,19 +51,22 @@ Gem::Specification.new do |s|
|
|
|
52
51
|
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
|
|
53
52
|
s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
|
|
54
53
|
s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
|
|
55
|
-
s.add_runtime_dependency(%q<thor>, ["
|
|
56
|
-
s.add_runtime_dependency(%q<openstack-compute>, ["
|
|
54
|
+
s.add_runtime_dependency(%q<thor>, ["~> 0.14.6"])
|
|
55
|
+
s.add_runtime_dependency(%q<openstack-compute>, ["~> 1.1.5"])
|
|
56
|
+
s.add_runtime_dependency(%q<net-ssh>, ["~> 2.2.1"])
|
|
57
57
|
else
|
|
58
58
|
s.add_dependency(%q<bundler>, ["~> 1.0.0"])
|
|
59
59
|
s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
|
|
60
|
-
s.add_dependency(%q<thor>, ["
|
|
61
|
-
s.add_dependency(%q<openstack-compute>, ["
|
|
60
|
+
s.add_dependency(%q<thor>, ["~> 0.14.6"])
|
|
61
|
+
s.add_dependency(%q<openstack-compute>, ["~> 1.1.5"])
|
|
62
|
+
s.add_dependency(%q<net-ssh>, ["~> 2.2.1"])
|
|
62
63
|
end
|
|
63
64
|
else
|
|
64
65
|
s.add_dependency(%q<bundler>, ["~> 1.0.0"])
|
|
65
66
|
s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
|
|
66
|
-
s.add_dependency(%q<thor>, ["
|
|
67
|
-
s.add_dependency(%q<openstack-compute>, ["
|
|
67
|
+
s.add_dependency(%q<thor>, ["~> 0.14.6"])
|
|
68
|
+
s.add_dependency(%q<openstack-compute>, ["~> 1.1.5"])
|
|
69
|
+
s.add_dependency(%q<net-ssh>, ["~> 2.2.1"])
|
|
68
70
|
end
|
|
69
71
|
end
|
|
70
72
|
|
metadata
CHANGED
|
@@ -1,95 +1,105 @@
|
|
|
1
|
-
--- !ruby/object:Gem::Specification
|
|
1
|
+
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: torpedo
|
|
3
|
-
version: !ruby/object:Gem::Version
|
|
4
|
-
|
|
5
|
-
prerelease:
|
|
6
|
-
segments:
|
|
7
|
-
- 1
|
|
8
|
-
- 0
|
|
9
|
-
- 1
|
|
10
|
-
version: 1.0.1
|
|
3
|
+
version: !ruby/object:Gem::Version
|
|
4
|
+
version: 1.0.18
|
|
5
|
+
prerelease:
|
|
11
6
|
platform: ruby
|
|
12
|
-
authors:
|
|
7
|
+
authors:
|
|
13
8
|
- Dan Prince
|
|
14
9
|
autorequire:
|
|
15
10
|
bindir: bin
|
|
16
11
|
cert_chain: []
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
dependencies:
|
|
21
|
-
- !ruby/object:Gem::Dependency
|
|
22
|
-
prerelease: false
|
|
12
|
+
date: 2012-11-13 00:00:00.000000000 Z
|
|
13
|
+
dependencies:
|
|
14
|
+
- !ruby/object:Gem::Dependency
|
|
23
15
|
name: bundler
|
|
24
|
-
|
|
16
|
+
requirement: !ruby/object:Gem::Requirement
|
|
25
17
|
none: false
|
|
26
|
-
requirements:
|
|
18
|
+
requirements:
|
|
27
19
|
- - ~>
|
|
28
|
-
- !ruby/object:Gem::Version
|
|
29
|
-
hash: 23
|
|
30
|
-
segments:
|
|
31
|
-
- 1
|
|
32
|
-
- 0
|
|
33
|
-
- 0
|
|
20
|
+
- !ruby/object:Gem::Version
|
|
34
21
|
version: 1.0.0
|
|
35
|
-
requirement: *id001
|
|
36
22
|
type: :development
|
|
37
|
-
- !ruby/object:Gem::Dependency
|
|
38
23
|
prerelease: false
|
|
24
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
25
|
+
none: false
|
|
26
|
+
requirements:
|
|
27
|
+
- - ~>
|
|
28
|
+
- !ruby/object:Gem::Version
|
|
29
|
+
version: 1.0.0
|
|
30
|
+
- !ruby/object:Gem::Dependency
|
|
39
31
|
name: jeweler
|
|
40
|
-
|
|
32
|
+
requirement: !ruby/object:Gem::Requirement
|
|
41
33
|
none: false
|
|
42
|
-
requirements:
|
|
34
|
+
requirements:
|
|
43
35
|
- - ~>
|
|
44
|
-
- !ruby/object:Gem::Version
|
|
45
|
-
hash: 7
|
|
46
|
-
segments:
|
|
47
|
-
- 1
|
|
48
|
-
- 6
|
|
49
|
-
- 4
|
|
36
|
+
- !ruby/object:Gem::Version
|
|
50
37
|
version: 1.6.4
|
|
51
|
-
requirement: *id002
|
|
52
38
|
type: :development
|
|
53
|
-
- !ruby/object:Gem::Dependency
|
|
54
39
|
prerelease: false
|
|
40
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
41
|
+
none: false
|
|
42
|
+
requirements:
|
|
43
|
+
- - ~>
|
|
44
|
+
- !ruby/object:Gem::Version
|
|
45
|
+
version: 1.6.4
|
|
46
|
+
- !ruby/object:Gem::Dependency
|
|
55
47
|
name: thor
|
|
56
|
-
|
|
48
|
+
requirement: !ruby/object:Gem::Requirement
|
|
57
49
|
none: false
|
|
58
|
-
requirements:
|
|
59
|
-
- -
|
|
60
|
-
- !ruby/object:Gem::Version
|
|
61
|
-
|
|
62
|
-
segments:
|
|
63
|
-
- 0
|
|
64
|
-
version: "0"
|
|
65
|
-
requirement: *id003
|
|
50
|
+
requirements:
|
|
51
|
+
- - ~>
|
|
52
|
+
- !ruby/object:Gem::Version
|
|
53
|
+
version: 0.14.6
|
|
66
54
|
type: :runtime
|
|
67
|
-
- !ruby/object:Gem::Dependency
|
|
68
55
|
prerelease: false
|
|
56
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
57
|
+
none: false
|
|
58
|
+
requirements:
|
|
59
|
+
- - ~>
|
|
60
|
+
- !ruby/object:Gem::Version
|
|
61
|
+
version: 0.14.6
|
|
62
|
+
- !ruby/object:Gem::Dependency
|
|
69
63
|
name: openstack-compute
|
|
70
|
-
|
|
64
|
+
requirement: !ruby/object:Gem::Requirement
|
|
71
65
|
none: false
|
|
72
|
-
requirements:
|
|
73
|
-
- -
|
|
74
|
-
- !ruby/object:Gem::Version
|
|
75
|
-
|
|
76
|
-
segments:
|
|
77
|
-
- 1
|
|
78
|
-
- 1
|
|
79
|
-
- 4
|
|
80
|
-
version: 1.1.4
|
|
81
|
-
requirement: *id004
|
|
66
|
+
requirements:
|
|
67
|
+
- - ~>
|
|
68
|
+
- !ruby/object:Gem::Version
|
|
69
|
+
version: 1.1.5
|
|
82
70
|
type: :runtime
|
|
83
|
-
|
|
71
|
+
prerelease: false
|
|
72
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
73
|
+
none: false
|
|
74
|
+
requirements:
|
|
75
|
+
- - ~>
|
|
76
|
+
- !ruby/object:Gem::Version
|
|
77
|
+
version: 1.1.5
|
|
78
|
+
- !ruby/object:Gem::Dependency
|
|
79
|
+
name: net-ssh
|
|
80
|
+
requirement: !ruby/object:Gem::Requirement
|
|
81
|
+
none: false
|
|
82
|
+
requirements:
|
|
83
|
+
- - ~>
|
|
84
|
+
- !ruby/object:Gem::Version
|
|
85
|
+
version: 2.2.1
|
|
86
|
+
type: :runtime
|
|
87
|
+
prerelease: false
|
|
88
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
89
|
+
none: false
|
|
90
|
+
requirements:
|
|
91
|
+
- - ~>
|
|
92
|
+
- !ruby/object:Gem::Version
|
|
93
|
+
version: 2.2.1
|
|
94
|
+
description: Fast integration tests OpenStack Compute.
|
|
84
95
|
email: dan.prince@rackspace.com
|
|
85
|
-
executables:
|
|
96
|
+
executables:
|
|
86
97
|
- torpedo
|
|
87
98
|
extensions: []
|
|
88
|
-
|
|
89
|
-
extra_rdoc_files:
|
|
99
|
+
extra_rdoc_files:
|
|
90
100
|
- LICENSE.txt
|
|
91
101
|
- README.md
|
|
92
|
-
files:
|
|
102
|
+
files:
|
|
93
103
|
- .document
|
|
94
104
|
- CHANGELOG
|
|
95
105
|
- Gemfile
|
|
@@ -107,41 +117,33 @@ files:
|
|
|
107
117
|
- lib/torpedo/compute/servers.rb
|
|
108
118
|
- lib/torpedo/config.rb
|
|
109
119
|
- test/helper.rb
|
|
110
|
-
- test/test_torpedo.rb
|
|
111
120
|
- torpedo.gemspec
|
|
112
|
-
has_rdoc: true
|
|
113
121
|
homepage: http://github.com/dprince/torpedo
|
|
114
|
-
licenses:
|
|
122
|
+
licenses:
|
|
115
123
|
- MIT
|
|
116
124
|
post_install_message:
|
|
117
125
|
rdoc_options: []
|
|
118
|
-
|
|
119
|
-
require_paths:
|
|
126
|
+
require_paths:
|
|
120
127
|
- lib
|
|
121
|
-
required_ruby_version: !ruby/object:Gem::Requirement
|
|
128
|
+
required_ruby_version: !ruby/object:Gem::Requirement
|
|
122
129
|
none: false
|
|
123
|
-
requirements:
|
|
124
|
-
- -
|
|
125
|
-
- !ruby/object:Gem::Version
|
|
126
|
-
|
|
127
|
-
segments:
|
|
130
|
+
requirements:
|
|
131
|
+
- - ! '>='
|
|
132
|
+
- !ruby/object:Gem::Version
|
|
133
|
+
version: '0'
|
|
134
|
+
segments:
|
|
128
135
|
- 0
|
|
129
|
-
|
|
130
|
-
required_rubygems_version: !ruby/object:Gem::Requirement
|
|
136
|
+
hash: -3718277356387359406
|
|
137
|
+
required_rubygems_version: !ruby/object:Gem::Requirement
|
|
131
138
|
none: false
|
|
132
|
-
requirements:
|
|
133
|
-
- -
|
|
134
|
-
- !ruby/object:Gem::Version
|
|
135
|
-
|
|
136
|
-
segments:
|
|
137
|
-
- 0
|
|
138
|
-
version: "0"
|
|
139
|
+
requirements:
|
|
140
|
+
- - ! '>='
|
|
141
|
+
- !ruby/object:Gem::Version
|
|
142
|
+
version: '0'
|
|
139
143
|
requirements: []
|
|
140
|
-
|
|
141
144
|
rubyforge_project:
|
|
142
|
-
rubygems_version: 1.
|
|
145
|
+
rubygems_version: 1.8.24
|
|
143
146
|
signing_key:
|
|
144
147
|
specification_version: 3
|
|
145
|
-
summary:
|
|
148
|
+
summary: Fire when ready. Fast Ruby integration tests for OpenStack.
|
|
146
149
|
test_files: []
|
|
147
|
-
|