fog 1.9.0 → 1.10.0

data/tests/openstack/requests/identity/role_tests.rb

@@ -27,7 +27,13 @@ Shindo.tests('Fog::Identity[:openstack] | role requests', ['openstack']) do
       Fog::Identity[:openstack].list_roles_for_user_on_tenant(@tenant['id'], @user['id']).body['roles']
     end
 
+    tests("#delete_user_role with tenant").returns("") do
+      Fog::Identity[:openstack].delete_user_role(@tenant['id'], @user['id'], @role['id']).body
+    end
+
     tests("#delete_user_role with tenant").formats(@role_format) do
+      # FIXME - Response (under mocks) is empty String which does not match schema
+      pending
       Fog::Identity[:openstack].delete_user_role(@tenant['id'], @user['id'], @role['id']).body
     end
 

data/tests/openstack/requests/identity/tenant_tests.rb

@@ -4,8 +4,7 @@ Shindo.tests('Fog::Identity[:openstack] | tenant requests', ['openstack']) do
     'id'   => String,
     'name' => String,
     'enabled'     => Fog::Nullable::Boolean,
-    'description' => Fog::Nullable::String,
-    'extra' => Fog::Nullable::Hash
+    'description' => Fog::Nullable::String
   }
 
   @role_format = {
@@ -13,6 +12,10 @@ Shindo.tests('Fog::Identity[:openstack] | tenant requests', ['openstack']) do
     'name' => String
   }
 
+  @tenant_name = Fog::Mock.random_hex(64)
+  @tenant_name_update = Fog::Mock.random_hex(64)
+  @tenant_name_update2 = Fog::Mock.random_hex(64)
+
   tests('success') do
     tests('#list_tenants').formats({'tenants' => [@tenant_format], 'tenants_links' => []}) do
       Fog::Identity[:openstack].list_tenants.body
@@ -20,34 +23,33 @@ Shindo.tests('Fog::Identity[:openstack] | tenant requests', ['openstack']) do
 
     tests('#list_roles_for_user_on_tenant(0,1)').
       formats({'roles' => [@role_format]}) do
-      user = Fog::Identity[:openstack].create_user("testuser", "passw", "e@mail.co", "us3r1d").body['user']
 
       openstack = Fog::Identity[:openstack]
       openstack.list_roles_for_user_on_tenant(
-        openstack.current_tenant['id'], user['id']).body
+        openstack.current_tenant['id'], OpenStack::Identity.get_user_id).body
     end
 
     tests('#create_tenant').formats({'tenant' => @tenant_format}) do
-      @instance = Fog::Identity[:openstack].create_tenant('name' => 'test').body
+      @tenant = Fog::Identity[:openstack].create_tenant('name' => @tenant_name).body
     end
 
     tests('#get_tenant').formats({'tenant' => @tenant_format}) do
-      Fog::Identity[:openstack].get_tenant(@instance['tenant']['id']).body
+      Fog::Identity[:openstack].get_tenant(@tenant['tenant']['id']).body
     end
 
     tests('#update_tenant check format').formats({'tenant' => @tenant_format}) do
-      @instance = Fog::Identity[:openstack].update_tenant(
-        @instance['tenant']['id'], 'name' => 'test2').body
+      @tenant = Fog::Identity[:openstack].update_tenant(
+        @tenant['tenant']['id'], 'name' => @tenant_name_update).body
     end
 
     tests('#update_tenant update name').succeeds do
-      @instance = Fog::Identity[:openstack].update_tenant(
-        @instance['tenant']['id'], 'name' => 'test3').body
-      @instance['tenant']['name'] == 'test3'
+      @tenant = Fog::Identity[:openstack].update_tenant(
+        @tenant['tenant']['id'], 'name' => @tenant_name_update2).body
+      @tenant['tenant']['name'] == @tenant_name_update2
     end
 
     tests('#delete_tenant').succeeds do
-      Fog::Identity[:openstack].delete_tenant(@instance['tenant']['id'])
+      Fog::Identity[:openstack].delete_tenant(@tenant['tenant']['id'])
     end
 
   end

data/tests/openstack/requests/identity/user_tests.rb

@@ -9,8 +9,12 @@ Shindo.tests('Fog::Identity[:openstack] | user requests', ['openstack']) do
   }
 
   tests('success') do
-    tests('#create_user("Onamae", "spoof", "user@email.com", "t3n4nt1d", true)').formats(@user_format, false) do
-      @user = Fog::Identity[:openstack].create_user("Onamae", "spoof", "morph@example.com", "m0rPh1d").body['user']
+
+    @user_name = Fog::Mock.random_hex(64)
+    @user_name_update = Fog::Mock.random_hex(64)
+
+    tests("#create_user('#{@user_name}', 'mypassword', 'morph@example.com', 't3n4nt1d', true)").formats(@user_format, false) do
+      @user = Fog::Identity[:openstack].create_user(@user_name, "mypassword", "morph@example.com", OpenStack::Identity.get_tenant_id).body['user']
     end
 
     tests('#list_users').formats({'users' => [@user_format]}) do
@@ -21,12 +25,12 @@ Shindo.tests('Fog::Identity[:openstack] | user requests', ['openstack']) do
       Fog::Identity[:openstack].get_user_by_id(@user['id']).body['user']
     end
 
-    tests('#get_user_by_name').formats({'users' => [@user_format]}) do
-      Fog::Identity[:openstack].get_user_by_name(@user['name']).body
+    tests('#get_user_by_name').formats(@user_format) do
+      Fog::Identity[:openstack].get_user_by_name(@user['name']).body['user']
     end
 
     tests("#update_user(#{@user['id']}, :name => 'fogupdateduser')").succeeds do
-      Fog::Identity[:openstack].update_user(@user['id'], :name => 'fogupdateduser', :email => 'fog@test.com')
+      Fog::Identity[:openstack].update_user(@user['id'], :name => @user_name_update, :email => 'fog@test.com')
     end
 
     tests("#delete_user(#{@user['id']})").succeeds do

data/tests/openstack/requests/storage/container_tests.rb

@@ -0,0 +1,64 @@
+Shindo.tests('Fog::Storage[:openstack] | container requests', ["openstack"]) do
+
+  @container_format = [String]
+
+  @containers_format = [{
+    'bytes' => Integer,
+    'count' => Integer,
+    'name'  => String
+  }]
+
+  tests('success') do
+
+    tests("#put_container('fogcontainertests')").succeeds do
+      pending if Fog.mocking?
+      Fog::Storage[:openstack].put_container('fogcontainertests')
+    end
+
+    tests("#get_container('fogcontainertests')").formats(@container_format) do
+      pending if Fog.mocking?
+      Fog::Storage[:openstack].get_container('fogcontainertests').body
+    end
+
+    tests("#get_containers").formats(@containers_format) do
+      pending if Fog.mocking?
+      Fog::Storage[:openstack].get_containers.body
+    end
+
+    tests("#head_container('fogcontainertests')").succeeds do
+      pending if Fog.mocking?
+      Fog::Storage[:openstack].head_container('fogcontainertests')
+    end
+
+    tests("#head_containers").succeeds do
+      pending if Fog.mocking?
+      Fog::Storage[:openstack].head_containers
+    end
+
+    tests("#delete_container('fogcontainertests')").succeeds do
+      pending if Fog.mocking?
+      Fog::Storage[:openstack].delete_container('fogcontainertests')
+    end
+
+  end
+
+  tests('failure') do
+
+    tests("#get_container('fognoncontainer')").raises(Fog::Storage::OpenStack::NotFound) do
+      pending if Fog.mocking?
+      Fog::Storage[:openstack].get_container('fognoncontainer')
+    end
+
+    tests("#head_container('fognoncontainer')").raises(Fog::Storage::OpenStack::NotFound) do
+      pending if Fog.mocking?
+      Fog::Storage[:openstack].head_container('fognoncontainer')
+    end
+
+    tests("#delete_container('fognoncontainer')").raises(Fog::Storage::OpenStack::NotFound) do
+      pending if Fog.mocking?
+      Fog::Storage[:openstack].delete_container('fognoncontainer')
+    end
+
+  end
+
+end

data/tests/openstack/requests/storage/large_object_tests.rb

@@ -0,0 +1,47 @@
+Shindo.tests('Fog::Storage[:openstack] | large object requests', ["openstack"]) do
+
+  unless Fog.mocking?
+    @directory = Fog::Storage[:openstack].directories.create(:key => 'foglargeobjecttests')
+  end
+
+  tests('success') do
+
+    tests("#put_object('foglargeobjecttests', 'fog_large_object/1', ('x' * 6 * 1024 * 1024))").succeeds do
+      pending if Fog.mocking?
+      Fog::Storage[:openstack].put_object(@directory.identity, 'fog_large_object/1', ('x' * 6 * 1024 * 1024))
+    end
+
+    tests("#put_object('foglargeobjecttests', 'fog_large_object/2', ('x' * 4 * 1024 * 1024))").succeeds do
+      pending if Fog.mocking?
+      Fog::Storage[:openstack].put_object(@directory.identity, 'fog_large_object/2', ('x' * 4 * 1024 * 1024))
+    end
+
+    tests("#put_object_manifest('foglargeobjecttests', 'fog_large_object')").succeeds do
+      pending if Fog.mocking?
+      Fog::Storage[:openstack].put_object_manifest(@directory.identity, 'fog_large_object')
+    end
+
+    tests("#get_object('foglargeobjecttests', 'fog_large_object').body").succeeds do
+      pending if Fog.mocking?
+      Fog::Storage[:openstack].get_object(@directory.identity, 'fog_large_object').body == ('x' * 10 * 1024 * 1024)
+    end
+
+    unless Fog.mocking?
+      ['fog_large_object', 'fog_large_object/1', 'fog_large_object/2'].each do |key|
+        @directory.files.new(:key => key).destroy
+      end
+    end
+
+  end
+
+  tests('failure') do
+
+    tests("put_object_manifest")
+
+  end
+
+  unless Fog.mocking?
+    @directory.destroy
+  end
+
+end

data/tests/openstack/requests/storage/object_tests.rb

@@ -0,0 +1,84 @@
+Shindo.tests('Fog::Storage[:openstack] | object requests', ["openstack"]) do
+
+  unless Fog.mocking?
+    @directory = Fog::Storage[:openstack].directories.create(:key => 'fogobjecttests')
+  end
+
+  module OpenStackStorageHelpers
+    def override_path(path)
+      @path = path
+    end
+  end
+
+  tests('success') do
+
+    tests("#put_object('fogobjecttests', 'fog_object')").succeeds do
+      pending if Fog.mocking?
+      Fog::Storage[:openstack].put_object('fogobjecttests', 'fog_object', lorem_file)
+    end
+
+    tests("#get_object('fogobjectests', 'fog_object')").succeeds do
+      pending if Fog.mocking?
+      Fog::Storage[:openstack].get_object('fogobjecttests', 'fog_object')
+    end
+
+    tests("#get_object('fogobjecttests', 'fog_object', &block)").returns(lorem_file.read) do
+      pending if Fog.mocking?
+      data = ''
+      Fog::Storage[:openstack].get_object('fogobjecttests', 'fog_object') do |chunk, remaining_bytes, total_bytes|
+        data << chunk
+      end
+      data
+    end
+
+    tests("#head_object('fogobjectests', 'fog_object')").succeeds do
+      pending if Fog.mocking?
+      Fog::Storage[:openstack].head_object('fogobjecttests', 'fog_object')
+    end
+
+    tests("#delete_object('fogobjecttests', 'fog_object')").succeeds do
+      pending if Fog.mocking?
+      Fog::Storage[:openstack].delete_object('fogobjecttests', 'fog_object')
+    end
+
+  end
+
+  tests('failure') do
+
+    tests("#get_object('fogobjecttests', 'fog_non_object')").raises(Fog::Storage::OpenStack::NotFound) do
+      pending if Fog.mocking?
+      Fog::Storage[:openstack].get_object('fogobjecttests', 'fog_non_object')
+    end
+
+    tests("#get_object('fognoncontainer', 'fog_non_object')").raises(Fog::Storage::OpenStack::NotFound) do
+      pending if Fog.mocking?
+      Fog::Storage[:openstack].get_object('fognoncontainer', 'fog_non_object')
+    end
+
+    tests("#head_object('fogobjecttests', 'fog_non_object')").raises(Fog::Storage::OpenStack::NotFound) do
+      pending if Fog.mocking?
+      Fog::Storage[:openstack].head_object('fogobjecttests', 'fog_non_object')
+    end
+
+    tests("#head_object('fognoncontainer', 'fog_non_object')").raises(Fog::Storage::OpenStack::NotFound) do
+      pending if Fog.mocking?
+      Fog::Storage[:openstack].head_object('fognoncontainer', 'fog_non_object')
+    end
+
+    tests("#delete_object('fogobjecttests', 'fog_non_object')").raises(Fog::Storage::OpenStack::NotFound) do
+      pending if Fog.mocking?
+      Fog::Storage[:openstack].delete_object('fogobjecttests', 'fog_non_object')
+    end
+
+    tests("#delete_object('fognoncontainer', 'fog_non_object')").raises(Fog::Storage::OpenStack::NotFound) do
+      pending if Fog.mocking?
+      Fog::Storage[:openstack].delete_object('fognoncontainer', 'fog_non_object')
+    end
+
+  end
+
+  unless Fog.mocking?
+    @directory.destroy
+  end
+
+end

data/tests/openstack/volume_tests.rb

@@ -0,0 +1,15 @@
+Shindo.tests('Fog::Volume[:openstack]', ['openstack', 'volume']) do
+
+  volume = Fog::Volume[:openstack]
+
+  tests("Volumes collection") do
+    %w{ volumes }.each do |collection|
+      test("it should respond to #{collection}") { volume.respond_to? collection }
+      test("it should respond to #{collection}.all") { eval("volume.#{collection}").respond_to? 'all' }
+      # not implemented
+      #test("it should respond to #{collection}.get") { eval("volume.#{collection}").respond_to? 'get' }
+    end
+  end
+
+end
+

data/tests/rackspace/cdn_tests.rb

@@ -0,0 +1,78 @@
+Shindo.tests('Fog::CDN::Rackspace', ['rackspace']) do
+
+  pending if Fog.mocking?
+  
+  def container_meta_attributes
+    @cdn.head_container(@directory.key).headers
+  end
+
+  def clear_metadata
+    @instance.metadata.tap do |metadata|
+      metadata.each_pair {|k, v| metadata[k] = nil }
+    end
+  end
+
+  directory_attributes = {
+    # Add a random suffix to prevent collision
+    :key => "fogfilestests-#{rand(65536)}"
+  }
+
+  @directory = Fog::Storage[:rackspace].directories.create(directory_attributes)
+  @cdn = @directory.service.cdn
+    
+    begin
+      
+      tests('publish_container').succeeds do
+        returns(nil, "CDN is not enabled") { container_meta_attributes['X-CDN-Enabled'] }
+        urls = @cdn.publish_container @directory
+        returns(true, "hash contains expected urls") { Fog::CDN::Rackspace::Base::URI_HEADERS.values.all? { |url_type| urls[url_type] } }
+        returns("True", "CDN is enabled") { container_meta_attributes['X-Cdn-Enabled'] }        
+      end
+      
+      tests('urls') do
+        tests('CDN enabled container').returns(false) do
+          @cdn.publish_container @directory
+          @cdn.urls(@directory).empty?
+        end
+        tests('Non-CDN enabled container').returns(true) do
+          @cdn.publish_container @directory, false
+          @cdn.urls(@directory).empty?
+        end
+        tests('Non-existent container').returns(true) do
+          non_existent_container = Fog::Storage::Rackspace::Directory.new :key => "non-existent"
+          @cdn.urls(non_existent_container).empty?
+        end
+      end
+      
+      tests('urls_from_headers') do
+        headers = { 
+          "X-Cdn-Streaming-Uri"=>"http://168e307d41afe64f1a62-d1e9259b2132e81da48ed3e1e802ef22.r2.stream.cf1.rackcdn.com", 
+          "X-Cdn-Uri"=>"http://6e8f4bf5125c9c2e4e3a-d1e9259b2132e81da48ed3e1e802ef22.r2.cf1.rackcdn.com", 
+          "Date"=>"Fri, 15 Feb 2013 18:36:41 GMT", 
+          "Content-Length"=>"0", 
+          "X-Trans-Id"=>"tx424df53b79bc43fe994d3cec0c4d2d8a", 
+          "X-Ttl"=>"3600", 
+          "X-Cdn-Ssl-Uri"=>"https://f83cb7d39e0b9ff9581b-d1e9259b2132e81da48ed3e1e802ef22.ssl.cf1.rackcdn.com", 
+          "X-Cdn-Ios-Uri"=>"http://a590286a323fec6aed22-d1e9259b2132e81da48ed3e1e802ef22.iosr.cf1.rackcdn.com", 
+          "X-Cdn-Enabled"=>"True", 
+          "Content-Type"=>"text/html; charset=UTF-8", 
+          "X-Log-Retention"=>"False"
+        }
+          
+          urls = @cdn.send(:urls_from_headers, headers)
+          returns(4) { urls.size }
+          returns("http://168e307d41afe64f1a62-d1e9259b2132e81da48ed3e1e802ef22.r2.stream.cf1.rackcdn.com") { urls[:streaming_uri] }
+          returns("http://6e8f4bf5125c9c2e4e3a-d1e9259b2132e81da48ed3e1e802ef22.r2.cf1.rackcdn.com") { urls[:uri] }
+          returns("https://f83cb7d39e0b9ff9581b-d1e9259b2132e81da48ed3e1e802ef22.ssl.cf1.rackcdn.com") { urls[:ssl_uri] }
+          returns("http://a590286a323fec6aed22-d1e9259b2132e81da48ed3e1e802ef22.iosr.cf1.rackcdn.com") { urls[:ios_uri] }
+      end
+      
+      tests('purge') do
+        pending
+      end
+      
+    ensure
+      @directory.destroy if @directory
+    end
+  
+end

data/tests/rackspace/helper.rb

@@ -36,5 +36,14 @@ module Shindo
       sleep 30 unless Fog.mocking?
     end
 
+    def rackspace_test_image_id(service) 
+      # I chose to use the first Ubuntu because it will work with the smallest flavor and it doesn't require a license
+      @image_id ||= Fog.credentials[:rackspace_image_id] || service.images.find {|img| img.name =~ /Ubuntu/ }.id
+    end
+
+    def rackspace_test_flavor_id(service)
+      @flavor_id ||= Fog.credentials[:rackspace_flavor_id] || service.flavors.first.id
+    end
+
   end  
 end

data/tests/rackspace/models/compute_v2/flavors_tests.rb

@@ -12,6 +12,6 @@ Shindo.tests('Fog::Compute::RackspaceV2 | flavors', ['rackspace']) do
   end
 
   tests("failure").returns(nil) do
-    service.flavors.get('some_random_identity')
+    service.flavors.get(Fog::Rackspace::MockData::NOT_FOUND_ID)
   end
 end

data/tests/rackspace/models/compute_v2/image_tests.rb

@@ -1,13 +1,11 @@
 Shindo.tests('Fog::Compute::RackspaceV2 | image', ['rackspace']) do
   service    = Fog::Compute::RackspaceV2.new
-  flavor_id  = Fog.credentials[:rackspace_flavor_id] || service.flavors.first.id
-  image_id   = Fog.credentials[:rackspace_image_id]  || service.images.first.id
 
   test_time = Time.now.to_i.to_s
   options = {
     :name => "fog_server_#{test_time}",
-    :flavor_id => flavor_id,
-    :image_id => image_id
+    :flavor_id => rackspace_test_flavor_id(service),
+    :image_id => rackspace_test_image_id(service)
   }
 
   tests("success") do

data/tests/rackspace/models/compute_v2/images_tests.rb

@@ -15,6 +15,6 @@ Shindo.tests('Fog::Compute::RackspaceV2 | images', ['rackspace']) do
   end
 
   tests("failure").returns(nil) do
-    service.images.get('some_random_identity')
+    service.images.get(Fog::Rackspace::MockData::NOT_FOUND_ID)
   end
 end