fog 1.7.0 → 1.8.0

data/tests/brightbox/requests/compute/interface_tests.rb

@@ -1,30 +1,44 @@
 Shindo.tests('Fog::Compute[:brightbox] | interface requests', ['brightbox']) do
 
+  @test_service = Fog::Compute[:brightbox]
+
   tests('success') do
 
     unless Fog.mocking?
-      server = Fog::Compute[:brightbox].servers.first
+      server = @test_service.servers.first
+
+      # If no server is available, create one just for the test
+      unless server
+        @test_server = Brightbox::Compute::TestSupport.get_test_server
+        server = @test_server
+      end
+
       @interface_id = server.interfaces.first["id"]
     end
 
     tests("#get_interface('#{@interface_id}')") do
       pending if Fog.mocking?
-      result = Fog::Compute[:brightbox].get_interface(@interface_id)
+      result = @test_service.get_interface(@interface_id)
       formats(Brightbox::Compute::Formats::Full::INTERFACE, false) { result }
     end
 
+    unless Fog.mocking?
+      # If we created a server just for this test, clean it up
+      @test_server.destroy if @test_server
+    end
+
   end
 
   tests('failure') do
 
     tests("#get_interface('int-00000')").raises(Excon::Errors::NotFound) do
       pending if Fog.mocking?
-      Fog::Compute[:brightbox].get_interface('int-00000')
+      @test_service.get_interface('int-00000')
     end
 
     tests("#get_interface()").raises(ArgumentError) do
       pending if Fog.mocking?
-      Fog::Compute[:brightbox].get_interface()
+      @test_service.get_interface()
     end
   end
 

data/tests/dns/models/record_tests.rb

@@ -7,12 +7,24 @@ for provider, config in dns_providers
 
   Shindo.tests("Fog::DNS[:#{provider}] | record", [provider.to_s]) do
 
-    record_attributes = {
-      :name   => 'www.' + domain_name,
+    a_record_attributes = {
+      :name   => 'a.' + domain_name,
       :type   => 'A',
       :value  => '1.2.3.4'
     }.merge!(config[:record_attributes] || {})
 
+    aaaa_record_attributes = {
+      :name   => 'aaaa.' + domain_name,
+      :type   => 'AAAA',
+      :value  => '2001:0db8:0000:0000:0000:ff00:0042:8329'
+    }.merge!(config[:record_attributes] || {})
+
+    cname_record_attributes = {
+      :name   => 'cname.' + domain_name,
+      :type   => 'CNAME',
+      :value  => 'real.' + domain_name
+    }.merge!(config[:record_attributes] || {})
+
     if !Fog.mocking? || config[:mocked]
       zone_attributes = {
         :domain => domain_name
@@ -20,7 +32,9 @@ for provider, config in dns_providers
 
       @zone = Fog::DNS[provider].zones.create(zone_attributes)
 
-      model_tests(@zone.records, record_attributes, config[:mocked])
+      model_tests(@zone.records, a_record_attributes, config[:mocked])
+      model_tests(@zone.records, aaaa_record_attributes, config[:mocked])
+      model_tests(@zone.records, cname_record_attributes, config[:mocked])
 
       @zone.destroy
     end

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

@@ -1,16 +1,10 @@
 Shindo.tests('Fog::Compute[:openstack] | address requests', ['openstack']) do
-  # clean the servers
-=begin  
-  @servers = Fog::Compute[:openstack].servers.each do |server|
-    Fog::Compute[:openstack].list_all_addresses(server.id).body['floating_ips'].each do |ip_add|
-      Fog::Compute[:openstack].release_address(ip_add['id'])
-    end
 
-    Fog::Compute[:openstack].delete_server(server.id)
-  end
-=end
+  compute = Fog::Compute[:openstack]
+  flavor_ref = ENV['OPENSTACK_FLAVOR_REF'] || compute.list_flavors.body['flavors'].first['links'].first['href']
+  image_ref = ENV['OPENSTACK_IMAGE_REF'] || compute.list_images.body['images'].first['links'].first['href']
 
-  @server = Fog::Compute[:openstack].create_server("shindo_test_server", Fog::Compute[:openstack].list_images.body['images'].last['links'].first['href'], Fog::Compute[:openstack].list_flavors.body['flavors'].first['links'].first['href'])
+  @server_id = compute.create_server("shindo_test_server", image_ref, flavor_ref).body['server']['id']
 
   @address_format = {
     "instance_id" => NilClass,
@@ -21,29 +15,38 @@ Shindo.tests('Fog::Compute[:openstack] | address requests', ['openstack']) do
   }
 
   tests('success') do
+
     tests('#allocate_address').formats({"floating_ip" => @address_format}) do
-      Fog::Compute[:openstack].allocate_address.body
+      data = compute.allocate_address.body
+      @address_id = data['floating_ip']['id']
+      @address_ip = data['floating_ip']['ip']
+      data
     end
 
     tests('#list_all_addresses').formats({"floating_ips" => [@address_format]}) do
-      Fog::Compute[:openstack].list_all_addresses.body
+      compute.list_all_addresses.body
     end
 
     tests('#get_address(address_id)').formats({"floating_ip" => @address_format}) do
-      address_id = Fog::Compute[:openstack].addresses.all.first.id
-      Fog::Compute[:openstack].get_address(address_id).body
+      compute.get_address(@address_id).body
     end
 
-    Fog::Compute[:openstack].servers.get(@server.body['server']['id']).wait_for { ready? }
+    compute.servers.get(@server_id).wait_for { ready? }
 
     tests('#associate_address(server_id, ip_address)').succeeds do
-      address_ip = Fog::Compute[:openstack].addresses.all.first.ip
-      Fog::Compute[:openstack].associate_address(@server.body['server']['id'], address_ip).body
+      compute.associate_address(@server_id, @address_ip).body
     end
 
     tests('#disassociate_address(server_id, ip_address)').succeeds do
-      address_ip = Fog::Compute[:openstack].addresses.all.first.ip
-      Fog::Compute[:openstack].disassociate_address(@server.body['server']['id'], address_ip).body
+      compute.disassociate_address(@server_id, @address_ip).body
+    end
+
+    tests('#release_address(ip_address)').succeeds do
+      compute.release_address(@address_id)
     end
+
   end
+
+  compute.delete_server(@server_id)
+
 end

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

@@ -6,9 +6,11 @@ Shindo.tests('Fog::Compute[:openstack] | flavor requests', ['openstack']) do
     'disk'        => Integer,
     'ram'         => Integer,
     'links'       => Array,
-    'swap'        => String,
+    'swap'        => Fog::Nullable::String,
     'rxtx_factor' => Fog::Nullable::Float,
     'OS-FLV-EXT-DATA:ephemeral'   => Integer,
+    'os-flavor-access:is_public'   => Fog::Nullable::Boolean,
+    'OS-FLV-DISABLED:disabled'   => Fog::Nullable::Boolean,
     'vcpus'       => Integer
   }
 
@@ -27,7 +29,7 @@ Shindo.tests('Fog::Compute[:openstack] | flavor requests', ['openstack']) do
     end
 
     tests('#create_flavor(attributes)').formats({'flavor' => @flavor_format}) do
-      attributes = {:flavor_id => '100', :name => 'shindo test flavor', :disk => 10, :ram => 10, :vcpus => 10, :swap => "0", :rxtx_factor => 1.0, :ephemeral => 0}
+      attributes = {:flavor_id => '100', :name => 'shindo test flavor', :disk => 10, :ram => 10, :vcpus => 10, :swap => "0", :rxtx_factor => 2.4, :ephemeral => 0, :is_public => false}
       Fog::Compute[:openstack].create_flavor(attributes).body
     end
 

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

@@ -0,0 +1,60 @@
+Shindo.tests('Fog::Compute[:openstack] | limits requests', ['openstack']) do
+  @rate_limit_format = {
+    'regex' => String,
+    'uri'   => String,
+    'limit' => Array
+  }
+
+  @rate_limit_usage_format = {
+    'next-available' => String,
+    'unit'           => String,
+    'verb'           => String,
+    'remaining'      => Fixnum,
+    'value'          => Fixnum
+  }
+
+  @absolute_limits_format = {
+    'maxServerMeta'             => Fixnum,
+    'maxTotalInstances'         => Fixnum,
+    'maxPersonality'            => Fixnum,
+    'maxImageMeta'              => Fixnum,
+    'maxPersonalitySize'        => Fixnum,
+    'maxSecurityGroupRules'     => Fixnum,
+    'maxTotalKeypairs'          => Fixnum,
+    'maxSecurityGroups'         => Fixnum,
+    'maxTotalCores'             => Fixnum,
+    'maxTotalFloatingIps'       => Fixnum,
+    'maxTotalRAMSize'           => Fixnum,
+    'totalCoresUsed'            => Fixnum,
+    'totalRAMUsed'              => Fixnum,
+    'totalInstancesUsed'        => Fixnum,
+    'totalSecurityGroupsUsed'   => Fixnum,
+    'totalKeyPairsUsed'         => Fixnum
+  }
+
+  @limits_format = {
+    'rate'     => Array,
+    'absolute' => Hash
+  }
+
+  tests('success') do
+    tests('#get_limits') do
+      tests('format').formats(@limits_format) do
+        Fog::Compute[:openstack].get_limits.body['limits']
+      end
+
+      tests('rate limit format').formats(@rate_limit_format) do
+        Fog::Compute[:openstack].get_limits.body['limits']['rate'].first
+      end
+
+      tests('rate limit usage format').formats(@rate_limit_usage_format) do
+        Fog::Compute[:openstack].get_limits.body['limits']['rate'].first['limit'].first
+      end
+
+      tests('absolute limits format').formats(@absolute_limits_format) do
+        Fog::Compute[:openstack].get_limits.body['limits']['absolute']
+      end
+    end
+  end
+end
+

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

@@ -2,14 +2,14 @@ Shindo.tests('Fog::Compute[:openstack] | quota requests', ['openstack']) do
 
   @tenant_id = Fog::Compute[:openstack].list_tenants.body['tenants'].first['id']
   @quota_set_format = {
+    'key_pairs' => Fixnum,
     'metadata_items' => Fixnum,
     'injected_file_content_bytes' => Fixnum,
+    'injected_file_path_bytes' => Fixnum,
     'injected_files' => Fixnum,
-    'gigabytes' => Fixnum,
     'ram' => Fixnum,
     'floating_ips' => Fixnum,
     'instances' => Fixnum,
-    'volumes' => Fixnum,
     'cores' => Fixnum,
     'security_groups' => Fog::Nullable::Integer,
     'security_group_rules' => Fog::Nullable::Integer,
@@ -17,6 +17,7 @@ Shindo.tests('Fog::Compute[:openstack] | quota requests', ['openstack']) do
   }
 
   tests('success') do
+
     tests('#get_quota_defaults').formats({ 'quota_set' => @quota_set_format }) do
       Fog::Compute[:openstack].get_quota_defaults(@tenant_id).body
     end
@@ -27,8 +28,9 @@ Shindo.tests('Fog::Compute[:openstack] | quota requests', ['openstack']) do
     end
 
     tests('#update_quota') do
+
       new_values = @quota.merge({
-        'volumes' => @quota['volumes']/2,
+        'floating_ips' => @quota['floating_ips']/2,
         'cores' => @quota['cores']/2
       })
 
@@ -39,6 +41,17 @@ Shindo.tests('Fog::Compute[:openstack] | quota requests', ['openstack']) do
       returns(new_values, 'returns new values') do
         Fog::Compute[:openstack].get_quota(@tenant_id).body['quota_set']
       end
+
+      # set quota back to old values
+      succeeds do
+        Fog::Compute[:openstack].update_quota(@tenant_id, @quota.clone)
+      end
+
+      # ensure old values are restored
+      returns(@quota, 'old values restored') do
+        Fog::Compute[:openstack].get_quota(@tenant_id).body['quota_set']
+      end
+
     end
 
   end

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

@@ -20,7 +20,7 @@ Shindo.tests('Fog::Compute[:openstack] | security group requests', ['openstack']
   }
 
   tests('success') do
-    tests('#create_security_group(name, description)').formats({"security_group" => [@security_group_format]}) do
+    tests('#create_security_group(name, description)').formats({"security_group" => @security_group_format}) do
       Fog::Compute[:openstack].create_security_group('from_shindo_test', 'this is from the shindo test').body
     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/storage/file_tests.rb

@@ -0,0 +1,172 @@
+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, 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