manageiq-smartstate 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: c9aeecaa1ea2d886cca76d62516f06ed1376fb04df6f14534d14dba79b5e36c9
-  data.tar.gz: 37c03eaae437868d213062120b5ca8c59b64dfa5e976e868426a628237b96596
+SHA1:
+  metadata.gz: 2b74b6d33e4a4216efbaae687ad75b865b07946e
+  data.tar.gz: 19c08a23f1de20db6d3b39aeb3427bbb2c93d1fa
 SHA512:
-  metadata.gz: e688b0a92499d7b28c2c2fc23c8731dad80da3a8ebecd0812005996374656e55cd62b5630b147c61462e58cfbc060b783b952de7c934a36964c9225e30afaee1
-  data.tar.gz: 8c740ee7250f6826861270028dde496e80dbabd93b710f61ff5e6fbe03a5a98cf0882b1e03c33a23f86bcebf734f449c031a02a9ffe02a84767fca5506613012
+  metadata.gz: a389e6c867dbf2a9a9b7e8f02db1f12aaa88fcf1b2f290866315abd4b8d61a147f1ced4a262789d9ad51c7d93daf6152e79be19c07721f05b10908faf6665bfe
+  data.tar.gz: 505c9dc9e075c8b35c1435033cc9b4c0c8f8562ee255e70b28ec05e5e34c690b60138164b04cf80b69d8602d8550efa4bdcecfdfbab8c3cd658dabff5b8aacf7

data/lib/OpenStackExtract/MiqOpenStackVm/MiqOpenStackCommon.rb

@@ -63,22 +63,28 @@ module MiqOpenStackCommon
     }
     volume = volume_service.volumes.new(volume_options)
     volume.save
-    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
+
+    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
+
+    $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/manageiq/smartstate/version.rb

@@ -1,5 +1,5 @@
 module ManageIQ
   module Smartstate
-    VERSION = "0.3.2".freeze
+    VERSION = "0.3.3".freeze
   end
 end

data/lib/metadata/linux/LinuxPackages.rb

@@ -175,7 +175,7 @@ module MiqLinux
       pkgs = doc.add_element 'applications'
       @packages.each do |p|
         next unless p.installed
-        pkgs.add_element('application', {"name" => p.name, "version" => p.version, "description" => p.description, "typename" => p.category, "arch" => p.arch, "release" => p.release, "install_time" => p.installtime})
+        pkgs.add_element('application', {"name" => p.name, "version" => p.version, "description" => p.description, "typename" => p.category, "arch" => p.arch, "release" => p.release, "install_time" => p.installtime, "build_time" => p.buildtime, "url" => p.url})
         # "status" => p.status, "depends" => p.depends
       end
       doc

data/lib/metadata/linux/MiqRpmPackages.rb

@@ -22,9 +22,11 @@ class MiqRpmPackages
   RELEASE     = 1002
   SUMMARY     = 1004
   DESCRIPTION = 1005
+  BUILDTIME   = 1006
   INSTALLTIME = 1008
   VENDOR      = 1011
   GROUP       = 1016
+  URL         = 1020
   ARCH        = 1022
   REQUIRES    = 1049
 
@@ -34,9 +36,11 @@ class MiqRpmPackages
     1002 => "release",
     1004 => "summary",
     1005 => "description",
+    1006 => "buildtime",
     1008 => "installtime",
     1011 => "vendor",
     1016 => "category",  # group
+    1020 => "url",
     1022 => "arch",
     1049 => "depends",   # requires
   }
@@ -101,7 +105,7 @@ class MiqRpmPackages
   private
 
   def time_tag?(tag)
-    tag == "installtime"
+    ['installtime', 'buildtime'].include?(tag)
   end
 
   def convert(tag, val)
@@ -148,6 +152,7 @@ if __FILE__ == $0
   rpmPkgs.each do |pkg|
     puts "Package: #{pkg.name}"
     puts "\tInstall Time: #{pkg.installtime}"
+    puts "\tBuild Time: #{pkg.buildtime}"
     puts "\tVersion: #{pkg.version}"
     puts "\tRelease: #{pkg.release}"
     puts "\tSummary: #{pkg.summary}"
@@ -155,6 +160,7 @@ if __FILE__ == $0
     puts "\tArchitecture: #{pkg.arch}"
     puts "\tCategory: #{pkg.category}"
     puts "\tDescription: #{pkg.description}"
+    puts "\tURL: #{pkg.url}"
     puts "\tDepends: #{pkg.depends}"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: manageiq-smartstate
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - ManageIQ Developers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-15 00:00:00.000000000 Z
+date: 2019-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: azure-armrest
@@ -559,7 +559,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubyforge_project: 
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: ManageIQ SmartState Analysis