fog 1.10.0 → 1.10.1

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

@@ -0,0 +1,28 @@
+Shindo.tests('Fog::Compute[:digitalocean] | ssh_keys collection', ['digitalocean']) do
+
+  service =  Fog::Compute[:digitalocean]
+
+  tests('The ssh_keys collection') do
+    key = service.ssh_keys.create :name => 'fookey',
+                                  :ssh_pub_key => 'fookey'
+    [:all, :get].each do |method|
+      test("should respond to #{method}") do
+        service.ssh_keys.respond_to? method
+      end
+    end
+
+    tests('should have Fog::Compute::DigitalOcean::SshKey inside') do
+      service.ssh_keys.each do |s|
+        test { s.kind_of? Fog::Compute::DigitalOcean::SshKey }
+      end
+    end
+
+    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
+      end
+    end
+
+  end
+
+end

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

@@ -0,0 +1,28 @@
+Shindo.tests('Fog::Compute[:digitalocean] | create_server request', ['digitalocean', 'compute']) do
+
+  @server_format = {
+    'id'             => Integer,
+    'name'           => String,
+    'image_id'       => Integer,
+    'size_id'        => Integer,
+    'event_id'       => Integer 
+  }
+
+  service = Fog::Compute[:digitalocean]
+
+  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' }
+      flavor = service.flavors.find { |f| f.name == '512MB' }
+      data = Fog::Compute[:digitalocean].create_server 'fog-test-server',
+                                                       flavor.id,
+                                                       image.id,
+                                                       service.regions.first.id
+      data.body
+    end
+    
+  end
+      
+
+end

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

@@ -0,0 +1,22 @@
+Shindo.tests('Fog::Compute[:digitalocean] | create_ssh_key request', ['digitalocean', 'compute']) do
+
+  @key_format = {
+    'id'             => Integer,
+    'name'           => String,
+    'ssh_pub_key'    => String
+  }
+
+  service = Fog::Compute[:digitalocean]
+
+  tests('success') do
+
+    tests('#create_ssh_key').formats({'status' => 'OK', 'ssh_key' => @key_format}) do
+      @key = Fog::Compute[:digitalocean].create_ssh_key 'fookey', 'fookey'
+      @key.body
+    end
+    
+  end
+
+  service.destroy_ssh_key @key.body['ssh_key']['id']
+
+end

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

@@ -0,0 +1,15 @@
+Shindo.tests('Fog::Compute[:digitalocean] | destroy_server request', ['digitalocean', 'compute']) do
+
+  service = Fog::Compute[:digitalocean]
+  server = fog_test_server
+
+  tests('success') do
+
+    test('#destroy_server') do
+      service.destroy_server(server.id).body['status'] == 'OK'
+    end
+
+  end
+      
+
+end

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

@@ -0,0 +1,23 @@
+Shindo.tests('Fog::Compute[:digitalocean] | destroy_ssh_key request', ['digitalocean', 'compute']) do
+
+  service = Fog::Compute[:digitalocean]
+
+  tests('success') do
+
+    test('#destroy_ssh_key') do
+      key = service.create_ssh_key 'fookey', 'fookey'
+      service.destroy_ssh_key(key.body['ssh_key']['id']).body['status'] == 'OK'
+    end
+    
+  end
+
+  tests('failures') do
+    test 'delete invalid key' do
+      # DigitalOcean API returns 500 with this sometimes
+      # so mark it as pending in real mode
+      pending unless Fog.mocking?
+      service.destroy_ssh_key('00000000000').body['status'] == 'ERROR'
+    end
+  end 
+
+end

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

@@ -0,0 +1,13 @@
+Shindo.tests('Fog::Compute[:digitalocean] | get_server_details request', ['digitalocean', 'compute']) do
+
+  tests('success') do
+
+    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'
+    end
+
+  end
+
+end

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

@@ -0,0 +1,22 @@
+Shindo.tests('Fog::Compute[:digitalocean] | get_ssh_keys request', ['digitalocean', 'compute']) do
+
+  @ssh_key_format = {
+    'id'             => Integer,
+    '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
+    end
+
+  end
+
+end

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

@@ -0,0 +1,23 @@
+Shindo.tests('Fog::Compute[:digitalocean] | list_flavors request', ['digitalocean', 'compute']) do
+
+  # {"id":2,"name":"Amsterdam 1"}
+  @flavor_format = {
+    'id'           => Integer,
+    'name'         => String,
+  }
+
+  tests('success') do
+
+    tests('#list_flavor') do
+      flavors = Fog::Compute[:digitalocean].list_flavors.body
+      test 'returns a Hash' do
+        flavors.is_a? Hash
+      end
+      tests('flavor').formats(@flavor_format, false) do
+        flavors['sizes'].first
+      end
+    end
+
+  end
+
+end

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

@@ -0,0 +1,24 @@
+Shindo.tests('Fog::Compute[:digitalocean] | list_images request', ['digitalocean', 'compute']) do
+
+  # {"id"=>1601, "name"=>"CentOS 5.8 x64", "distribution"=>"CentOS"}
+  @image_format = {
+    'id'           => Integer,
+    'name'         => String,
+    'distribution' => String
+  }
+
+  tests('success') do
+
+    tests('#list_images') do
+      images = Fog::Compute[:digitalocean].list_images.body
+      test 'returns a Hash' do
+        images.is_a? Hash
+      end
+      tests('image').formats(@image_format, false) do
+        images['images'].first
+      end
+    end
+
+  end
+
+end

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

@@ -0,0 +1,23 @@
+Shindo.tests('Fog::Compute[:digitalocean] | list_regions request', ['digitalocean', 'compute']) do
+
+  # {"id":2,"name":"Amsterdam 1"}
+  @region_format = {
+    'id'           => Integer,
+    'name'         => String,
+  }
+
+  tests('success') do
+
+    tests('#list_regions') do
+      regions = Fog::Compute[:digitalocean].list_regions.body
+      test 'returns a Hash' do
+        regions.is_a? Hash
+      end
+      tests('region').formats(@region_format, false) do
+        regions['regions'].first
+      end
+    end
+
+  end
+
+end

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

@@ -0,0 +1,26 @@
+Shindo.tests('Fog::Compute[:digitalocean] | list_servers request', ['digitalocean', 'compute']) do
+  
+  @server_format = {
+    'id'             => Integer,
+    'name'           => String,
+    'image_id'       => Integer,
+    'size_id'        => Integer,
+    'region_id'      => Integer,
+    'backups_active' => Fog::Nullable::Boolean,
+    'ip_address'     => Fog::Nullable::String,
+    'status'         => String
+  }
+
+  tests('success') do
+
+    tests('#list_servers') do
+      Fog::Compute[:digitalocean].list_servers.body['droplets'].each do |server|
+        tests('format').data_matches_schema(@server_format) do
+          server
+        end
+      end
+    end
+
+  end
+
+end

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

@@ -0,0 +1,21 @@
+Shindo.tests('Fog::Compute[:digitalocean] | list_ssh_keys request', ['digitalocean', 'compute']) do
+
+  @ssh_key_format = {
+    'id'           => Integer,
+    'name'         => String
+  }
+
+  tests('success') do
+
+    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|
+        tests('format').data_matches_schema(@ssh_key_format) do
+          key
+        end
+      end
+    end
+
+  end
+
+end

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

@@ -0,0 +1,20 @@
+Shindo.tests('Fog::Compute[:digitalocean] | power_cycle_server request', ['digitalocean', 'compute']) do
+
+  server = fog_test_server
+
+  tests('success') do
+
+    tests('#power_cycle_server') do
+      test('returns 200') do
+        service.power_cycle_server(server.id).status == 200
+      end
+      test('state is off') do
+        server.wait_for { server.state == 'off' }
+        server.state == 'off'
+      end
+    end
+    
+  end
+      
+
+end

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

@@ -0,0 +1,25 @@
+Shindo.tests('Fog::Compute[:digitalocean] | power on/off/shutdown requests', 
+             ['digitalocean', 'compute']) do
+
+  service = Fog::Compute[:digitalocean]
+  server = fog_test_server
+
+  tests('success') do
+
+    test('#power_off_server') do
+      service.power_off_server(server.id).body['status'] == 'OK'
+    end
+
+    test('#power_on_server') do
+      service.power_on_server(server.id).body['status'] == 'OK'
+    end
+    
+    test('#shutdown_server') do
+      service.shutdown_server(server.id).body['status'] == 'OK'
+    end
+    
+    server.start
+
+  end
+
+end

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

@@ -0,0 +1,14 @@
+Shindo.tests('Fog::Compute[:digitalocean] | reboot_server request', ['digitalocean', 'compute']) do
+
+  server = fog_test_server
+
+  tests('success') do
+
+    tests('#reboot_server').succeeds do
+      service.reboot_server(server.id).body['status'] == 'OK'
+    end
+    
+  end
+      
+
+end

data/tests/helpers/collection_helper.rb

@@ -21,6 +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
@@ -31,6 +33,39 @@ def collection_tests(collection, params = {}, mocks_implemented = true)
       collection.get(@identity)
     end
 
+    tests('Enumerable') do
+      pending if Fog.mocking? && !mocks_implemented
+
+      [
+        'all?', 'any?', 'find',  'detect', 'collect', 'map', 
+        'find_index', 'flat_map', 'collect_concat', 'group_by',
+        'none?', 'one?'
+      ].each do |enum_method|
+        if collection.respond_to?(enum_method)
+          tests("##{enum_method}").succeeds do
+            block_called = false
+            collection.send(enum_method) {|x| block_called = true }
+            block_called
+          end
+        end
+      end
+
+      [
+        'max_by','min_by'
+      ].each do |enum_method|
+        if collection.respond_to?(enum_method)
+          tests("##{enum_method}").succeeds do
+            block_called = false
+            collection.send(enum_method) {|x| block_called = true; 0 }
+            block_called
+          end
+        end
+
+      end
+
+    end
+
+
     if block_given?
       yield
     end
@@ -39,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

@@ -69,6 +69,8 @@ if Fog.mock?
     :libvirt_uri                      => 'qemu://libvirt/system',
     :rackspace_api_key                => 'rackspace_api_key',
     :rackspace_username               => 'rackspace_username',
+    :riakcs_access_key_id             => 'riakcs_access_key_id',
+    :riakcs_secret_access_key         => 'riakcs_secret_access_key',
     :storm_on_demand_username         => 'storm_on_demand_username',
     :storm_on_demand_password         => 'storm_on_demand_password',
     :vcloud_host                      => 'vcloud_host',

data/tests/internet_archive/models/storage/directory_tests.rb

@@ -1,51 +1,43 @@
 Shindo.tests("Storage[:internet_archive] | directory", ["internet_archive"]) do
 
   directory_attributes = {
-    :key => 'fogdirectorytests'
+    :key => "fogdirectorytests-#{rand(65536)}",
+    :collections => ['test_collection']
   }
 
-  model_tests(Fog::Storage[:internetarchive].directories, directory_attributes, Fog.mocking?) do
+  tests('success') do
+    params = directory_attributes
+    mocks_implemented = Fog.mocking?
 
-    tests("#versioning=") do
-      tests("#versioning=(true)").succeeds do
-        @instance.versioning = true
-      end
+    collection = Fog::Storage[:internetarchive].directories
+    @instance = collection.new(params)
 
-      tests("#versioning=(true) sets versioning to 'Enabled'").returns('Enabled') do
-        @instance.versioning = true
-        @instance.connection.get_bucket_versioning(@instance.key).body['VersioningConfiguration']['Status']
-      end
-
-      tests("#versioning=(false)").succeeds do
-        (@instance.versioning = false).equal? false
-      end
+    tests("#save").succeeds do
+      pending if Fog.mocking? && !mocks_implemented
+      @instance.save
+    end
 
-      tests("#versioning=(false) sets versioning to 'Suspended'").returns('Suspended') do
-        @instance.versioning = false
-        @instance.connection.get_bucket_versioning(@instance.key).body['VersioningConfiguration']['Status']
-      end
+    tests("#public_url").returns("http://archive.org/details/#{directory_attributes[:key]}") do
+      @instance.public_url
     end
 
   end
 
-  model_tests(Fog::Storage[:internetarchive].directories, directory_attributes, Fog.mocking?) do
+  tests("#set_metadata_array_headers") do
+    params = directory_attributes
 
-    tests("#versioning?") do
-      tests("#versioning? false if not enabled").returns(false) do
-        @instance.versioning?
-      end
+    collection = Fog::Storage[:internetarchive].directories
+    @instance = collection.new(params)
 
-      tests("#versioning? true if enabled").returns(true) do
-        @instance.connection.put_bucket_versioning(@instance.key, 'Enabled')
-        @instance.versioning?
-      end
+    @instance.collections = ['test_collection', 'opensource']
+    @options = {}
+    @instance.set_metadata_array_headers(:collections, @options)
 
-      tests("#versioning? false if suspended").returns(false) do
-        @instance.connection.put_bucket_versioning(@instance.key, 'Suspended')
-        @instance.versioning?
-      end
+    tests("#set_metadata_array_headers should set options").returns(true) do
+      @options['x-archive-meta01-collection'] == 'opensource' &&
+      @options['x-archive-meta02-collection'] == 'test_collection'
     end
-
   end
 
+
 end