gapinc-fog 1.12.1.2.1 → 1.14.0

data/tests/dnsimple/requests/dns/dns_tests.rb

@@ -1,13 +1,11 @@
 Shindo.tests('Fog::DNS[:dnsimple] | DNS requests', ['dnsimple', 'dns']) do
 
-  @domain = ''
+  @domain = nil
   @domain_count = 0
 
   tests("success") do
 
     test("get current domain count") do
-      pending if Fog.mocking?
-
       response = Fog::DNS[:dnsimple].list_domains()
       if response.status == 200
         @domain_count = response.body.size
@@ -17,8 +15,6 @@ Shindo.tests('Fog::DNS[:dnsimple] | DNS requests', ['dnsimple', 'dns']) do
     end
 
     test("create domain") do
-      pending if Fog.mocking?
-
       domain = generate_unique_domain
       response = Fog::DNS[:dnsimple].create_domain(domain)
       if response.status == 201
@@ -29,15 +25,11 @@ Shindo.tests('Fog::DNS[:dnsimple] | DNS requests', ['dnsimple', 'dns']) do
     end
 
     test("get domain by id") do
-      pending if Fog.mocking?
-
       response = Fog::DNS[:dnsimple].get_domain(@domain["id"])
       response.status == 200
     end
 
     test("create an A resource record") do
-      pending if Fog.mocking?
-
       domain = @domain["name"]
       name = "www"
       type = "A"
@@ -53,48 +45,65 @@ Shindo.tests('Fog::DNS[:dnsimple] | DNS requests', ['dnsimple', 'dns']) do
     end
 
     test("create a MX record") do
-      pending if Fog.mocking?
-
       domain = @domain["name"]
       name = ""
       type = "MX"
       content = "mail.#{domain}"
-      options = { :ttl => 60, :prio => 10 }
+      options = { "ttl" => 60, "prio" => 10 }
       response = Fog::DNS[:dnsimple].create_record(domain, name, type, content, options)
 
-      response.status == 201
+      test "MX record creation returns 201" do
+        response.status == 201
+      end
+
+      options.each do |key, value|
+        test("MX record has option #{key}") { value == response.body["record"][key.to_s] }
+      end
+
+      test "MX record is correct type" do
+        response.body["record"]["record_type"] == "MX"
+      end
     end
 
-    test("update a record") do
-      pending if Fog.mocking?
+    test("get a record") do
+      domain = @domain["name"]
+      record_id = @record["id"]
+
+      response = Fog::DNS[:dnsimple].get_record(domain, record_id)
+
+      (response.status == 200) and (@record == response.body["record"])
+    end
 
+    test("update a record") do
       domain = @domain["name"]
       record_id = @record["id"]
-      options = { :content => "2.3.4.5", :ttl => 600 }
+      options = { "content" => "2.3.4.5", "ttl" => 600 }
       response = Fog::DNS[:dnsimple].update_record(domain, record_id, options)
       response.status == 200
     end
 
     test("list records") do
-      pending if Fog.mocking?
-
       response = Fog::DNS[:dnsimple].list_records(@domain["name"])
 
       if response.status == 200
         @records = response.body
       end
 
-      (response.status == 200) and (response.body.size == 2)
+      test "list records returns all records for domain" do
+        @records.reject { |record| record["record"]["system_record"] }.size == 2
+      end
+
+      response.status == 200
     end
 
     test("delete records") do
-      pending if Fog.mocking?
       domain = @domain["name"]
 
       result = true
       @records.each do |record|
+        next if record["record"]["system_record"]
         response = Fog::DNS[:dnsimple].delete_record(domain, record["record"]["id"])
-        if(response.status != 200)
+        if response.status != 200
           result = false
           break
         end
@@ -104,15 +113,10 @@ Shindo.tests('Fog::DNS[:dnsimple] | DNS requests', ['dnsimple', 'dns']) do
     end
 
     test("delete domain") do
-      pending if Fog.mocking?
-
       response = Fog::DNS[:dnsimple].delete_domain(@domain["name"])
       response.status == 200
     end
 
   end
 
-  tests( 'failure') do
-  end
-
 end

data/tests/helper.rb

@@ -1,7 +1,7 @@
 require 'simplecov'
-require 'coveralls'
 
-unless ENV['COVERAGE'] == 'false'
+if ENV['COVERAGE'] != 'false' && RUBY_VERSION != "1.9.2"
+  require 'coveralls'
   SimpleCov.command_name "shindo:#{Process.pid.to_s}"
   SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
     SimpleCov::Formatter::HTMLFormatter,

data/tests/helpers/collection_helper.rb

@@ -21,8 +21,8 @@ def collection_tests(collection, params = {}, mocks_implemented = true)
       pending if Fog.mocking? && !mocks_implemented
       collection.all
     end
-    
-    
+
+
 
     if !Fog.mocking? || mocks_implemented
       @identity = @instance.identity
@@ -37,7 +37,7 @@ def collection_tests(collection, params = {}, mocks_implemented = true)
       pending if Fog.mocking? && !mocks_implemented
 
       [
-        'all?', 'any?', 'find',  'detect', 'collect', 'map', 
+        'all?', 'any?', 'find',  'detect', 'collect', 'map',
         'find_index', 'flat_map', 'collect_concat', 'group_by',
         'none?', 'one?'
       ].each do |enum_method|
@@ -74,7 +74,7 @@ def collection_tests(collection, params = {}, mocks_implemented = true)
       @instance.destroy
     end
   end
-  
+
   tests('failure') do
 
     if !Fog.mocking? || mocks_implemented

data/tests/helpers/mock_helper.rb

@@ -28,6 +28,8 @@ if Fog.mock?
     :cloudstack_zone_id               => 'c554c592-e09c-9df5-7688-4a32754a4305',
     :clodo_api_key                    => 'clodo_api_key',
     :clodo_username                   => 'clodo_username',
+    :digitalocean_api_key             => 'digitalocean_api_key',
+    :digitalocean_client_id           => 'digitalocean_client_id',
     :dnsimple_email                   => 'dnsimple_email',
     :dnsimple_password                => 'dnsimple_password',
     :dnsmadeeasy_api_key              => 'dnsmadeeasy_api_key',

data/tests/openstack/requests/metering/meter_tests.rb

@@ -0,0 +1,52 @@
+Shindo.tests('Fog::Metering[:openstack] | meter requests', ['openstack']) do
+
+  @sample_format = {
+    'counter_name'      => String,
+    'user_id'           => String,
+    'resource_id'       => String,
+    'timestamp'         => String,
+    'resource_metadata' => Hash,
+    'source'            => String,
+    'counter_unit'      => String,
+    'counter_volume'    => Float,
+    'project_id'        => String,
+    'message_id'        => String,
+    'counter_type'      => String
+  }
+
+  @meter_format = {
+    'user_id'     => String,
+    'name'        => String,
+    'resource_id' => String,
+    'project_id'  => String,
+    'type'        => String,
+    'unit'        => String
+  }
+
+  @statistics_format = {
+    'count'          => Integer,
+    'duration_start' => String,
+    'min'            => Float,
+    'max'            => Float,
+    'duration_end'   => String,
+    'period'         => Integer,
+    'period_end'     => String,
+    'duration'       => Float,
+    'period_start'   => String,
+    'avg'            => Float,
+    'sum'            => Float
+  }
+  tests('success') do
+    tests('#list_meters').formats([@meter_format]) do
+      Fog::Metering[:openstack].list_meters.body
+    end
+
+    tests('#get_samples').formats([@sample_format]) do
+      Fog::Metering[:openstack].get_samples('test').body
+    end
+
+    tests('#get_statistics').formats([@statistics_format]) do
+      Fog::Metering[:openstack].get_statistics('test').body
+    end
+  end
+end

data/tests/openstack/requests/metering/resource_tests.rb

@@ -0,0 +1,19 @@
+Shindo.tests('Fog::Metering[:openstack] | resource requests', ['openstack']) do
+
+  @resource_format = {
+    'resource_id' => String,
+    'project_id'  => String,
+    'user_id'     => String,
+    'metadata'    => Hash,
+  }
+
+  tests('success') do
+    tests('#list_resource').formats([@resource_format]) do
+      Fog::Metering[:openstack].list_resources.body
+    end
+
+    tests('#get_resource').formats(@resource_format) do
+      Fog::Metering[:openstack].get_resource('test').body
+    end
+  end
+end

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

@@ -0,0 +1,65 @@
+Shindo.tests('Fog::Network[:openstack] | quota requests', ['openstack']) do
+
+  @tenant_id = Fog::Compute[:openstack].list_tenants.body['tenants'].first['id']
+  @quota_format = {
+    'subnet'     => Fog::Nullable::Integer,
+    'router'     => Fog::Nullable::Integer,
+    'port'       => Fog::Nullable::Integer,
+    'network'    => Fog::Nullable::Integer,
+    'floatingip' => Fog::Nullable::Integer
+  }
+
+  @quotas_format = [{
+    'subnet'     => Fog::Nullable::Integer,
+    'router'     => Fog::Nullable::Integer,
+    'port'       => Fog::Nullable::Integer,
+    'network'    => Fog::Nullable::Integer,
+    'floatingip' => Fog::Nullable::Integer,
+    'tenant_id'  => Fog::Nullable::String
+  }]
+
+  tests('success') do
+
+    tests('#get_quotas').formats({ 'quotas' => @quotas_format }) do
+      Fog::Network[:openstack].get_quotas.body
+    end
+
+    tests('#get_quota').formats(@quota_format) do
+      @quota = Fog::Network[:openstack].get_quota(@tenant_id).body['quota']
+    end
+
+    tests('#update_quota') do
+
+      new_values = @quota.merge({
+        'volumes'   => @quota['subnet']/2,
+        'snapshots' => @quota['router']/2
+      })
+
+      succeeds do
+        Fog::Network[:openstack].update_quota(@tenant_id, new_values.clone)
+      end
+
+      returns(new_values, 'returns new values') do
+        Fog::Network[:openstack].get_quota(@tenant_id).body['quota']
+      end
+
+      # set quota back to old values
+      succeeds do
+        Fog::Network[:openstack].update_quota(@tenant_id, @quota.clone)
+      end
+
+      # ensure old values are restored
+      returns(@quota, 'old values restored') do
+        Fog::Network[:openstack].get_quota(@tenant_id).body['quota']
+      end
+
+    end
+
+    tests('#delete_quota') do
+      succeeds do
+        Fog::Network[:openstack].delete_quota(@tenant_id)
+      end
+    end
+
+  end
+end

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

@@ -17,9 +17,9 @@ Shindo.tests('Fog::Storage[:openstack] | object requests', ["openstack"]) do
       Fog::Storage[:openstack].put_object('fogobjecttests', 'fog_object', lorem_file)
     end
 
-    tests("#get_object('fogobjectests', 'fog_object')").succeeds do
+    tests("#get_object('fogobjectests', 'fog_object')").returns(lorem_file.read) do
       pending if Fog.mocking?
-      Fog::Storage[:openstack].get_object('fogobjecttests', 'fog_object')
+      Fog::Storage[:openstack].get_object('fogobjecttests', 'fog_object').body
     end
 
     tests("#get_object('fogobjecttests', 'fog_object', &block)").returns(lorem_file.read) do
@@ -41,6 +41,31 @@ Shindo.tests('Fog::Storage[:openstack] | object requests', ["openstack"]) do
       Fog::Storage[:openstack].delete_object('fogobjecttests', 'fog_object')
     end
 
+    tests("put_object with block") do
+      pending if Fog.mocking?
+
+      tests("#put_object('fogobjecttests', 'fog_object', &block)").succeeds do
+        begin
+          file = lorem_file
+          buffer_size = file.stat.size / 2 # chop it up into two buffers
+          Fog::Storage[:openstack].put_object('fogobjecttests', 'fog_block_object', nil) do
+            file.read(buffer_size).to_s
+          end
+        ensure
+          file.close
+        end
+      end
+
+      tests('#get_object').succeeds do
+        Fog::Storage[:openstack].get_object('fogobjecttests', 'fog_block_object').body == lorem_file.read
+      end
+
+      tests('#delete_object').succeeds do
+        Fog::Storage[:openstack].delete_object('fogobjecttests', 'fog_block_object')
+      end
+    end
+
+
   end
 
   tests('failure') do

data/tests/rackspace/block_storage_tests.rb

@@ -85,7 +85,8 @@ Shindo.tests('Fog::Rackspace::BlockStorage', ['rackspace']) do
       @service.list_volumes
     end
     tests('specify old contstant style service endoint').succeeds do
-      @service = Fog::Rackspace::BlockStorage.new :rackspace_endpoint =>  Fog::Rackspace::BlockStorage::ORD_ENDPOINT
+      @service = Fog::Rackspace::BlockStorage.new :rackspace_endpoint => Fog::Rackspace::BlockStorage::ORD_ENDPOINT
+      returns(true) { (@service.instance_variable_get("@uri").to_s =~ /#{Fog::Rackspace::BlockStorage::ORD_ENDPOINT}/ ) != nil }
       @service.list_volumes
     end
     tests('specify region') do

data/tests/rackspace/cdn_tests.rb

@@ -96,6 +96,15 @@ Shindo.tests('Fog::CDN::Rackspace', ['rackspace']) do
     end
   end
 
+  tests('reauthentication') do
+    pending if Fog.mocking?
+
+    @service = Fog::CDN::Rackspace.new
+    returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
+    @service.instance_variable_set("@auth_token", "bad-token")
+    returns(204) { @service.head_containers.status }
+  end
+
   pending if Fog.mocking?
   
   def container_meta_attributes

data/tests/rackspace/compute_v2_tests.rb

@@ -1,5 +1,5 @@
 Shindo.tests('Fog::Compute::RackspaceV2', ['rackspace']) do
-  
+
   def assert_method(url, method)
     @service.instance_variable_set "@rackspace_auth_url", url
     returns(method) { @service.send :authentication_method }
@@ -7,22 +7,22 @@ Shindo.tests('Fog::Compute::RackspaceV2', ['rackspace']) do
 
   tests('#authentication_method') do
     @service = Fog::Compute::RackspaceV2.new
-  
+
     assert_method nil, :authenticate_v2
 
     assert_method 'auth.api.rackspacecloud.com', :authenticate_v1 # chef's default auth endpoint
 
     assert_method 'https://identity.api.rackspacecloud.com', :authenticate_v1
     assert_method 'https://identity.api.rackspacecloud.com/v1', :authenticate_v1
-    assert_method 'https://identity.api.rackspacecloud.com/v1.1', :authenticate_v1    
+    assert_method 'https://identity.api.rackspacecloud.com/v1.1', :authenticate_v1
     assert_method 'https://identity.api.rackspacecloud.com/v2.0', :authenticate_v2
-    
-    assert_method 'https://lon.identity.api.rackspacecloud.com', :authenticate_v1    
+
+    assert_method 'https://lon.identity.api.rackspacecloud.com', :authenticate_v1
     assert_method 'https://lon.identity.api.rackspacecloud.com/v1', :authenticate_v1
     assert_method 'https://lon.identity.api.rackspacecloud.com/v1.1', :authenticate_v1
     assert_method 'https://lon.identity.api.rackspacecloud.com/v2.0', :authenticate_v2
   end
-  
+
   tests('legacy authentication') do
     pending if Fog.mocking?
 
@@ -33,9 +33,9 @@ Shindo.tests('Fog::Compute::RackspaceV2', ['rackspace']) do
       returns(true, "identity_service was not used") { @service.instance_variable_get("@identity_service").nil? }
       @service.list_flavors
     end
-    
+
     tests('custom endpoint') do
-      @service = Fog::Compute::RackspaceV2.new :rackspace_auth_url => 'https://identity.api.rackspacecloud.com/v1.0', 
+      @service = Fog::Compute::RackspaceV2.new :rackspace_auth_url => 'https://identity.api.rackspacecloud.com/v1.0',
         :rackspace_compute_url => 'https://my-custom-endpoint.com'
         returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
         returns(true, "uses custom endpoint") { (@service.instance_variable_get("@uri").host =~ /my-custom-endpoint\.com/) != nil }
@@ -44,7 +44,7 @@ Shindo.tests('Fog::Compute::RackspaceV2', ['rackspace']) do
 
   tests('current authentation') do
     pending if Fog.mocking?
-    
+
     tests('variables populated').succeeds do
       @service = Fog::Compute::RackspaceV2.new :rackspace_auth_url => 'https://identity.api.rackspacecloud.com/v2.0', :connection_options => {:ssl_verify_peer => true}
       returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
@@ -67,16 +67,16 @@ Shindo.tests('Fog::Compute::RackspaceV2', ['rackspace']) do
       @service.list_flavors
     end
     tests('custom endpoint') do
-      @service = Fog::Compute::RackspaceV2.new :rackspace_auth_url => 'https://identity.api.rackspacecloud.com/v2.0', 
+      @service = Fog::Compute::RackspaceV2.new :rackspace_auth_url => 'https://identity.api.rackspacecloud.com/v2.0',
         :rackspace_compute_url => 'https://my-custom-endpoint.com'
         returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
         returns(true, "uses custom endpoint") { (@service.instance_variable_get("@uri").host =~ /my-custom-endpoint\.com/) != nil }
     end
   end
-  
+
   tests('default auth') do
     pending if Fog.mocking?
-    
+
     tests('no params').succeeds do
       @service = Fog::Compute::RackspaceV2.new
       returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
@@ -85,6 +85,7 @@ Shindo.tests('Fog::Compute::RackspaceV2', ['rackspace']) do
     end
     tests('specify old contstant style service endoint').succeeds do
       @service = Fog::Compute::RackspaceV2.new :rackspace_endpoint => Fog::Compute::RackspaceV2::ORD_ENDPOINT
+      returns(true) { (@service.instance_variable_get("@uri").to_s =~ /#{Fog::Compute::RackspaceV2::ORD_ENDPOINT}/ ) != nil }
       @service.list_flavors
     end
     tests('specify region').succeeds do
@@ -92,14 +93,14 @@ Shindo.tests('Fog::Compute::RackspaceV2', ['rackspace']) do
       returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
       returns(true) { (@service.instance_variable_get("@uri").host =~ /ord/ ) != nil }
       @service.list_flavors
-    end    
+    end
     tests('custom endpoint') do
       @service = Fog::Compute::RackspaceV2.new :rackspace_compute_url => 'https://my-custom-endpoint.com'
       returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
       returns(true, "uses custom endpoint") { (@service.instance_variable_get("@uri").host =~ /my-custom-endpoint\.com/) != nil }
     end
   end
-  
+
   tests('reauthentication') do
     pending if Fog.mocking?
 
@@ -109,4 +110,4 @@ Shindo.tests('Fog::Compute::RackspaceV2', ['rackspace']) do
     returns(true) { [200, 203].include? @service.list_flavors.status }
   end
 
-end
+end