fog-maestrodev 1.7.0.20121114190951 → 1.8.0.20130109172219

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

@@ -0,0 +1,41 @@
+Shindo.tests('Fog::Identity[:openstack] | EC2 credential requests', ['openstack']) do
+
+  @credential_format = {
+    'access'    => String,
+    'tenant_id' => String,
+    'secret'    => String,
+    'user_id'   => String,
+  }
+
+  tests('success') do
+    tests('#create_ec2_credential').
+      formats({'credential' => @credential_format}) do
+      response =
+        Fog::Identity[:openstack].
+          create_ec2_credential('user_id', 'tenant_id')
+
+      @ec2_credential = response.body['credential']
+
+      response.body
+    end
+
+    tests('#get_ec2_credential').
+      formats({'credential' => @credential_format}) do
+      Fog::Identity[:openstack].
+        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
+    end
+
+    tests('#delete_ec2_credential').succeeds do
+      Fog::Identity[:openstack].
+        delete_ec2_credential('user_id', @ec2_credential['access'])
+    end
+
+  end
+
+end

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

@@ -1,5 +1,4 @@
 Shindo.tests('Fog::Identity[:openstack] | role requests', ['openstack']) do
-
   @role_format = {
     'id'   => String,
     'name' => String

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

@@ -17,6 +17,14 @@ Shindo.tests('Fog::Identity[:openstack] | user requests', ['openstack']) do
       Fog::Identity[:openstack].list_users.body
     end
 
+    tests('#get_user_by_id').formats(@user_format) 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
+    end
+
     tests("#update_user(#{@user['id']}, :name => 'fogupdateduser')").succeeds do
       Fog::Identity[:openstack].update_user(@user['id'], :name => 'fogupdateduser', :email => 'fog@test.com')
     end

data/tests/rackspace/models/block_storage/snapshot_tests.rb

@@ -3,18 +3,25 @@ Shindo.tests('Fog::Rackspace::BlockStorage | snapshot', ['rackspace']) do
   pending if Fog.mocking?
 
   service = Fog::Rackspace::BlockStorage.new
-  volume = service.volumes.create({
-    :display_name => "fog_#{Time.now.to_i.to_s}",
-    :size => 100
-  })
+  begin
+    volume = service.volumes.create({
+      :display_name => "fog_#{Time.now.to_i.to_s}",
+      :size => 100
+    })
 
-  volume.wait_for { ready? }
+    volume.wait_for { ready? }
 
-  options = { :display_name => "fog_#{Time.now.to_i.to_s}", :volume_id => volume.id }
-  model_tests(service.snapshots, options, false) do
-    @instance.wait_for { ready? }
-  end
+    options = { :display_name => "fog_#{Time.now.to_i.to_s}", :volume_id => volume.id }
+    model_tests(service.snapshots, options, false) do
+      @instance.wait_for { ready? }
+    
+      tests('double save').raises(Fog::Rackspace::BlockStorage::IdentifierTaken) do
+        @instance.save
+      end    
+    end
 
-  volume.wait_for { snapshots.empty? }
-  volume.destroy
+    volume.wait_for { snapshots.empty? }
+  ensure
+    volume.destroy if volume
+  end
 end

data/tests/rackspace/models/block_storage/volume_tests.rb

@@ -6,7 +6,11 @@ Shindo.tests('Fog::Rackspace::BlockStorage | volume', ['rackspace']) do
   options = { :display_name => "fog_#{Time.now.to_i.to_s}", :size => 100 }
 
   model_tests(service.volumes, options, false) do
-    @instance.wait_for { ready? }
+    @instance.wait_for(timeout=1200) { ready? }
+
+    tests('double save').raises(Fog::Rackspace::BlockStorage::IdentifierTaken) do
+      @instance.save
+    end
 
     tests('#attached?').succeeds do
       @instance.state = 'in-use'
@@ -14,12 +18,14 @@ Shindo.tests('Fog::Rackspace::BlockStorage | volume', ['rackspace']) do
     end
 
     tests('#snapshots').succeeds do
-      snapshot = service.snapshots.create({ :volume_id => @instance.id })
-      snapshot.wait_for { ready? }
-
-      returns(true) { @instance.snapshots.first.id == snapshot.id }
-
-      snapshot.destroy
+      begin
+        snapshot = @instance.create_snapshot
+        snapshot.wait_for(timeout=1200) { ready? }
+
+        returns(true) { @instance.snapshots.first.id == snapshot.id }
+      ensure
+        snapshot.destroy if snapshot
+      end
     end
 
     @instance.wait_for { snapshots.empty? }

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

@@ -0,0 +1,28 @@
+Shindo.tests('Fog::Compute::RackspaceV2 | image', ['rackspace']) do
+
+  pending if Fog.mocking?
+
+  service = Fog::Compute::RackspaceV2.new
+  test_time = Time.now.to_i.to_s
+  options = {
+    :name => "fog_server_#{test_time}",
+    :flavor_id => 2,
+    :image_id => '3afe97b2-26dc-49c5-a2cc-a2fc8d80c001'
+  }
+  
+
+  tests("success") do
+    begin
+      server = service.servers.create(options)
+      server.wait_for { ready? }
+      image_id = server.create_image("fog_image_#{test_time}")
+      image = service.images.get(image_id)        
+    
+      tests("destroy").succeeds do
+        image.destroy
+      end
+    ensure
+      server.destroy if server
+    end
+  end  
+end

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

@@ -59,4 +59,19 @@ Shindo.tests('Fog::Compute::RackspaceV2 | server', ['rackspace']) do
 
     @instance.wait_for { ready? }
   end
+  
+  # When after testing resize/resize_confirm we get a 409 when we try to resize_revert so I am going to split it into two blocks
+  model_tests(service.servers, options, false) do
+    @instance.wait_for { ready? }
+    tests('#resize').succeeds do
+      @instance.resize(4)
+      returns('RESIZE') { @instance.state }
+    end
+  
+    @instance.wait_for { state == 'VERIFY_RESIZE' }
+    tests('#revert_resize').succeeds do
+      @instance.revert_resize
+    end
+    @instance.wait_for { ready? }    
+  end  
 end

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

@@ -11,4 +11,10 @@ Shindo.tests('Fog::Compute::RackspaceV2 | servers', ['rackspace']) do
   collection_tests(service.servers, options, false) do
     @instance.wait_for { ready? }
   end
+
+  tests("#bootstrap").succeeds do
+    @server = service.servers.bootstrap(options)
+  end
+  @server.destroy
+
 end

data/tests/rackspace/models/load_balancers/load_balancer_tests.rb

@@ -36,6 +36,23 @@ Shindo.tests('Fog::Rackspace::LoadBalancers | load_balancer', ['rackspace']) do
         returns(false) { @instance.connection_logging }
       end
 
+   @instance.wait_for { ready? }
+      tests('#enable_content_caching').succeeds do
+        @instance.enable_content_caching
+        returns(true) { @instance.content_caching }
+      end
+
+      tests('#enable_content_caching after reload').succeeds do
+        @instance.reload
+        returns(true) { @instance.content_caching }
+      end
+
+      @instance.wait_for { ready? }
+      tests('#disable_content_caching').succeeds do
+        @instance.disable_content_caching
+        returns(false) { @instance.content_caching }
+      end
+
       tests('#usage').succeeds do
         @instance.usage
       end

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

@@ -0,0 +1,178 @@
+Shindo.tests('Fog::Rackspace::Storage | file', ['rackspace']) do
+
+  pending if Fog.mocking?
+
+  def object_meta_attributes
+    @instance.connection.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[:rackspace].
+    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/rackspace/requests/compute/address_tests.rb

@@ -1,19 +1,21 @@
 Shindo.tests('Fog::Compute[:rackspace] | address requests', ['rackspace']) do
 
+  @service = Fog::Compute.new(:provider => :rackspace, :version => :v1)
+  
   tests('success') do
-
-    @server = Fog::Compute[:rackspace].servers.create(:flavor_id => 1, :image_id => 19)
+ 
+    @server = @service.servers.create(:flavor_id => 1, :image_id => 19)
 
     tests("#list_addresses(#{@server.id})").formats({'addresses' => {'private' => [String], 'public' => [String]}}) do
-      Fog::Compute[:rackspace].list_addresses(@server.id).body
+      @service.list_addresses(@server.id).body
     end
 
     tests("#list_private_addresses(#{@server.id})").formats({'private' => [String]}) do
-      Fog::Compute[:rackspace].list_private_addresses(@server.id).body
+      @service.list_private_addresses(@server.id).body
     end
 
     tests("#list_public_addresses(#{@server.id})").formats({'public' => [String]}) do
-      Fog::Compute[:rackspace].list_public_addresses(@server.id).body
+      @service.list_public_addresses(@server.id).body
     end
 
     @server.wait_for { ready? }
@@ -22,17 +24,17 @@ Shindo.tests('Fog::Compute[:rackspace] | address requests', ['rackspace']) do
   end
 
   tests('failure') do
-
+  
     tests('#list_addresses(0)').raises(Fog::Compute::Rackspace::NotFound) do
-      Fog::Compute[:rackspace].list_addresses(0)
+      @service.list_addresses(0)
     end
 
     tests('#list_private_addresses(0)').raises(Fog::Compute::Rackspace::NotFound) do
-      Fog::Compute[:rackspace].list_private_addresses(0)
+      @service.list_private_addresses(0)
     end
 
     tests('#list_public_addresses(0)').raises(Fog::Compute::Rackspace::NotFound) do
-      Fog::Compute[:rackspace].list_public_addresses(0)
+      @service.list_public_addresses(0)
     end
 
   end