deltacloud-core 0.5.0 → 1.0.0

data/tests/drivers/{rackspace → fgcp}/setup.rb

@@ -1,14 +1,13 @@
-ENV['API_DRIVER']   = "rackspace"
-ENV['API_USER']     = 'mandreou'
-ENV['API_PASSWORD'] = 'a4d531ef02a37dd32cac1e8e516df9eb'
+ENV.delete 'API_VERBOSE'
+ENV['API_DRIVER']   = "fgcp"
+ENV['API_USER']     = 'cert-dir'
+ENV['API_PASSWORD'] = 'secret'
 
 require 'vcr'
-
 DeltacloudTestCommon::record!
 
 VCR.config do |c|
-  c.cassette_library_dir = "#{File.dirname(__FILE__)}/../../../tests/drivers/rackspace/fixtures/"
+  c.cassette_library_dir = "#{File.dirname(__FILE__)}/../../../tests/drivers/fgcp/fixtures/"
   c.stub_with :webmock
   c.default_cassette_options = { :record => :new_episodes }
 end
-

data/tests/drivers/google/api_test.rb

@@ -1,35 +1,19 @@
 $:.unshift File.join(File.dirname(__FILE__), '..', '..', '..')
-require 'tests/common'
+require 'tests/drivers/google/common'
 
-module GoogleTest
+describe 'Deltacloud API' do
 
-  class ApiTest < Test::Unit::TestCase
-    include Rack::Test::Methods
+  before do
+    VCR.insert_cassette __name__
+  end
 
-    def app
-      Sinatra::Application
-    end
+  after do
+    VCR.eject_cassette
+  end
 
-    def test_01_it_returns_entry_points
-      get_auth_url '/api;driver=google/?force_auth=1'
-      (last_xml_response/'/api').first[:driver].should == 'google'
-      (last_xml_response/'/api/link').length.should > 0
-    end
+  include Deltacloud::Test
 
-    def test_02_it_has_google_features
-      get_url '/api;driver=google'
-      features = (last_xml_response/'/api/link[@rel="buckets"]/feature').collect { |f| f[:name] }
-      features.include?('bucket_location').should == true
-      features.length.should == 1
-    end
+  eval File.read('tests/minitest_common_api_test.rb')
 
-    def test_03_it_has_google_collections
-      get_url '/api;driver=google'
-      collections = (last_xml_response/'/api/link').collect { |f| f[:rel] }
-      collections.include?('buckets').should == true
-      collections.include?('drivers').should == true
-      collections.length.should == 2
-    end
 
-  end
 end

data/tests/drivers/google/buckets_test.rb

@@ -1,116 +1,100 @@
 $:.unshift File.join(File.dirname(__FILE__), '..', '..', '..')
-require 'tests/common'
-#require 'webmock/test_unit'
-module GoogleTest
+require 'tests/drivers/google/common'
 
-  class BucketsTest < Test::Unit::TestCase
-    include Rack::Test::Methods
+describe 'Deltacloud API' do
 
-    def app
-      Sinatra::Application
-    end
+  before do
+    VCR.insert_cassette __name__
+  end
+
+  after do
+    VCR.eject_cassette
+  end
+
+  include Deltacloud::Test
+
+i_suck_and_my_tests_are_order_dependent!
 
     @@bucket_name_google="#{@@created_bucket_name}googel"
     @@blob_name_google="#{@@created_blob_name}googel"
 #intentional typos here - bucket names cannot contain 'google'
 #see http://code.google.com/apis/storage/docs/reference/v1/developer-guidev1.html
+  it 'can create a new bucket' do
+    authenticate
+    bucket_name = @@bucket_name_google
+    post collection_url(:buckets), {:name=>bucket_name}
+    last_response.status.must_equal 201
+    bucket = xml_response
+    check_bucket_basics(bucket, "googel")
+    (bucket/'bucket/size').first.text.must_equal "0"
+  end
 
-   def test_01_it_can_create_new_bucket
-      params = {
-        :name => @@bucket_name_google,
-        :'api[driver]' => 'google'
-      }
-      vcr_cassette = stable_vcr_cassette_name('post', '/api/buckets', params)
-      post_url '/api/buckets', params, {'vcr_cassette'=>vcr_cassette}
-      last_response.status.should == 201 # Created
-      bucket = last_xml_response
-      check_bucket_basics(bucket, "googel")
-      (bucket/'bucket/size').first.text.should == "0"
-    end
-
-    def test_02_it_can_post_new_blob
-      temp_file=File.open(@@created_blob_local_file)
-      params = {
-        'blob_id' => @@blob_name_google,
-        :meta_params=>"2",
-        :meta_name1=>"Author",
-        :meta_value1=>"deltacloud",
-        :meta_name2=>"foo",
-        :meta_value2=>"bar",
-        :'api[driver]' => 'google'
-      }
-      uri="/api/buckets/#{@@bucket_name_google}"
-      vcr_cassette = stable_vcr_cassette_name('post', uri, params)
-      params.merge!({'blob_data' => Rack::Test::UploadedFile.new(temp_file.path, "text/html")})
-      post_url uri, params, {'vcr_cassette'=>vcr_cassette}
-      last_response.status.should == 200
-      blob= last_xml_response
-      check_blob_basics(blob, "googel")
-    end
+  it 'can create a new blob with HTTP POST' do
+    authenticate
+    temp_file=File.open(@@created_blob_local_file)
+    params = { 'blob_id' => @@blob_name_google,
+              :meta_params=>"2",
+              :meta_name1=>"Author",
+              :meta_value1=>"deltacloud",
+              :meta_name2=>"foo",
+              :meta_value2=>"bar",
+              'blob_data' => Rack::Test::UploadedFile.new(temp_file.path, "text/html") }
+    post "#{collection_url(:buckets)}/#{@@bucket_name_google}", params
+    last_response.status.must_equal 200
+    blob = xml_response
+    check_blob_basics(blob, "googel")
+  end
 
-    def test_03_it_can_retrieve_named_bucket_details
-       params = {
-        :'api[driver]' => 'google'
-      }
-      get_url "/api/buckets/#{@@bucket_name_google}", params
-      last_response.status.should == 200
-      bucket = last_xml_response
-      check_bucket_basics(bucket, "googel")
-      (bucket/'bucket/size').first.text.should == "1" #assuming blob created succesfully right?
-    end
+  it 'can retrieve named bucket details' do
+    authenticate
+    get "#{collection_url(:buckets)}/#{@@bucket_name_google}"
+    last_response.status.must_equal 200
+    bucket = xml_response
+    check_bucket_basics(bucket, "googel")
+    (bucket/'bucket/size').first.text.must_equal "1" #assuming blob created succesfully right?
+  end
 
-    def test_04_it_can_retrieve_named_blob_details
-      params = {
-                :'api[driver]' => 'google'
-               }
-      get_url "/api/buckets/#{@@bucket_name_google}/#{@@blob_name_google}", params
-      last_response.status.should == 200
-      blob = last_xml_response
+  it 'can retrieve details of a named blob' do
+      authenticate
+      get "#{collection_url(:buckets)}/#{@@bucket_name_google}/#{@@blob_name_google}"
+      last_response.status.must_equal 200
+      blob = xml_response
       check_blob_basics(blob, "googel")
       check_blob_metadata(blob, {"author"=>"deltacloud", "foo"=>"bar"})
-    end
+  end
 
-    def test_05_it_can_retrieve_blob_metadata
-      params = {
-                :'api[driver]' => 'google'
-               }
-      head_url "/api/buckets/#{@@bucket_name_google}/#{@@blob_name_google}", params
-      last_response.status.should == 204
-      blob_meta_hash = last_response.headers.inject({}){|result, (k,v)| result[k]=v if k=~/^X-Deltacloud-Blobmeta-/i ; result}
-      blob_meta_hash.gsub_keys(/x-.*meta-/i, "")
-      ({"author"=>"deltacloud", "foo"=>"bar"}.eql?(blob_meta_hash)).should == true
-    end
+  it 'can retrieve named blob metadata' do
+    authenticate
+    head "#{collection_url(:buckets)}/#{@@bucket_name_google}/#{@@blob_name_google}"
+    last_response.status.must_equal 204
+    blob_meta_hash = last_response.headers.inject({}){|result, (k,v)| result[k]=v if k=~/^X-Deltacloud-Blobmeta-/i ; result}
+    blob_meta_hash.gsub_keys(/x-.*meta-/i, "")
+    {"author"=>"deltacloud", "foo"=>"bar"}.must_equal blob_meta_hash
+  end
 
-    def test_06_it_can_update_blob_metadata
-      params = {
-                :'api[driver]' => 'google'
-               }
-      new_meta = {"X-Deltacloud-Blobmeta-author" => "ApacheDeltacloud", "X-Deltacloud-Blobmeta-oof" => "rab"}
-      new_meta.each_pair do |k,v|
-        header k, v
-      end
-      post_url "/api/buckets/#{@@bucket_name_google}/#{@@blob_name_google}", params
-      last_response.status.should == 204
-      new_meta.each_pair do |k,v|
-        (last_response.headers[k]==v).should == true
-      end
+  it 'can update blob metadata' do
+    authenticate
+    new_meta = {"X-Deltacloud-Blobmeta-author" => "ApacheDeltacloud", "X-Deltacloud-Blobmeta-oof" => "rab"}
+    new_meta.each_pair do |k,v|
+      header k, v
     end
-
-    def test_07_it_can_delete_blob
-      params = {
-                :'api[driver]' => 'google'
-               }
-      delete_url "/api/buckets/#{@@bucket_name_google}/#{@@blob_name_google}", params
-      last_response.status.should == 204
+    post "#{collection_url(:buckets)}/#{@@bucket_name_google}/#{@@blob_name_google}"
+    last_response.status.must_equal 204
+    new_meta.each_pair do |k,v|
+      last_response.headers[k].must_equal v
     end
+  end
 
-    def test_08_it_can_delete_bucket
-      params = {
-                :'api[driver]' => 'google'
-               }
-      delete_url "/api/buckets/#{@@bucket_name_google}", params
-      last_response.status.should == 204
-    end
+  it 'can delete blob' do
+    authenticate
+    delete "#{collection_url(:buckets)}/#{@@bucket_name_google}/#{@@blob_name_google}"
+    last_response.status.must_equal 204
+  end
 
+  it 'can delete bucket' do
+    authenticate
+    delete "#{collection_url(:buckets)}/#{@@bucket_name_google}"
+    last_response.status.must_equal 204
   end
+
 end

data/tests/drivers/google/common.rb

@@ -0,0 +1,54 @@
+ENV['API_DRIVER']   = "google"
+ENV['TESTS_API_USERNAME']     = 'GOOGUM2I5ZVSPSV5H42U'
+ENV['TESTS_API_PASSWORD'] = 'sXhLOsE4SYU+M7SKsTwwNX2YPpMOKIiRyZaZxcBp'
+
+$:.unshift File.join(File.dirname(__FILE__), '..', '..', '..')
+require 'tests/minitest_common'
+
+require 'vcr'
+
+VCR.configure do |c|
+  c.cassette_library_dir = "#{File.dirname(__FILE__)}/fixtures/"
+  c.hook_into :excon
+  c.default_cassette_options = { :record => :new_episodes}
+end
+
+#the following can probably be moved to somewhere more 'common'
+#once other driver tests start using them (e.g. openstack).
+
+  @@created_bucket_name="testbucki2rpux3wdelme"
+  @@created_blob_name="testblobk1ds91kVdelme"
+  @@created_blob_local_file="#{File.dirname(__FILE__)}/../common_fixtures/deltacloud_blob_test.png"
+
+  def check_bucket_basics(bucket, cloud)
+    (bucket/'bucket/name').first.text.must_equal "#{@@created_bucket_name}#{cloud}"
+    (bucket/'bucket').attribute("id").text.must_equal "#{@@created_bucket_name}#{cloud}"
+    (bucket/'bucket').length.must_be :>, 0
+    (bucket/'bucket/name').first.text.wont_be_nil
+    (bucket/'bucket').attribute("href").text.wont_be_nil
+  end
+
+  def check_blob_basics(blob, cloud)
+    (blob/'blob').length.must_equal 1
+    (blob/'blob').attribute("id").text.wont_be_nil
+    (blob/'blob').attribute("href").text.wont_be_nil
+    (blob/'blob/bucket').text.wont_be_nil
+    (blob/'blob/content_length').text.wont_be_nil
+    (blob/'blob/content_type').text.wont_be_nil
+    (blob/'blob').attribute("id").text.must_equal "#{@@created_blob_name}#{cloud}"
+    (blob/'blob/bucket').text.must_equal "#{@@created_bucket_name}#{cloud}"
+    (blob/'blob/content_length').text.to_i.must_equal File.size(@@created_blob_local_file)
+  end
+
+  def check_blob_metadata(blob, metadata_hash)
+    meta_from_blob = {}
+    #extract metadata from nokogiri blob xml
+    (0.. (((blob/'blob/user_metadata').first).elements.size - 1) ).each do |i|
+      meta_from_blob[(((blob/'blob/user_metadata').first).elements[i].attribute("key").value)] =
+                                  (((blob/'blob/user_metadata').first).elements[i].children[1].text)
+    end
+    #remove any 'x-goog-meta-' prefixes (problem for google blobs and vcr...)
+    meta_from_blob.gsub_keys(/x-.*-meta-/i, "")
+    meta_from_blob.must_equal metadata_hash
+  end
+

data/tests/drivers/mock/api_test.rb

@@ -1,133 +1,10 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.  The
-# ASF licenses this file to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance with the
-# License.  You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
-# License for the specific language governing permissions and limitations
-# under the License.
-#
-
 $:.unshift File.join(File.dirname(__FILE__), '..', '..', '..')
-require 'tests/common'
-
-module DeltacloudUnitTest
-  class ApiTest < Test::Unit::TestCase
-    include Rack::Test::Methods
-
-    def app
-      Sinatra::Application
-    end
-
-    def test_it_returns_entry_points
-      get_auth_url '/api'
-      (last_xml_response/'/api/link').length.should > 0
-    end
-
-    def test_it_has_correct_attributes_set
-      get_auth_url '/api'
-      (last_xml_response/'/api/link').each do |link|
-        link.attributes.keys.sort.should == [ 'href', 'rel' ]
-      end
-    end
-
-    def test_it_responses_to_html
-      get_url '/api', {}, { :format => :html }
-      last_response.status.should == 200
-      Nokogiri::HTML(last_response.body).search('html').first.name.should == 'html'
-    end
-
-    def test_it_responses_to_json
-      get_url '/api', {}, { :format => :json }
-      last_response.status.should == 200
-      JSON::parse(last_response.body).class.should == Hash
-      JSON::parse(last_response.body)['api'].class.should == Hash
-    end
-
-    def test_it_switches_drivers
-      with_provider("") do
-        get_auth_url '/api'
-        (last_xml_response/"api/link[rel = 'instances']").first.should_not == nil
-      end
-
-      # Switch to storage-only mock driver
-      with_provider("storage") do
-        get_auth_url '/api'
-        (last_xml_response/"api/link[rel = 'instances']").first.should == nil
-      end
-    end
-
-    def test_it_handles_unsupported_collections
-      get_auth_url '/api/no_such_collection'
-      last_response.status.should == 404
-
-      with_provider("storage") do
-        get_auth_url '/api/instances'
-        last_response.status.should == 403
-      end
-    end
-
-    def test_it_allows_accessing_docs
-      get_url '/api/docs/instances'
-      last_response.status.should == 200
-
-      with_provider("storage") do
-        get_url '/api/docs/instances'
-        last_response.status.should == 403
-      end
-    end
-
-    def test_it_respond_to_head
-      head '/api/instances'
-      last_response.headers['Allow'].should_not == nil
-      last_response.headers['Allow'].split(',').include?('HEAD').should == true
-    end
-
-    def test_it_expose_available_drivers
-      get_auth_url '/api/drivers'
-      last_response.status.should == 200
-      (last_xml_response/"drivers").length.should > 0
-      (last_xml_response/'drivers/driver').length.should > 0
-      (last_xml_response/"drivers/driver[@id = 'mock']").length.should == 1
-    end
+require 'tests/drivers/mock/common'
 
-    def test_it_expose_ec2_driver_entrypoints
-      get_auth_url '/api/drivers'
-      last_response.status.should == 200
-      ec2 = (last_xml_response/'drivers/driver[@id=ec2]').first
-      (ec2/"provider").length.should > 0
-      (ec2/"provider[@id = 'eu-west-1']").length.should == 1
-      get_auth_url ec2[:href]
-      eu_west = (last_xml_response/"provider[@id = 'eu-west-1']").first
-      (eu_west/"entrypoint").length.should > 0
-      (eu_west/"entrypoint[@kind = 'ec2']").length.should == 1
-    end
+describe 'Deltacloud API' do
 
-    def test_it_supports_matrix_params
-      get_auth_url "/api;driver=ec2"
-      last_response.status.should == 200
-      (last_xml_response/'api').first[:driver].should == 'ec2'
-      get_auth_url "/api;driver=mock"
-      (last_xml_response/'api').first[:driver].should == 'mock'
-      get_auth_url "/api;driver=ec2/hardware_profiles"
-      (last_xml_response/'hardware_profiles/hardware_profile/@id').map {|n| n.to_s}.include?('m1.small').should == true
-      last_response.status.should == 200
-    end
+  include Deltacloud::Test
 
-    def test_it_change_features_after_driver_change
-      get_auth_url "/api;driver=ec2"
-      (last_xml_response/'api/link[@rel="instances"]/feature[@name="user_name"]').first.should == nil
-      (last_xml_response/'api/link[@rel="instances"]/feature[@name="user_data"]').first.should_not == nil
-      get_auth_url "/api;driver=mock"
-      (last_xml_response/'api/link[@rel="instances"]/feature[@name="user_name"]').first.should_not == nil
-      (last_xml_response/'api/link[@rel="instances"]/feature[@name="firewalls"]').first.should == nil
-    end
+  eval File.read('tests/minitest_common_api_test.rb')
 
-  end
 end