manageiq-smartstate 0.2.18.2 → 0.2.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc370e283415ef0f673cc154434a73468044e80a
-  data.tar.gz: ccaba160917649865aaea1df3e3084a294ae059d
+  metadata.gz: 497ad568d7d383c0c741d53c576a237199683a75
+  data.tar.gz: 007c295b7a61bc8dc23be2070479b4499df130d1
 SHA512:
-  metadata.gz: 2336a58cac30acbaa7923ab5cb8d0207f456cdf8338778ecd93e3c8a690d4917abacc5d7555de89a79a2aeecb13475c13d8d75c3945ceb005339d1096d67ff20
-  data.tar.gz: 62a8d48dc5fb9d0096f10f4bf8265e76e47ca2e9d7b5501d73a8d7f09ef3042e68d34eeebe4ccf636210554f579e8304ee25572c585558bd1a3409f4dac33f1e
+  metadata.gz: 733ef557955bbfa9f13fa1915ad04ad170d355304fe3e7ecfd48fe2dc50900358ae09b2b447b2007af738b95fff00fea264be03a9fb1e4eadecf680f56274df4
+  data.tar.gz: afca04f7eb0f4dade8483d35add5582dfc5eb28f2e0369ff80b54c2661d4b6ba6914bb1dc6a917c773a04e43114841c545635b56e05920856d0ae601256afd00

data/lib/OpenStackExtract/MiqOpenStackVm/MiqOpenStackCommon.rb

@@ -63,28 +63,22 @@ module MiqOpenStackCommon
     }
     volume = volume_service.volumes.new(volume_options)
     volume.save
-
-    while volume.status != 'available'
-      sleep(10)
-      volume = volume_service.volumes.get(volume.id)
-    end
-
-    response = volume_service.action(volume.id, 'os-volume_upload_image' => {
-                                       :image_name => "Temp Image from #{snapshot.name}",
-                                       :disk_format => disk_format})
-    image_id = response.body["os-volume_upload_image"]["image_id"]
-
-    while image_service.images.get(image_id).status.downcase != 'active'
-      sleep(10)
+    begin
+      while volume.status != 'available'
+        sleep(10)
+        volume = volume_service.volumes.get(volume.id)
+      end
+      response = volume_service.action(volume.id, 'os-volume_upload_image' => {
+                                         :image_name => "Temp Image from #{snapshot.name}",
+                                         :disk_format => disk_format})
+      image_id = response.body["os-volume_upload_image"]["image_id"]
+      while image_service.images.get(image_id).status.downcase != 'active'
+        sleep(10)
+      end
+      return image_service.images.get(image_id)
+    ensure
+      volume.destroy
     end
-
-    $log.debug "#{log_prefix}: Deleting temp volume #{volume.name} in #{volume.status} status"
-    volume.destroy
-
-    return image_service.images.get(image_id)
-  rescue => ex
-    $log.error "#{log_prefix}: Create image from Snapshot step raised error"
-    $log.error ex
   end
   
   def get_image_file_glance_v2(image_id)

data/lib/OpenStackExtract/MiqOpenStackVm/MiqOpenStackInstance.rb

@@ -137,14 +137,8 @@ class MiqOpenStackInstance
           $log.warn "#{log_prefix}: pointer from instance doesn't match #{snapshot_image_id}"
         end
         $log.info "#{log_prefix}: deleting snapshot image"
-
-        image = compute_service.images.get(image_id)
-        image.metadata.each do |m|
-          next unless m.key == "block_device_mapping"
-          m.value.each do |volume_snapshot|
-            volume_snapshot_id = volume_snapshot["snapshot_id"]
-            delete_volume_snapshot(volume_snapshot_id) if volume_snapshot_id
-          end
+        if (volume_snapshot_id = get_image_metadata_snapshot_id(compute_service.images.get(image_id)))
+          delete_volume_snapshot(volume_snapshot_id)
         end
         snapshot.destroy
         snapshot_metadata.destroy

data/lib/manageiq/smartstate/version.rb

@@ -1,5 +1,5 @@
 module ManageIQ
   module Smartstate
-    VERSION = "0.2.18.2".freeze
+    VERSION = "0.2.19".freeze
   end
 end

data/manageiq-smartstate.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "memory_buffer",      ">=0.1.0"
   spec.add_dependency "rufus-lru",          "~>1.0.3"
   spec.add_dependency "sys-uname",          "~>1.0.1"
-  spec.add_dependency "vmware_web_service", "~>0.3.0"
+  spec.add_dependency "vmware_web_service", "~>0.4.0"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: manageiq-smartstate
 version: !ruby/object:Gem::Version
-  version: 0.2.18.2
+  version: 0.2.19
 platform: ruby
 authors:
 - ManageIQ Developers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-06 00:00:00.000000000 Z
+date: 2019-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: azure-armrest
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement