bosh_vsphere_cpi 1.2891.0 → 1.2902.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 678a4c4b62f1f63531d9267799beb7cf24668c71
-  data.tar.gz: a4e234a5b76d4a5e5631a763bbf48a312c9186e0
+  metadata.gz: 8476afad7bad1192d764778265348d8a31ec60d9
+  data.tar.gz: ad2c4d1f695e444660d4e765db47a3c0f7f89b7c
 SHA512:
-  metadata.gz: 9113ac6721de4646ad2235256d2a40c6e5f67332bd68e92f429ecf5966eb7ed71173281dc599874e3adde005883d3c3252eebe1e48b7c9a493aec3f47512bce4
-  data.tar.gz: cdabfa2e161ae004531356c03ec420917e954fcdc4fc12c265ac2890d3b785a53d4c8f1949a628df324e4beab8398398099cf73ababd4e436259de72d6ae9639
+  metadata.gz: 3409e451fde5a32cdaa22e092abe8211046207ebc2f35bfdfae60b667a2999bc6aa1d8329dfb2a72595459796afcf1c8a10bfc7690d1b68da81a17538a31cdfd
+  data.tar.gz: 79ff48d380c07d508b12ab1935a0f873d6eafa2f46eacd0a7592817efd9fb00351ebbf8642865a64dc43760d4dd3508e59760c17553161a51953c197b7805a7b

data/lib/cloud/vsphere/client.rb

@@ -1,7 +1,9 @@
 module VSphereCloud
-
   class Client
     include VimSdk
+
+    class TaskException < StandardError; end
+    class FileNotFoundException < TaskException; end
     class AlreadyLoggedInException < StandardError; end
     class NotLoggedInException < StandardError; end
 
@@ -171,7 +173,7 @@ module VSphereCloud
           when Vim::TaskInfo::State::SUCCESS
             return properties["info.result"]
           when Vim::TaskInfo::State::ERROR
-            raise properties["info.error"].msg
+            raise task_exception_for_vim_fault(properties["info.error"])
         end
       end
     end
@@ -258,14 +260,20 @@ module VSphereCloud
       search_spec.query = [query]
 
       vm_disk_infos = wait_for_task(datastore.mob.browser.search("[#{datastore.name}] #{disk_folder}", search_spec)).file
-
       return nil if vm_disk_infos.empty?
 
       vm_disk_infos.first.capacity_kb / 1024
-    rescue VimSdk::SoapError
+    rescue VimSdk::SoapError, FileNotFoundException
       nil
     end
 
+    def task_exception_for_vim_fault(fault)
+      exceptions_by_fault = {
+        VimSdk::Vim::Fault::FileNotFound => FileNotFoundException,
+      }
+      exceptions_by_fault.fetch(fault.class, TaskException).new(fault.msg)
+    end
+
     def find_perf_metric_names(mob, names)
       @lock.synchronize do
         unless @metrics_cache.has_key?(mob.class)

data/lib/cloud/vsphere/version.rb

@@ -1,7 +1,7 @@
 module Bosh
   module Clouds
     class VSphere
-      VERSION = '1.2891.0'
+      VERSION = '1.2902.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_vsphere_cpi
 version: !ruby/object:Gem::Version
-  version: 1.2891.0
+  version: 1.2902.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-23 00:00:00.000000000 Z
+date: 2015-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_common
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2891.0
+        version: 1.2902.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2891.0
+        version: 1.2902.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2891.0
+        version: 1.2902.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2891.0
+        version: 1.2902.0
 - !ruby/object:Gem::Dependency
   name: membrane
   requirement: !ruby/object:Gem::Requirement
@@ -208,7 +208,7 @@ dependencies:
         version: '0'
 description: |-
   BOSH VSphere CPI
-  1d294c
+  ac0a41
 email: support@cloudfoundry.com
 executables:
 - vsphere_cpi