bosh_vcloud_cpi 0.7.6 → 0.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf7473f0bbaafdc184e9fe8923772d86ad365c8f
-  data.tar.gz: c055af6d12a18656c12c5bb242d1947ffff07890
+  metadata.gz: 07d91dc15ea8945ce0b95c3b27544e22ef364f5b
+  data.tar.gz: 349ef92995b29e875dcada52f16d22e4081770ce
 SHA512:
-  metadata.gz: 12a08c0323b6f09f2e8d0d8fa827aa0c0087adfa980882260d99bac73e2f68047db9d3cd1c83b5d1351f15abcde23e693f2799bd84db9df090faee2c3768fbfd
-  data.tar.gz: 896a4a062153993c66caf2a803636c6ecf89ae723512859bfb352a85c5e922b43a857efc39ebfb6d343582349dd69abc224eeab6a037160129cdfd75808f88c3
+  metadata.gz: 71a8bda2ffac0f6df601119fcaf0fcd9a7b2dfdb30dec1eaca871a926a7a0dbfc7b46de099b1f365ef69e845225b4e6050c0627af52e53095b378859d7ba4ec8
+  data.tar.gz: c88c7e27548b5e1ed7cd7fb576f1e8d8b50202e2fd53d5cdec3724f31bc2ece235144e6541adcd61b5845fde6ca6fa275dff845ec40c715b478966d5a0b8fb2f

data/lib/cloud/vcloud/steps/insert_catalog_media.rb

@@ -10,7 +10,7 @@ module VCloudCloud
         client.timed_loop do
           media = client.reload media
           vm = client.reload vm
-          if media.running_tasks.empty?
+          if media.running_tasks.empty? && media.prerunning_tasks.empty?
             client.invoke_and_wait :post, vm.insert_media_link,
                     :payload => params,
                     :headers => { :content_type => VCloudSdk::Xml::MEDIA_TYPE[:MEDIA_INSERT_EJECT_PARAMS] }

data/lib/cloud/vcloud/vcd_client.rb

@@ -145,9 +145,15 @@ module VCloudCloud
     end
 
     def wait_entity(entity, accept_failure = false)
-      entity.running_tasks.each do |task|
+      prerunning_tasks = entity.prerunning_tasks
+      prerunning_tasks.each do |task|
         wait_task task, accept_failure
-      end if entity.running_tasks && !entity.running_tasks.empty?
+      end if prerunning_tasks && !prerunning_tasks.empty?
+
+      running_tasks = entity.running_tasks
+      running_tasks.each do |task|
+        wait_task task, accept_failure
+      end if running_tasks && !running_tasks.empty?
 
       entity = reload entity
 

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

@@ -70,6 +70,8 @@ module VCloudSdk
         :ABORTED => "aborted"
     }
 
+    PRE_RUNNING_TASK_STATUSES = [TASK_STATUS[:QUEUED], TASK_STATUS[:PRE_RUNNING]]
+
     MAX_DISK_ID = 15
 
     MEDIA_TYPE = {

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

@@ -15,6 +15,10 @@ module VCloudSdk
         end
       end
 
+      def prerunning_tasks
+        tasks.find_all { |t| PRE_RUNNING_TASK_STATUSES.include?(t.status) }
+      end
+
       def running_tasks
         tasks.find_all {|t| RUNNING.include?(t.status)}
       end

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

@@ -24,6 +24,10 @@ module VCloudSdk
         @root["size"].to_i/1024/1024
       end
 
+      def prerunning_tasks
+        tasks.find_all { |t| PRE_RUNNING_TASK_STATUSES.include?(t.status) }
+      end
+
       def running_tasks
         tasks.find_all {|t| RUNNING.include?(t.status)}
       end

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

@@ -44,6 +44,10 @@ module VCloudSdk
         get_nodes("Link", {"rel" => "remove"}, true).first
       end
 
+      def prerunning_tasks
+        tasks.find_all { |t| PRE_RUNNING_TASK_STATUSES.include?(t.status) }
+      end
+
       def running_tasks
         get_nodes("Task", {"status" => "running"})
       end

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

@@ -33,6 +33,10 @@ module VCloudSdk
         fix_if_invalid(link, "remove", "", href)
       end
 
+      def prerunning_tasks
+        tasks.find_all { |t| PRE_RUNNING_TASK_STATUSES.include?(t.status) }
+      end
+
       def running_tasks
         get_nodes("Task", {"status" => "running"})
       end

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

@@ -76,6 +76,10 @@ module VCloudSdk
         get_nodes("Link", {"type" => MEDIA_TYPE[:VAPP]}, true).first
       end
 
+      def prerunning_tasks
+        tasks.find_all { |t| PRE_RUNNING_TASK_STATUSES.include?(t.status) }
+      end
+
       def running_tasks
         get_nodes("Task", {"status" => "running"})
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_vcloud_cpi
 version: !ruby/object:Gem::Version
-  version: 0.7.6
+  version: 0.7.7
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-29 00:00:00.000000000 Z
+date: 2015-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_common
@@ -124,7 +124,7 @@ dependencies:
         version: '0'
 description: |-
   BOSH vCloud CPI
-  152369
+  c90a70
 email: support@cloudfoundry.com
 executables: []
 extensions: []
@@ -417,7 +417,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: BOSH vCloud CPI