fog 0.10.0 → 0.11.0

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

@@ -14,7 +14,3 @@ class AWS
   end
 
 end
-
-unless defined?(GENTOO_AMI)
-  GENTOO_AMI = 'ami-5ee70037'
-end

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

@@ -1,37 +1,68 @@
 Shindo.tests('Fog::Compute[:aws] | image requests', ['aws']) do
-
-  @images_format = {
+  @describe_images_format = {
     'imagesSet'    => [{
       'architecture'        => String,
-      'blockDeviceMapping'  =>[],
+      'blockDeviceMapping'  => [],
+      'description'         => Fog::Nullable::String,
+      'hypervisor'          => String,
       'imageId'             => String,
       'imageLocation'       => String,
+      'imageOwnerAlias'     => Fog::Nullable::String,
       'imageOwnerId'        => String,
       'imageState'          => String,
       'imageType'           => String,
       'isPublic'            => Fog::Boolean,
       'kernelId'            => String,
+      'name'                => String,
+      'platform'            => Fog::Nullable::String,
       'productCodes'        => [],
-      'ramdiskId'           => String,
+      'ramdiskId'           => Fog::Nullable::String,
+      'rootDeviceName'      => String,
       'rootDeviceType'      => String,
+      'stateReason'         => {},
       'tagSet'              => {},
       'virtualizationType'  => String
     }],
     'requestId'     => String,
   }
 
-  tests('success') do
+  @register_image_format = {
+    'imageId'               => String,
+    'requestId'             => String
+  }
 
+  tests('success') do
     # the result for this is HUGE and relatively uninteresting...
     # tests("#describe_images").formats(@images_format) do
     #   Fog::Compute[:aws].describe_images.body
     # end
+    @image_id = 'ami-1aad5273'
+
+    if Fog.mocking?
+      tests("#register_image").formats(@register_image_format) do
+        @image = Fog::Compute[:aws].register_image('image', 'image', '/dev/sda1').body
+      end
+
+      @image_id = @image['imageId']
+      sleep 1
 
-    tests("#describe_images('ImageId' => '#{GENTOO_AMI}')").formats(@images_format) do
-      pending if Fog.mocking?
-      Fog::Compute[:aws].describe_images('ImageId' => GENTOO_AMI).body
+      tests("#describe_images('Owner' => 'self')").formats(@describe_images_format) do
+        Fog::Compute[:aws].describe_images('Owner' => 'self').body
+      end
+
+      tests("#describe_images('state' => 'available')").formats(@describe_images_format) do
+        Fog::Compute[:aws].describe_images('state' => 'available').body
+      end
     end
 
-  end
+    tests("#describe_images('image-id' => '#{@image_id}')").formats(@describe_images_format) do
+      @other_image = Fog::Compute[:aws].describe_images('image-id' => @image_id).body
+    end
 
+    unless Fog.mocking?
+      tests("#describe_images('Owner' => '#{@other_image['imageOwnerAlias']}', 'image-id' => '#{@image_id}')").formats(@describe_images_format) do
+        Fog::Compute[:aws].describe_images('Owner' => @other_image['imageOwnerAlias'], 'image-id' => @image_id).body
+      end
+    end
+  end
 end

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

@@ -30,7 +30,7 @@ Shindo.tests('Fog::Compute[:brightbox] | account requests', ['brightbox']) do
 
   tests('failure') do
 
-    tests("#update_account").returns(nil) do
+    tests("#update_account").raises(ArgumentError) do
       pending if Fog.mocking?
       Fog::Compute[:brightbox].update_account
     end

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

@@ -103,6 +103,7 @@ class Brightbox
           "url"             => String,
           "id"              => String,
           "ipv4_address"    => String,
+          "ipv6_address"    => Fog::Nullable::String,
           "mac_address"     => String
         }
 
@@ -281,6 +282,7 @@ class Brightbox
           "verified_telephone" => Fog::Nullable::String,
           "verified_at"     => Fog::Nullable::String,
           "verified_ip"     => Fog::Nullable::String,
+          "valid_credit_card" => Fog::Boolean,
           "owner"           => Brightbox::Compute::Formats::Nested::USER,
           "users"           => [Brightbox::Compute::Formats::Nested::USER],
           "clients"         => [Brightbox::Compute::Formats::Nested::API_CLIENT],
@@ -338,6 +340,7 @@ class Brightbox
           "url"             => String,
           "id"              => String,
           "ipv4_address"    => String,
+          "ipv6_address"    => Fog::Nullable::String,
           "mac_address"     => String,
           "server"          => Brightbox::Compute::Formats::Nested::SERVER
         }

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

@@ -55,7 +55,7 @@ Shindo.tests('Fog::Compute[:brightbox] | load balancer requests', ['brightbox'])
 
   tests('failure') do
 
-    tests("#create_load_balancer").raises(Excon::Errors::BadRequest) do
+    tests("#create_load_balancer").raises(ArgumentError) do
       pending if Fog.mocking?
       Fog::Compute[:brightbox].create_load_balancer
     end

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

@@ -13,7 +13,7 @@ Shindo.tests('Fog::Compute[:voxel] | server requests', ['voxel']) do
       'access_methods'    => [],
       'description'       => String,
       'drives'            => [{
-        'position'  => Fog::Nullable::Integer,
+        'position'  => Fog::Nullable::String,
         'size'      => Integer
       }],
       'id'                => String,
@@ -34,7 +34,7 @@ Shindo.tests('Fog::Compute[:voxel] | server requests', ['voxel']) do
           'id'    => String,
           'value' => String
         },
-        'position'  => Fog::Nullable::Integer,
+        'position'  => Fog::Nullable::String,
         'rack'      => {
           'id'    => String,
           'value' => String

data/tests/dns/helper.rb

@@ -15,6 +15,12 @@ def dns_providers
     :dnsmadeeasy  => {
       :mocked => false
     },
+    :dynect       => {
+      :mocked => false,
+      :zone_attributes => {
+        :email => 'fog@example.com'
+      }
+    },
     :linode       => {
       :mocked => false,
       :zone_attributes => {
@@ -29,3 +35,15 @@ def dns_providers
     }
   }
 end
+
+def generate_unique_domain( with_trailing_dot = false)
+  #get time (with 1/100th of sec accuracy)
+  #want unique domain name and if provider is fast, this can be called more than once per second
+  time= (Time.now.to_f * 100).to_i
+  domain = 'test-' + time.to_s + '.com'
+  if with_trailing_dot
+    domain+= '.'
+  end
+
+  domain
+end

data/tests/dns/models/record_tests.rb

@@ -3,7 +3,7 @@ for provider, config in dns_providers
   # FIXME: delay/timing breaks things :(
   next if [:dnsmadeeasy].include?(provider)
 
-  Shindo.tests("Fog::DNS[:#{provider}] | record", [provider]) do
+  Shindo.tests("Fog::DNS[:#{provider}] | record", [provider.to_s]) do
 
     record_attributes = {
       :name   => 'www.fogrecordtests.com',
@@ -17,6 +17,7 @@ for provider, config in dns_providers
       }.merge(config[:zone_attributes] || {})
 
       @zone = Fog::DNS[provider].zones.create(zone_attributes)
+
       model_tests(@zone.records, record_attributes, config[:mocked])
 
       @zone.destroy
@@ -24,4 +25,4 @@ for provider, config in dns_providers
 
   end
 
-end
+end

data/tests/dns/models/records_tests.rb

@@ -3,7 +3,7 @@ for provider, config in dns_providers
   # FIXME: delay/timing breaks things :(
   next if [:dnsmadeeasy].include?(provider)
 
-  Shindo.tests("Fog::DNS[:#{provider}] | records", [provider]) do
+  Shindo.tests("Fog::DNS[:#{provider}] | records", [provider.to_s]) do
 
     record_attributes = {
       :name   => 'www.fogrecordstests.com',
@@ -25,4 +25,4 @@ for provider, config in dns_providers
 
   end
 
-end
+end

data/tests/dns/models/zone_tests.rb

@@ -3,7 +3,7 @@ for provider, config in dns_providers
   # FIXME: delay/timing breaks things :(
   next if [:dnsmadeeasy].include?(provider)
 
-  Shindo.tests("Fog::DNS[:#{provider}] | zone", [provider]) do
+  Shindo.tests("Fog::DNS[:#{provider}] | zone", [provider.to_s]) do
 
     zone_attributes = {
       :domain => 'fogzonetests.com'
@@ -13,4 +13,4 @@ for provider, config in dns_providers
 
   end
 
-end
+end

data/tests/dns/models/zones_tests.rb

@@ -3,7 +3,7 @@ for provider, config in dns_providers
   # FIXME: delay/timing breaks things :(
   next if [:dnsmadeeasy].include?(provider)
 
-  Shindo.tests("Fog::DNS[:#{provider}] | zones", [provider]) do
+  Shindo.tests("Fog::DNS[:#{provider}] | zones", [provider.to_s]) do
 
     zone_attributes = {
       :domain => 'fogzonestests.com'

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

@@ -4,18 +4,6 @@ Shindo.tests('Fog::DNS[:bluebox] | DNS requests', ['bluebox', 'dns']) do
   @new_zones = []
   @new_records =[]
 
-  def generate_unique_domain(with_trailing_dot = false)
-    #get time (with 1/100th of sec accuracy)
-    #want unique domain name and if provider is fast, this can be called more than once per second
-    time= (Time.now.to_f * 100).to_i
-    domain = 'test-' + time.to_s + '.com'
-    if with_trailing_dot
-      domain+= '.'
-    end
-
-    domain
-  end
-
   tests( 'success') do
 
     test('get current zone count') do

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

@@ -3,18 +3,6 @@ Shindo.tests('Fog::DNS[:dnsimple] | DNS requests', ['dnsimple', 'dns']) do
   @domain = ''
   @domain_count = 0
 
-  def generate_unique_domain( with_trailing_dot = false)
-    #get time (with 1/100th of sec accuracy)
-    #want unique domain name and if provider is fast, this can be called more than once per second
-    time= (Time.now.to_f * 100).to_i
-    domain = 'test-' + time.to_s + '.com'
-    if with_trailing_dot
-      domain+= '.'
-    end
-
-    domain
-  end
-
   tests("success") do
 
     test("get current domain count") do

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

@@ -3,18 +3,6 @@ Shindo.tests('Fog::DNS[:dnsmadeeasy] | DNS requests', ['dnsmadeeasy', 'dns']) do
   @domain = ''
   @domain_count = 0
 
-  def generate_unique_domain( with_trailing_dot = false)
-    #get time (with 1/100th of sec accuracy)
-    #want unique domain name and if provider is fast, this can be called more than once per second
-    time= (Time.now.to_f * 100).to_i
-    domain = 'test-' + time.to_s + '.com'
-    if with_trailing_dot
-      domain+= '.'
-    end
-
-    domain
-  end
-
   tests("success") do
 
     test("get current domain count") do

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

@@ -0,0 +1,132 @@
+Shindo.tests('Dynect::dns | DNS requests', ['dynect', 'dns']) do
+
+  pending if Fog.mocking?
+
+  shared_format = {
+    'job_id' => Integer,
+    'msgs' => [{
+      'ERR_CD'  => Fog::Nullable::String,
+      'INFO'    => String,
+      'LVL'     => String,
+      'SOURCE'  => String
+    }],
+    'status' => String
+  }
+
+  tests "success" do
+
+    @dns = Fog::DNS[:dynect]
+    @domain = generate_unique_domain
+    @fqdn = "www.#{@domain}"
+
+    post_session_format = shared_format.merge({
+      'data' => {
+        'token'   => String,
+        'version' => String
+      }
+    })
+
+    tests("post_session").formats(post_session_format) do
+      @dns.post_session.body
+    end
+
+    post_zone_format = shared_format.merge({
+      'data' => {
+        'serial'        => Integer,
+        'zone'          => String,
+        'zone_type'     => String,
+        'serial_style'  => String
+      }
+    })
+
+    tests("post_zone('netops@#{@domain}', 3600, '#{@domain}')").formats(post_zone_format) do
+      @dns.post_zone("netops@#{@domain}", 3600, @domain).body
+    end
+
+    get_zones_format = shared_format.merge({
+      'data' => [String]
+    })
+
+    tests("get_zone").formats(get_zones_format) do
+      @dns.get_zone.body
+    end
+
+    get_zone_format = shared_format.merge({
+      'data' => {
+        "serial"        => Integer,
+        "serial_style"  => String,
+        "zone"          => String,
+        "zone_type"     => String
+      }
+    })
+
+    tests("get_zone('zone' => '#{@domain}')").formats(get_zone_format) do
+      @dns.get_zone('zone' => @domain).body
+    end
+
+    post_record_format = shared_format.merge({
+      'data' => {
+        'fqdn'        => String,
+        'rdata'       => {
+          'address' => String
+        },
+        'record_id'   => Integer,
+        'record_type' => String,
+        'ttl'         => Integer,
+        'zone'        => String
+      }
+    })
+
+    tests("post_record('A', '#{@domain}', '#{@fqdn}', 'address' => '1.2.3.4')").formats(post_record_format) do
+      @dns.post_record('A', @domain, @fqdn, {'address' => '1.2.3.4'}, {}).body
+    end
+
+    put_zone_format = shared_format.merge({
+      'data' => {
+        'serial'        => Integer,
+        'serial_style'  => String,
+        'zone'          => String,
+        'zone_type'     => String
+      }
+    })
+
+    tests("put_zone('#{@domain}', :publish => true)").formats(put_zone_format) do
+      @dns.put_zone(@domain, :publish => true).body
+    end
+
+    get_node_list_format = shared_format.merge({
+      'data' => [String]
+    })
+
+    tests("get_node_list('#{@domain}')").formats(get_node_list_format) do
+      @dns.get_node_list(@domain).body
+    end
+
+    get_records_format = shared_format.merge({
+      'data' => [String]
+    })
+
+    tests("get_record('A', '#{@domain}', '#{@fqdn}')").formats(get_records_format) do
+      data = @dns.get_record('A', @domain, @fqdn).body
+      @record_id = data['data'].first.split('/').last
+      data
+    end
+
+    delete_record_format = shared_format.merge({
+      'data' => {}
+    })
+
+    tests("delete_record('A', '#{@domain}', '#{@fqdn}', '#{@record_id}')").formats(delete_record_format) do
+      @dns.delete_record('A', @domain, "#{@fqdn}", @record_id).body
+    end
+
+    delete_zone_format = shared_format.merge({
+      'data' => {}
+    })
+
+    tests("delete_zone('#{@domain}')").formats(delete_zone_format) do
+      @dns.delete_zone(@domain).body
+    end
+
+  end
+end

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

@@ -3,19 +3,7 @@ Shindo.tests('Fog::DNS[:linode] | DNS requests', ['linode', 'dns']) do
   @domain = ''
   @new_zones = []
   @new_records =[]
-    
-  def generate_unique_domain( with_trailing_dot = false)
-    #get time (with 1/100th of sec accuracy)
-    #want unique domain name and if provider is fast, this can be called more than once per second
-    time= (Time.now.to_f * 100).to_i   
-    domain = 'test-' + time.to_s + '.com'
-    if with_trailing_dot
-      domain+= '.'
-    end
-    
-    domain
-  end
-    
+
   tests( 'success') do
 
     test('get current zone count') do