fog 1.18.0 → 1.19.0

data/tests/aws/models/dns/zone_tests.rb

@@ -1,4 +1,4 @@
 Shindo.tests("Fog::DNS[:aws] | zone", ['aws', 'dns']) do
   params = {:domain => generate_unique_domain }
-  model_tests(Fog::DNS[:aws].zones, params, false)
+  model_tests(Fog::DNS[:aws].zones, params)
 end

data/tests/aws/models/dns/zones_tests.rb

@@ -1,4 +1,4 @@
 Shindo.tests("Fog::DNS[:aws] | zones", ['aws', 'dns']) do
   params = {:domain => generate_unique_domain }
-  collection_tests(Fog::DNS[:aws].zones, params, false)
+  collection_tests(Fog::DNS[:aws].zones, params)
 end

data/tests/aws/models/elb/model_tests.rb

@@ -193,6 +193,12 @@ Shindo.tests('AWS::ELB | models', ['aws', 'elb']) do
       returns(@availability_zones) { elb.availability_zones.sort }
     end
 
+    tests('cross_zone_load_balancing') do
+      returns(false) {elb.cross_zone_load_balancing?}
+      elb.cross_zone_load_balancing = true
+      returns(true) {elb.cross_zone_load_balancing?}
+    end
+
     tests('default health check') do
       default_health_check = {
         "HealthyThreshold"=>10,
@@ -324,5 +330,9 @@ Shindo.tests('AWS::ELB | models', ['aws', 'elb']) do
     end
 
     Fog::AWS[:iam].delete_server_certificate(@key_name)
+
+    @igw.destroy
+    @subnet.destroy
+    @vpc.destroy
   end
 end

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

@@ -44,6 +44,10 @@ Shindo.tests("Storage[:aws] | file", ["aws"]) do
       end
 
       tests('#versions are all for the correct key').returns(true) do
+        # JRuby 1.7.5+ issue causes a SystemStackError: stack level too deep
+        # https://github.com/jruby/jruby/issues/1265
+        pending if RUBY_PLATFORM == "java" and JRUBY_VERSION =~ /1\.7\.[5-8]/
+
         @instance.versions.all? { |v| v.key == @instance.key }
       end
     end

data/tests/aws/requests/compute/assign_private_ip_tests.rb

@@ -0,0 +1,52 @@
+Shindo.tests('Fog::Compute[:aws] | internet_gateway requests', ['aws']) do
+
+  tests('success') do
+
+    @vpc=Fog::Compute[:aws].vpcs.create('cidr_block' => '10.0.10.0/24')
+    @vpc_id = @vpc.id
+
+    @subnet=Fog::Compute[:aws].subnets.create('vpc_id' => @vpc_id, 'cidr_block' => '10.0.10.0/24')
+    @subnet_id = @subnet.subnet_id
+
+    @network_interface = Fog::Compute[:aws].network_interfaces.new(:subnet_id => @subnet_id)
+    @network_interface.save
+    @network_interface_id =  @network_interface.network_interface_id
+
+    @ip_address = Fog::AWS::Mock.ip_address
+    @second_ip_address = Fog::AWS::Mock.ip_address
+
+    tests("#assign_private_ip_addresses('#{@network_interface_id}', {'PrivateIpAddresses'=>['#{@ip_address}','#{@second_ip_address}']})").formats(AWS::Compute::Formats::BASIC) do
+      Fog::Compute[:aws].assign_private_ip_addresses(@network_interface_id, { 'PrivateIpAddresses' =>[@ip_address, @second_ip_address]}).body
+    end
+
+    tests("#assign_private_ip_addresses('#{@network_interface_id}', {'SecondaryPrivateIpAddressCount'=>4})").formats(AWS::Compute::Formats::BASIC) do
+      Fog::Compute[:aws].assign_private_ip_addresses(@network_interface_id, {'SecondaryPrivateIpAddressCount'=>4}).body
+    end
+
+    @network_interface.destroy
+    @subnet.destroy
+    @vpc.destroy
+  end
+
+  tests('failure') do
+    @vpc=Fog::Compute[:aws].vpcs.create('cidr_block' => '10.0.10.0/24')
+    @vpc_id = @vpc.id
+
+    @subnet=Fog::Compute[:aws].subnets.create('vpc_id' => @vpc_id, 'cidr_block' => '10.0.10.0/24')
+    @subnet_id = @subnet.subnet_id
+
+    @network_interface = Fog::Compute[:aws].network_interfaces.new(:subnet_id => @subnet_id)
+    @network_interface.save
+    @network_interface_id =  @network_interface.network_interface_id
+
+    @ip_address = Fog::AWS::Mock.ip_address
+
+    tests("#assign_private_ip_addresses('#{@network_interface_id}', {'PrivateIpAddresses'=>['#{@ip_address}','#{@second_ip_address}'], 'SecondaryPrivateIpAddressCount'=>4 })").raises(Fog::Compute::AWS::Error) do
+      Fog::Compute[:aws].assign_private_ip_addresses(@network_interface_id, { 'PrivateIpAddresses' =>[@ip_address, @second_ip_address], 'SecondaryPrivateIpAddressCount'=>4 }).body
+    end
+
+    @network_interface.destroy
+    @subnet.destroy
+    @vpc.destroy
+  end
+end

data/tests/aws/requests/compute/vpc_tests.rb

@@ -26,9 +26,25 @@ Shindo.tests('Fog::Compute[:aws] | vpc requests', ['aws']) do
       Fog::Compute[:aws].describe_vpcs.body
     end
 
+
+    tests("#modify_vpc_attribute('#{@vpc_id}', {'EnableDnsSupport.Value' => true})").formats(AWS::Compute::Formats::BASIC) do
+      Fog::Compute[:aws].modify_vpc_attribute(@vpc_id, {'EnableDnsSupport.Value' => true}).body
+    end
+
+    tests("#modify_vpc_attribute('#{@vpc_id}', {'EnableDnsHostnames.Value' => true})").formats(AWS::Compute::Formats::BASIC) do
+      Fog::Compute[:aws].modify_vpc_attribute(@vpc_id, {'EnableDnsHostnames.Value' => true}).body
+    end
+
+    tests("#modify_vpc_attribute('#{@vpc_id}')").raises(Fog::Compute::AWS::Error) do
+      Fog::Compute[:aws].modify_vpc_attribute(@vpc_id).body
+    end
+
+    tests("#modify_vpc_attribute('#{@vpc_id}', {'EnableDnsSupport.Value' => true, 'EnableDnsHostnames.Value' => true})").raises(Fog::Compute::AWS::Error) do
+      Fog::Compute[:aws].modify_vpc_attribute(@vpc_id, {'EnableDnsSupport.Value' => true, 'EnableDnsHostnames.Value' => true}).body
+    end
+
     tests("#delete_vpc('#{@vpc_id}')").formats(AWS::Compute::Formats::BASIC) do
       Fog::Compute[:aws].delete_vpc(@vpc_id).body
     end
-
   end
 end

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

@@ -12,8 +12,6 @@ Shindo.tests('Fog::DNS[:aws] | DNS requests', ['aws', 'dns']) do
   tests('success') do
 
     test('get current zone count') do
-      pending if Fog.mocking?
-
       @org_zone_count= 0
       response = @r53_connection.list_hosted_zones
       if response.status == 200
@@ -25,8 +23,6 @@ Shindo.tests('Fog::DNS[:aws] | DNS requests', ['aws', 'dns']) do
     end
 
     test('create simple zone') {
-      pending if Fog.mocking?
-
       result = false
 
       response = @r53_connection.create_hosted_zone(@domain_name)
@@ -55,8 +51,6 @@ Shindo.tests('Fog::DNS[:aws] | DNS requests', ['aws', 'dns']) do
     }
 
     test("get status of change #{@change_id}") {
-      pending if Fog.mocking?
-
       result = false
       response = @r53_connection.get_change(@change_id)
       if response.status == 200
@@ -70,8 +64,6 @@ Shindo.tests('Fog::DNS[:aws] | DNS requests', ['aws', 'dns']) do
     }
 
     test("get info on hosted zone #{@zone_id}") {
-      pending if Fog.mocking?
-
       result = false
 
       response = @r53_connection.get_hosted_zone(@zone_id)
@@ -83,7 +75,6 @@ Shindo.tests('Fog::DNS[:aws] | DNS requests', ['aws', 'dns']) do
         ns_servers = response.body['NameServers']
 
         # AWS returns domain with a dot at end - so when compare, remove dot
-
         if (zone_id == @zone_id) and (name.chop == @domain_name) and (caller_ref.length > 0) and
            (ns_servers.count > 0)
            result = true
@@ -94,8 +85,6 @@ Shindo.tests('Fog::DNS[:aws] | DNS requests', ['aws', 'dns']) do
     }
 
     test('list zones') do
-      pending if Fog.mocking?
-
       result = false
 
       response = @r53_connection.list_hosted_zones
@@ -120,8 +109,6 @@ Shindo.tests('Fog::DNS[:aws] | DNS requests', ['aws', 'dns']) do
     end
 
     test("add a A resource record") {
-      pending if Fog.mocking?
-
       # create an A resource record
       host = 'www.' + @domain_name
       ip_addrs = ['1.2.3.4']
@@ -142,8 +129,6 @@ Shindo.tests('Fog::DNS[:aws] | DNS requests', ['aws', 'dns']) do
     }
 
     test("add a CNAME resource record") {
-      pending if Fog.mocking?
-
       # create a CNAME resource record
       host = 'mail.' + @domain_name
       value = ['www.' + @domain_name]
@@ -164,8 +149,6 @@ Shindo.tests('Fog::DNS[:aws] | DNS requests', ['aws', 'dns']) do
     }
 
     test("add a MX resource record") {
-      pending if Fog.mocking?
-
       # create a MX resource record
       host = @domain_name
       value = ['7 mail.' + @domain_name]
@@ -186,8 +169,6 @@ Shindo.tests('Fog::DNS[:aws] | DNS requests', ['aws', 'dns']) do
     }
 
     test("add an ALIAS resource record") {
-      pending if Fog.mocking?
-
       # create a load balancer
       @elb_connection.create_load_balancer(["us-east-1a"], "fog", [{"Protocol" => "HTTP", "LoadBalancerPort" => "80", "InstancePort" => "80"}])
 
@@ -213,7 +194,7 @@ Shindo.tests('Fog::DNS[:aws] | DNS requests', ['aws', 'dns']) do
       puts "DNS Name (ELB): #{dns_name}"
       puts "Zone ID for Route 53: #{@zone_id}"
 
-      sleep 120
+      sleep 120 unless Fog.mocking?
       response = @r53_connection.change_resource_record_sets(@zone_id, change_batch, options)
       if response.status == 200
         change_id = response.body['Id']
@@ -225,15 +206,11 @@ Shindo.tests('Fog::DNS[:aws] | DNS requests', ['aws', 'dns']) do
     }
 
     tests("list resource records").formats(AWS::DNS::Formats::LIST_RESOURCE_RECORD_SETS)  {
-      pending if Fog.mocking?
-
       # get resource records for zone
       @r53_connection.list_resource_record_sets(@zone_id).body
     }
 
     test("delete #{@new_records.count} resource records") {
-      pending if Fog.mocking?
-
       result = true
 
       change_batch = []
@@ -252,8 +229,6 @@ Shindo.tests('Fog::DNS[:aws] | DNS requests', ['aws', 'dns']) do
     }
 
     test("delete hosted zone #{@zone_id}") {
-      pending if Fog.mocking?
-
       # cleanup the ELB as well
       @elb_connection.delete_load_balancer("fog")
 

data/tests/aws/requests/elb/load_balancer_tests.rb

@@ -36,6 +36,12 @@ Shindo.tests('AWS::ELB | load_balancer_tests', ['aws', 'elb']) do
       end
     end
 
+    tests("modify_load_balancer_attributes") do
+      Fog::AWS[:elb].modify_load_balancer_attributes(@load_balancer_id, 'CrossZoneLoadBalancing' => {'Enabled' => true}).body
+      response = Fog::AWS[:elb].describe_load_balancer_attributes(@load_balancer_id).body
+      response['DescribeLoadBalancerAttributesResult']['LoadBalancerAttributes']['CrossZoneLoadBalancing']['Enabled'] == true
+    end
+
     tests("#configure_health_check").formats(AWS::ELB::Formats::CONFIGURE_HEALTH_CHECK) do
       health_check = {
         'Target' => 'HTTP:80/index.html',

data/tests/aws/requests/rds/{subnet_groups_test.rb → subnet_groups_tests.rb}

@@ -38,6 +38,10 @@ Shindo.tests('AWS::RDS | subnet group requests', ['aws', 'rds']) do
       Fog::AWS[:rds].describe_db_subnet_groups.body
     end
 
+    tests("#delete_db_subnet_group").formats(AWS::RDS::Formats::BASIC) do
+      Fog::AWS[:rds].delete_db_subnet_group(@subnet_group_name).body
+    end
+
   end
 
   @subnets.each do |sn|

data/tests/aws/requests/storage/bucket_tests.rb

@@ -48,6 +48,14 @@ Shindo.tests('Fog::Storage[:aws] | bucket requests', ["aws"]) do
       @aws_owner = Fog::Storage[:aws].get_bucket_acl(Fog::Storage[:aws].directories.first.key).body['Owner']
     end
 
+    tests('put existing bucket - default region') do
+      Fog::Storage[:aws].put_bucket(@aws_bucket_name)
+
+      tests("#put_bucket('#{@aws_bucket_name}') existing").succeeds do
+        Fog::Storage[:aws].put_bucket(@aws_bucket_name)
+      end
+    end    
+
     tests("#get_service").formats(@service_format) do
       Fog::Storage[:aws].get_service.body
     end
@@ -337,6 +345,15 @@ Shindo.tests('Fog::Storage[:aws] | bucket requests', ["aws"]) do
       Fog::Storage[:aws].put_bucket_website('fognonbucket', 'index.html')
     end
 
+    tests('put existing bucket - non-default region') do
+      storage_eu_endpoint = Fog::Storage[:aws]
+      storage_eu_endpoint.region = "eu-west-1"
+      storage_eu_endpoint.put_bucket(@aws_bucket_name)
+
+      tests("#put_bucket('#{@aws_bucket_name}') existing").raises(Excon::Errors::Conflict) do
+        storage_eu_endpoint.put_bucket(@aws_bucket_name)
+      end
+    end
   end
 
   # don't keep the bucket around

data/tests/aws/requests/storage/delete_multiple_objects_tests.rb

@@ -0,0 +1,12 @@
+Shindo.tests('AWS::Storage | delete_multiple_objects', ['aws']) do
+  @directory = Fog::Storage[:aws].directories.create(:key => 'fogobjecttests-' + Time.now.to_i.to_s(32))
+
+  tests("doesn't alter options") do
+    version_id = {'fog_object' => ['12345']}
+    options = {:quiet => true, 'versionId' => version_id}
+    Fog::Storage[:aws].delete_multiple_objects(@directory.identity, ['fog_object'], options)
+
+    test(":quiet is unchanged") { options[:quiet] }
+    test("'versionId' is unchanged") { options['versionId'] == version_id }
+  end
+end

data/tests/brightbox/compute/schema.rb

@@ -525,19 +525,6 @@ class Brightbox
           "firewall_policy" => Brightbox::Compute::Formats::Nested::FIREWALL_POLICY
         }
 
-        #FIREWALL_RULE = {
-          #"id"              => String,
-          #"resource_type"   => String,
-          #"url"             => String,
-          #"source"          => String,
-          #"source_port"     => String,
-          #"destination"     => String,
-          #"destination_port" => String,
-          #"protocol"        => String,
-          #"icmp_type_name"  => String,
-          #"description"     => Fog::Nullable::String
-        #}
-
         IMAGE = {
           "name"            => String,
           "created_at"      => String,

data/tests/brightbox/models/compute/server_tests.rb

@@ -1,21 +1,19 @@
 Shindo.tests("Fog::Compute[:brightbox] | Server model", ["brightbox"]) do
-
   pending if Fog.mocking?
 
   tests("success") do
-
-    unless Fog.mocking?
-      @server = Brightbox::Compute::TestSupport.get_test_server
-      server_id = @server.id
-    end
+    @server = Brightbox::Compute::TestSupport.get_test_server
+    server_id = @server.id
 
     tests("#dns_name") do
-      pending if Fog.mocking?
       returns("public.#{@server.fqdn}") { @server.dns_name }
     end
 
-    unless Fog.mocking?
-      @server.destroy
+    tests("#mapping_identity") do
+      first_interface_id = @server.interfaces.first["id"]
+      returns(first_interface_id) { @server.mapping_identity }
     end
+
+    @server.destroy
   end
 end

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

@@ -5,28 +5,17 @@ Shindo.tests('Fog::Compute[:brightbox] | interface requests', ['brightbox']) do
   tests('success') do
 
     unless Fog.mocking?
-      server = @test_service.servers.first
+      @test_server = Brightbox::Compute::TestSupport.get_test_server
+      @interface_id = @test_server.interfaces.first["id"]
 
-      # If no server is available, create one just for the test
-      unless server
-        @test_server = Brightbox::Compute::TestSupport.get_test_server
-        server = @test_server
+      tests("#get_interface('#{@interface_id}')") do
+        pending if Fog.mocking?
+        result = @test_service.get_interface(@interface_id)
+        data_matches_schema(Brightbox::Compute::Formats::Full::INTERFACE, {:allow_extra_keys => true}) { result }
       end
 
-      @interface_id = server.interfaces.first["id"]
+      @test_server.destroy
     end
-
-    tests("#get_interface('#{@interface_id}')") do
-      pending if Fog.mocking?
-      result = @test_service.get_interface(@interface_id)
-      data_matches_schema(Brightbox::Compute::Formats::Full::INTERFACE, {:allow_extra_keys => true}) { 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
@@ -41,5 +30,4 @@ Shindo.tests('Fog::Compute[:brightbox] | interface requests', ['brightbox']) do
       @test_service.get_interface()
     end
   end
-
 end

data/tests/digitalocean/models/compute/server_tests.rb

@@ -6,8 +6,8 @@ Shindo.tests("Fog::Compute[:digitalocean] | server model", ['digitalocean', 'com
 
     tests('have the action') do
       test('reload') { server.respond_to? 'reload' }
-      %w{ 
-        shutdown 
+      %w{
+        shutdown
         reboot
         power_cycle
         stop
@@ -19,12 +19,13 @@ Shindo.tests("Fog::Compute[:digitalocean] | server model", ['digitalocean', 'com
 
     tests('have attributes') do
       model_attribute_hash = server.attributes
-      attributes = [ 
+      attributes = [
         :id,
         :name,
         :state,
         :backups_active,
         :public_ip_address,
+        :private_ip_address,
         :flavor_id,
         :region_id,
         :image_id,

data/tests/google/models/compute/disk_tests.rb

@@ -0,0 +1,5 @@
+Shindo.tests("Fog::Compute[:google] | disk model", ['google']) do
+
+  model_tests(Fog::Compute[:google].disks, {:name => 'fogdiskname', :zone_name => 'us-central1-a'})
+
+end

data/tests/google/models/compute/disks_tests.rb

@@ -0,0 +1,5 @@
+Shindo.tests("Fog::Compute[:google] | disks", ['google']) do
+
+  collection_tests(Fog::Compute[:google].disks, {:name => 'fogdiskname', :zone_name => 'us-central1-a'})
+
+end