RubyGems - fog - Versions diffs - 0.8.2 → 0.9.0 - Mend

fog 0.8.2 → 0.9.0

Files changed (913) hide show

data/tests/dns/requests/slicehost/dns_tests.rb CHANGED

@@ -1,4 +1,4 @@
-Shindo.tests('Slicehost::dns | DNS requests', ['slicehost', 'dns']) do
+Shindo.tests('Fog::DNS[:slicehost] | DNS requests', ['slicehost', 'dns']) do
   @domain = ''
   @new_zones = []
@@ -22,7 +22,7 @@ Shindo.tests('Slicehost::dns | DNS requests', ['slicehost', 'dns']) do
       pending if Fog.mocking?
       @org_zone_count= 0
-      response = Slicehost[:dns].get_zones()
+      response = Fog::DNS[:slicehost].get_zones()
       if response.status == 200
         zones = response.body['zones']
         @org_zone_count = zones.count
@@ -35,7 +35,7 @@ Shindo.tests('Slicehost::dns | DNS requests', ['slicehost', 'dns']) do
       pending if Fog.mocking?
       domain = generate_unique_domain( true)
-      response = Slicehost[:dns].create_zone(domain)
+      response = Fog::DNS[:slicehost].create_zone(domain)
       if response.status == 201
         zone_id = response.body['id']
         @new_zones << zone_id
@@ -49,7 +49,7 @@ Shindo.tests('Slicehost::dns | DNS requests', ['slicehost', 'dns']) do
       options = { :ttl => 1800, :active => 'N' }
       @domain= generate_unique_domain( true)
-      response = Slicehost[:dns].create_zone( @domain, options)
+      response = Fog::DNS[:slicehost].create_zone( @domain, options)
       if response.status == 201
         @zone_id = response.body['id']
         @new_zones << @zone_id
@@ -63,7 +63,7 @@ Shindo.tests('Slicehost::dns | DNS requests', ['slicehost', 'dns']) do
       result= false
-      response = Slicehost[:dns].get_zone( @zone_id)
+      response = Fog::DNS[:slicehost].get_zone( @zone_id)
       if response.status == 200
         zone = response.body
         if (zone['origin'] == @domain) and (zone['ttl'] == 1800) and
@@ -80,7 +80,7 @@ Shindo.tests('Slicehost::dns | DNS requests', ['slicehost', 'dns']) do
       result= false
-      response = Slicehost[:dns].get_zones()
+      response = Fog::DNS[:slicehost].get_zones()
       if response.status == 200
         zones = response.body['zones']
         if (@org_zone_count+2) == zones.count
@@ -96,7 +96,7 @@ Shindo.tests('Slicehost::dns | DNS requests', ['slicehost', 'dns']) do
       result= false
-      response = Slicehost[:dns].get_zones()
+      response = Fog::DNS[:slicehost].get_zones()
       if response.status == 200
         zones = response.body['zones']
         zones.each { |zone|
@@ -120,7 +120,7 @@ Shindo.tests('Slicehost::dns | DNS requests', ['slicehost', 'dns']) do
       host= 'www.' + @domain
       zone_id= @new_zones[1]
-      response = Slicehost[:dns].create_record( 'A', zone_id, host, '1.2.3.4')
+      response = Fog::DNS[:slicehost].create_record( 'A', zone_id, host, '1.2.3.4')
       if response.status == 201
         record_id = response.body['id']
         @new_records << record_id
@@ -135,7 +135,7 @@ Shindo.tests('Slicehost::dns | DNS requests', ['slicehost', 'dns']) do
       host= 'ftp.' + @domain
       zone_id= @new_zones[1]
       options = { :ttl => 3600, :active => 'N'}
-      response = Slicehost[:dns].create_record( 'A', zone_id, host, '1.2.3.4', options)
+      response = Fog::DNS[:slicehost].create_record( 'A', zone_id, host, '1.2.3.4', options)
       if response.status == 201
         record_id = response.body['id']
         @new_records << record_id
@@ -148,7 +148,7 @@ Shindo.tests('Slicehost::dns | DNS requests', ['slicehost', 'dns']) do
       pending if Fog.mocking?
       zone_id= @new_zones[1]
-      response = Slicehost[:dns].create_record( 'CNAME', zone_id, 'mail', @domain)
+      response = Fog::DNS[:slicehost].create_record( 'CNAME', zone_id, 'mail', @domain)
       if response.status == 201
         record_id = response.body['id']
         @new_records << record_id
@@ -163,7 +163,7 @@ Shindo.tests('Slicehost::dns | DNS requests', ['slicehost', 'dns']) do
       ns_domain = 'ns.' + @domain
       zone_id= @new_zones[1]
       options = { :ttl => 3600, :active => 'N'}
-      response = Slicehost[:dns].create_record( 'NS', zone_id, @domain, ns_domain, options)
+      response = Fog::DNS[:slicehost].create_record( 'NS', zone_id, @domain, ns_domain, options)
       if response.status == 201
         record_id = response.body['id']
         @new_records << record_id
@@ -178,7 +178,7 @@ Shindo.tests('Slicehost::dns | DNS requests', ['slicehost', 'dns']) do
       mail_domain = 'mail.' + @domain
       zone_id= @new_zones[1]
       options = { :ttl => 3600, :active => 'N', :aux => '10'}
-      response = Slicehost[:dns].create_record( 'MX', zone_id, @domain, mail_domain, options)
+      response = Fog::DNS[:slicehost].create_record( 'MX', zone_id, @domain, mail_domain, options)
       if response.status == 201
         @record_id = response.body['id']
         @new_records << @record_id
@@ -192,7 +192,7 @@ Shindo.tests('Slicehost::dns | DNS requests', ['slicehost', 'dns']) do
       result= false
-      response = Slicehost[:dns].get_record(@record_id)
+      response = Fog::DNS[:slicehost].get_record(@record_id)
       if response.status == 200
         mail_domain = 'mail.' + @domain
         record = response.body['records'][0]
@@ -211,7 +211,7 @@ Shindo.tests('Slicehost::dns | DNS requests', ['slicehost', 'dns']) do
       result= false
-      response = Slicehost[:dns].get_records()
+      response = Fog::DNS[:slicehost].get_records()
       if response.status == 200
         records = response.body['records']
@@ -239,7 +239,7 @@ Shindo.tests('Slicehost::dns | DNS requests', ['slicehost', 'dns']) do
       result= true
       @new_records.each { |record_id|
-        response = Slicehost[:dns].delete_record( record_id)
+        response = Fog::DNS[:slicehost].delete_record( record_id)
         if response.status != 200
             result= false;
         end
@@ -253,7 +253,7 @@ Shindo.tests('Slicehost::dns | DNS requests', ['slicehost', 'dns']) do
       result= true
       @new_zones.each { |zone_id|
-        response = Slicehost[:dns].delete_zone( zone_id)
+        response = Fog::DNS[:slicehost].delete_zone( zone_id)
         if response.status != 200
             result= false;
         end

data/tests/dns/requests/zerigo/dns_tests.rb CHANGED

@@ -1,12 +1,12 @@
-Shindo.tests('Zerigo::dns | DNS requests', ['zerigo', 'dns']) do
+Shindo.tests('Fog::DNS[:zerigo] | DNS requests', ['zerigo', 'dns']) do
   # tests assume have a free acccount - ie need to limit # of zones to max of 3
   @domain = ''
   @org_zone_count = 0
   @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
@@ -15,18 +15,17 @@ Shindo.tests('Zerigo::dns | DNS requests', ['zerigo', 'dns']) do
     if with_trailing_dot
       domain+= '.'
     end
     domain
   end
   tests( 'success') do
     test('get current zone count') do
       pending if Fog.mocking?
       @org_zone_count= 0
-      response = Zerigo[:dns].count_zones()
+      response = Fog::DNS[:zerigo].count_zones()
       if response.status == 200
         @org_zone_count = response.body['count']
       end
@@ -39,11 +38,11 @@ Shindo.tests('Zerigo::dns | DNS requests', ['zerigo', 'dns']) do
       options = { :nx_ttl => 1800 }
       domain = generate_unique_domain
-      response = Zerigo[:dns].create_zone( domain, 3600, 'pri_sec', options)
+      response = Fog::DNS[:zerigo].create_zone( domain, 3600, 'pri_sec', options)
       if response.status == 201
         zone_id = response.body['id']
         #worked so can now delete
-        response = Zerigo[:dns].delete_zone( zone_id)
+        response = Fog::DNS[:zerigo].delete_zone( zone_id)
       end
       response.status == 200
@@ -54,11 +53,11 @@ Shindo.tests('Zerigo::dns | DNS requests', ['zerigo', 'dns']) do
       options = { :active => 'N', :ns1=> '2.3.4.5' }
       domain= generate_unique_domain
-      response = Zerigo[:dns].create_zone( domain, 14400, 'sec', options )
+      response = Fog::DNS[:zerigo].create_zone( domain, 14400, 'sec', options )
       if response.status == 201
         zone_id = response.body['id']
         #worked so can now delete
-        response = Zerigo[:dns].delete_zone( zone_id)
+        response = Fog::DNS[:zerigo].delete_zone( zone_id)
       end
       response.status == 200
@@ -69,11 +68,11 @@ Shindo.tests('Zerigo::dns | DNS requests', ['zerigo', 'dns']) do
       domain= generate_unique_domain
       options = { :active => 'N', :slave_nameservers=> "ns1.#{domain},ns2.#{domain}" }
-      response = Zerigo[:dns].create_zone( domain, 14400, 'pri', options )
+      response = Fog::DNS[:zerigo].create_zone( domain, 14400, 'pri', options )
       if response.status == 201
         zone_id = response.body['id']
         #worked so can now delete
-        response = Zerigo[:dns].delete_zone( zone_id)
+        response = Fog::DNS[:zerigo].delete_zone( zone_id)
       end
       response.status == 200
@@ -85,7 +84,7 @@ Shindo.tests('Zerigo::dns | DNS requests', ['zerigo', 'dns']) do
       @domain = generate_unique_domain
       options = { :nx_ttl => 1800, :active => 'N', :hostmaster => "netops@#{@domain}",
                   :notes => 'for client ABC', :tag_list=> 'sample-tag' }
-      response = Zerigo[:dns].create_zone( @domain, 14400, 'pri', options )
+      response = Fog::DNS[:zerigo].create_zone( @domain, 14400, 'pri', options )
       if response.status == 201
         @zone_id = response.body['id']
         @new_zones << @zone_id
@@ -99,7 +98,7 @@ Shindo.tests('Zerigo::dns | DNS requests', ['zerigo', 'dns']) do
       result= false
-      response = Zerigo[:dns].get_zone( @zone_id)
+      response = Fog::DNS[:zerigo].get_zone( @zone_id)
       if response.status == 200
         zone = response.body
         if (zone['ns-type'] == 'pri') and (zone['tag-list'] == 'sample-tag') and
@@ -118,7 +117,7 @@ Shindo.tests('Zerigo::dns | DNS requests', ['zerigo', 'dns']) do
       pending if Fog.mocking?
       options = { :notes => 'for client XYZ', :tag_list=> 'testing-tag' }
-      response = Zerigo[:dns].update_zone( @zone_id, options )
+      response = Fog::DNS[:zerigo].update_zone( @zone_id, options )
       response.status == 200
     end
@@ -128,7 +127,7 @@ Shindo.tests('Zerigo::dns | DNS requests', ['zerigo', 'dns']) do
       result= false
-      response = Zerigo[:dns].get_zone( @zone_id)
+      response = Fog::DNS[:zerigo].get_zone( @zone_id)
       if response.status == 200
         zone = response.body
         if (zone['tag-list'] == 'testing-tag') and (zone['notes'] == 'for client XYZ')
@@ -144,7 +143,7 @@ Shindo.tests('Zerigo::dns | DNS requests', ['zerigo', 'dns']) do
       result= false
-      response = Zerigo[:dns].get_zone_stats( @zone_id)
+      response = Fog::DNS[:zerigo].get_zone_stats( @zone_id)
       if response.status == 200
         zone = response.body
         if (zone['domain'] == @domain) and (zone['id'] == @zone_id) and
@@ -162,7 +161,7 @@ Shindo.tests('Zerigo::dns | DNS requests', ['zerigo', 'dns']) do
        result= false
-       response = Zerigo[:dns].list_zones()
+       response = Fog::DNS[:zerigo].list_zones()
        if response.status == 200
          zones = response.body['zones']
          if (@org_zone_count+1) == zones.count
@@ -178,7 +177,7 @@ Shindo.tests('Zerigo::dns | DNS requests', ['zerigo', 'dns']) do
       host= 'www'
       options = { :hostname => host }
-      response = Zerigo[:dns].create_host( @zone_id, 'A', '1.2.3.4', options)
+      response = Fog::DNS[:zerigo].create_host( @zone_id, 'A', '1.2.3.4', options)
       if response.status == 201
         record_id = response.body['id']
         @new_records << record_id
@@ -192,7 +191,7 @@ Shindo.tests('Zerigo::dns | DNS requests', ['zerigo', 'dns']) do
       host = 'mail'
       options = { :hostname => host }
-      response = Zerigo[:dns].create_host( @zone_id, 'CNAME', @domain, options)
+      response = Fog::DNS[:zerigo].create_host( @zone_id, 'CNAME', @domain, options)
       if response.status == 201
         record_id = response.body['id']
         @new_records << record_id
@@ -210,7 +209,7 @@ Shindo.tests('Zerigo::dns | DNS requests', ['zerigo', 'dns']) do
       sub_domain = 'subdomain'        # that we want to delete DNS for
       ns_host = 'ns.' + @domain
       options = { :hostname => sub_domain}
-      response = Zerigo[:dns].create_host( @zone_id, 'NS', ns_host, options)
+      response = Fog::DNS[:zerigo].create_host( @zone_id, 'NS', ns_host, options)
       if response.status == 201
         record_id = response.body['id']
         @new_records << record_id
@@ -224,7 +223,7 @@ Shindo.tests('Zerigo::dns | DNS requests', ['zerigo', 'dns']) do
       mail_domain = 'mail.' + @domain
       options = { :hostname => @domain, :ttl => 3600, :priority => '3'}
-      response = Zerigo[:dns].create_host( @zone_id, 'MX', mail_domain, options)
+      response = Fog::DNS[:zerigo].create_host( @zone_id, 'MX', mail_domain, options)
       if response.status == 201
         @record_id = response.body['id']
         @new_records << @record_id
@@ -238,7 +237,7 @@ Shindo.tests('Zerigo::dns | DNS requests', ['zerigo', 'dns']) do
       result = false
-      response = Zerigo[:dns].get_host( @record_id)
+      response = Fog::DNS[:zerigo].get_host( @record_id)
       if response.status == 200
         host = response.body
         if (host['id'] == @record_id) and (host['host-type'] == 'MX') and
@@ -256,9 +255,9 @@ Shindo.tests('Zerigo::dns | DNS requests', ['zerigo', 'dns']) do
       result = false
       options = { :priority => 7 }
-      response = Zerigo[:dns].update_host( @record_id, options)
+      response = Fog::DNS[:zerigo].update_host( @record_id, options)
       if response.status == 200
-        response = Zerigo[:dns].get_host( @record_id)
+        response = Fog::DNS[:zerigo].get_host( @record_id)
         if response.status == 200
           host= response.body
           if (host['priority']  == 7)
@@ -274,7 +273,7 @@ Shindo.tests('Zerigo::dns | DNS requests', ['zerigo', 'dns']) do
       pending if Fog.mocking?
       host_count = 0
-      response = Zerigo[:dns].count_hosts( @zone_id)
+      response = Fog::DNS[:zerigo].count_hosts( @zone_id)
       if response.status == 200
         host_count = response.body['count']
       end
@@ -287,7 +286,7 @@ Shindo.tests('Zerigo::dns | DNS requests', ['zerigo', 'dns']) do
       result = false
-      response = Zerigo[:dns].list_hosts( @zone_id)
+      response = Fog::DNS[:zerigo].list_hosts( @zone_id)
       if response.status == 200
         hosts = response.body['hosts']
         if (hosts.count == 4)
@@ -309,7 +308,7 @@ Shindo.tests('Zerigo::dns | DNS requests', ['zerigo', 'dns']) do
       result = false
       host = 'mail.' + @domain
-      response = Zerigo[:dns].find_hosts( host)
+      response = Fog::DNS[:zerigo].find_hosts( host)
       if response.status == 200
         hosts = response.body['hosts']
         host_count = hosts.count
@@ -327,7 +326,7 @@ Shindo.tests('Zerigo::dns | DNS requests', ['zerigo', 'dns']) do
       result = false
       host = 'mail.' + @domain
-      response = Zerigo[:dns].find_hosts( host, @zone_id)
+      response = Fog::DNS[:zerigo].find_hosts( host, @zone_id)
       if response.status == 200
         hosts = response.body['hosts']
         host_count = hosts.count
@@ -344,7 +343,7 @@ Shindo.tests('Zerigo::dns | DNS requests', ['zerigo', 'dns']) do
       result= true
       @new_records.each { |record_id|
-        response = Zerigo[:dns].delete_host( record_id)
+        response = Fog::DNS[:zerigo].delete_host( record_id)
         if response.status != 200
             result= false;
         end
@@ -358,7 +357,7 @@ Shindo.tests('Zerigo::dns | DNS requests', ['zerigo', 'dns']) do
       result= true
       @new_zones.each { |zone_id|
-        response = Zerigo[:dns].delete_zone( zone_id)
+        response = Fog::DNS[:zerigo].delete_zone( zone_id)
         if response.status != 200
             result= false;
         end

data/tests/helper.rb CHANGED

@@ -8,7 +8,7 @@ def lorem_file
 end
 # check to see which credentials are available and add others to the skipped tags list
-all_providers = ['aws', 'bluebox', 'brightbox', 'dnsimple', 'ecloud', 'gogrid', 'google', 'linode', 'local', 'newservers', 'rackspace', 'slicehost', 'stormondemand', 'voxel', 'zerigo']
+all_providers = ['aws', 'bluebox', 'brightbox', 'dnsimple', 'dnsmadeeasy', 'ecloud', 'gogrid', 'google', 'linode', 'local', 'ninefold', 'newservers', 'rackspace', 'slicehost', 'stormondemand', 'voxel', 'zerigo']
 available_providers = Fog.available_providers.map {|provider| provider.downcase}
 for provider in (all_providers - available_providers)
   Formatador.display_line("[yellow]Skipping tests for [bold]#{provider}[/] [yellow]due to lacking credentials (add some to '~/.fog' to run them)[/]")

data/tests/helpers/collection_helper.rb CHANGED

@@ -38,7 +38,7 @@ def collection_tests(collection, params = {}, mocks_implemented = true)
   tests('failure') do
     if !Fog.mocking? || mocks_implemented
-      @identity = @identity.to_s.gsub(/\w/, '0')
+      @identity = @identity.to_s.gsub(/\w/, Fog::Mock.random_letters(1))
     end
     tests("#get('#{@identity}')").returns(nil) do

data/tests/helpers/mock_helper.rb CHANGED

@@ -17,6 +17,8 @@ if Fog.mock?
     :brightbox_secret                 => 'brightbox_secret',
     :dnsimple_email                   => 'dnsimple_email',
     :dnsimple_password                => 'dnsimple_password',
+    :dnsmadeeasy_api_key              => 'dnsmadeeasy_api_key',
+    :dnsmadeeasy_secret_key           => 'dnsmadeeasy_secret_key',
     :ecloud_username                  => 'ecloud_username',
     :ecloud_password                  => 'ecloud_password',
     :ecloud_versions_uri              => 'http://ecloud.versions.uri',
@@ -28,6 +30,8 @@ if Fog.mock?
     :local_root                       => '~/.fog',
     :new_servers_password             => 'new_servers_password',
     :new_servers_username             => 'new_servers_username',
+    :ninefold_compute_key             => 'ninefold_compute_key',
+    :ninefold_compute_secret          => 'ninefold_compute_secret',
 #    :public_key_path                  => '~/.ssh/id_rsa.pub',
 #    :private_key_path                 => '~/.ssh/id_rsa',
     :rackspace_api_key                => 'rackspace_api_key',

data/tests/helpers/model_helper.rb CHANGED

@@ -24,3 +24,15 @@ def model_tests(collection, params = {}, mocks_implemented = true)
   end
 end
+# Generates a unique identifier with a random differentiator.
+# Useful when rapidly re-running tests, so we don't have to wait
+# serveral minutes for deleted objects to disappear from the API
+# E.g. 'fog-test-1234'
+def uniq_id(base_name = 'fog-test')
+  # random_differentiator
+  suffix = rand(65536).to_s(16).rjust(4, '0')
+  [base_name, suffix] * '-'
+end

data/tests/storage/helper.rb CHANGED

@@ -1,15 +1,15 @@
 def storage_providers
   {
-    AWS       => {
+    :aws        => {
       :mocked => true
     },
-    Google    => {
+    :google     => {
       :mocked => true
     },
-    Local     => {
+    :local      => {
       :mocked => false
     },
-    Rackspace => {
+    :rackspace  => {
       :mocked => false
     }
   }

data/tests/storage/models/directories_tests.rb CHANGED

@@ -1,6 +1,6 @@
 for provider, config in storage_providers
-  Shindo.tests("#{provider}::Storage | directories", [provider.to_s.downcase]) do
+  Shindo.tests("Storage[:#{provider}] | directories", [provider]) do
     if !Fog.mocking? || config[:mocked]
@@ -8,7 +8,7 @@ for provider, config in storage_providers
         :key => 'fogdirectoriestests',
       }.merge!(config[:directory_attributes] || {})
-      collection_tests(provider[:storage].directories, directory_attributes, config[:mocked])
+      collection_tests(Fog::Storage[provider].directories, directory_attributes, config[:mocked])
     end