fog 1.5.0 → 1.6.0

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

@@ -171,6 +171,45 @@ Shindo.tests('Dynect::dns | DNS requests', ['dynect', 'dns']) do
     tests("delete_zone('#{@domain}')").formats(delete_zone_format) do
       @dns.delete_zone(@domain).body
     end
+
+    tests("job handling") do
+      pending unless Fog.mocking?
+
+      old_mock_value = Excon.defaults[:mock]
+      Excon.stubs.clear
+
+      tests("returns final response from a complete job") do
+        begin
+          Excon.defaults[:mock] = true
+
+          Excon.stub({:method => :post, :path => "/REST/Session"}, {:body=>"{\"status\": \"success\", \"data\": {\"token\": \"foobar\", \"version\": \"2.3.1\"}, \"job_id\": 150583906, \"msgs\": [{\"INFO\": \"login: Login successful\", \"SOURCE\": \"BLL\", \"ERR_CD\": null, \"LVL\": \"INFO\"}]}", :headers=>{"Content-Type"=>"application/json"}, :status=>200})
+
+          Excon.stub({:method => :get, :path => "/REST/Zone/example.com"}, {:status => 307, :body => '/REST/Job/150576635', :headers => {'Content-Type' => 'text/html', 'Location' => '/REST/Job/150576635'}})
+          Excon.stub({:method => :get, :path => "/REST/Job/150576635"}, {:status => 307, :body => '{"status":"success"}', :headers => {'Content-Type' => 'application/json'}})
+
+          Fog::DNS::Dynect::Real.new.request(:method => :get, :path => "Zone/example.com").body.should == { "status" => "success" }
+        ensure
+          Excon.stubs.clear
+          Excon.defaults[:mock] = old_mock_value
+        end
+      end
+
+      tests("passes expects through when polling a job") do
+        begin
+          Excon.defaults[:mock] = true
+
+          Excon.stub({:method => :post, :path => "/REST/Session"}, {:body=>"{\"status\": \"success\", \"data\": {\"token\": \"foobar\", \"version\": \"2.3.1\"}, \"job_id\": 150583906, \"msgs\": [{\"INFO\": \"login: Login successful\", \"SOURCE\": \"BLL\", \"ERR_CD\": null, \"LVL\": \"INFO\"}]}", :headers=>{"Content-Type"=>"application/json"}, :status=>200})
+
+          Excon.stub({:method => :get, :path => "/REST/Zone/example.com"}, {:status => 307, :body => '/REST/Job/150576635', :headers => {'Content-Type' => 'text/html', 'Location' => '/REST/Job/150576635'}})
+          Excon.stub({:method => :get, :path => "/REST/Job/150576635"}, {:status => 404, :body => '{"status":"success"}', :headers => {'Content-Type' => 'application/json'}})
+
+          Fog::DNS::Dynect::Real.new.request(:method => :get, :expects => 404, :path => "Zone/example.com").body.should == { "status" => "success" }
+        ensure
+          Excon.stubs.clear
+          Excon.defaults[:mock] = old_mock_value
+        end
+      end
+    end
   end
 
   tests('failure') do

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

@@ -1,4 +1,4 @@
-Shindo.tests('Fog::Storage[:google] | bucket requests', [:google]) do
+Shindo.tests('Fog::Storage[:google] | bucket requests', ["google"]) do
 
   tests('success') do
 
@@ -16,8 +16,7 @@ Shindo.tests('Fog::Storage[:google] | bucket requests', [:google]) do
           'DisplayName' => String,
           'ID'          => String
         },
-        'Size' => Integer,
-        'StorageClass'  => String
+        'Size' => Integer
       }]
     }
 

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

@@ -1,4 +1,4 @@
-Shindo.tests('Fog::Storage[:google] | object requests', [:google]) do
+Shindo.tests('Fog::Storage[:google] | object requests', ["google"]) do
 
   @directory = Fog::Storage[:google].directories.create(:key => 'fogobjecttests')
 

data/tests/helper.rb

@@ -1,5 +1,5 @@
 require 'fog'
-require 'fog/bin' # for available_providers
+require 'fog/bin' # for available_providers and registered_providers
 
 require File.expand_path(File.join(File.dirname(__FILE__), 'helpers', 'mock_helper'))
 
@@ -12,9 +12,16 @@ def array_differences(array_a, array_b)
 end
 
 # check to see which credentials are available and add others to the skipped tags list
-all_providers = ['aws', 'bare_metal_cloud', 'bluebox', 'brightbox', 'cloudstack', 'dnsimple', 'dnsmadeeasy', 'dynect', 'ecloud', 'glesys', 'gogrid', 'google', 'hp', 'linode', 'local', 'ninefold', 'openstack', 'rackspace', 'stormondemand', 'voxel', 'xenserver', 'zerigo']
+all_providers = Fog.registered_providers.map {|provider| provider.downcase}
+
+# Manually remove these providers since they are local applications, not lacking credentials
+all_providers = all_providers - ["libvirt", "virtualbox", "vmfusion"]
+
 available_providers = Fog.available_providers.map {|provider| provider.downcase}
-for provider in (all_providers - available_providers)
+
+unavailable_providers = all_providers - available_providers
+
+for provider in unavailable_providers
   Formatador.display_line("[yellow]Skipping tests for [bold]#{provider}[/] [yellow]due to lacking credentials (add some to '~/.fog' to run them)[/]")
   Thread.current[:tags] << ('-' << provider)
 end

data/tests/helpers/formats_helper.rb

@@ -48,7 +48,8 @@ module Shindo
         format.delete(key)
         case value
         when Array
-          valid &&= datum.is_a?(Array) || p("#{key.inspect} not Array: #{datum.inspect}")
+          p("#{key.inspect} not Array: #{datum.inspect}") unless datum.is_a?(Array)
+          valid &&= datum.is_a?(Array)
           if datum.is_a?(Array) && !value.empty?
             for element in datum
               type = value.first
@@ -60,7 +61,8 @@ module Shindo
             end
           end
         when Hash
-          valid &&= datum.is_a?(Hash) || p("#{key.inspect} not Hash: #{datum.inspect}")
+          p("#{key.inspect} not Hash: #{datum.inspect}") unless datum.is_a?(Hash)
+          valid &&= datum.is_a?(Hash)
           valid &&= formats_kernel(datum, value, false, strict)
         else
           p "#{key.inspect} not #{value.inspect}: #{datum.inspect}" unless datum.is_a?(value)

data/tests/helpers/formats_helper_tests.rb

@@ -40,6 +40,15 @@ Shindo.tests('test_helper', 'meta') do
         !formats_kernel({}, {:a => String})
       end
 
+      test('when an array is expected but another data type is found') do
+        !formats_kernel({:a => 'not an array'}, {:a => []})
+      end
+
+      test('when a hash is expected but another data type is found') do
+        !formats_kernel({:a => 'not a hash'}, {:a => {}}, true, false)
+      end
+
+
       test('non strict extra data') do
         !formats_kernel({:a => :b, :b => :c}, {:z => Symbol}, true, false)
       end

data/tests/helpers/mock_helper.rb

@@ -11,12 +11,17 @@ if Fog.mock?
   Fog.credentials = {
     :aws_access_key_id                => 'aws_access_key_id',
     :aws_secret_access_key            => 'aws_secret_access_key',
+    :atmos_storage_token              => 'atmos_token',
+    :atmos_storage_secret             => 'atmos_secret',
+    :atmos_storage_endpoint           => 'http://atmos.is.cool:1000/test1.0',
     :bluebox_api_key                  => 'bluebox_api_key',
     :bluebox_customer_id              => 'bluebox_customer_id',
     :brightbox_client_id              => 'brightbox_client_id',
     :brightbox_secret                 => 'brightbox_secret',
+    :cloudstack_disk_offering_id      => '',
     :cloudstack_host                  => 'http://cloudstack.example.org',
-    :cloudstack_service_offering_id     => '4437ac6c-9fe3-477a-57ec-60a5a45896a4',
+    :cloudstack_network_ids           => '',
+    :cloudstack_service_offering_id   => '4437ac6c-9fe3-477a-57ec-60a5a45896a4',
     :cloudstack_template_id           => '8a31cf9c-f248-0588-256e-9dbf58785216',
     :cloudstack_zone_id               => 'c554c592-e09c-9df5-7688-4a32754a4305',
     :clodo_api_key                    => 'clodo_api_key',

data/tests/helpers/model_helper.rb

@@ -20,9 +20,6 @@ def model_tests(collection, params = {}, mocks_implemented = true)
 
   end
 
-  tests('failure') do
-  end
-
 end
 
 # Generates a unique identifier with a random differentiator.

data/tests/hp/models/compute/address_tests.rb

@@ -1,4 +1,4 @@
-Shindo.tests("Fog::Compute[:hp] | address", [:hp]) do
+Shindo.tests("Fog::Compute[:hp] | address", ["hp"]) do
 
   @base_image_id = ENV["BASE_IMAGE_ID"] || 1242
 

data/tests/hp/models/compute/addresses_tests.rb

@@ -1,4 +1,4 @@
-Shindo.tests("Fog::Compute[:hp] | addresses", [:hp]) do
+Shindo.tests("Fog::Compute[:hp] | addresses", ["hp"]) do
 
   collection_tests(Fog::Compute[:hp].addresses, {}, true)
 

data/tests/hp/models/compute/key_pair_tests.rb

@@ -1,4 +1,4 @@
-Shindo.tests("Fog::Compute[:hp] | key_pair", [:hp]) do
+Shindo.tests("Fog::Compute[:hp] | key_pair", ["hp"]) do
 
   model_tests(Fog::Compute[:hp].key_pairs, {:name => 'fogkeyname'}, true)
 

data/tests/hp/models/compute/key_pairs_tests.rb

@@ -1,4 +1,4 @@
-Shindo.tests("Fog::Compute[:hp] | key_pairs", [:hp]) do
+Shindo.tests("Fog::Compute[:hp] | key_pairs", ["hp"]) do
 
   collection_tests(Fog::Compute[:hp].key_pairs, {:name => 'fogkeyname'}, true)
 

data/tests/hp/models/compute/security_group_tests.rb

@@ -1,4 +1,4 @@
-Shindo.tests("Fog::Compute[:hp] | security_group", [:hp]) do
+Shindo.tests("Fog::Compute[:hp] | security_group", ["hp"]) do
 
   model_tests(Fog::Compute[:hp].security_groups, {:name => 'foggroupname', :description => 'foggroupdescription'}, true)
 

data/tests/hp/models/compute/security_groups_tests.rb

@@ -1,4 +1,4 @@
-Shindo.tests("Fog::Compute[:hp] | security_groups", [:hp]) do
+Shindo.tests("Fog::Compute[:hp] | security_groups", ["hp"]) do
 
   collection_tests(Fog::Compute[:hp].security_groups, {:name => 'foggroupname', :description => 'foggroupdescription'}, true)
 

data/tests/hp/requests/cdn/container_tests.rb

@@ -1,4 +1,4 @@
-Shindo.tests('Fog::CDN[:hp] | container requests', [:hp]) do
+Shindo.tests('Fog::CDN[:hp] | container requests', ["hp"]) do
 
   @cdn_containers_format = [{
     'x-cdn-ssl-uri' => String,

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

@@ -1,4 +1,4 @@
-Shindo.tests('Fog::Compute[:hp] | address requests', [:hp]) do
+Shindo.tests('Fog::Compute[:hp] | address requests', ["hp"]) do
 
   @floating_ips_format = {
     'instance_id' => Fog::Nullable::Integer,

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

@@ -1,4 +1,4 @@
-Shindo.tests('Fog::Compute[:hp] | flavor requests', [:hp]) do
+Shindo.tests('Fog::Compute[:hp] | flavor requests', ["hp"]) do
 
   @flavor_format = {
     'rxtx_quota' => Integer,

data/tests/hp/requests/compute/image_tests.rb

@@ -1,4 +1,4 @@
-Shindo.tests('Fog::Compute[:hp] | image requests', [:hp]) do
+Shindo.tests('Fog::Compute[:hp] | image requests', ["hp"]) do
 
   @image_format = {
     'id'        => String,

data/tests/hp/requests/compute/key_pair_tests.rb

@@ -1,4 +1,4 @@
-Shindo.tests('Fog::Compute[:hp] | key pair requests', [:hp]) do
+Shindo.tests('Fog::Compute[:hp] | key pair requests', ["hp"]) do
 
   tests('success') do
 

data/tests/hp/requests/compute/security_group_rule_tests.rb

@@ -1,4 +1,4 @@
-Shindo.tests('Fog::Compute[:hp] | security group requests', [:hp]) do
+Shindo.tests('Fog::Compute[:hp] | security group requests', ["hp"]) do
 
   @security_group_rule_format = {
     'from_port'       => Integer,

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

@@ -1,4 +1,4 @@
-Shindo.tests('Fog::Compute[:hp] | security group requests', [:hp]) do
+Shindo.tests('Fog::Compute[:hp] | security group requests', ["hp"]) do
 
   @security_groups_format = {
     'security_groups' => [{

data/tests/hp/requests/compute/server_address_tests.rb

@@ -1,4 +1,4 @@
-Shindo.tests('Fog::Compute[:hp] | address requests', [:hp]) do
+Shindo.tests('Fog::Compute[:hp] | address requests', ["hp"]) do
 
   @base_image_id = ENV["BASE_IMAGE_ID"] || 1242
 

data/tests/hp/requests/compute/server_tests.rb

@@ -1,4 +1,4 @@
-Shindo.tests('Fog::Compute[:hp] | server requests', [:hp]) do
+Shindo.tests('Fog::Compute[:hp] | server requests', ["hp"]) do
 
   @server_format = {
     'addresses'   => Fog::Nullable::Hash,

data/tests/hp/requests/storage/container_tests.rb

@@ -1,4 +1,4 @@
-Shindo.tests('Fog::Storage[:hp] | container requests', [:hp]) do
+Shindo.tests('Fog::Storage[:hp] | container requests', ["hp"]) do
 
   @container_format = [String]
 

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

@@ -1,4 +1,4 @@
-Shindo.tests('Fog::Storage[:hp] | object requests', [:hp]) do
+Shindo.tests('Fog::Storage[:hp] | object requests', ["hp"]) do
 
   @directory = Fog::Storage[:hp].directories.create(:key => 'fogobjecttests')
   @dir_name = @directory.identity

data/tests/local/models/file_tests.rb

@@ -1,4 +1,4 @@
-Shindo.tests('Storage[:local] | file', [:local]) do
+Shindo.tests('Storage[:local] | file', ["local"]) do
 
   pending if Fog.mocking?
 

data/tests/rackspace/models/block_storage/snapshot_tests.rb

@@ -0,0 +1,20 @@
+Shindo.tests('Fog::Rackspace::BlockStorage | snapshot', ['rackspace']) do
+
+  pending if Fog.mocking?
+
+  service = Fog::Rackspace::BlockStorage.new
+  volume = service.volumes.create({
+    :display_name => "fog_#{Time.now.to_i.to_s}",
+    :size => 100
+  })
+
+  volume.wait_for { ready? }
+
+  options = { :display_name => "fog_#{Time.now.to_i.to_s}", :volume_id => volume.id }
+  model_tests(service.snapshots, options, false) do
+    @instance.wait_for { ready? }
+  end
+
+  volume.wait_for { snapshots.empty? }
+  volume.destroy
+end

data/tests/rackspace/models/block_storage/snapshots_tests.rb

@@ -0,0 +1,20 @@
+Shindo.tests('Fog::Rackspace::BlockStorage | snapshots', ['rackspace']) do
+
+  pending if Fog.mocking?
+
+  service = Fog::Rackspace::BlockStorage.new
+  volume = service.volumes.create({
+    :display_name => "fog_#{Time.now.to_i.to_s}",
+    :size => 100
+  })
+
+  volume.wait_for { ready? }
+
+  options = { :display_name => "fog_#{Time.now.to_i.to_s}", :volume_id => volume.id }
+  collection_tests(service.snapshots, options, false) do
+    @instance.wait_for { ready? }
+  end
+
+  volume.wait_for { snapshots.empty? }
+  volume.destroy
+end

data/tests/rackspace/models/block_storage/volume_tests.rb

@@ -0,0 +1,27 @@
+Shindo.tests('Fog::Rackspace::BlockStorage | volume', ['rackspace']) do
+
+  pending if Fog.mocking?
+
+  service = Fog::Rackspace::BlockStorage.new
+  options = { :display_name => "fog_#{Time.now.to_i.to_s}", :size => 100 }
+
+  model_tests(service.volumes, options, false) do
+    @instance.wait_for { ready? }
+
+    tests('#attached?').succeeds do
+      @instance.state = 'in-use'
+      returns(true) { @instance.attached? }
+    end
+
+    tests('#snapshots').succeeds do
+      snapshot = service.snapshots.create({ :volume_id => @instance.id })
+      snapshot.wait_for { ready? }
+
+      returns(true) { @instance.snapshots.first.id == snapshot.id }
+
+      snapshot.destroy
+    end
+
+    @instance.wait_for { snapshots.empty? }
+  end
+end

data/tests/rackspace/models/block_storage/volume_types_tests.rb

@@ -0,0 +1,20 @@
+Shindo.tests('Fog::Rackspace::BlockStorage | volume_types', ['rackspace']) do
+
+  pending if Fog.mocking?
+
+  service = Fog::Rackspace::BlockStorage.new
+
+  tests("success") do
+    tests("#all").succeeds do
+      service.volume_types.all
+    end
+
+    tests("#get").succeeds do
+      service.volume_types.get(1)
+    end
+  end
+
+  tests("failure").returns(nil) do
+    service.volume_types.get('some_random_identity')
+  end
+end

data/tests/rackspace/models/block_storage/volumes_tests.rb

@@ -0,0 +1,11 @@
+Shindo.tests('Fog::Rackspace::BlockStorage | volumes', ['rackspace']) do
+
+  pending if Fog.mocking?
+
+  service = Fog::Rackspace::BlockStorage.new
+  options = { :display_name => "fog_#{Time.now.to_i.to_s}", :size => 100 }
+
+  collection_tests(service.volumes, options, false) do
+    @instance.wait_for { ready? }
+  end
+end

data/tests/rackspace/models/compute_v2/flavors_tests.rb

@@ -0,0 +1,20 @@
+Shindo.tests('Fog::Compute::RackspaceV2 | flavors', ['rackspace']) do
+
+  pending if Fog.mocking?
+
+  service = Fog::Compute::RackspaceV2.new
+
+  tests("success") do
+    tests("#all").succeeds do
+      service.flavors.all
+    end
+
+    tests("#get").succeeds do
+      service.flavors.get(2)
+    end
+  end
+
+  tests("failure").returns(nil) do
+    service.flavors.get('some_random_identity')
+  end
+end

data/tests/rackspace/models/compute_v2/images_tests.rb

@@ -0,0 +1,22 @@
+Shindo.tests('Fog::Compute::RackspaceV2 | images', ['rackspace']) do
+
+  pending if Fog.mocking?
+
+  service = Fog::Compute::RackspaceV2.new
+  image_id = nil
+
+  tests("success") do
+    tests("#all").succeeds do
+      images = service.images.all
+      image_id = images.first.id
+    end
+
+    tests("#get").succeeds do
+      service.images.get(image_id)
+    end
+  end
+
+  tests("failure").returns(nil) do
+    service.images.get('some_random_identity')
+  end
+end

data/tests/rackspace/models/compute_v2/server_tests.rb

@@ -0,0 +1,62 @@
+Shindo.tests('Fog::Compute::RackspaceV2 | server', ['rackspace']) do
+
+  pending if Fog.mocking?
+
+  service = Fog::Compute::RackspaceV2.new
+  options = {
+    :name => "fog_server_#{Time.now.to_i.to_s}",
+    :flavor_id => 2,
+    :image_id => '3afe97b2-26dc-49c5-a2cc-a2fc8d80c001'
+  }
+
+  model_tests(service.servers, options, false) do
+    @instance.wait_for { ready? }
+    tests('#reboot("SOFT")').succeeds do
+      @instance.reboot('SOFT')
+      returns('REBOOT') { @instance.state }
+    end
+
+    @instance.wait_for { ready? }
+    tests('#reboot("HARD")').succeeds do
+      @instance.reboot('HARD')
+      returns('HARD_REBOOT') { @instance.state }
+    end
+
+    @instance.wait_for { ready? }
+    tests('#rebuild').succeeds do
+      @instance.rebuild('5cebb13a-f783-4f8c-8058-c4182c724ccd')
+      returns('REBUILD') { @instance.state }
+    end
+
+    @instance.wait_for { ready? }
+    tests('#resize').succeeds do
+      @instance.resize(3)
+      returns('RESIZE') { @instance.state }
+    end
+
+    @instance.wait_for { state == 'VERIFY_RESIZE' }
+    tests('#confirm_resize').succeeds do
+      @instance.confirm_resize
+    end
+
+    @instance.wait_for { ready? }
+    tests('#resize').succeeds do
+      @instance.resize(2)
+      returns('RESIZE') { @instance.state }
+    end
+
+    @instance.wait_for { state == 'VERIFY_RESIZE' }
+    tests('#revert_resize').succeeds do
+      @instance.revert_resize
+    end
+
+    @instance.wait_for { ready? }
+    tests('#change_admin_password').succeeds do
+      @instance.change_admin_password('somerandompassword')
+      returns('PASSWORD') { @instance.state }
+      returns('somerandompassword') { @instance.password }
+    end
+
+    @instance.wait_for { ready? }
+  end
+end