manageiq-smartstate 0.5.9 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d75e73f8d9428561d2b4a97ada29fd241c2a0d2bc1ba1ca1dd8465f8bbbd6112
-  data.tar.gz: d2f3a3bae73311a0be7c4e5237572326881fd294967710626513e9a3fff37abe
+  metadata.gz: 2eed9833b4418d9405995117c01ae36ec8d9dbd8f59c2a71a3b1695fd1845eca
+  data.tar.gz: 014abce3c3c7a22594ffe9877046b1a390b0941e58e4052b3eb29525c80bd6fb
 SHA512:
-  metadata.gz: 8e6fc1892a1c2b8a18e9114bbc1d3d3b30125c5808ff394b87af671ea9cfde6afc2b4489afab9042cd0e40e5055e21ebc2df1521dfab545c4a8418131802847d
-  data.tar.gz: 409a17333f94aada6807c384eca810e6bcac9c4d1e27d3d46df072be31a6e33da3539efddc8451f40a569c5e3251ab89e8d4ea80642c8753081e8d912d6db604
+  metadata.gz: 417c6b7efe6f1ebdf11f037beb537f9fd48f1654e5985699a6b6c2d29342ea7fd22b59df97b48ae4ba09e1d6c75624c198add8d988b6387d071084ae48b0aafb
+  data.tar.gz: 35335b08093b49f9fb4e57aeba97b2c89d6c01ead9de3cb854086f84b0a70b59f90a178f1aaa44230dd1feea24c70acefa0546f43e2b65a279b8bcd59b0d1146

data/.codeclimate.yml

@@ -1,17 +1,23 @@
----
-exclude_paths:
-- ".git/"
-- "**.xml"
-- "**.yaml"
-- "**.yml"
-- lib/metadata/linux/test/Packages
-- lib/metadata/linux/test/tc_LinuxUtils.rb
-- locale/
-- spec/
-- test/
-- tools/
-- tmp/
-engines:
+checks:
+  method-complexity:
+    enabled: true
+    config:
+      threshold: 8
+prepare:
+  fetch:
+  - url: https://raw.githubusercontent.com/ManageIQ/manageiq-style/master/.rubocop_base.yml
+    path: ".rubocop_base.yml"
+  - url: https://raw.githubusercontent.com/ManageIQ/manageiq-style/master/.rubocop_cc_base.yml
+    path: ".rubocop_cc_base.yml"
+  - url: https://raw.githubusercontent.com/ManageIQ/manageiq-style/master/styles/base.yml
+    path: styles/base.yml
+  - url: https://raw.githubusercontent.com/ManageIQ/manageiq-style/master/styles/cc_base.yml
+    path: styles/cc_base.yml
+plugins:
+  rubocop:
+    enabled: true
+    config: ".rubocop_cc.yml"
+    channel: rubocop-0-82
   brakeman:
     enabled: false
   bundler-audit:
@@ -25,7 +31,7 @@ engines:
         ruby:
           mass_threshold: 25
           count_threshold: 5
-        javascript: 
+        javascript:
   eslint:
     enabled: false
     channel: eslint-3
@@ -33,23 +39,16 @@ engines:
     enabled: false
   markdownlint:
     enabled: false
-  rubocop:
-    enabled: true
-    config: ".rubocop_cc.yml"
-    channel: rubocop-0-69
-checks:
-  method-complexity:
-    enabled: true
-    config:
-      threshold: 8
-prepare:
-  fetch:
-  - url: https://raw.githubusercontent.com/ManageIQ/guides/master/.rubocop_base.yml
-    path: ".rubocop_base.yml"
-  - url: https://raw.githubusercontent.com/ManageIQ/guides/master/.rubocop_cc_base.yml
-    path: ".rubocop_cc_base.yml"
-ratings:
-  paths:
-  - Gemfile.lock
-  - "**.rake"
-  - "**.rb"
+exclude_patterns:
+- ".git/"
+- "**.xml"
+- "**.yaml"
+- "**.yml"
+- lib/metadata/linux/test/Packages
+- lib/metadata/linux/test/tc_LinuxUtils.rb
+- locale/
+- spec/
+- test/
+- tools/
+- tmp/
+version: '2'

data/.rubocop.yml

@@ -1,4 +1,4 @@
 inherit_from:
-- https://raw.githubusercontent.com/ManageIQ/guides/master/.rubocop_base.yml
-# put all local rubocop config into .rubocop_local.yml as it will be loaded by .rubocop_cc.yml as well
-- .rubocop_local.yml
+- ".rubocop_local.yml"
+inherit_gem:
+  manageiq-style: ".rubocop_base.yml"

data/.rubocop_cc.yml

@@ -1,5 +1,4 @@
 inherit_from:
-# this is downloaded by .codeclimate.yml
-- .rubocop_base.yml
-- .rubocop_cc_base.yml
-- .rubocop_local.yml
+- ".rubocop_base.yml"
+- ".rubocop_cc_base.yml"
+- ".rubocop_local.yml"

data/.rubocop_local.yml

@@ -1,7 +1,7 @@
 #
 # Overrides
 #
-GlobalVars:
+Style/GlobalVars:
   AllowedVariables:
   # Loggers
   - $log

data/.travis.yml

@@ -1,10 +1,9 @@
 ---
-sudo: false
 cache: bundler
 language: ruby
 rvm:
-- 2.5.7
-- 2.6.5
+- 2.5.8
+- 2.6.6
 after_script: bundle exec codeclimate-test-reporter
 notifications:
   webhooks:

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/disk/modules/MSCommon.rb

@@ -1,10 +1,12 @@
 require 'disk/modules/MiqLargeFile'
-require 'util/miq-unicode'
+require 'miq_unicode'
 require 'binary_struct'
 require 'memory_buffer'
 require 'Scvmm/miq_hyperv_disk'
 
 module MSCommon
+  using ManageIQ::UnicodeString
+
   # NOTE: All values are stored in network byte order.
 
   FOOTER = BinaryStruct.new([

data/lib/disk/modules/VhdxDisk.rb

@@ -1,6 +1,6 @@
 # encoding: US-ASCII
 
-require 'util/miq-unicode'
+require 'miq_unicode'
 require 'binary_struct'
 require 'disk/MiqDisk'
 require 'memory_buffer'
@@ -8,6 +8,8 @@ require 'disk/modules/MiqLargeFile'
 require 'disk/modules/vhdx_bat_entry'
 
 module VhdxDisk
+  using ManageIQ::UnicodeString
+
   # NOTE: All values are stored in network byte order.
 
   VHDX_FILE_IDENTIFIER = BinaryStruct.new([

data/lib/fs/MiqMountManager.rb

@@ -8,6 +8,7 @@ class MiqMountManager < MiqFS
   def self.mountVolumes(volMgr, vmCfg, ost = nil)
     rootTrees = []
     noFsVolumes = []
+
     volMgr.visibleVolumes.each do |dobj|
       $log.debug("MiqMountManager.mountVolumes >> fileName=#{dobj.dInfo.fileName}, partition=#{dobj.partNum}") if $log
       fs = MiqFS.getFS(dobj)
@@ -20,10 +21,7 @@ class MiqMountManager < MiqFS
         rootTrees << new(rsm, dobj, volMgr, vmCfg, ost)
       end
     end
-    if volMgr.kind_of?(MiqNativeVolumeManager)
-      require 'MetakitFS'
-      rootTrees.each { |rt| rt.findPayload(noFsVolumes) } unless noFsVolumes.empty?
-    end
+
     rootTrees
   end # def self.mountVolumes
 
@@ -41,31 +39,6 @@ class MiqMountManager < MiqFS
     super(rootModule, rootVolume)
   end # def initialize
 
-  def findPayload(noFsVolumes)
-    $log.debug "MiqMountManager.findPayload: searching for payloads:" if $log
-    noFsVolumes.each do |v|
-      next unless v.respond_to?(:devFile)
-      if v.devFile
-        $log.debug "\tMiqMountManager.findPayload: devFile = #{v.devFile}" if $log
-        v.mkfile = v.devFile
-        unless MetakitFS.supported?(v)
-          $log.debug "\tMiqMountManager.findPayload: devFile = #{v.devFile} not mkfs, skipping" if $log
-          v.mkfile = nil
-          next
-        end
-        mkFs = MiqFS.new(MetakitFS, v)
-        if mkFs.fsId == "MIQPAYLOAD"
-          $log.debug "\tMiqMountManager.findPayload: payload found devFile = #{v.devFile}" if $log
-          @payloads << mkFs
-        else
-          $log.debug "\tMiqMountManager.findPayload: devFile = #{v.devFile} not payload, fsId = #{mkFs.fsId}" if $log
-        end
-      else
-        $log.debug "\tMiqMountManager.findPayload: devFile not set, fileName = #{v.dInfo.fileName}" if $log
-      end
-    end
-  end
-
   #
   # Override standard MiqFS methods to account for mount indirection.
   # The getFsPath method is defined by the OS-specific mount modules.

data/lib/fs/VimDatastoreFS/VimDatastoreFS.rb

@@ -105,12 +105,7 @@ module VimDatastoreFS
   #
   #     fpos = 0
   #     fsize = @pSize.get(fileRow)
-  #     if ftruncate && fsize != 0
-  #         @pSize.set fileRow, 0
-  #         @pData.set fileRow, Metakit::Bytes.new("", 0)
-  #     elsif fappend
-  #         fpos = fsize
-  #     end
+  #     fpos = fsize if fappend
   #
   #     return(MkFile.new(p, fileRow, fpos, fread, fwrite))
   # end # def fs_fileOpen

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