manageiq-smartstate 0.2.8 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb3a8cbd47ea506835fe8f9945c8b2a9e3a9d567
-  data.tar.gz: 7551eec8bf0e551ef965d367f815b16dfbdbdf47
+  metadata.gz: 6eb97c180a24d90e1c1ddf4967219d6a4c6dc454
+  data.tar.gz: 045130c52ec03cdbf3df0972bda3b1b2dd22633f
 SHA512:
-  metadata.gz: a35ea5d4d2ae00b832ec7e8d6a20f5691b436014a4ffc964868481b3ff8d0417522942b80da165faf710b93f6b6484b6461c57320212ddc5ba5e661ecc71d342
-  data.tar.gz: 12b80f47b85ee9560d7971678bb1960d7dc3e4e29b2f88e581b33ecac80a2f11824dee9b4c0a9523cc0a7c98da74e77c5585b5a046d83d6671b9ce34e47a37b0
+  metadata.gz: abd7b68aab062cc0af0f1afc108a614d0eaad41990e4899e71eef0d420385b4d3ae2a1156bde5deda1a12a77a242109af227e3a24fa222d13b2e53ba38569139
+  data.tar.gz: e8e5ce33b6b7859b9698354e407e4ec6f93f8a64e44d458f90c96f41ea864cd71b5329d80b2f29357185c3cd8d80acd4d2f42afcd899f35147f0bc72b120102f

data/lib/MiqVm/miq_scvmm_vm.rb

@@ -26,6 +26,7 @@ class MiqScvmmVm < MiqVm
     disk_info.hyperv_connection        = {}
     disk_info.fileName                 = disk_file
     disk_info.driveType                = @scvmm.get_drivetype(disk_file)
+    disk_info.scvmm                    = @scvmm
     disk_info.hyperv_connection[:host] = @ost.miq_hyperv[:host]
     disk_info.hyperv_connection[:port] = @ost.miq_hyperv[:port]
     if @ost.miq_hyperv[:domain].nil?

data/lib/VolumeManager/VolMgrPlatformSupportLinux.rb

@@ -40,25 +40,27 @@ module VolMgrPlatformSupportLinux
     desc = @ost.snapshotDescription ? @ost.snapshotDescription : "EVM Snapshot"
     st = Time.now
     @snMor = @vimVm.createEvmSnapshot(desc, "false", true, @ost.snapshot_create_free_space)
-    $log.info "VolMgrPlatformSupportLinux.preMount: VM snapshot created in [#{Time.now - st}] seconds"
+    $log.info "VolMgrPlatformSupportLinux.preMount: VM snapshot [#{@snMor}] created in [#{Time.now - st}] seconds"
     $log.debug "VolMgrPlatformSupportLinux.preMount: snMor = \"#{@snMor}\""
   end
 
   def postMount
-    $log.debug "VolMgrPlatformSupportLinux.postMount Enter: force = #{@ost.force}, @vimVm.nil? = #{@vimVm.nil?}"
+    log_prefix = "VolMgrPlatformSupportLinux.postMount"
+    $log.debug "#{log_prefix} Enter: force = #{@ost.force}, @vimVm.nil? = #{@vimVm.nil?}"
     return unless @ost.force
     return unless @vimVm
 
     if @ost.force
       if !@snMor
-        $log.warn "VolMgrPlatformSupportLinux.postMount: VM not snapped: #{@cfgFile}"
+        $log.warn "#{log_prefix}: VM not snapped: #{@cfgFile}"
       else
-        $log.debug "VolMgrPlatformSupportLinux.postMount: removing snapshot snMor = \"#{@snMor}\""
+        $log.debug "#{log_prefix}: removing snapshot snMor = \"#{@snMor}\""
         begin
           @vimVm.removeSnapshot(@snMor, "false", true, @ost.snapshot_remove_free_space)
+          $log.info "#{log_prefix}: VM snapshot [#{@snMor}] removed"
         rescue => err
-          $log.warn "VolMgrPlatformSupportLinux.postMount: failed to remove snapshot for VM: #{@cfgFile}"
-          $log.warn "VolMgrPlatformSupportLinux.postMount: #{err}"
+          $log.warn "#{log_prefix}: failed to remove snapshot for VM: #{@cfgFile}"
+          $log.warn "#{log_prefix}: #{err}"
         end
       end
     end

data/lib/disk/modules/VhdxDisk.rb

@@ -182,6 +182,7 @@ module VhdxDisk
     @has_parent           = nil
     @parent_locator       = nil
     @file_name            = dInfo.fileName
+    @scvmm                = dInfo.scvmm
     @hyperv_connection    = nil
     @vhdx_file            = connection_to_file(dInfo)
     @converter            = Encoding::Converter.new("UTF-16LE", "UTF-8")
@@ -518,7 +519,7 @@ module VhdxDisk
   def parent_disk(path)
     @parent_ostruct                   = OpenStruct.new
     @parent_ostruct.fileName          = path
-    @parent_ostruct.driveType         = dInfo.driveType
+    @parent_ostruct.driveType         = @scvmm.get_drivetype(path)
     @parent_ostruct.hyperv_connection = @hyperv_connection if @hyperv_connection
     parent                            = MiqDisk.getDisk(@parent_ostruct)
     raise "Unable to access parent disk #{path}" if parent.nil?

data/lib/manageiq/smartstate/version.rb

@@ -1,5 +1,5 @@
 module ManageIQ
   module Smartstate
-    VERSION = "0.2.8".freeze
+    VERSION = "0.2.9".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: manageiq-smartstate
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - ManageIQ Developers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-09 00:00:00.000000000 Z
+date: 2018-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: azure-armrest