gapinc-fog 1.12.1.1 → 1.12.1.2

data/lib/fog/xml.rb

@@ -0,0 +1,21 @@
+require "nokogiri"
+require "fog/core/parser"
+
+module Fog
+
+  # @note Extracting XML components out of core is a work in progress.
+  #
+  # The {XML} module includes functionality that is common between APIs using
+  # XML to send and receive data.
+  #
+  # The intent is to provide common code for provider APIs using XML but not
+  # require it for those using JSON.
+  #
+  # @todo Add +require "fog/xml"+ and/or +include Fog::XML+ to providers using
+  #   its services
+  #
+  module XML
+  end
+end
+
+require "fog/xml/sax_parser_connection"

data/lib/fog/xml/sax_parser_connection.rb

@@ -0,0 +1,43 @@
+module Fog
+  module XML
+    class SAXParserConnection < Fog::Core::Connection
+
+      # Makes a request using the connection using Excon
+      #
+      # @param [Hash] params
+      # @option params [String] :body text to be sent over a socket
+      # @option params [Hash<Symbol, String>] :headers The default headers to supply in a request
+      # @option params [String] :host The destination host's reachable DNS name or IP, in the form of a String
+      # @option params [String] :path appears after 'scheme://host:port/'
+      # @option params [Fixnum] :port The port on which to connect, to the destination host
+      # @option params [Hash]   :query appended to the 'scheme://host:port/path/' in the form of '?key=value'
+      # @option params [String] :scheme The protocol; 'https' causes OpenSSL to be used
+      # @option params [Proc] :response_block
+      # @option params [Nokogiri::XML::SAX::Document] :parser
+      #
+      # @return [Excon::Response]
+      #
+      # @raise [Excon::Errors::StubNotFound]
+      # @raise [Excon::Errors::Timeout]
+      # @raise [Excon::Errors::SocketError]
+      #
+      def request(parser, params)
+        reset unless @persistent
+
+        # Prepare the SAX parser
+        data_stream = Nokogiri::XML::SAX::PushParser.new(parser)
+        params[:response_block] = lambda do |chunk, remaining, total|
+          data_stream << chunk
+        end
+
+        # Make request which read chunks into parser
+        response = @excon.request(params)
+
+        # Cease parsing and override response.body with parsed data
+        data_stream.finish
+        response.body = parser.response
+        response
+      end
+    end
+  end
+end

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

@@ -192,9 +192,9 @@ Shindo.tests('Fog::Compute[:aws] | volume requests', ['aws']) do
       Fog::Compute[:aws].create_volume(@server.availability_zone, 10, 'VolumeType' => 'io1', 'Iops' => 99)
     end
 
-    # iops invalid value (greater than 2000)
-    tests("#create_volume('#{@server.availability_zone}', 1024, 'VolumeType' => 'io1', 'Iops' => 2001)").raises(Fog::Compute::AWS::Error) do
-      Fog::Compute[:aws].create_volume(@server.availability_zone, 1024, 'VolumeType' => 'io1', 'Iops' => 2001)
+    # iops invalid value (greater than 4000)
+    tests("#create_volume('#{@server.availability_zone}', 1024, 'VolumeType' => 'io1', 'Iops' => 4001)").raises(Fog::Compute::AWS::Error) do
+      Fog::Compute[:aws].create_volume(@server.availability_zone, 1024, 'VolumeType' => 'io1', 'Iops' => 4001)
     end
 
     @volume.destroy

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

@@ -137,6 +137,7 @@ class AWS
             'DBSecurityGroupName' => String
           }],
         'DBSubnetGroupName' => Fog::Nullable::String,
+        'PubliclyAccessible' => Fog::Boolean,
         'Endpoint' => {
           'Address' => Fog::Nullable::String,
           'Port' => Fog::Nullable::Integer

data/tests/aws/requests/ses/verified_domain_identity_tests.rb

@@ -0,0 +1,16 @@
+Shindo.tests('AWS::SES | verified domain identity requests', ['aws', 'ses']) do
+
+  tests('success') do
+
+    tests("#verify_domain_identity('example.com')").formats(AWS::SES::Formats::BASIC) do
+      pending if Fog.mocking?
+      Fog::AWS[:ses].verify_domain_identity('example.com').body
+    end
+
+  end
+
+  tests('failure') do
+
+  end
+
+end

data/tests/core/connection_tests.rb

@@ -0,0 +1,26 @@
+Shindo.tests('Fog::Core::Connection', ['core']) do
+
+  raises(ArgumentError, "raises ArgumentError when no arguments given") do
+    Fog::Core::Connection.new
+  end
+
+  tests('new("http://example.com")') do
+    @instance = Fog::Core::Connection.new("http://example.com")
+    responds_to([:request, :reset])
+
+    tests('user agent').returns("fog/#{Fog::VERSION}") do
+      @instance.instance_variable_get(:@excon).data[:headers]['User-Agent']
+    end
+  end
+
+  tests('new("http://example.com", true)') do
+    Fog::Core::Connection.new("http://example.com", true)
+  end
+
+  tests('new("http://example.com", false, options")') do
+    options = {
+      :debug_response => false
+    }
+    Fog::Core::Connection.new("http://example.com", true, options)
+  end
+end

data/tests/helper.rb

@@ -1,13 +1,15 @@
 require 'simplecov'
 require 'coveralls'
 
-SimpleCov.command_name "shindo:#{Process.pid.to_s}"
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
-  SimpleCov::Formatter::HTMLFormatter,
-  Coveralls::SimpleCov::Formatter
-]
-SimpleCov.merge_timeout 3600
-SimpleCov.start if Gem::Version.new(RUBY_VERSION) > Gem::Version.new('1.9')
+unless ENV['COVERAGE'] == 'false'
+  SimpleCov.command_name "shindo:#{Process.pid.to_s}"
+  SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+    SimpleCov::Formatter::HTMLFormatter,
+    Coveralls::SimpleCov::Formatter
+  ]
+  SimpleCov.merge_timeout 3600
+  SimpleCov.start
+end
 
 ENV['FOG_RC']         = ENV['FOG_RC'] || File.expand_path('../.fog', __FILE__)
 ENV['FOG_CREDENTIAL'] = ENV['FOG_CREDENTIAL'] || 'default'

data/tests/rackspace/block_storage_tests.rb

@@ -101,4 +101,13 @@ Shindo.tests('Fog::Rackspace::BlockStorage', ['rackspace']) do
     end
   end
 
+  tests('reauthentication') do
+    pending if Fog.mocking?
+
+    @service = Fog::Rackspace::BlockStorage.new  :rackspace_region => :ord
+    returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
+    @service.instance_variable_set("@auth_token", "bad-token")
+    returns(200) { @service.list_volumes.status }
+  end
+
 end

data/tests/rackspace/compute_tests.rb

@@ -87,4 +87,13 @@ Shindo.tests('Rackspace | Compute', ['rackspace']) do
       returns(true, "uses custom endpoint") { (@service.instance_variable_get("@uri").host =~ /snet-/) != nil }
     end
   end
+
+  tests('reauthentication') do
+    pending if Fog.mocking?
+
+    @service =  Fog::Compute::Rackspace.new
+    returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
+    @service.instance_variable_set("@auth_token", "bad-token")
+    returns(true) { [200, 203].include?(@service.list_flavors.status) }
+  end
 end

data/tests/rackspace/compute_v2_tests.rb

@@ -100,4 +100,13 @@ Shindo.tests('Fog::Compute::RackspaceV2', ['rackspace']) do
     end
   end
   
+  tests('reauthentication') do
+    pending if Fog.mocking?
+
+    @service = Fog::Compute::RackspaceV2.new
+    returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
+    @service.instance_variable_set("@auth_token", "bad_token")
+    returns(true) { [200, 203].include? @service.list_flavors.status }
+  end
+
 end

data/tests/rackspace/databases_tests.rb

@@ -102,6 +102,15 @@ Shindo.tests('Fog::Rackspace::Databases', ['rackspace']) do |variable|
     end
   end
 
+  tests('reauthentication') do
+    pending if Fog.mocking?
+
+    @service = Fog::Rackspace::Databases.new
+    returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
+    @service.instance_variable_set("@auth_token", "bad_token")
+    returns(200) { @service.list_flavors.status }
+  end
+
   @service = Fog::Rackspace::Databases.new
 
   tests('#flavors').succeeds do

data/tests/rackspace/dns_tests.rb

@@ -82,6 +82,15 @@ Shindo.tests('Fog::DNS::Rackspace', ['rackspace']) do
     end
   end
 
+  tests('reauthentication') do
+    pending if Fog.mocking?
+
+    @service =Fog::DNS::Rackspace.new
+    returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
+    @service.instance_variable_set("@auth_token", "bad_token")
+    returns(200) { @service.list_domains.status }
+  end
+
   tests('array_to_query_string') do
     pending if Fog.mocking?
 

data/tests/rackspace/helper.rb

@@ -1,6 +1,11 @@
 module Shindo
   class Tests
-    
+
+    unless Fog.mocking?
+      Fog.timeout = 2000
+      Fog::Logger.warning "Setting default fog timeout to #{Fog.timeout} seconds"
+    end
+
     def given_a_load_balancer_service(&block)
       @service = Fog::Rackspace::LoadBalancers.new
       instance_eval(&block)
@@ -23,6 +28,12 @@ module Shindo
       end
     end
   
+   def wait_for_request(description = "waiting", &block)
+     return if Fog.mocking?
+     tests(description) do
+       Fog.wait_for &block
+     end
+   end
 
    def wait_for_server_deletion(server)
      return if Fog.mocking?

data/tests/rackspace/identity_tests.rb

@@ -0,0 +1,25 @@
+Shindo.tests('Fog::Rackspace::Identity', ['rackspace']) do
+
+  tests('current authentication') do
+    pending if Fog.mocking?
+
+    tests('variables populated').returns(200)  do
+      @service = Fog::Rackspace::Identity.new :rackspace_auth_url => 'https://identity.api.rackspacecloud.com/v2.0', :connection_options => {:ssl_verify_peer => true}
+      returns(true, "auth token populated") { !@service.auth_token.nil? }
+      returns(false, "path populated") { @service.instance_variable_get("@uri").host.nil? }
+      returns(false, "service catalog populated") { @service.service_catalog.nil? }
+
+      @service.list_tenants.status
+    end
+  end
+
+  tests('reauthentication') do
+    pending if Fog.mocking?
+
+    @service = Fog::Rackspace::Identity.new  :rackspace_region => :ord
+    returns(true, "auth token populated") { !@service.auth_token.nil? }
+    @service.instance_variable_set("@auth_token", "bad-token")
+    returns(true) { [200, 203].include? @service.list_tenants.status }
+  end
+
+end

data/tests/rackspace/load_balancer_tests.rb

@@ -101,6 +101,16 @@ Shindo.tests('Fog::Rackspace::LoadBalancers', ['rackspace']) do
     end
   end
 
+
+  tests('reauthentication') do
+    pending if Fog.mocking?
+
+    @service = Fog::Rackspace::LoadBalancers.new
+    returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
+    @service.instance_variable_set("@auth_token", "bad-token")
+    returns(200) { @service.list_load_balancers.status }
+  end
+
   pending if Fog.mocking?
 
   @service = Fog::Rackspace::LoadBalancers.new

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

@@ -4,7 +4,7 @@ Shindo.tests('Fog::Rackspace::BlockStorage | volume', ['rackspace']) do
   options = { :display_name => "fog_#{Time.now.to_i.to_s}", :size => 100 }
 
   model_tests(service.volumes, options, true) do
-    @instance.wait_for(timeout=1200) { ready? }
+    @instance.wait_for{ ready? }
 
     tests('double save').raises(Fog::Rackspace::BlockStorage::IdentifierTaken) do
       @instance.save
@@ -18,7 +18,7 @@ Shindo.tests('Fog::Rackspace::BlockStorage | volume', ['rackspace']) do
     tests('#snapshots').succeeds do
       begin
         snapshot = @instance.create_snapshot
-        snapshot.wait_for(timeout=1200) { ready? }
+        snapshot.wait_for { ready? }
 
         returns(true) { @instance.snapshots.first.id == snapshot.id }
       ensure

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

@@ -11,7 +11,7 @@ Shindo.tests('Fog::Compute::RackspaceV2 | metadata', ['rackspace']) do
       :flavor_id => rackspace_test_flavor_id(service),
       :image_id => rackspace_test_image_id(service))
       
-      @server.wait_for(timeout=1500) { ready? }
+      @server.wait_for { ready? }
       
       tests('server') do
         collection_tests(@server.metadata, {:key => 'my_key', :value => 'my_value'}) do
@@ -21,7 +21,7 @@ Shindo.tests('Fog::Compute::RackspaceV2 | metadata', ['rackspace']) do
       
       tests('image') do
         @image = @server.create_image("fog_image_#{test_time}", :metadata => {:my_key => 'my_value'})
-        @image.wait_for(timeout = 1500) { ready? }
+        @image.wait_for { ready? }
         tests("#all").succeeds do
           pending if Fog.mocking? && !mocks_implemented
           metadata = @image.metadata.all

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

@@ -66,7 +66,7 @@ Shindo.tests('Fog::Compute::RackspaceV2 | server', ['rackspace']) do
   end
 
   model_tests(service.servers, options, true) do
-    @instance.wait_for(timeout=1500) { ready? }
+    @instance.wait_for { ready? }
     
     tests('#metadata[\'fog_test\']').returns('true') do
       @instance.metadata['fog_test']
@@ -79,12 +79,12 @@ Shindo.tests('Fog::Compute::RackspaceV2 | server', ['rackspace']) do
     tests('#update').succeeds do
       @instance.name = "fog_server_update"
       @instance.access_ipv4_address= "10.10.0.1"
-      @instance.access_ipv6_address= "0:0:0:0:0:0:0:1"
+      @instance.access_ipv6_address= "::1"
       @instance.save
       sleep 60 unless Fog.mocking?
       @instance.reload
       returns("10.10.0.1") { @instance.access_ipv4_address }
-      returns("0:0:0:0:0:0:0:1") { @instance.access_ipv6_address }
+      returns("::1") { @instance.access_ipv6_address }
       returns("fog_server_update") { @instance.name }
     end
     
@@ -93,13 +93,13 @@ Shindo.tests('Fog::Compute::RackspaceV2 | server', ['rackspace']) do
       returns('REBOOT') { @instance.state }
     end
 
-    @instance.wait_for(timeout=1500)  { ready? }
+    @instance.wait_for { ready? }
     tests('#reboot("HARD")').succeeds do
       @instance.reboot('HARD')
       returns('HARD_REBOOT') { @instance.state }
     end
     
-    @instance.wait_for(timeout=1500)  { ready? }
+    @instance.wait_for { ready? }
     @test_image = nil
     begin
       tests('#create_image').succeeds do
@@ -112,7 +112,7 @@ Shindo.tests('Fog::Compute::RackspaceV2 | server', ['rackspace']) do
     end
 
     sleep 30 unless Fog.mocking?
-    @instance.wait_for(timeout=1500) { ready? }
+    @instance.wait_for { ready? }
     sleep 60  unless Fog.mocking?
     tests('#rebuild').succeeds do
       @instance.rebuild rackspace_test_image_id(service)
@@ -120,7 +120,7 @@ Shindo.tests('Fog::Compute::RackspaceV2 | server', ['rackspace']) do
     end
 
     sleep 30  unless Fog.mocking?
-    @instance.wait_for(timeout=1500) { ready? }
+    @instance.wait_for { ready? }
     sleep 60  unless Fog.mocking?
     tests('#resize').succeeds do
       @instance.resize(3)
@@ -128,37 +128,37 @@ Shindo.tests('Fog::Compute::RackspaceV2 | server', ['rackspace']) do
     end
 
     sleep 30  unless Fog.mocking?
-    @instance.wait_for(timeout=1500) { ready?('VERIFY_RESIZE', ['ACTIVE', 'ERROR']) }
+    @instance.wait_for { ready?('VERIFY_RESIZE', ['ACTIVE', 'ERROR']) }
     sleep 60  unless Fog.mocking?
     tests('#confirm_resize').succeeds do
       @instance.confirm_resize
     end
 
     sleep 30 unless Fog.mocking?
-    @instance.wait_for(timeout=1500) { ready? }
+    @instance.wait_for { ready? }
     sleep 60 unless Fog.mocking?
     tests('#resize').succeeds do
       @instance.resize(2)
       returns('RESIZE') { @instance.state }
     end
 
-    @instance.wait_for(timeout=1500) { ready?('VERIFY_RESIZE') }
+    @instance.wait_for { ready?('VERIFY_RESIZE') }
     sleep 60  unless Fog.mocking?
     tests('#revert_resize').succeeds do
       @instance.revert_resize
     end
 
-    @instance.wait_for(timeout=1500)  { ready? }
+    @instance.wait_for { ready? }
     tests('#rescue').succeeds do
       @instance.rescue
     end
 
-    @instance.wait_for(timeout=1500) { ready?('RESCUE') }
+    @instance.wait_for { ready?('RESCUE') }
     tests('#unrescue').succeeds do
       @instance.unrescue
     end
 
-    @instance.wait_for(timeout=1500)  { ready? }
+    @instance.wait_for  { ready? }
     tests('#change_admin_password').succeeds do
       @instance.change_admin_password('somerandompassword')
       returns('PASSWORD') { @instance.state }
@@ -168,28 +168,29 @@ Shindo.tests('Fog::Compute::RackspaceV2 | server', ['rackspace']) do
     tests('attachments') do
       begin
         @volume = cbs_service.volumes.create(:size => 100, :display_name => "fog-#{Time.now.to_i.to_s}")
-        @volume.wait_for(timeout=1500) { ready? }
+        @volume.wait_for { ready? }
         tests('#attach_volume').succeeds do
           @instance.attach_volume(@volume)
         end
         tests('#attachments').returns(true) do
-          @instance.wait_for(timeout=1500)  do
+          @instance.wait_for do
             !attachments.empty?
           end
           @instance.attachments.any? {|a| a.volume_id == @volume.id }
         end
       ensure
-        @volume.wait_for(timeout=1500) { !attachments.empty? }
+        @volume.wait_for { !attachments.empty? }
         @instance.attachments.each {|a| a.detach }
-        @volume.wait_for(timeout=1500) { ready? && attachments.empty? }        
+        @volume.wait_for { ready? && attachments.empty? }
         @volume.destroy if @volume
       end
     end
 
-    @instance.wait_for(timeout=1500)  { ready? }
+    @instance.wait_for { ready? }
    end
 
    wait_for_server_deletion(@instance)
+   sleep 60 unless Fog.mocking?
 
    tests("delete network #{@network.label}").succeeds do
      @network.destroy if @network
@@ -197,17 +198,17 @@ Shindo.tests('Fog::Compute::RackspaceV2 | server', ['rackspace']) do
 
   #When after testing resize/resize_confirm we get a 409 when we try to resize_revert so I am going to split it into two blocks
   model_tests(service.servers, options, true) do
-    @instance.wait_for(timeout=1500) { ready? }
+    @instance.wait_for { ready? }
     tests('#resize').succeeds do
       @instance.resize(4)
       returns('RESIZE') { @instance.state }
     end
   
-    @instance.wait_for(timeout=1500) { ready?('VERIFY_RESIZE') }
+    @instance.wait_for { ready?('VERIFY_RESIZE') }
     sleep 60 unless Fog.mocking?
     tests('#revert_resize').succeeds do
       @instance.revert_resize
     end
-    @instance.wait_for(timeout=1500) { ready? }
+    @instance.wait_for { ready? }
   end
 end