You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltacloud.apache.org by mf...@apache.org on 2011/03/31 10:54:14 UTC
svn commit: r1087220 - in /incubator/deltacloud/trunk/server: ./
lib/deltacloud/drivers/rackspace/ tests/ tests/drivers/mock/
tests/drivers/rackspace/ tests/rackspace/fixtures/
Author: mfojtik
Date: Thu Mar 31 08:54:13 2011
New Revision: 1087220
URL: http://svn.apache.org/viewvc?rev=1087220&view=rev
Log:
Revert "Added VCR gem to recort Test::Unit"
Revert "Added basic RackSpace unit tests"
Revert "Fixed Rackspace driver error code when you're trying to get non-existing instance"
This reverts commit 2e891fc27706845e4527e071773de3bf68504853.
This reverts commit 4e519c5546608217b695f614050711e571ed47c3.
This reverts commit 051ae1986d019f65953f6819e12a8448cce64177.
Removed:
incubator/deltacloud/trunk/server/tests/drivers/mock/setup.rb
incubator/deltacloud/trunk/server/tests/drivers/rackspace/api_test.rb
incubator/deltacloud/trunk/server/tests/drivers/rackspace/hardware_profiles_test.rb
incubator/deltacloud/trunk/server/tests/drivers/rackspace/images_test.rb
incubator/deltacloud/trunk/server/tests/drivers/rackspace/instances_test.rb
incubator/deltacloud/trunk/server/tests/drivers/rackspace/realms_test.rb
incubator/deltacloud/trunk/server/tests/drivers/rackspace/setup.rb
incubator/deltacloud/trunk/server/tests/rackspace/fixtures/11c8bc2b7e52a46b9a004dd40c2512dd3c489f64.yml
incubator/deltacloud/trunk/server/tests/rackspace/fixtures/1f3658efb8b59ffcd7e73860fafffa3bd95e02f5.yml
incubator/deltacloud/trunk/server/tests/rackspace/fixtures/25f930c42a61cf5e4e966e351590ae20345ad30e.yml
incubator/deltacloud/trunk/server/tests/rackspace/fixtures/30691ff4842a33afdbcc653195b1bd4ec93bd644.yml
incubator/deltacloud/trunk/server/tests/rackspace/fixtures/3573bb0263b44db6f99a809f92047289108e604f.yml
incubator/deltacloud/trunk/server/tests/rackspace/fixtures/3c394d211d025518184ec6a793eb906c901045c1.yml
incubator/deltacloud/trunk/server/tests/rackspace/fixtures/3f559471f7f352032117bfa6a521415b928d67a5.yml
incubator/deltacloud/trunk/server/tests/rackspace/fixtures/57833ca12de5561f349e567f6278da04fefc4880.yml
incubator/deltacloud/trunk/server/tests/rackspace/fixtures/7115e1f7a3a156de28733eb38670635bd4a67824.yml
incubator/deltacloud/trunk/server/tests/rackspace/fixtures/86c5bac6a91239044d567c41ee7061850753aceb.yml
incubator/deltacloud/trunk/server/tests/rackspace/fixtures/9357e09a4d550b4e9608549638d13a7bd68b1ceb.yml
incubator/deltacloud/trunk/server/tests/rackspace/fixtures/9663e49d06662082f6be10bec846857ddb1a2b66.yml
incubator/deltacloud/trunk/server/tests/rackspace/fixtures/ad0d40707087d6f351926eada3e98a6dc08a5e38.yml
incubator/deltacloud/trunk/server/tests/rackspace/fixtures/b3475ee551d099862e0123ec4d7a38f96f031f5e.yml
incubator/deltacloud/trunk/server/tests/rackspace/fixtures/b4db99458905e95872d37bf8484c3af7dc41d264.yml
incubator/deltacloud/trunk/server/tests/rackspace/fixtures/c02df61167a57ada65fafcaa985357a91314f930.yml
incubator/deltacloud/trunk/server/tests/rackspace/fixtures/c3bd10b31498023723c8c5ff8de08a900469d62b.yml
incubator/deltacloud/trunk/server/tests/rackspace/fixtures/cc7ccfa2f6e74357956824051e8360d7f0751004.yml
incubator/deltacloud/trunk/server/tests/rackspace/fixtures/ccbb5c591ed1b2c1a3d4233329c9475a9965ba2d.yml
incubator/deltacloud/trunk/server/tests/rackspace/fixtures/e306158847e6efd491e1b51770012a76b010d81a.yml
incubator/deltacloud/trunk/server/tests/rackspace/fixtures/e5f1a88e1991237fb416428685888ad232604fa1.yml
incubator/deltacloud/trunk/server/tests/rackspace/fixtures/eff069c1da23b5e703dc9894dbb9186a6c3fd8d2.yml
incubator/deltacloud/trunk/server/tests/rackspace/fixtures/f2349b91a95d0d93889416e7fc17f2187140247b.yml
Modified:
incubator/deltacloud/trunk/server/Gemfile
incubator/deltacloud/trunk/server/Rakefile
incubator/deltacloud/trunk/server/lib/deltacloud/drivers/rackspace/rackspace_driver.rb
incubator/deltacloud/trunk/server/server.rb
incubator/deltacloud/trunk/server/tests/common.rb
Modified: incubator/deltacloud/trunk/server/Gemfile
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/server/Gemfile?rev=1087220&r1=1087219&r2=1087220&view=diff
==============================================================================
--- incubator/deltacloud/trunk/server/Gemfile (original)
+++ incubator/deltacloud/trunk/server/Gemfile Thu Mar 31 08:54:13 2011
@@ -38,8 +38,6 @@ group :test do
gem 'ruby-debug', :platforms => :mri_18
gem 'ruby-debug19', :platforms => :mri_19, :require => 'ruby-debug'
gem "compass"
- gem "vcr"
- gem "webmock"
gem "nokogiri"
gem "rack-test"
gem "ci_reporter"
Modified: incubator/deltacloud/trunk/server/Rakefile
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/server/Rakefile?rev=1087220&r1=1087219&r2=1087220&view=diff
==============================================================================
--- incubator/deltacloud/trunk/server/Rakefile (original)
+++ incubator/deltacloud/trunk/server/Rakefile Thu Mar 31 08:54:13 2011
@@ -28,26 +28,12 @@ begin
rescue LoadError
end
-namespace :test do
-
- desc "Run mock unit tests"
- Rake::TestTask.new("mock") { |t|
- t.test_files = FileList.new('tests/drivers/mock/*_test.rb') + FileList.new('tests/rabbit_test.rb')
- t.options = "-v -v"
- t.verbose = true
- t.warning = false
- }
-
- desc "Run rackspace unit tests"
- Rake::TestTask.new("rackspace") { |t|
- t.test_files = ['tests/common.rb', 'tests/drivers/rackspace/setup.rb'] + FileList.new('tests/drivers/rackspace/*_test.rb')
- t.options = "-v -v"
- t.verbose = true
- t.warning = false
- }
-
-
-end
+desc "Run basic unit tests"
+Rake::TestTask.new("test") { |t|
+ t.test_files = FileList.new('tests/**/*_test.rb')
+ t.verbose = true
+ t.warning = false
+}
begin
require 'yard'
Modified: incubator/deltacloud/trunk/server/lib/deltacloud/drivers/rackspace/rackspace_driver.rb
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/server/lib/deltacloud/drivers/rackspace/rackspace_driver.rb?rev=1087220&r1=1087219&r2=1087220&view=diff
==============================================================================
--- incubator/deltacloud/trunk/server/lib/deltacloud/drivers/rackspace/rackspace_driver.rb (original)
+++ incubator/deltacloud/trunk/server/lib/deltacloud/drivers/rackspace/rackspace_driver.rb Thu Mar 31 08:54:13 2011
@@ -154,16 +154,13 @@ class RackspaceDriver < Deltacloud::Base
insts = []
safely do
- begin
- if opts[:id]
- server = rs.get_server(opts[:id].to_i)
- insts << convert_instance_after_create(server, credentials.user)
- else
- insts = rs.list_servers_detail.collect do |server|
- convert_instance(server, credentials.user)
- end
+ if opts[:id]
+ server = rs.get_server(opts[:id].to_i)
+ insts << convert_instance_after_create(server, credentials.user)
+ else
+ insts = rs.list_servers_detail.collect do |server|
+ convert_instance(server, credentials.user)
end
- rescue CloudServers::Exception::ItemNotFound
end
end
Modified: incubator/deltacloud/trunk/server/server.rb
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/server/server.rb?rev=1087220&r1=1087219&r2=1087220&view=diff
==============================================================================
--- incubator/deltacloud/trunk/server/server.rb (original)
+++ incubator/deltacloud/trunk/server/server.rb Thu Mar 31 08:54:13 2011
@@ -364,15 +364,17 @@ END
param :realm_id, :string, :optional
param :hwp_id, :string, :optional
control do
- @instance = driver.create_instance(credentials, params[:image_id], params)
+ @image = driver.image(credentials, :id => params[:image_id])
+ instance = driver.create_instance(credentials, @image.id, params)
respond_to do |format|
format.xml do
response.status = 201 # Created
- response['Location'] = instance_url(@instance.id)
+ response['Location'] = instance_url(instance.id)
+ @instance = instance
haml :"instances/show"
end
format.html do
- redirect instance_url(@instance.id) if @instance and @instance.id
+ redirect instance_url(instance.id) if instance and instance.id
redirect instances_url
end
end
Modified: incubator/deltacloud/trunk/server/tests/common.rb
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/server/tests/common.rb?rev=1087220&r1=1087219&r2=1087220&view=diff
==============================================================================
--- incubator/deltacloud/trunk/server/tests/common.rb (original)
+++ incubator/deltacloud/trunk/server/tests/common.rb Thu Mar 31 08:54:13 2011
@@ -1,7 +1,6 @@
$:.unshift File.join(File.dirname(__FILE__), '..')
require 'rubygems'
-require 'yaml'
require 'base64'
require 'test/unit'
require 'spec'
@@ -11,8 +10,11 @@ require 'json'
# Set proper environment variables for running test
ENV['RACK_ENV'] = 'test'
+ENV['API_DRIVER'] = 'mock'
ENV['API_HOST'] = 'localhost'
ENV['API_PORT'] = '4040'
+ENV['API_USER'] = 'mockuser'
+ENV['API_PASSWORD'] = 'mockpassword'
require 'server'
@@ -60,32 +62,21 @@ module DeltacloudTestCommon
"#{url}"
end
- require 'digest/sha1'
-
def do_request(uri, params=nil, authentication=false, opts={ :format => :xml })
header 'Accept', accept_header(opts[:format])
- VCR.use_cassette(Digest::SHA1.hexdigest("#{uri}-#{params}-#{authentication}")) do
- get create_url(uri), params || {}, (authentication) ? authenticate(opts) : {}
- end
+ get create_url(uri), params || {}, (authentication) ? authenticate(opts) : {}
end
def do_xml_request(uri, params=nil, authentication=false)
header 'Accept', accept_header(:xml)
- VCR.use_cassette(Digest::SHA1.hexdigest("#{uri}-#{params}-#{(authentication) ? authenticate : ''}")) do
- get create_url(uri), params || {}, (authentication) ? authenticate : {}
- end
+ get create_url(uri), params || {}, (authentication) ? authenticate : {}
+ puts "[401] Authentication required to get #{uri}" if last_response.status == 401
if last_response.status == 200
@xml_response = false
@xml_response = Nokogiri::XML(last_response.body)
end
end
- def do_post(uri, params, authentication)
- VCR.use_cassette(Digest::SHA1.hexdigest("#{uri}-#{params}-#{(authentication) ? authenticate : ''}")) do
- post uri, params, authentication ? authenticate : nil
- end
- end
-
def require_authentication?(uri)
get uri, {}
true if last_response.status.eql?(401)