deltacloud-core 0.4.1 → 0.5.0

data/tests/cimi/features/support/env.rb

@@ -0,0 +1,53 @@
+require 'rubygems'
+require 'nokogiri'
+
+ENV['API_DRIVER'] = 'mock'
+ENV['API_FRONTEND'] = 'cimi'
+ENV.delete('API_VERBOSE')
+
+$top_srcdir = File.join(File.dirname(__FILE__), '..', '..', '..', '..')
+$:.unshift File.join($top_srcdir, 'lib')
+
+load File.join($top_srcdir, 'lib', 'cimi', 'server.rb')
+
+require 'rack/test'
+
+def last_xml_response
+  Nokogiri::XML(last_response.body)
+end
+
+def new_machine
+  @@new_machine
+end
+
+def set_new_machine(machine)
+  @@new_machine = machine
+end
+
+class String
+
+  def to_class_name
+    to_collection_name
+  end
+
+  def to_entity_name
+    to_collection_name.uncapitalize
+  end
+
+  def to_collection_name
+    self.tr(' ', '').singularize
+  end
+
+  def to_collection_uri
+    self.tr(' ', '_').downcase
+  end
+
+  def to_entity_uri
+    to_collection_uri.pluralize
+  end
+
+end
+
+def app
+  Sinatra::Application
+end

data/tests/common.rb

@@ -13,19 +13,22 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 #
+ENV.delete 'API_VERBOSE'
 
-$:.unshift File.join(File.dirname(__FILE__), '..')
+$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+$top_srcdir = File::dirname(File::dirname(__FILE__))
 
 require 'rubygems'
 require 'yaml'
+require 'rspec/core'
+require 'rspec/matchers'
 require 'test/unit'
-require 'spec'
 require 'nokogiri'
 require 'json'
 require 'digest/sha1'
 require 'base64'
 require 'rack/test'
-require 'server'
+require "%s/server" % (ENV['API_FRONTEND'] == 'cimi' ? 'cimi' : 'deltacloud')
 
 driver
 
@@ -41,8 +44,9 @@ configure :test do
   set :show_exceptions, false
 end
 
-Spec::Runner.configure do |conf|
+RSpec.configure do |conf|
   conf.include Rack::Test::Methods
+  conf.expect_with :rspec
 end
 
 module DeltacloudTestCommon
@@ -100,7 +104,9 @@ module DeltacloudTestCommon
       get(uri, params || {}, opts[:auth] ? authenticate(opts) : {})
       if last_response.status.to_s =~ /5(\d{2})/
         puts "============= [ ERROR ] ================"
-        puts last_response.inspect
+        puts last_response.body
+        puts "============= [ RESPONSE ] ================"
+        puts last_response.errors
         puts "========================================"
       end
     end
@@ -112,7 +118,9 @@ module DeltacloudTestCommon
     get_url(uri, params, opts)
     if last_response.status.to_s =~ /5(\d{2})/
       puts "============= [ ERROR ] ================"
-      puts last_response.inspect
+      puts last_response.body
+      puts "============= [ RESPONSE ] ================"
+      puts last_response.errors
       puts "========================================"
     end
   end
@@ -120,14 +128,22 @@ module DeltacloudTestCommon
   def post_url(uri, params={}, opts={})
     header 'Accept', accept(opts[:format] || :xml)
     if DeltacloudTestCommon::recording?
-      VCR.use_cassette("post-" + Digest::SHA1.hexdigest("#{uri}-#{params}")) do
-        post(uri, params || {}, authenticate(opts))
+      if opts['vcr_cassette']
+        VCR.use_cassette(opts['vcr_cassette']) do
+          post(uri, params || {}, authenticate(opts))
+        end
+      else
+        VCR.use_cassette("post-" + Digest::SHA1.hexdigest("#{uri}-#{params}")) do
+          post(uri, params || {}, authenticate(opts))
+        end
       end
     else
       post(uri, params || {}, authenticate(opts))
       if last_response.status.to_s =~ /5(\d{2})/
         puts "============= [ ERROR ] ================"
-        puts last_response.inspect
+        puts last_response.body
+        puts "============= [ RESPONSE ] ================"
+        puts last_response.errors
         puts "========================================"
       end
     end
@@ -141,6 +157,23 @@ module DeltacloudTestCommon
       end
     else
       delete(uri, params || {}, authenticate(opts))
+      if last_response.status.to_s =~ /5(\d{2})/
+        puts "============= [ ERROR ] ================"
+        puts last_response.body
+        puts "============= [ RESPONSE ] ================"
+        puts last_response.errors
+      end
+    end
+  end
+
+  def head_url(uri, params={}, opts={})
+    header 'Accept', accept(opts[:format] || :xml)
+    if DeltacloudTestCommon::recording?
+      VCR.use_cassette("head-"+Digest::SHA1.hexdigest("#{uri}-#{params}")) do
+        head(uri, params || {}, authenticate(opts))
+      end
+    else
+       head(uri, params || {}, authenticate(opts))
       if last_response.status.to_s =~ /5(\d{2})/
         puts "============= [ ERROR ] ================"
         puts last_response.inspect
@@ -159,8 +192,9 @@ module DeltacloudTestCommon
        put(uri, params || {}, authenticate(opts))
       if last_response.status.to_s =~ /5(\d{2})/
         puts "============= [ ERROR ] ================"
-        puts last_response.inspect
-        puts "========================================"
+        puts last_response.body
+        puts "============= [ RESPONSE ] ================"
+        puts last_response.errors
       end
     end
   end
@@ -197,6 +231,50 @@ module DeltacloudTestCommon
     $created_instances << id
   end
 
+ #common variables used by the bucket/blob unit tests across clouds
+  @@created_bucket_name="testbucki2rpux3wdelme"
+  @@created_blob_name="testblobk1ds91kVdelme"
+  @@created_blob_local_file="#{File.dirname(__FILE__)}/drivers/common_fixtures/deltacloud_blob_test.png"
+
+  def check_bucket_basics(bucket, cloud)
+    (bucket/'bucket/name').first.text.should == "#{@@created_bucket_name}#{cloud}"
+    (bucket/'bucket').attribute("id").text.should == "#{@@created_bucket_name}#{cloud}"
+    (bucket/'bucket').length.should > 0
+    (bucket/'bucket/name').first.text.should_not == nil
+    (bucket/'bucket').attribute("href").text.should_not == nil
+  end
+
+  def check_blob_basics(blob, cloud)
+    (blob/'blob').length.should == 1
+    (blob/'blob').attribute("id").text.should_not == nil
+    (blob/'blob').attribute("href").text.should_not==nil
+    (blob/'blob/bucket').text.should_not == nil
+    (blob/'blob/content_length').text.should_not == nil
+    (blob/'blob/content_type').text.should_not == nil
+    (blob/'blob').attribute("id").text.should == "#{@@created_blob_name}#{cloud}"
+    (blob/'blob/bucket').text.should == "#{@@created_bucket_name}#{cloud}"
+    (blob/'blob/content_length').text.to_i.should == 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.eql?(metadata_hash).should == true
+  end
+
+  #hash ordering is unpredictable - sort the params hash
+  #so we get same vcr cassette name each time
+  def stable_vcr_cassette_name(method, uri, params)
+    digest = Digest::SHA1.hexdigest("#{uri}-#{params.sort_by {|k,v| k.to_s}}")
+    return "#{method}-#{digest}"
+  end
+
 end
 
 include DeltacloudTestCommon

data/tests/core_ext/string.rb

@@ -0,0 +1,31 @@
+# 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'
+
+require 'deltacloud/drivers'
+require 'deltacloud/drivers/mock/mock_driver'
+
+module DeltacloudUnitTest
+
+  class StringTest < Test::Unit::TestCase
+    def test_camelize
+      "hello_camel".camelize.should == "helloCamel"
+      "hello_camel_lots_of_humps".camelize.should == "helloCamelLotsOfHumps"
+    end
+  end
+end

data/tests/drivers/google/api_test.rb

@@ -0,0 +1,35 @@
+$:.unshift File.join(File.dirname(__FILE__), '..', '..', '..')
+require 'tests/common'
+
+module GoogleTest
+
+  class ApiTest < Test::Unit::TestCase
+    include Rack::Test::Methods
+
+    def app
+      Sinatra::Application
+    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
+
+    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
+
+    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

@@ -0,0 +1,116 @@
+$:.unshift File.join(File.dirname(__FILE__), '..', '..', '..')
+require 'tests/common'
+#require 'webmock/test_unit'
+module GoogleTest
+
+  class BucketsTest < Test::Unit::TestCase
+    include Rack::Test::Methods
+
+    def app
+      Sinatra::Application
+    end
+
+    @@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
+
+   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
+
+    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
+
+    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
+      check_blob_basics(blob, "googel")
+      check_blob_metadata(blob, {"author"=>"deltacloud", "foo"=>"bar"})
+    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
+
+    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
+    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
+    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
+
+  end
+end

data/tests/drivers/google/setup.rb

@@ -0,0 +1,38 @@
+ENV['API_DRIVER']   = "google"
+ENV['API_USER']     = 'GOOGK7JXLS6UEYS6AYVO'
+ENV['API_PASSWORD'] = 'QjxUunLgszKhBGn/LISQajGR82CfwvraxA9lqnkg'
+
+require 'vcr'
+
+DeltacloudTestCommon::record!
+
+VCR.config do |c|
+  c.cassette_library_dir = "#{File.dirname(__FILE__)}/fixtures/"
+  c.stub_with :excon
+  c.default_cassette_options = { :record => :new_episodes}
+end
+
+#monkey patch fix for VCR normalisation code:
+#see https://github.com/myronmarston/vcr/issues/4
+#when body is a tempfile, like when creating new blob
+#this method of normalisation fails and excon throws errors
+#(Excon::Errors::SocketError:can't convert Tempfile into String)
+#
+#RELEVANT: https://github.com/myronmarston/vcr/issues/101
+#(will need revisiting when vcr 2 comes along)
+
+module VCR
+  module Normalizers
+    module Body
+
+    private
+    def normalize_body
+     self.body = case body
+          when nil, ''; nil
+          else
+            String.new(body) unless body.is_a?(Tempfile)
+        end
+      end
+    end
+  end
+end

data/tests/drivers/mock/instances_test.rb

@@ -109,18 +109,33 @@ module DeltacloudUnitTest
       test_instance_attributes(last_xml_response/'instance')
     end
 
-    def test_it_create_a_new_instance_using_image_id_and_name_and_hwp
+    def test_it_create_a_new_instance_using_image_id_and_name_and_hwp_storage_and_hwp_cpu
       params = {
         :image_id => 'img1',
-        :name => "unit_test_instance1",
-        :hwp_id => "m1-xlarge"
+        :realm_id => '',
+        :name => "unit_test_instance3",
+        :hwp_id => "m1-large",
+        :hwp_storage => '850',
+        :hwp_memory => '7680.0',
+        :hwp_cpu => "1.0",
+      }
+      post_url '/api/instances', params
+      last_response.status.should == 400
+    end
+
+    def test_it_create_a_new_instance_using_image_id_and_name_and_hwp_storage
+      params = {
+        :image_id => 'img1',
+        :name => "unit_test_instance2",
+        :hwp_id => "m1-small",
+        :hwp_storage => "160"
       }
       post_url '/api/instances', params
       last_response.status.should == 201
       last_response.headers['Location'].should_not == nil
       get_auth_url last_response.headers['Location'], {}
-      (last_xml_response/'instance/name').text.should == 'unit_test_instance1'
-      (last_xml_response/'instance/hardware_profile').first['id'].should == 'm1-xlarge'
+      (last_xml_response/'instance/name').text.should == 'unit_test_instance2'
+      (last_xml_response/'instance/hardware_profile').first['id'].should == 'm1-small'
       add_created_instance (last_xml_response/'instance').first['id']
       test_instance_attributes(last_xml_response/'instance')
     end