bosh_vcloud_cpi 0.7.7 → 0.7.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07d91dc15ea8945ce0b95c3b27544e22ef364f5b
-  data.tar.gz: 349ef92995b29e875dcada52f16d22e4081770ce
+  metadata.gz: fcbdf7f3f5c6a9d0852c992f96b106ddd67503f0
+  data.tar.gz: a48e39654ba4916e2c28cf221f1e949ce4224e55
 SHA512:
-  metadata.gz: 71a8bda2ffac0f6df601119fcaf0fcd9a7b2dfdb30dec1eaca871a926a7a0dbfc7b46de099b1f365ef69e845225b4e6050c0627af52e53095b378859d7ba4ec8
-  data.tar.gz: c88c7e27548b5e1ed7cd7fb576f1e8d8b50202e2fd53d5cdec3724f31bc2ece235144e6541adcd61b5845fde6ca6fa275dff845ec40c715b478966d5a0b8fb2f
+  metadata.gz: ad0c6cd71dbe20b8e184e75660ff18d7cb727dee725b9c9a6f47f8f8f941a2b867cb2f3e5b03b8ad32c30af8282b501d37fdb7dbece810d0251416de5e9ef0fb
+  data.tar.gz: 0ccad8d4448fb37560df3cfbf6128ffe4caad3e833f463c398ec7d10998b9d24e5e7c3290bf5d8255b88ba618a1d4055a761675729303b31131a61635a1cdf83

data/lib/cloud/vcloud/errors.rb

@@ -6,4 +6,7 @@ module VCloudCloud
 
   class TimeoutError < StandardError
   end
+
+  class ObjectExistsError < StandardError
+  end
 end

data/lib/cloud/vcloud/vcd_client.rb

@@ -1,6 +1,7 @@
 require 'base64'
 require 'uri'
 require 'rest_client'
+require 'common/common'
 
 require_relative 'cache'
 require_relative 'file_uploader'
@@ -188,7 +189,7 @@ module VCloudCloud
     WAIT_DELAY     = 5      # delay in seconds for pooling next task status
     COOKIE_TIMEOUT = 600    # default timeout in seconds, if not specified in configuration file, after which session must be re-created
     RETRY_MAX      = 3      # maximum attempts
-    RETRY_DELAY    = 100    # delay of first retry, the next is * 2
+    RETRY_DELAY    = 0.1    # wait time before retrying
 
     def cookie_available?
       @cookie && Time.now < @cookie_expiration
@@ -219,6 +220,21 @@ module VCloudCloud
       end
     end
 
+    def raise_specific_error(response, e)
+      begin
+        wrapped_response = VCloudSdk::Xml::WrapperFactory.wrap_document response.body
+      rescue => ex
+        @logger.debug "Wrap document raise error: #{ex.message}"
+      end
+
+      unless wrapped_response.nil?
+        if wrapped_response.is_a?VCloudSdk::Xml::Error
+          wrapped_response.exception(e)
+        end
+      end
+      raise e
+    end
+
     def send_request(method, path, options = {})
       path = path.href unless path.is_a?(String)
 
@@ -238,11 +254,19 @@ module VCloudCloud
       params[:cookies] = @cookie if !options[:login] && cookie_available?
       params[:payload] = options[:payload].to_s if options[:payload]
       params[:headers].merge! options[:headers] if options[:headers]
-      response = retry_for_network_issue do
+
+      errors = [RestClient::Exception, OpenSSL::SSL::SSLError, OpenSSL::X509::StoreError]
+      Bosh::Common.retryable(sleep: @retry_delay, tries: 20, on: errors) do |tries, error|
         @logger.debug "REST REQ #{method.to_s.upcase} #{params[:url]} #{params[:headers].inspect} #{params[:cookies].inspect} #{params[:payload]}"
+        @logger.warn "Attempting to retry #{method.to_s.upcase} request against #{params[:url]} after #{tries} unsuccessful attempts. Latest error: #{error.inspect}" if tries > 1
+
         RestClient::Request.execute params do |response, request, result, &block|
           @logger.debug "REST RES #{response.code} #{response.headers.inspect} #{response.body}"
-          response.return! request, result, &block
+          begin
+            response.return! request, result, &block
+          rescue => e
+            raise_specific_error(response, e)
+          end
         end
       end
     end
@@ -271,24 +295,5 @@ module VCloudCloud
     def wrap_response(response)
       VCloudSdk::Xml::WrapperFactory.wrap_document response
     end
-
-    def retry_for_network_issue
-      retries = 0
-      delay = @retry_delay
-      result = nil
-      loop do
-        begin
-          result = yield
-          break
-        rescue RestClient::Exception => ex
-          raise ex if retries >= @retry_max
-          @logger.error "RestClient exception (retry after #{delay}ms): #{ex}"
-          sleep(delay / 1000)
-          delay *= 2
-          retries += 1
-        end
-      end
-      result
-    end
   end
 end

data/lib/cloud/vcloud/xml/wrapper.rb

@@ -96,6 +96,10 @@ module VCloudSdk
         href.split('/')[-1]
       end
 
+      def error
+         @root["Error"]
+      end
+
       def name
         @root["name"]
       end
@@ -311,3 +315,4 @@ require_relative "wrapper_classes/vdc"
 require_relative "wrapper_classes/vdc_storage_profile"
 require_relative "wrapper_classes/virtual_hardware_section"
 require_relative "wrapper_classes/vm"
+require_relative "wrapper_classes/error_wrapper"

data/lib/cloud/vcloud/xml/wrapper_classes/error_wrapper.rb

@@ -0,0 +1,29 @@
+require 'cloud/vcloud/errors'
+
+module VCloudSdk
+  module Xml
+    class Error < Wrapper
+
+      def major_error
+        @root["majorErrorCode"]
+      end
+
+      def minor_error
+        @root["minorErrorCode"]
+      end
+
+      def error_msg
+        @root["message"]
+      end
+
+      def exception(e)
+        if error_msg.include? "There is already a VM named" and major_error == "400"
+          raise VCloudCloud::ObjectExistsError
+        else
+          raise e
+        end
+      end
+    end
+  end
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_vcloud_cpi
 version: !ruby/object:Gem::Version
-  version: 0.7.7
+  version: 0.7.8
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-09 00:00:00.000000000 Z
+date: 2015-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_common
@@ -124,7 +124,7 @@ dependencies:
         version: '0'
 description: |-
   BOSH vCloud CPI
-  c90a70
+  a3d5f4
 email: support@cloudfoundry.com
 executables: []
 extensions: []
@@ -175,6 +175,7 @@ files:
 - lib/cloud/vcloud/xml/wrapper_classes/disk_attach_or_detach_params.rb
 - lib/cloud/vcloud/xml/wrapper_classes/disk_create_params.rb
 - lib/cloud/vcloud/xml/wrapper_classes/entity.rb
+- lib/cloud/vcloud/xml/wrapper_classes/error_wrapper.rb
 - lib/cloud/vcloud/xml/wrapper_classes/file.rb
 - lib/cloud/vcloud/xml/wrapper_classes/hard_disk_item_wrapper.rb
 - lib/cloud/vcloud/xml/wrapper_classes/instantiate_vapp_template_params.rb