bosh_vcloud_cpi 0.7.9 → 0.7.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 710aa4ae586bb095e7d141d87f370f32aea9b5a3
-  data.tar.gz: 244fc9bb0602ed4cb4de55cfdbccef20b91b1c66
+  metadata.gz: fb7cda14ebdb11a1c818ce26c463bc7fd9605bd3
+  data.tar.gz: 7a6e5455d43ccd766749289d04592e9d61c630cd
 SHA512:
-  metadata.gz: 622c767b56144f930d34a7241cc3f942a52553ef246277b8a9cac0c71dcbb57db0744d63a3bde2a19a13f83be359f0e561c60113d993f4fc10d3ad2d64f9bf38
-  data.tar.gz: 081218358ed1a0ecb744bad2953e67d83515ee8895ae01d2c363d6b68a6e4ac6cf96c5f16efe624608ee4c9e5a2cacf0d7df1a2bbef4f5a99baa238a1db29aa1
+  metadata.gz: d644a6ecb8f31d59a23e18c11bd479233a1bd48420b449816d751c5f8d1bbf01836d8dbd12c630da58a383f75fd0af3dab8f2be2dfbb4da70365bacb9adc6998
+  data.tar.gz: e5f5d04c699e5f7e56068be8f7c54c2add73396e8e12e77fbaffa4b1c45f446a7770b5f0c3c873345840c42730e27bb9b30472684e765e44ef4378645998bf4e

data/lib/cloud/vcloud/cloud.rb

@@ -38,16 +38,27 @@ module VCloudCloud
 
     def delete_stemcell(catalog_vapp_id)
       steps "delete_stemcell(#{catalog_vapp_id})" do |s|
-        catalog_vapp = client.resolve_entity catalog_vapp_id
-        raise "Catalog vApp #{catalog_vapp_id} not found" unless catalog_vapp
-        vapp = client.resolve_link catalog_vapp.entity
-        client.wait_entity vapp, true
-        client.invoke :delete, vapp.remove_link
-        client.invoke :delete, catalog_vapp.href
+        begin
+          catalog_vapp = client.resolve_entity catalog_vapp_id
+          if catalog_vapp.nil?
+            @logger.warn "Catalog vApp #{catalog_vapp_id} not found, skip the error"
+            return
+          end
+
+          vapp = client.resolve_link catalog_vapp.entity
+          client.wait_entity vapp, true
+          client.invoke :delete, vapp.remove_link
+          client.invoke :delete, catalog_vapp.href
+        rescue RestClient::Forbidden, ObjectNotFoundError => e
+          @logger.warn "get #{e.message} error while deleting Catalog vApp #{catalog_vapp_id} in #delete_stemcell, skip the error"
+          return
+        end
       end
     end
 
-    def cpi_call_wait_time; 2; end
+    def cpi_call_wait_time
+      2
+    end
 
     def create_vm(agent_id, catalog_vapp_id, resource_pool, networks, disk_locality = nil, environment = nil)
       (steps "create_vm(#{agent_id}, #{catalog_vapp_id}, #{resource_pool}, ...)" do |s|
@@ -65,7 +76,7 @@ module VCloudCloud
 
 
         s.next Steps::Instantiate, catalog_vapp_id, vapp_name, description, disk_locality, storage_profile
-        client.flush_cache  # flush cached vdc which contains vapp list
+        client.flush_cache # flush cached vdc which contains vapp list
         vapp = s.state[:vapp]
         vm = s.state[:vm] = vapp.vms[0]
 
@@ -195,7 +206,7 @@ module VCloudCloud
     def has_vm?(vm_id)
       vm = client.resolve_entity vm_id
       vm.type == VCloudSdk::Xml::MEDIA_TYPE[:VM]
-    rescue RestClient::Exception  # invalid ID will get 403
+    rescue RestClient::Exception # invalid ID will get 403
       false
     rescue ObjectNotFoundError
       false
@@ -203,11 +214,9 @@ module VCloudCloud
 
     def delete_vm(vm_id)
       steps "delete_vm(#{vm_id})" do |s|
-        vm = s.state[:vm] = client.resolve_entity vm_id
+        begin
+          vm = s.state[:vm] = client.resolve_entity vm_id
 
-        errors = [RuntimeError]
-        Bosh::Common.retryable(sleep: cpi_call_wait_time, tries: 20, on: errors) do
-          begin
           # poweroff vm before we are able to delete it
           s.next Steps::PowerOff, :vm, true
 
@@ -222,14 +231,12 @@ module VCloudCloud
             s.next Steps::Undeploy, :vm
             s.next Steps::Delete, s.state[:vm], true
           end
-          rescue Exception => e
-            @logger.warn "Caught an exception during delete_vm Exception #{e}, Type #{e.class} Message #{e.message}"
-            @logger.warn "Exception trace #{e.backtrace.join('\n')}"
-            raise "re raising exception #{e.message} in delete_vm"
-          end
-        end
 
-        s.next Steps::DeleteCatalogMedia, vm.name
+          s.next Steps::DeleteCatalogMedia, vm.name
+        rescue RestClient::Forbidden, ObjectNotFoundError => e
+          @logger.warn "get #{e.message} error while deleting vm #{vm_id} likely due to non-existence, skip the error"
+          return
+        end
       end
     end
 
@@ -254,7 +261,7 @@ module VCloudCloud
         # vm.hardware_section will change, save current state of disks
         previous_disks_list = Array.new(vm.hardware_section.hard_disks)
 
-        s.state[:disk]  = client.resolve_entity disk_id
+        s.state[:disk] = client.resolve_entity disk_id
 
         errors = [RuntimeError]
         Bosh::Common.retryable(sleep: cpi_call_wait_time, tries: 20, on: errors) do
@@ -266,7 +273,7 @@ module VCloudCloud
             s.next Steps::LoadAgentEnv
 
             vm = s.state[:vm] = client.reload vm
-            Steps::CreateOrUpdateAgentEnv.update_persistent_disk s.state[:env], vm, disk_id , previous_disks_list
+            Steps::CreateOrUpdateAgentEnv.update_persistent_disk s.state[:env], vm, disk_id, previous_disks_list
 
             save_agent_env s
           rescue Exception => e
@@ -313,8 +320,13 @@ module VCloudCloud
 
     def delete_disk(disk_id)
       steps "delete_disk(#{disk_id})" do |s|
-        disk = client.resolve_entity disk_id
-        s.next Steps::Delete, disk, true
+        begin
+          disk = client.resolve_entity disk_id
+          s.next Steps::Delete, disk, true
+        rescue RestClient::Forbidden, ObjectNotFoundError => e
+          @logger.warn "got #{e.message} error while deleting disk #{disk_id}, skip the error"
+          return
+        end
       end
     end
 
@@ -348,7 +360,7 @@ module VCloudCloud
     end
 
     def network_names(networks)
-      networks.map { |k,v| v['cloud_properties']['name'] }.uniq
+      networks.map { |k, v| v['cloud_properties']['name'] }.uniq
     end
 
     def reconfigure_vm(s, name, description, resource_pool, networks)

data/lib/cloud/vcloud/vcd_client.rb

@@ -168,7 +168,8 @@ module VCloudCloud
         failed_tasks = entity.tasks.find_all { |task| task.status.downcase != VCloudSdk::Xml::TASK_STATUS[:SUCCESS] }
         unless failed_tasks.empty?
           @logger.error "Failed tasks: #{failed_tasks}"
-          raise "Some tasks failed"
+          failed_tasks_info = failed_tasks.map {|t| "Task #{t.urn} #{t.operation}"}
+          raise "Some tasks failed: #{failed_tasks_info.join('; ')}"
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_vcloud_cpi
 version: !ruby/object:Gem::Version
-  version: 0.7.9
+  version: 0.7.10
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-09 00:00:00.000000000 Z
+date: 2015-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_common
@@ -124,7 +124,7 @@ dependencies:
         version: '0'
 description: |-
   BOSH vCloud CPI
-  99eceb
+  dc1c42
 email: support@cloudfoundry.com
 executables: []
 extensions: []