manageiq-smartstate 0.5.10 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9339962d9971082ef3464c0a0a2f20d6b2366636
-  data.tar.gz: 0a1b72d88811858835e05d7e1468259318c96768
+SHA256:
+  metadata.gz: dc46ede682ac6c4b95558f1856c26b8bedda0cc01a8d4302d72530cf9cf01cbc
+  data.tar.gz: ded7f8e35edf8a05db918015aaec80b934256232df374a428eb5e22a7911f1ac
 SHA512:
-  metadata.gz: 07ac4b7630d00c02654eaea1f9c8a33aa155a4a6e770ada1e1cc5c9aec5dfb0d4622b2fdd3ec0c9202c4fa596c8c3ab1607f2415017596e09d82eeabd3bcca75
-  data.tar.gz: e0884bd02ece3f99f637140e2cec0f805ff08d784fee5f86c6b1f7336e630b32af6b6852d04b950f1a1c78b4648703d6fa45defbb1a28f1bb8a83118c08b6ad4
+  metadata.gz: ecb7a9753e7863f0a1c2e755e238d45ba88036dd8660a5a71507157347e034e324ff5e5352a056fb7f840aeeb5f761a1224d9172aa7986b71aee9c967ff68211
+  data.tar.gz: 24ffa299fb984257c85b907a7acd57fd4c364512af79dda73b3c73b6ed610a1f2c61de34750433090d81092659754f6820d16416ea470cdb4ffac8ee86f8352b

data/lib/MiqVm/MiqRhevmVm.rb

@@ -42,7 +42,7 @@ class MiqRhevmVm < MiqVm
     disks = @rhevm.collect_vm_disks(@rhevmVm)
     disks.each_with_index do |disk, idx|
       $log.debug "MiqRhevmVm#getCfg: disk = #{disk.inspect}"
-      storage_domain = disk.storage_domains&.first
+      storage_domain = disk.storage_domains.first
       if storage_domain.nil?
         $log.info("Disk <#{disk.name}> is skipped due to unassigned storage domain")
         next

data/lib/MiqVm/MiqVm.rb

@@ -205,143 +205,3 @@ class MiqVm
     (xml)
   end
 end # class MiqVm
-
-if __FILE__ == $0
-  require 'metadata/util/win32/boot_info_win'
-
-  # vmDir = File.join(ENV.fetch("HOME", '.'), 'VMs')
-  vmDir = "/volumes/WDpassport/Virtual Machines"
-  puts "vmDir = #{vmDir}"
-
-  targetLv = "rpolv2"
-  rootLv = "LogVol00"
-
-  require 'logger'
-  $log = Logger.new(STDERR)
-  $log.level = Logger::DEBUG
-
-  #
-  # *** Test start
-  #
-
-  # vmCfg = File.join(vmDir, "cacheguard/cacheguard.vmx")
-  # vmCfg = File.join(vmDir, "Red Hat Linux.vmwarevm/Red Hat Linux.vmx")
-  # vmCfg = File.join(vmDir, "MIQ Server Appliance - Ubuntu MD - small/MIQ Server Appliance - Ubuntu.vmx")
-  # vmCfg = File.join(vmDir, "winxpDev.vmwarevm/winxpDev.vmx")
-  vmCfg = File.join(vmDir, "Win2K_persistent/Windows 2000 Professional.vmx")
-  # vmCfg = File.join(vmDir, "Win2K_non_persistent/Windows 2000 Professional.vmx")
-  puts "VM config file: #{vmCfg}"
-
-  ost = OpenStruct.new
-  ost.openParent = true
-
-  vm = MiqVm.new(vmCfg, ost)
-
-  puts "\n*** Disk Files:"
-  vm.vmConfig.getDiskFileHash.each do |k, v|
-    puts "\t#{k}\t#{v}"
-  end
-
-  puts "\n*** configHash:"
-  vm.vmConfig.getHash.each do |k, v|
-    puts "\t#{k} => #{v}"
-  end
-
-  tlv = nil
-  rlv = nil
-  puts "\n*** Visible Volumes:"
-  vm.volumeManager.visibleVolumes.each do |vv|
-    puts "\tDisk type: #{vv.diskType}"
-    puts "\tDisk sig: #{vv.diskSig}"
-    puts "\tStart LBA: #{vv.lbaStart}"
-    if vv.respond_to?(:logicalVolume)
-      puts "\t\tLV name: #{vv.logicalVolume.lvName}"
-      puts "\t\tLV UUID: #{vv.logicalVolume.lvId}"
-      tlv = vv if vv.logicalVolume.lvName == targetLv
-      rlv = vv if vv.logicalVolume.lvName == rootLv
-    end
-  end
-
-  # raise "#{targetLv} not found" if !tlv
-  #
-  # tlv.seek(0, IO::SEEK_SET)
-  # rs = tlv.read(2040)
-  # puts "\n***** START *****"
-  # puts rs
-  # puts "****** END ******"
-  #
-  # tlv.seek(2048*512*5119, IO::SEEK_SET)
-  # rs = tlv.read(2040)
-  # puts "\n***** START *****"
-  # puts rs
-  # puts "****** END ******"
-  #
-  # raise "#{rootLv} not found" if !rlv
-  #
-  # puts "\n*** Mounting #{rootLv}"
-  # rfs = MiqFS.getFS(rlv)
-  # puts "\tFS Type: #{rfs.fsType}"
-  # puts "\t*** Root-level files and directories:"
-  # rfs.dirForeach("/") { |de| puts "\t\t#{de}" }
-
-  puts "\n***** Detected Guest OSs:"
-  raise "No OSs detected" if vm.rootTrees.length == 0
-  vm.rootTrees.each do |rt|
-    puts "\t#{rt.guestOS}"
-    if rt.guestOS == "Linux"
-      puts "\n\t\t*** /etc/fstab contents:"
-      rt.fileOpen("/etc/fstab", &:read).each_line do |fstl|
-        next if fstl =~ /^#.*$/
-        puts "\t\t\t#{fstl}"
-      end
-    end
-  end
-
-  vm.rootTrees.each do |rt|
-    if rt.guestOS == "Linux"
-      # tdirArr = [ "/", "/boot", "/var/www/miq", "/var/www/miq/vmdb/log", "/var/lib/mysql" ]
-      tdirArr = ["/", "/boot", "/etc/init.d", "/etc/rc.d/init.d", "/etc/rc.d/rc0.d"]
-
-      tdirArr.each do |tdir|
-        begin
-          puts "\n*** Listing #{tdir} directory (1):"
-          rt.dirForeach(tdir) { |de| puts "\t\t#{de}" }
-          puts "*** end"
-
-          puts "\n*** Listing #{tdir} directory (2):"
-          rt.chdir(tdir)
-          rt.dirForeach { |de| puts "\t\t#{de}" }
-          puts "*** end"
-        rescue => err
-          puts "*** #{err}"
-        end
-      end
-
-      # lf = rt.fileOpen("/etc/rc0.d/S01halt")
-      # puts "\n*** Contents of /etc/rc0.d/S01halt:"
-      # puts lf.read
-      # puts "*** END"
-      # lf.close
-      #
-      # lfn = "/etc/rc0.d/S01halt"
-      # puts "Is #{lfn} a symbolic link? #{rt.fileSymLink?(lfn)}"
-      # puts "#{lfn} => #{rt.getLinkPath(lfn)}"
-    else  # Windows
-      tdirArr = ["c:/", "e:/", "e:/testE2", "f:/"]
-
-      tdirArr.each do |tdir|
-        puts "\n*** Listing #{tdir} directory (1):"
-        rt.dirForeach(tdir) { |de| puts "\t\t#{de}" }
-        puts "*** end"
-
-        puts "\n*** Listing #{tdir} directory (2):"
-        rt.chdir(tdir)
-        rt.dirForeach { |de| puts "\t\t#{de}" }
-        puts "*** end"
-      end
-    end
-  end
-
-  vm.unmount
-  puts "...done"
-end

data/lib/OpenStackExtract/MiqOpenStackVm/MiqOpenStackImage.rb

@@ -1,5 +1,4 @@
 require 'miq_tempfile'
-require_relative '../../MiqVm/MiqVm'
 require_relative 'MiqOpenStackCommon'
 
 class MiqOpenStackImage

data/lib/OpenStackExtract/MiqOpenStackVm/MiqOpenStackInstance.rb

@@ -1,5 +1,4 @@
 require 'miq_tempfile'
-require_relative '../../MiqVm/MiqVm'
 require_relative 'MiqOpenStackCommon'
 
 #

data/lib/VolumeManager/MiqLdm.rb

@@ -5,7 +5,7 @@
 
 require 'ostruct'
 require 'binary_struct'
-require 'util/miq-uuid'
+require 'uuidtools'
 
 class BinaryStruct
   def self.stepDecode(data, format)

data/lib/db/MiqSqlite/MiqSqlite3Cell.rb

@@ -5,7 +5,6 @@ require 'enumerator'
 
 require 'binary_struct'
 require_relative 'MiqSqlite3Util'
-require_relative 'MiqSqlite3Page'
 
 module MiqSqlite3DB
   class MiqSqlite3Cell
@@ -150,8 +149,8 @@ module MiqSqlite3DB
       when 2 then         return 2, 'integer'
       when 3 then         return 3, 'integer'
       when 4 then         return 4, 'integer'
-      when 6 then         return 6, 'integer'
-      when 8 then         return 8, 'integer'
+      when 5 then         return 6, 'integer'
+      when 6 then         return 8, 'integer'
       when 7 then         return 8, 'float'
       when 8 then         return 0, 'false'
       when 9 then         return 0, 'true'

data/lib/fs/ext3/superblock.rb

@@ -4,7 +4,7 @@ require 'fs/ext3/group_descriptor_table'
 require 'fs/ext3/inode'
 
 require 'binary_struct'
-require 'util/miq-uuid'
+require 'uuidtools'
 require 'stringio'
 require 'memory_buffer'
 

data/lib/fs/ext4/superblock.rb

@@ -4,7 +4,7 @@ require 'fs/ext4/group_descriptor_table'
 require 'fs/ext4/inode'
 
 require 'binary_struct'
-require 'util/miq-uuid'
+require 'uuidtools'
 require 'stringio'
 require 'memory_buffer'
 
@@ -225,7 +225,7 @@ module Ext4
     end
 
     def groupDescriptorSize
-      @groupDescriptorSize ||= is_enabled_64_bit? ? @sb['group_desc_size'] : GDE_SIZE 
+      @groupDescriptorSize ||= is_enabled_64_bit? ? @sb['group_desc_size'] : GDE_SIZE
     end
 
     def freeBytes

data/lib/fs/ntfs/attrib_object_id.rb

@@ -1,4 +1,4 @@
-require 'util/miq-uuid'
+require 'uuidtools'
 
 module NTFS
   # There is no real data definition for this class - it consists entirely of GUIDs.

data/lib/fs/xfs/allocation_group.rb

@@ -1,5 +1,5 @@
 require 'binary_struct'
-require 'util/miq-uuid'
+require 'uuidtools'
 require 'stringio'
 require 'memory_buffer'
 require 'fs/xfs/superblock'

data/lib/fs/xfs/bmap_btree_block.rb

@@ -1,5 +1,5 @@
 require 'binary_struct'
-require 'util/miq-uuid'
+require 'uuidtools'
 require 'stringio'
 
 require 'rufus/lru'

data/lib/fs/xfs/superblock.rb

@@ -1,7 +1,7 @@
 # encoding: US-ASCII
 
 require 'binary_struct'
-require 'util/miq-uuid'
+require 'uuidtools'
 require 'stringio'
 require 'memory_buffer'
 require 'fs/xfs/allocation_group'

data/lib/manageiq/smartstate/version.rb

@@ -1,5 +1,5 @@
 module ManageIQ
   module Smartstate
-    VERSION = "0.5.10".freeze
+    VERSION = "0.6.0".freeze
   end
 end

data/lib/metadata/MIQExtract/MIQExtract.rb

@@ -1,4 +1,3 @@
-require 'MiqVm/MiqVm'
 require 'metadata/util/md5deep'
 require 'util/miq-xml'
 require 'ostruct'

data/lib/metadata/VmConfig/VmConfig.rb

@@ -364,7 +364,7 @@ class VmConfig
 
   def resolve_ds_path(filename)
     # TODO: Determine if we need to do any work here.
-    ds, dir, name = split_filename(filename)
+    ds, _dir, _name = split_filename(filename)
     return filename unless ds.nil?
 
     @ds_replace ||= {}
@@ -373,7 +373,7 @@ class VmConfig
     end
 
     ds_filename = resolve_ds_path_with_vim(filename)
-    ds, dir, name = split_filename(ds_filename)
+    ds, dir, _name = split_filename(ds_filename)
     unless ds.nil?
       idx = filename.index(dir)
       replaced_str = filename[0, idx]
@@ -498,7 +498,7 @@ class VmConfig
   end
 
   def rhevm_disk_file_entry(disk)
-    storage_id = disk.storage_domains&.first&.id
+    storage_id = disk.storage_domains.first&.id
     disk_id = disk.image_id || disk.id
     full_path = storage_id && File.join('/dev', storage_id, disk_id)
     {:path => full_path, :name => disk_id, :size => disk.actual_size.to_i}
@@ -550,7 +550,7 @@ class VmConfig
         elsif miqvm.rhevmVm
           disks = miqvm.rhevm.collect_vm_disks(miqvm.rhevmVm)
           disks.each do |disk|
-            storage_id = disk.storage_domains&.first&.id
+            storage_id = disk.storage_domains.first&.id
             disk_id = disk.image_id || disk.id
             full_path = storage_id && File.join('/dev', storage_id, disk_id)
             d = {:path => full_path, :name => disk.name.to_s, :size => disk.actual_size.to_i}

data/lib/metadata/util/md5deep.rb

@@ -13,6 +13,8 @@ class MD5deep
   def initialize(fs = nil, options = {})
     @fullFileCount = 0
     @fullDirCount = 0
+    @drive_letter = nil
+
     # Create XML document
     @xml = XmlHash.createDoc(:filesystem)
     @fs = fs.kind_of?(MiqFS) ? fs : nil
@@ -179,9 +181,9 @@ class MD5deep
 
   def fileOpen(currFile)
     if @fs
-      fh = @fs.fileOpen(currFile)
+      @fs.fileOpen(currFile)
     else
-      fh = File.open(currFile)
+      File.open(currFile)
     end
   end
 

data/lib/metadata/util/win32/Win32EventLog.rb

@@ -684,8 +684,8 @@ class Win32EventLog
       reg.each_key do |subKey, _wtime|
         subpath = "#{src}\\#{subKey}"
         subKey.downcase!
-        Win32::Registry::HKEY_LOCAL_MACHINE.open(subpath) do |reg|
-          reg.each_value do |name, _type, data|
+        Win32::Registry::HKEY_LOCAL_MACHINE.open(subpath) do |subreg|
+          subreg.each_value do |name, _type, data|
             case name
             when 'EventMessageFile', 'ParameterMessageFile', 'CategoryMessageFile' then
               fn = data.to_s

data/lib/metadata/util/win32/peheader.rb

@@ -15,8 +15,6 @@ class PEheader
   IMAGE_NT_SIGNATURE = "PE\0\0"
   IMAGE_DOS_SIGNATURE = "MZ"
 
-  attr_reader :imports, :icons, :messagetables, :versioninfo
-
   def initialize(path)
     @fname = path
     @dataDirs = []
@@ -91,19 +89,19 @@ class PEheader
   end
 
   def imports
-    @import_array ||= getImports
+    @imports ||= getImports
   end
 
   def icons
-    @icon_array ||= getIcons(@fBuf)
+    @icons ||= getIcons(@fBuf)
   end
 
   def messagetables
-    @messagetable_hash ||= getMessagetables
+    @messagetables ||= getMessagetables
   end
 
   def versioninfo
-    @versioninfo_array ||= getVersioninfo
+    @versioninfo ||= getVersioninfo
   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.6"
+  spec.add_dependency "azure-armrest",      "~> 0.9"
   spec.add_dependency "binary_struct",      "~> 2.1"
   spec.add_dependency "iniparse"
   spec.add_dependency "linux_block_device", "~>0.2.1"
@@ -28,7 +28,8 @@ 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.2.1"
-  spec.add_dependency "vmware_web_service", "~>1.0"
+  spec.add_dependency "uuidtools",          "~>2.1"
+  spec.add_dependency "vmware_web_service", "~>2.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.5.10
+  version: 0.6.0
 platform: ruby
 authors:
 - ManageIQ Developers
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-05 00:00:00.000000000 Z
+date: 2020-08-04 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.6
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.6
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: binary_struct
   requirement: !ruby/object:Gem::Requirement
@@ -122,20 +122,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.1
+- !ruby/object:Gem::Dependency
+  name: uuidtools
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: vmware_web_service
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -263,7 +277,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.0.0
 description: ManageIQ SmartState Analysis
-email: 
+email:
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -546,7 +560,7 @@ homepage: https://github.com/ManageIQ/manageiq-smartstate
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -561,9 +575,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.12
-signing_key: 
+rubygems_version: 3.1.3
+signing_key:
 specification_version: 4
 summary: ManageIQ SmartState Analysis
 test_files: []