gapinc-fog 1.12.1.2.1 → 1.14.0

data/tests/aws/requests/rds/log_file_tests.rb

@@ -0,0 +1,19 @@
+Shindo.tests('AWS::RDS | log file requests', %w[aws rds]) do
+  tests('success') do
+    pending if Fog.mocking?
+
+    suffix = rand(65536).to_s(16)
+    @db_instance_id = "fog-test-#{suffix}"
+
+    tests('#describe_db_log_files').formats(AWS::RDS::Formats::DESCRIBE_DB_LOG_FILES) do
+      result = Fog::AWS[:rds].describe_db_log_files(@db_instance_id).body['DescribeDBLogFilesResult']
+      returns(true) { result['DBLogFiles'].size > 0 }
+      result
+    end
+
+  end
+
+  tests('failures') do
+    raises(Fog::AWS::RDS::NotFound) {Fog::AWS[:rds].describe_db_log_files('doesntexist')}
+  end
+end

data/tests/aws/requests/sts/assume_role_tests.rb

@@ -0,0 +1,19 @@
+Shindo.tests('AWS::STS | assume role', ['aws']) do
+
+	@policy = {"Statement" => [{"Effect" => "Allow", "Action" => "*", "Resource" => "*"}]}
+
+	@response_format = {
+		'SessionToken' => String,
+		'SecretAccessKey' => String,
+		'Expiration' => String,
+		'AccessKeyId' => String,
+		'Arn' => String,
+		'RequestId' => String
+	}
+	
+	tests("#assume_role('rolename', 'assumed_role_session', 'external_id', #{@policy.inspect}, 900)").formats(@response_format) do
+		pending if Fog.mocking?
+		Fog::AWS[:sts].assume_role("rolename","assumed_role_session","external_id", @policy, 900).body
+	end
+
+end

data/tests/core/mocking_tests.rb

@@ -52,6 +52,21 @@ Shindo.tests('Fog mocking', 'core') do
     end
   end
 
+  tests('Fog::Mock.random_ip') do
+    tests('Fog::Mock.random_ip').returns(true, "default to ipv4") do
+      IPAddr.new(Fog::Mock.random_ip).ipv4?
+    end
+    tests('Fog::Mock.random_ip').returns(true, "explicit ipv4") do
+      IPAddr.new(Fog::Mock.random_ip({:version => :v4})).ipv4?
+    end
+    tests('Fog::Mock.random_ip({:version => :v6})').returns(true, "changes to ipv6") do
+      IPAddr.new(Fog::Mock.random_ip({:version => :v6})).ipv6?
+    end
+    tests('Fog::Mock.random_ip({:version => :v5})').raises(ArgumentError) do
+      IPAddr.new(Fog::Mock.random_ip({:version => :v5})).ipv4?
+    end
+  end
+
   tests('Fog::Mock.not_implemented').raises(Fog::Errors::MockNotImplemented) do
     Fog::Mock.not_implemented
   end

data/tests/digitalocean/helper.rb

@@ -4,36 +4,43 @@ def service
   Fog::Compute[:digitalocean]
 end
 
+def fog_test_server_attributes
+  image = service.images.find { |i| i.name == 'Ubuntu 12.04 x64' }
+  region = service.regions.find { |r| r.name == 'New York 1' }
+  flavor = service.flavors.find { |r| r.name == '512MB' }
+
+  {
+    :image_id  => image.id,
+    :region_id => region.id,
+    :flavor_id => flavor.id
+  }
+end
+
+def fog_server_name
+  "fog-server-test"
+end
+
 # Create a long lived server for the tests
 def fog_test_server
-  server = service.servers.find { |s| s.name == 'fog-test-server' }
+  server = service.servers.find { |s| s.name == fog_server_name }
   unless server
-    image = service.images.find { |i| i.name == 'Ubuntu 12.04 x64 Server' }
-    region = service.regions.find { |r| r.name == 'New York 1' }
-    flavor = service.flavors.find { |r| r.name == '512MB' }
-    server = service.servers.create :name      => 'fog-test-server',
-                                    :image_id  => image.id,
-                                    :region_id => region.id,
-                                    :flavor_id => flavor.id
-    # Wait for the server to come up
-    begin
-      server.wait_for(120) { server.reload rescue nil; server.ready? }
-    rescue Fog::Errors::TimeoutError
-      # Server bootstrap took more than 120 secs!
-    end
+    server = service.servers.create({
+      :name => fog_server_name
+    }.merge(fog_test_server_attributes))
+    server.wait_for { ready? }
   end
   server
 end
 
 # Destroy the long lived server
 def fog_test_server_destroy
-  server = service.servers.find { |s| s.name == 'fog-test-server' }
+  server = service.servers.find { |s| s.name == fog_server_name }
   server.destroy if server
 end
 
 at_exit do
   unless Fog.mocking? || Fog.credentials[:digitalocean_api_key].nil?
-    server = service.servers.find { |s| s.name == 'fog-test-server' }
+    server = service.servers.find { |s| s.name == fog_server_name }
     if server
       server.wait_for(120) do
         reload rescue nil; ready?

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

@@ -2,14 +2,14 @@ Shindo.tests("Fog::Compute[:digitalocean] | flavor model", ['digitalocean', 'com
 
   service = Fog::Compute[:digitalocean]
   flavor  = service.flavors.first
-  
+
   tests('The flavor model should') do
     tests('have the action') do
       test('reload') { flavor.respond_to? 'reload' }
     end
     tests('have attributes') do
       model_attribute_hash = flavor.attributes
-      attributes = [ 
+      attributes = [
         :id,
         :name,
       ]

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

@@ -2,14 +2,14 @@ Shindo.tests("Fog::Compute[:digitalocean] | image model", ['digitalocean', 'comp
 
   service = Fog::Compute[:digitalocean]
   image  = service.images.first
-  
+
   tests('The image model should') do
     tests('have the action') do
       test('reload') { image.respond_to? 'reload' }
     end
     tests('have attributes') do
       model_attribute_hash = image.attributes
-      attributes = [ 
+      attributes = [
         :id,
         :name,
         :distribution

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

@@ -2,14 +2,14 @@ Shindo.tests("Fog::Compute[:digitalocean] | region model", ['digitalocean', 'com
 
   service = Fog::Compute[:digitalocean]
   region  = service.regions.first
-  
+
   tests('The region model should') do
     tests('have the action') do
       test('reload') { region.respond_to? 'reload' }
     end
     tests('have attributes') do
       model_attribute_hash = region.attributes
-      attributes = [ 
+      attributes = [
         :id,
         :name,
       ]

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

@@ -16,6 +16,7 @@ Shindo.tests("Fog::Compute[:digitalocean] | server model", ['digitalocean', 'com
         test(action) { server.respond_to? action }
       end
     end
+
     tests('have attributes') do
       model_attribute_hash = server.attributes
       attributes = [ 
@@ -23,10 +24,11 @@ Shindo.tests("Fog::Compute[:digitalocean] | server model", ['digitalocean', 'com
         :name,
         :state,
         :backups_active,
-        :ip_address,
+        :public_ip_address,
         :flavor_id,
         :region_id,
-        :image_id
+        :image_id,
+        :ssh_keys=
       ]
       tests("The server model should respond to") do
         attributes.each do |attribute|
@@ -34,12 +36,14 @@ Shindo.tests("Fog::Compute[:digitalocean] | server model", ['digitalocean', 'com
         end
       end
     end
+
     test('#reboot') do
       pending if Fog.mocking?
       server.reboot
       server.wait_for { server.state == 'off' }
       server.state == 'off'
     end
+
     test('#power_cycle') do
       pending if Fog.mocking?
       server.wait_for { server.ready? }
@@ -47,16 +51,19 @@ Shindo.tests("Fog::Compute[:digitalocean] | server model", ['digitalocean', 'com
       server.wait_for { server.state == 'off' }
       server.state == 'off'
     end
+
     test('#stop') do
       server.stop
       server.wait_for { server.state == 'off' }
       server.state == 'off'
     end
+
     test('#start') do
       server.start
       server.wait_for { ready? }
       server.ready?
     end
+
     # DigitalOcean shutdown is unreliable
     # so disable it in real mode for now
     test('#shutdown') do
@@ -67,6 +74,7 @@ Shindo.tests("Fog::Compute[:digitalocean] | server model", ['digitalocean', 'com
       server.wait_for { server.state == 'off' }
       server.state == 'off'
     end
+
     test('#update') do
       begin
         server.update
@@ -74,11 +82,11 @@ Shindo.tests("Fog::Compute[:digitalocean] | server model", ['digitalocean', 'com
         true
       end
     end
-
   end
 
   # restore server state
   server.start
+  server.wait_for { ready? }
 
 end
 

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

@@ -1,35 +1,21 @@
 Shindo.tests('Fog::Compute[:digitalocean] | servers collection', ['digitalocean']) do
+  service = Fog::Compute[:digitalocean]
 
-  service =  Fog::Compute[:digitalocean]
+  options = {
+    :name => "#{fog_server_name}-#{Time.now.to_i.to_s}"
+  }.merge fog_test_server_attributes
 
-  tests('The servers collection') do
-    servers = service.servers.all
-
-    server = fog_test_server
-
-    test('should NOT be empty') do
-      servers.reload
-      !servers.empty? 
-    end
-
-    test('should be a kind of Fog::Compute::DigitalOcean::Servers') do 
-      servers.kind_of? Fog::Compute::DigitalOcean::Servers 
-    end
-
-    tests('should have Fog::Compute::DigitalOcean::Servers inside') do
-      servers.each do |s|
-        test { s.kind_of? Fog::Compute::DigitalOcean::Server }
-      end
-    end
-
-    tests('should be able to reload itself').succeeds { servers.reload }
-
-    tests('should be able to get a model') do
-      test('by instance id') do
-        servers.get(server.id).kind_of? Fog::Compute::DigitalOcean::Server
-      end
-    end
+  collection_tests(service.servers, options, true) do
+    @instance.wait_for { ready? }
+  end
 
+  tests("#bootstrap").succeeds do
+    pending if Fog.mocking?
+    @server = service.servers.bootstrap({
+      :public_key_path => File.join(File.dirname(__FILE__), '../../fixtures/id_rsa.pub'),
+      :private_key_path => File.join(File.dirname(__FILE__), '../../fixtures/id_rsa')
+    }.merge(options))
   end
 
+  @server.destroy if @server
 end

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

@@ -3,33 +3,37 @@ Shindo.tests("Fog::Compute[:digitalocean] | ssh_key model", ['digitalocean', 'co
   service = Fog::Compute[:digitalocean]
 
   tests('The ssh_key model should') do
-    
+
     test('#save') do
       @key = service.ssh_keys.create :name => 'fookey',
                                      :ssh_pub_key => 'fookey'
       @key.is_a? Fog::Compute::DigitalOcean::SshKey
     end
+
     tests('have the action') do
       test('reload') { @key.respond_to? 'reload' }
-      %w{ 
+      %w{
         save
         destroy
       }.each do |action|
         test(action) { @key.respond_to? action }
       end
     end
+
     tests('have attributes') do
-      attributes = [ 
+      attributes = [
         :id,
         :name,
         :ssh_pub_key
       ]
+
       tests("The key model should respond to") do
         attributes.each do |attribute|
           test("#{attribute}") { @key.respond_to? attribute }
         end
       end
     end
+
     test('#destroy') do
       @key.destroy
     end

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

@@ -19,10 +19,14 @@ Shindo.tests('Fog::Compute[:digitalocean] | ssh_keys collection', ['digitalocean
 
     tests('should be able to get a model') do
       test('by instance id') do
-        service.ssh_keys.get(key.id).kind_of? Fog::Compute::DigitalOcean::SshKey
+        retrieved_key = service.ssh_keys.get(key.id)
+        test { retrieved_key.kind_of? Fog::Compute::DigitalOcean::SshKey }
+        test { retrieved_key.name == key.name }
       end
     end
 
+    key.destroy
+
   end
 
 end

data/tests/digitalocean/requests/compute/create_server_tests.rb

@@ -5,7 +5,7 @@ Shindo.tests('Fog::Compute[:digitalocean] | create_server request', ['digitaloce
     'name'           => String,
     'image_id'       => Integer,
     'size_id'        => Integer,
-    'event_id'       => Integer 
+    'event_id'       => Integer
   }
 
   service = Fog::Compute[:digitalocean]
@@ -13,16 +13,13 @@ Shindo.tests('Fog::Compute[:digitalocean] | create_server request', ['digitaloce
   tests('success') do
 
     tests('#create_server').formats({'status' => 'OK', 'droplet' => @server_format}) do
-      image = service.images.find { |img| img.name == 'Ubuntu 12.04 x64 Server' }
+      image = service.images.find { |img| img.name == 'Ubuntu 12.04 x64' }
       flavor = service.flavors.find { |f| f.name == '512MB' }
-      data = Fog::Compute[:digitalocean].create_server 'fog-test-server',
+      data = Fog::Compute[:digitalocean].create_server fog_server_name,
                                                        flavor.id,
                                                        image.id,
                                                        service.regions.first.id
       data.body
     end
-    
   end
-      
-
 end

data/tests/digitalocean/requests/compute/destroy_server_tests.rb

@@ -7,9 +7,8 @@ Shindo.tests('Fog::Compute[:digitalocean] | destroy_server request', ['digitaloc
 
     test('#destroy_server') do
       service.destroy_server(server.id).body['status'] == 'OK'
+      service.servers.get(server.id) == nil
     end
 
   end
-      
-
 end

data/tests/digitalocean/requests/compute/get_server_details_tests.rb

@@ -5,7 +5,7 @@ Shindo.tests('Fog::Compute[:digitalocean] | get_server_details request', ['digit
     test('#get_server_details') do
       server = fog_test_server
       body = Fog::Compute[:digitalocean].get_server_details(server.id).body
-      body['droplet']['name'] == 'fog-test-server'
+      body['droplet']['name'] == fog_server_name
     end
 
   end

data/tests/digitalocean/requests/compute/get_ssh_key_tests.rb

@@ -5,16 +5,19 @@ Shindo.tests('Fog::Compute[:digitalocean] | get_ssh_keys request', ['digitalocea
     'name'           => String,
     'ssh_pub_key'    => String,
   }
-  
+
   service = Fog::Compute[:digitalocean]
 
   tests('success') do
 
     tests('#get_ssh_key') do
       key = service.create_ssh_key 'fookey', 'ssh-dss FOO'
+
       tests('format').data_matches_schema(@ssh_key_format) do
         service.get_ssh_key(key.body['ssh_key']['id']).body['ssh_key']
       end
+
+      service.destroy_ssh_key(key.body['ssh_key']['id'])
     end
 
   end

data/tests/digitalocean/requests/compute/list_ssh_keys_tests.rb

@@ -7,15 +7,18 @@ Shindo.tests('Fog::Compute[:digitalocean] | list_ssh_keys request', ['digitaloce
 
   tests('success') do
 
+    ssh_key = service.create_ssh_key 'fookey', 'ssh-dss FOO'
+
     tests('#list_ssh_keys') do
-      Fog::Compute[:digitalocean].create_ssh_key 'fookey', 'ssh-dss FOO'
-      Fog::Compute[:digitalocean].list_ssh_keys.body['ssh_keys'].each do |key|
+      service.list_ssh_keys.body['ssh_keys'].each do |key|
         tests('format').data_matches_schema(@ssh_key_format) do
           key
         end
       end
     end
 
+    service.destroy_ssh_key(ssh_key.body['ssh_key']['id'])
+
   end
 
 end