fog-maestrodev 1.8.0.20130114204828 → 1.14.0.20130806165225

data/tests/openstack/models/storage/file_tests.rb

@@ -0,0 +1,178 @@
+Shindo.tests('Fog::OpenStack::Storage | file', ['openstack']) do
+
+  pending if Fog.mocking?
+
+  def object_meta_attributes
+    @instance.service.head_object(@directory.key, @instance.key).headers.reject {|k, v| !(k =~ /X-Object-Meta-/)}
+  end
+
+  def clear_metadata
+    @instance.metadata.tap do |metadata|
+      metadata.each_pair {|k, v| metadata[k] = nil }
+    end
+  end
+
+  file_attributes = {
+    :key => 'fog_file_tests',
+    :body => lorem_file
+  }
+
+  directory_attributes = {
+    # Add a random suffix to prevent collision
+    :key => "fogfilestests-#{rand(65536)}"
+  }
+
+  @directory = Fog::Storage[:openstack].
+    directories.
+    create(directory_attributes)
+
+  model_tests(@directory.files, file_attributes.merge(:etag => 'foo'), Fog.mocking?) do
+    tests('#save should not blow up with etag') do
+      @instance.save
+    end
+  end
+
+  model_tests(@directory.files, file_attributes, Fog.mocking?) do
+
+    tests("#metadata should load empty metadata").returns({}) do
+      @instance.metadata
+    end
+
+    tests('#save') do
+
+      tests('#metadata') do
+
+        before do
+          @instance.metadata[:foo] = 'bar'  
+          @instance.save
+        end
+
+        after do
+          clear_metadata
+          @instance.save
+        end
+
+        tests("should update metadata").returns('bar') do
+          object_meta_attributes['X-Object-Meta-Foo']
+        end
+
+        tests('should cache metadata').returns('bar') do
+          @instance.metadata[:foo]
+        end
+
+        tests('should remove empty metadata').returns({}) do
+          @instance.metadata[:foo] = nil
+          @instance.save
+          object_meta_attributes
+        end
+
+      end
+    
+      tests('#metadata keys') do
+        
+        after do
+          clear_metadata
+          @instance.save
+        end
+
+        @instance.metadata[:foo_bar] = 'baz'  
+        tests("should support compound key names").returns('baz') do
+          @instance.save
+          object_meta_attributes['X-Object-Meta-Foo-Bar']
+        end
+
+        @instance.metadata['foo'] = 'bar'  
+        tests("should support string keys").returns('bar') do
+          @instance.save
+          object_meta_attributes['X-Object-Meta-Foo']
+        end
+
+        @instance.metadata['foo_bar'] = 'baz'  
+        tests("should support compound string key names").returns('baz') do
+          @instance.save
+          object_meta_attributes['X-Object-Meta-Foo-Bar']
+        end
+
+        @instance.metadata['foo-bar'] = 'baz'  
+        tests("should support hyphenated keys").returns('baz') do
+          @instance.save
+          object_meta_attributes['X-Object-Meta-Foo-Bar']
+        end
+
+        @instance.metadata['foo-bar']  = 'baz'  
+        @instance.metadata[:'foo_bar'] = 'bref'  
+        tests("should only support one value per metadata key").returns('bref') do
+          @instance.save
+          object_meta_attributes['X-Object-Meta-Foo-Bar']
+        end
+
+      end
+
+    end
+
+    tests("#access_control_allow_origin") do
+
+      tests("#access_control_allow_origin should default to nil").returns(nil) do
+        @instance.access_control_allow_origin
+      end
+
+      @instance.access_control_allow_origin = 'http://example.com'
+      @instance.save              
+      tests("#access_control_allow_origin should return access control attribute").returns('http://example.com') do
+        @instance.access_control_allow_origin
+      end
+
+      @instance.access_control_allow_origin = 'foo'
+      @instance.save              
+      tests("#access_control_allow_origin= should update access_control_allow_origin").returns('bar') do
+        @instance.access_control_allow_origin = 'bar'
+        @instance.save                
+        @instance.access_control_allow_origin
+      end
+
+      tests("#access_control_allow_origin= should not blow up on nil") do
+        @instance.access_control_allow_origin = nil
+        @instance.save                        
+      end
+
+    end
+
+  end
+
+
+  model_tests(@directory.files, file_attributes, Fog.mocking?) do
+
+    tests("#origin") do
+
+      tests("#origin should default to nil").returns(nil) do
+        @instance.save                        
+        @instance.origin
+      end
+
+      @instance.origin = 'http://example.com'
+      @instance.save
+      tests("#origin should return access control attributes").returns('http://example.com') do
+        @instance.origin
+      end
+      @instance.attributes.delete('Origin')
+
+      @instance.origin = 'foo'
+      @instance.save      
+      tests("#origin= should update origin").returns('bar') do
+        @instance.origin = 'bar'
+        @instance.save
+        @instance.origin
+      end
+
+      tests("#origin= should not blow up on nil") do
+        @instance.origin = nil
+        @instance.save        
+      end
+
+    end
+
+  end
+
+  @directory.destroy
+
+end

data/tests/openstack/requests/compute/address_tests.rb

@@ -12,6 +12,10 @@ Shindo.tests('Fog::Compute[:openstack] | address requests', ['openstack']) do
     "pool" => String
   }
 
+  @address_pools_format = {
+    "name" => String
+  }
+  
   tests('success') do
 
     tests('#allocate_address').formats({"floating_ip" => @address_format}) do
@@ -29,6 +33,10 @@ Shindo.tests('Fog::Compute[:openstack] | address requests', ['openstack']) do
       compute.get_address(@address_id).body
     end
 
+    tests('#list_address_pools').formats({"floating_ip_pools" => [@address_pools_format]}) do
+      compute.list_address_pools.body
+    end
+    
     compute.servers.get(@server_id).wait_for { ready? }
 
     tests('#associate_address(server_id, ip_address)').succeeds do

data/tests/openstack/requests/compute/flavor_tests.rb

@@ -37,6 +37,18 @@ Shindo.tests('Fog::Compute[:openstack] | flavor requests', ['openstack']) do
       Fog::Compute[:openstack].delete_flavor('100')
     end
 
+    tests('add_flavor_access(flavor_ref, tenant_id)').formats({'flavor_access' => [{'tenant_id' => 1, 'flavor_id' => 1}]}) do
+      Fog::Compute[:openstack].add_flavor_access(1, 1).body
+    end
+
+    tests('remove_flavor_access(flavor_ref, tenant_id)').formats({'flavor_access' => []}) do
+      Fog::Compute[:openstack].remove_flavor_access(1, 1).body
+    end
+
+    tests('list_tenants_with_flavor_access(flavor_ref)').formats({'flavor_access' => [{'tenant_id' => nil, 'flavor_id' => 1}]}) do
+      Fog::Compute[:openstack].list_tenants_with_flavor_access(1).body
+    end
+
   end
 
   tests('failure') do

data/tests/openstack/requests/compute/limit_tests.rb

@@ -29,7 +29,7 @@ Shindo.tests('Fog::Compute[:openstack] | limits requests', ['openstack']) do
     'totalRAMUsed'              => Fixnum,
     'totalInstancesUsed'        => Fixnum,
     'totalSecurityGroupsUsed'   => Fixnum,
-    'totalKeyPairsUsed'         => Fixnum
+    'totalFloatingIpsUsed'      => Fixnum
   }
 
   @limits_format = {

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

@@ -4,11 +4,11 @@ Shindo.tests('Fog::Compute[:openstack] | tenant requests', ['openstack']) do
     'id'    => String,
     'name'  => String,
     'enabled'    => Fog::Boolean,
-    'description' => String
+    'description' => Fog::Nullable::String
   }
 
   tests('success') do
-    tests('#list_tenants').formats({'tenants' => [@tenant_format]}) do
+    tests('#list_tenants').formats({'tenants_links' => Array, 'tenants' => [@tenant_format]}) do
       Fog::Compute[:openstack].list_tenants.body
     end
 

data/tests/openstack/requests/compute/volume_tests.rb

@@ -4,9 +4,9 @@ Shindo.tests('Fog::Compute[:openstack] | volume requests', ['openstack']) do
 
   @volume_format = {
     'id'                  => String,
-    'display_name'        => String,
+    'name'                => String,
     'size'                => Integer,
-    'display_description' => String,
+    'description'         => String,
     'status'              => String,
     'snapshot_id'         => Fog::Nullable::String,
     'availability_zone'   => String,
@@ -16,23 +16,25 @@ Shindo.tests('Fog::Compute[:openstack] | volume requests', ['openstack']) do
   }
 
   tests('success') do
+    tests('#create_volume').formats({'volume' => @volume_format}) do
+      pending unless Fog.mocking?
+      Fog::Compute[:openstack].create_volume('loud', 'this is a loud volume', 3).body
+    end
+
     tests('#list_volumes').formats({'volumes' => [@volume_format]}) do
       Fog::Compute[:openstack].list_volumes.body
     end
 
     tests('#get_volume_detail').formats({'volume' => @volume_format}) do
       pending unless Fog.mocking?
-      Fog::Compute[:openstack].get_volume_details(1).body
-    end
-
-    tests('#create_volume').formats({'volume' => @volume_format}) do
-      pending unless Fog.mocking?
-      Fog::Compute[:openstack].create_volume('loud', 'this is a loud volume', 3).body
+      volume_id = Fog::Compute[:openstack].volumes.all.first.id
+      Fog::Compute[:openstack].get_volume_details(volume_id).body
     end
 
     tests('#delete_volume').succeeds do
       pending unless Fog.mocking?
-      Fog::Compute[:openstack].delete_volume(1)
+      volume_id = Fog::Compute[:openstack].volumes.all.first.id
+      Fog::Compute[:openstack].delete_volume(volume_id)
     end
   end
 end

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

@@ -7,12 +7,15 @@ Shindo.tests('Fog::Identity[:openstack] | EC2 credential requests', ['openstack'
     'user_id'   => String,
   }
 
+  @user_id = OpenStack::Identity.get_user_id
+  @tenant_id = OpenStack::Identity.get_tenant_id
+
   tests('success') do
     tests('#create_ec2_credential').
       formats({'credential' => @credential_format}) do
       response =
         Fog::Identity[:openstack].
-          create_ec2_credential('user_id', 'tenant_id')
+          create_ec2_credential(@user_id, @tenant_id)
 
       @ec2_credential = response.body['credential']
 
@@ -22,18 +25,18 @@ Shindo.tests('Fog::Identity[:openstack] | EC2 credential requests', ['openstack'
     tests('#get_ec2_credential').
       formats({'credential' => @credential_format}) do
       Fog::Identity[:openstack].
-        get_ec2_credential('user_id', @ec2_credential['access']).body
+        get_ec2_credential(@user_id, @ec2_credential['access']).body
     end
 
     tests('#list_ec2_credentials').
       formats({'credentials' => [@credential_format]}) do
       Fog::Identity[:openstack].
-        list_ec2_credentials('user_id').body
+        list_ec2_credentials(@user_id).body
     end
 
     tests('#delete_ec2_credential').succeeds do
       Fog::Identity[:openstack].
-        delete_ec2_credential('user_id', @ec2_credential['access'])
+        delete_ec2_credential(@user_id, @ec2_credential['access'])
     end
 
   end

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

@@ -0,0 +1,17 @@
+class OpenStack
+
+  module Identity
+
+    def self.get_tenant_id
+      identity = Fog::Identity[:openstack]
+      ENV['OPENSTACK_TENANT_NAME'] || identity.list_tenants.body['tenants'].first['id']
+    end
+
+    def self.get_user_id
+      identity = Fog::Identity[:openstack]
+      ENV['OPENSTACK_USER_ID'] || identity.list_users.body['users'].first['id']
+    end
+
+  end
+
+end

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