fog 1.10.1 → 1.11.0

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

@@ -1,6 +1,6 @@
 Shindo.tests('Fog::Storage[:aws] | multipart upload requests', ["aws"]) do
 
-  @directory = Fog::Storage[:aws].directories.create(:key => 'fogmultipartuploadtests')
+  @directory = Fog::Storage[:aws].directories.create(:key => uniq_id('fogmultipartuploadtests'))
 
   tests('success') do
 

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

@@ -111,14 +111,16 @@ Shindo.tests('AWS::Storage | object requests', ['aws']) do
 
   end
 
+  fognonbucket = uniq_id('fognonbucket')
+
   tests('failure') do
 
-    tests("#put_object('fognonbucket', 'fog_non_object', lorem_file)").raises(Excon::Errors::NotFound) do
-      Fog::Storage[:aws].put_object('fognonbucket', 'fog_non_object', lorem_file)
+    tests("#put_object('#{fognonbucket}', 'fog_non_object', lorem_file)").raises(Excon::Errors::NotFound) do
+      Fog::Storage[:aws].put_object(fognonbucket, 'fog_non_object', lorem_file)
     end
 
-    tests("#copy_object('fognonbucket', 'fog_object', '#{@directory.identity}', 'fog_other_object')").raises(Excon::Errors::NotFound) do
-      Fog::Storage[:aws].copy_object('fognonbucket', 'fog_object', @directory.identity, 'fog_other_object')
+    tests("#copy_object('#{fognonbucket}', 'fog_object', '#{@directory.identity}', 'fog_other_object')").raises(Excon::Errors::NotFound) do
+      Fog::Storage[:aws].copy_object(fognonbucket, 'fog_object', @directory.identity, 'fog_other_object')
     end
 
     tests("#copy_object('#{@directory.identity}', 'fog_non_object', '#{@directory.identity}', 'fog_other_object')").raises(Excon::Errors::NotFound) do
@@ -126,32 +128,32 @@ Shindo.tests('AWS::Storage | object requests', ['aws']) do
     end
 
     tests("#copy_object('#{@directory.identity}', 'fog_object', 'fognonbucket', 'fog_other_object')").raises(Excon::Errors::NotFound) do
-      Fog::Storage[:aws].copy_object(@directory.identity, 'fog_object', 'fognonbucket', 'fog_other_object')
+      Fog::Storage[:aws].copy_object(@directory.identity, 'fog_object', fognonbucket, 'fog_other_object')
     end
 
-    tests("#get_object('fognonbucket', 'fog_non_object')").raises(Excon::Errors::NotFound) do
-      Fog::Storage[:aws].get_object('fognonbucket', 'fog_non_object')
+    tests("#get_object('#{fognonbucket}', 'fog_non_object')").raises(Excon::Errors::NotFound) do
+      Fog::Storage[:aws].get_object(fognonbucket, 'fog_non_object')
     end
 
     tests("#get_object('#{@directory.identity}', 'fog_non_object')").raises(Excon::Errors::NotFound) do
       Fog::Storage[:aws].get_object(@directory.identity, 'fog_non_object')
     end
 
-    tests("#head_object('fognonbucket', 'fog_non_object')").raises(Excon::Errors::NotFound) do
-      Fog::Storage[:aws].head_object('fognonbucket', 'fog_non_object')
+    tests("#head_object(fognonbucket, 'fog_non_object')").raises(Excon::Errors::NotFound) do
+      Fog::Storage[:aws].head_object(fognonbucket, 'fog_non_object')
     end
 
     tests("#head_object('#{@directory.identity}', 'fog_non_object')").raises(Excon::Errors::NotFound) do
       Fog::Storage[:aws].head_object(@directory.identity, 'fog_non_object')
     end
 
-    tests("#delete_object('fognonbucket', 'fog_non_object')").raises(Excon::Errors::NotFound) do
-      Fog::Storage[:aws].delete_object('fognonbucket', 'fog_non_object')
+    tests("#delete_object('#{fognonbucket}', 'fog_non_object')").raises(Excon::Errors::NotFound) do
+      Fog::Storage[:aws].delete_object(fognonbucket, 'fog_non_object')
     end
 
-    tests("#delete_multiple_objects('fognonbucket', ['fog_non_object'])").raises(Excon::Errors::NotFound) do
+    tests("#delete_multiple_objects('#{fognonbucket}', ['fog_non_object'])").raises(Excon::Errors::NotFound) do
       pending if Fog.mocking?
-      Fog::Storage[:aws].delete_multiple_objects('fognonbucket', ['fog_non_object'])
+      Fog::Storage[:aws].delete_multiple_objects(fognonbucket, ['fog_non_object'])
     end
 
     tests("#put_object_acl('#{@directory.identity}', 'fog_object', 'invalid')").raises(Excon::Errors::BadRequest) do

data/tests/brightbox/compute/image_selector_tests.rb

@@ -0,0 +1,103 @@
+Shindo.tests("Fog::Brightbox::Compute::ImageSelector.new", ["brightbox"]) do
+
+  sample_images = [
+    {
+      "id" => "img-00000",
+      "name" => "Ubuntu Lucid 10.04 LTS",
+      "official" => true,
+      "arch" => "i686",
+      "created_at" => "2013-04-30T12:34:56"
+    },
+    {
+      "id" => "img-11111",
+      "name" => "ubuntu-precise-12.04-amd64-server",
+      "official" => false,
+      "arch" => "i686",
+      "created_at" => "2013-05-01T12:34:56"
+    },
+    {
+      "id" => "img-22222",
+      "name" => "ubuntu-quantal-12.10-i386-server",
+      "official" => true,
+      "arch" => "i686",
+      "created_at" => "2013-05-01T12:34:56"
+    },
+    {
+      "id" => "img-33333",
+      "name" => "ubuntu-raring-13.04-amd64-server",
+      "official" => true,
+      "arch" => "amd64",
+      "created_at" => "2013-05-01T12:34:56"
+    },
+    {
+      "id" => "img-44444",
+      "name" => "Fedora 17 server",
+      "official" => true,
+      "arch" => "i686",
+      "created_at" => "2013-05-01T12:34:56"
+    },
+    {
+      "id" => "img-ubuntu",
+      "name" => "ubuntu-raring-13.04-i386-server",
+      "official" => true,
+      "arch" => "i686",
+      "created_at" => "2013-05-01T12:34:56"
+    },
+  ]
+
+  @image_selector = Fog::Brightbox::Compute::ImageSelector.new(sample_images)
+
+  test("#respond_to?(:latest_ubuntu)") do
+    @image_selector.respond_to?(:latest_ubuntu)
+  end
+
+  tests("when there are sample of images") do
+    tests("#latest_ubuntu").returns("img-ubuntu") do
+      @image_selector.latest_ubuntu
+    end
+  end
+
+  tests("when only old format names are present") do
+    tests("#latest_ubuntu").returns("img-ubuntu") do
+      sample_images = [
+        {
+          "id" => "img-11111",
+          "name" => "Ubuntu Lucid 10.04 LTS server",
+          "official" => true,
+          "arch" => "i686",
+          "created_at" => "2013-05-01T12:34:56"
+        },
+        {
+          "id" => "img-22222",
+          "name" => "Ubuntu Quantal 12.10 server",
+          "official" => false,
+          "arch" => "x86_64",
+          "created_at" => "2013-05-01T12:34:56"
+        },
+        {
+          "id" => "img-ubuntu",
+          "name" => "Ubuntu Quantal 12.10 server",
+          "official" => true,
+          "arch" => "i686",
+          "created_at" => "2013-05-01T12:34:56"
+        },
+        {
+          "id" => "img-33333",
+          "name" => "Blank disk image",
+          "official" => true,
+          "arch" => "i686",
+          "created_at" => "2013-05-01T12:34:56"
+        }
+      ]
+      @image_selector = Fog::Brightbox::Compute::ImageSelector.new(sample_images)
+      @image_selector.latest_ubuntu
+
+    end
+  end
+
+  tests("when ") do
+    tests("#latest_ubuntu").returns(nil) do
+      Fog::Brightbox::Compute::ImageSelector.new([]).latest_ubuntu
+    end
+  end
+end

data/tests/cloudstack/compute/models/disk_offering_tests.rb

@@ -0,0 +1,5 @@
+Shindo.tests("Fog::Compute[:cloudstack] | disk_offering", "cloudstack") do
+  config = compute_providers[:cloudstack]
+  compute = Fog::Compute[:cloudstack]
+  model_tests(compute.disk_offerings, config[:disk_offering_attributes], config[:mocked])
+end

data/tests/cloudstack/compute/models/snapshot_tests.rb

@@ -3,19 +3,6 @@ def snapshot_tests(connection, params, mocks_implemented = true)
     if !Fog.mocking? || mocks_implemented
       @instance.wait_for { ready? }
     end
-
-    @volume = @instance.connection.volumes.create(params[:volumes_attributes])
-    @volume.wait_for { ready? }
-
-    tests('create').succeeds do
-      @instance.create :volume_id => @volume.id
-    end
-
-    tests('destroy').succeeds do
-      @instance.destroy
-    end
-
-    @volume.destroy
   end
 end
 
@@ -23,12 +10,10 @@ Shindo.tests("Fog::Compute[:cloudstack] | snapshot", "cloudstack") do
 
   config = compute_providers[:cloudstack]
 
-  snapshot_tests(Fog::Compute[:cloudstack], config, config[:mocked]) do
-    if Fog.mocking? && !mocks_implemented
-      pending
-    else
-      responds_to(:ready?)
-      responds_to(:volume)
-    end
+  snapshot_tests(Fog::Compute[:cloudstack], config, config[:mocked])
+
+  tests('has volume relation') do
+    responds_to(:volume)
   end
+
 end

data/tests/cloudstack/requests/disk_offering_tests.rb

@@ -4,14 +4,15 @@ Shindo.tests('Fog::Compute[:cloudstack] | disk offering requests', ['cloudstack'
     'listdiskofferingsresponse'  => {
       'count' => Integer,
       'diskoffering' => [
-        'id' => Integer,
+        'id' => String,
         'created' => String,
         'disksize' => Integer,
         'displaytext' => String,
         'domain' => Fog::Nullable::String,
-        'domainid' => Fog::Nullable::Integer,
+        'domainid' => Fog::Nullable::String,
         'iscustomized' => Fog::Boolean,
         'name' => String,
+        'storagetype' => String,
         'tags' => Fog::Nullable::String
       ]
     }
@@ -20,7 +21,6 @@ Shindo.tests('Fog::Compute[:cloudstack] | disk offering requests', ['cloudstack'
   tests('success') do
 
     tests('#list_disk_offerings').formats(@disk_offerings_format) do
-      pending if Fog.mocking?
       Fog::Compute[:cloudstack].list_disk_offerings
     end
 

data/tests/cloudstack/requests/os_type_tests.rb

@@ -4,9 +4,9 @@ Shindo.tests('Fog::Compute[:cloudstack] | os type requests', ['cloudstack']) do
     'listostypesresponse'  => {
       'count' => Integer,
       'ostype' => [
-        'id' => Integer,
+        'id' => String,
         'description' => String,
-        'oscategoryid' => Integer
+        'oscategoryid' => String
       ]
     }
   }
@@ -24,7 +24,6 @@ Shindo.tests('Fog::Compute[:cloudstack] | os type requests', ['cloudstack']) do
   tests('success') do
 
     tests('#list_os_types').formats(@os_types_format) do
-      pending if Fog.mocking?
       Fog::Compute[:cloudstack].list_os_types
     end
     

data/tests/compute/helper.rb

@@ -60,6 +60,14 @@ def compute_providers
           end
         end
       end,
+      :snapshot_attributes => {:volume_id => "89198f7c-0245-aa1d-136a-c5f479ef9db7"}.tap do |hash|
+        [:volume_id, :domain_id, :policy_id].each do |k|
+          key = "cloudstack_#{k}".to_sym
+          if Fog.credentials[key]
+            hash[k]= Fog.credentials[key]
+          end
+        end
+      end,
       :security_group_attributes => {:name => "cloudstack.sg.#{Time.now.to_i}"},
       :security_group_rule_attributes => {
         :cidr => '0.0.0.0/0',
@@ -67,6 +75,7 @@ def compute_providers
         :end_port => 456,
         :protocol => 'tcp'
       },
+      :disk_offering_attributes => { :name => "new disk offering", :display_text => 'New Disk Offering' },
       :mocked => true
     },
     :glesys   => {

data/tests/core/json_tests.rb

@@ -0,0 +1,62 @@
+Shindo.tests('Fog#JSON', 'core') do
+
+TEST_HASH = {'quantity' => 4}
+VALID_JSON = "{\"quantity\":4}"
+
+  tests('LegacyJSON') do
+
+    begin
+      require 'json'
+    rescue => e
+      returns('Failed to load JSON library', true) { false }
+    end
+
+    pending? unless defined? ::JSON
+
+    class LegacyJSONTester
+      include Fog::JSON::LegacyJSON
+    end
+
+    @tester = LegacyJSONTester.new
+    tests('encode').returns(VALID_JSON) do
+      @tester.encode(TEST_HASH)
+    end
+
+    tests('decode').returns(TEST_HASH) do
+      @tester.decode(VALID_JSON)
+    end
+
+    tests('invalid decode').raises(Fog::JSON::LoadError) do
+      @tester.decode("I am not json")
+    end
+  end
+
+  tests('NewJSON') do
+
+    begin
+      require 'multi_json'
+    rescue => e
+      returns('Failed to load multi_json library', true) { false }
+     end
+
+     pending unless defined? ::MultiJson
+
+    class NewJSONTester
+      include Fog::JSON::NewJSON
+    end
+
+    @tester = NewJSONTester.new
+    tests('encode').returns(VALID_JSON) do
+      @tester.encode(TEST_HASH)
+    end
+
+    tests('decode').returns(TEST_HASH) do
+      @tester.decode(VALID_JSON)
+    end
+
+    tests('invalid decode').raises(Fog::JSON::LoadError) do
+      @tester.decode("I am not json")
+    end
+
+  end
+end

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

@@ -1,6 +1,3 @@
-require 'spec'
-require 'spec/mocks'
-
 Shindo.tests('Dynect::dns | DNS requests', ['dynect', 'dns']) do
 
   shared_format = {

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

@@ -0,0 +1,24 @@
+Shindo.tests("Fog::Compute[:google] | server model", ['google']) do
+
+  tests('servers') do
+    @instance = nil
+    test('#bootstrap') do
+      @instance = Fog::Compute[:google].servers.bootstrap
+      @instance.ready?
+    end
+
+    test('#sshable?') do
+      @instance.wait_for { sshable? }
+      @instance.sshable?
+    end
+
+    test('#ssh') do
+      @instance.ssh("uname") == "Linux"
+    end
+
+    test('#destroy') do
+      response = @instance.destroy
+      response.body['operationType'] == 'delete'
+    end
+  end
+end

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

@@ -0,0 +1,88 @@
+Shindo.tests('Fog::Compute[:google] | disk requests', ['google']) do
+
+  @google = Fog::Compute[:google]
+
+  @insert_disk_format = {
+      'kind' => String,
+      'id' => String,
+      'selfLink' => String,
+      'name' => String,
+      'targetLink' => String,
+      'status' => String,
+      'user' => String,
+      'progress' => Integer,
+      'zone' => String,
+      'insertTime' => String,
+      'startTime' => String,
+      'operationType' => String
+  }
+
+  @get_disk_format = {
+      'kind' => String,
+      'id' => String,
+      'selfLink' => String,
+      'creationTimestamp' => String,
+      'name' => String,
+      'zone' => String,
+      'status' => String,
+      'sizeGb' => String
+  }
+
+  @delete_disk_format = {
+      'kind' => String,
+      'id' => String,
+      'selfLink' => String,
+      'name' => String,
+      'targetLink' => String,
+      'targetId' => String,
+      'status' => String,
+      'user' => String,
+      'progress' => Integer,
+      'insertTime' => String,
+      'zone' => String,
+      'startTime' => String,
+      'operationType' => String
+  }
+
+  @list_disks_format = {
+      'kind' => String,
+      'id' => String,
+      'selfLink' => String,
+      'items' => [{
+        'kind'=> String,
+        'id'=> String,
+        'creationTimestamp'=>String,
+        'selfLink'=>String,
+        'name'=> String,
+        'sizeGb'=> String,
+        'zone'=> String,
+        'status'=>String,
+      }]
+  }
+
+  tests('success') do
+
+    disk_name = 'new-disk-test'
+    disk_size = '2'
+    zone_name = 'us-central1-a'
+
+    # These will all fail if errors happen on insert
+    tests("#insert_disk").formats(@insert_disk_format) do
+      @google.insert_disk(disk_name, disk_size, zone_name).body
+    end
+
+    tests("#get_disk").formats(@get_disk_format) do
+      @google.get_disk(disk_name, zone_name).body
+    end
+
+    tests("#list_disks").formats(@list_disks_format) do
+      @google.list_disks(zone_name).body
+    end
+
+    tests("#delete_disk").formats(@delete_disk_format) do
+      @google.delete_disk(disk_name, zone_name).body
+    end
+
+  end
+
+end