manageiq-smartstate 0.2.9 → 0.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6eb97c180a24d90e1c1ddf4967219d6a4c6dc454
-  data.tar.gz: 045130c52ec03cdbf3df0972bda3b1b2dd22633f
+  metadata.gz: dd6c8e7fc62f55e3496569ccfb9b7154401a3f1c
+  data.tar.gz: aa6b6c308e48258d4ce2f4a502907d1747332980
 SHA512:
-  metadata.gz: abd7b68aab062cc0af0f1afc108a614d0eaad41990e4899e71eef0d420385b4d3ae2a1156bde5deda1a12a77a242109af227e3a24fa222d13b2e53ba38569139
-  data.tar.gz: e8e5ce33b6b7859b9698354e407e4ec6f93f8a64e44d458f90c96f41ea864cd71b5329d80b2f29357185c3cd8d80acd4d2f42afcd899f35147f0bc72b120102f
+  metadata.gz: e1ef8e9e1f61e45418d4fef638e4b021a0e5e80b3e6701af800f46b6f695d316cfc23ea3bc10526c623b781961d22a44fe7a8691ff76e33cb833b8d8503176da
+  data.tar.gz: 242e3b1c155fca702a7fc3987c169299bcd240fb2012adc87f6ea778d340f257ba80eceebf37e8919235f6d48ad9bfd2011f07af5172e3ef606700e009450e4a

data/lib/Scvmm/miq_hyperv_disk.rb

@@ -1,6 +1,7 @@
 # encoding: US-ASCII
 
 require 'util/miq_winrm'
+require 'util/miq-exception'
 require 'Scvmm/miq_scvmm_parse_powershell'
 require 'base64'
 require 'securerandom'
@@ -50,7 +51,7 @@ STAT_EOL
     file_size, stderr = @parser.parse_single_powershell_value(run_correct_powershell(stat_script))
 
     if @network && stderr.include?("RegisterTaskDefinition")
-      raise "Unable to obtain virtual disk size for #{vm_disk}. Check Hyper-V Host Domain Credentials"
+      raise MiqException::MiqInvalidCredentialsError, "Unable to obtain virtual disk size for #{vm_disk}. Check Hyper-V Host Domain Credentials."
     end
     OPEN_ERRORS.each { |error| raise "Unable to obtain virtual disk size for #{vm_disk}" if stderr.include?(error) }
     @file_size           = file_size.to_i

data/lib/disk/DiskProbe.rb

@@ -1,4 +1,5 @@
 module DiskProbe
+  require 'util/miq-exception'
   MODDIR = File.expand_path(File.join(File.dirname(__FILE__), "modules"))
 
   PROBE_FILES = Dir.glob(File.join(MODDIR, "*Probe.rb*"))
@@ -30,6 +31,9 @@ module DiskProbe
           require_relative "modules/#{mod}"
           return Object.const_get(mod)
         end
+      rescue MiqException::MiqInvalidCredentialsError => err
+        $log.error "MIQ(DiskProbe-getDiskMod) [#{pmod.chomp("Probe")}-#{mod}] for [#{fname}]: #{err}"
+        raise err
       rescue => err
         $log.warn "MIQ(DiskProbe-getDiskMod) [#{pmod.chomp("Probe")}-#{mod}] for [#{fname}]: #{err}"
       end

data/lib/disk/modules/MSVSDiffDisk.rb

@@ -1,19 +1,13 @@
 # encoding: US-ASCII
 
 require 'disk/modules/MSCommon'
+require 'disk/modules/miq_disk_common'
 
 module MSVSDiffDisk
   def d_init
     self.diskType = "MSVS Differencing"
     self.blockSize = MSCommon::SECTOR_LENGTH
-    if dInfo.mountMode.nil? || dInfo.mountMode == "r"
-      dInfo.mountMode = "r"
-      fileMode = "r"
-    elsif dInfo.mountMode == "rw"
-      fileMode = "r+"
-    else
-      raise "Unrecognized mountMode: #{dInfo.mountMode}"
-    end
+    fileMode = MiqDiskCommon.file_mode(dInfo)
     if dInfo.hyperv_connection
       @hyperv_connection = dInfo.hyperv_connection
       @ms_disk_file      = MSCommon.connect_to_hyperv(dInfo)

data/lib/disk/modules/MSVSDynamicDisk.rb

@@ -1,17 +1,11 @@
 require 'disk/modules/MSCommon'
+require 'disk/modules/miq_disk_common'
 
 module MSVSDynamicDisk
   def d_init
     self.diskType = "MSVS Dynamic"
     self.blockSize = MSCommon::SECTOR_LENGTH
-    if dInfo.mountMode.nil? || dInfo.mountMode == "r"
-      dInfo.mountMode = "r"
-      fileMode = "r"
-    elsif dInfo.mountMode == "rw"
-      fileMode = "r+"
-    else
-      raise "Unrecognized mountMode: #{dInfo.mountMode}"
-    end
+    fileMode = MiqDiskCommon.file_mode(dInfo)
     @ms_disk_file = if dInfo.hyperv_connection
                       MSCommon.connect_to_hyperv(dInfo)
                     else

data/lib/disk/modules/MSVSFixedDisk.rb

@@ -1,18 +1,12 @@
 require 'disk/modules/MiqLargeFile'
+require 'disk/modules/miq_disk_common'
 
 module MSVSFixedDisk
   def d_init
     @diskType = "MSVSFixed"
     @blockSize = 512
 
-    if dInfo.mountMode.nil? || dInfo.mountMode == "r"
-      dInfo.mountMode = "r"
-      fileMode = "r"
-    elsif dInfo.mountMode == "rw"
-      fileMode = "r+"
-    else
-      raise "Unrecognized mountMode: #{dInfo.mountMode}"
-    end
+    fileMode = MiqDiskCommon.file_mode
 
     if dInfo.hyperv_connection
       @ms_flat_disk_file = MSCommon.connect_to_hyperv(dInfo)

data/lib/disk/modules/RawDisk.rb

@@ -1,18 +1,12 @@
 require 'disk/modules/MiqLargeFile'
+require 'disk/modules/miq_disk_common'
 
 module RawDisk
   def d_init
     self.diskType = "Raw"
     self.blockSize = 512
 
-    if dInfo.mountMode.nil? || dInfo.mountMode == "r"
-      dInfo.mountMode = "r"
-      fileMode = "r"
-    elsif dInfo.mountMode == "rw"
-      fileMode = "r+"
-    else
-      raise "Unrecognized mountMode: #{dInfo.mountMode}"
-    end
+    fileMode = MiqDiskCommon.file_mode(dInfo)
 
     @dOffset = dInfo.offset
     @rawDisk_file = MiqLargeFile.open(dInfo.fileName, fileMode)

data/lib/disk/modules/VMWareCowdDisk.rb

@@ -1,4 +1,5 @@
 require 'disk/modules/MiqLargeFile'
+require 'disk/modules/miq_disk_common'
 require 'binary_struct'
 require 'memory_buffer'
 
@@ -24,14 +25,7 @@ module VMWareCowdDisk
   def d_init
     self.diskType = "VMWare CopyOnWrite"
     self.blockSize = 512
-    if dInfo.mountMode.nil? || dInfo.mountMode == "r"
-      dInfo.mountMode = "r"
-      fileMode = "r"
-    elsif dInfo.mountMode == "rw"
-      fileMode = "r+"
-    else
-      raise "Unrecognized mountMode: #{dInfo.mountMode}"
-    end
+    fileMode = MiqDiskCommon.file_mode(dInfo)
     @dParent = @dInfo.parent
 
     @vmwareCowDisk_file = MiqLargeFile.open(dInfo.fileName, fileMode)

data/lib/disk/modules/VMWareSparseDisk.rb

@@ -1,4 +1,5 @@
 require 'disk/modules/MiqLargeFile'
+require 'disk/modules/miq_disk_common'
 require 'binary_struct'
 require 'memory_buffer'
 
@@ -24,14 +25,7 @@ module VMWareSparseDisk
   def d_init
     self.diskType = "VMWare Sparse"
     self.blockSize = 512
-    if dInfo.mountMode.nil? || dInfo.mountMode == "r"
-      dInfo.mountMode = "r"
-      fileMode = "r"
-    elsif dInfo.mountMode == "rw"
-      fileMode = "r+"
-    else
-      raise "Unrecognized mountMode: #{dInfo.mountMode}"
-    end
+    fileMode = MiqDiskCommon.file_mode(dInfo)
     @vmwareSparseDisk_file = MiqLargeFile.open(dInfo.fileName, fileMode)
     buf = @vmwareSparseDisk_file.read(SIZEOF_SPARSE_EXTENT_HEADER)
     @sparseHeader = OpenStruct.new(SPARSE_EXTENT_HEADER.decode(buf))

data/lib/disk/modules/miq_disk_common.rb

@@ -0,0 +1,11 @@
+module MiqDiskCommon
+  def self.file_mode(d_info)
+    if d_info.mountMode.nil? || d_info.mountMode == "r"
+      d_info.mountMode = "r"
+      return "r"
+    elsif d_info.mountMode == "rw"
+      return "r+"
+    end
+    raise "Unrecognized mountMode: #{d_info.mountMode}"
+  end
+end

data/lib/manageiq/smartstate/version.rb

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

data/manageiq-smartstate.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "azure-armrest",      "~> 0.9.5"
+  spec.add_dependency "azure-armrest",      "~> 0.9.6"
   spec.add_dependency "binary_struct",      "~> 2.1"
   spec.add_dependency "iniparse"
   spec.add_dependency "linux_block_device", "~>0.2.1"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: manageiq-smartstate
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.10
 platform: ruby
 authors:
 - ManageIQ Developers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-27 00:00:00.000000000 Z
+date: 2018-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: azure-armrest
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.5
+        version: 0.9.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.5
+        version: 0.9.6
 - !ruby/object:Gem::Dependency
   name: binary_struct
   requirement: !ruby/object:Gem::Requirement
@@ -356,6 +356,7 @@ files:
 - lib/disk/modules/VixDiskMod.rb
 - lib/disk/modules/VixDiskProbe.rb
 - lib/disk/modules/miq_disk_cache.rb
+- lib/disk/modules/miq_disk_common.rb
 - lib/disk/modules/miq_dummy_disk.rb
 - lib/disk/modules/vhdx_bat_entry.rb
 - lib/disk/test.rb