manageiq-smartstate 0.2.24 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88652f88b8c5d6a77b1954fadbe76dc2d489d79d
-  data.tar.gz: 8077e08ee5d0e4ef22347586ce6556c76e7f46f5
+  metadata.gz: 4f731538916cc77ead512682c9f59f0973df895c
+  data.tar.gz: c749c7daf28c1e65ae613bfe632ff8c98ba1a0eb
 SHA512:
-  metadata.gz: 9275dbe27efff2e306632e60d025c1f7c520c0652480b7c110d30402993ae41b751ebc1cd2a5ec80f0cdbbcf57d5668b284572aab3e5f7f53aa48668ec1dc4eb
-  data.tar.gz: 16788607a86a04fe9c05d103ce49c7da0184de1ce951d076c486724b9b801d5c893028f67793161ff6b4291adb43fb6655da983844c456d7bd777669574066c7
+  metadata.gz: b28438c09564c8d3e44cfda1a7c263847578274d231c8ca5423d7e44622cb8cd5b10dedbaa8ef0c2109f0212f6e47a5ff7aa793f687a9d50e23f9feeae1959f1
+  data.tar.gz: 2e55c1e754a8adc088be23da2ca5c0d7b07dffd9ed0a93f39ef41aa904de1f46a5d271a45f406b62399e2752f55fc60e7475435153cb416ace39cdd79bb4bb77

data/.codeclimate.yml

@@ -4,19 +4,17 @@ exclude_paths:
 - "**.xml"
 - "**.yaml"
 - "**.yml"
-- "lib/metadata/linux/test/Packages"
-- "lib/metadata/linux/test/tc_LinuxUtils.rb"
-- "locale/"
-- "spec/"
-- "test/"
-- "tools/"
-- "tmp/"
+- lib/metadata/linux/test/Packages
+- lib/metadata/linux/test/tc_LinuxUtils.rb
+- locale/
+- spec/
+- test/
+- tools/
+- tmp/
 engines:
   brakeman:
-    # very slow :sad_panda:
     enabled: false
   bundler-audit:
-    # requires Gemfile.lock
     enabled: false
   csslint:
     enabled: false
@@ -27,19 +25,18 @@ engines:
         ruby:
           mass_threshold: 25
           count_threshold: 5
-        javascript:
+        javascript: 
   eslint:
     enabled: false
-    channel: "eslint-3"
+    channel: eslint-3
   fixme:
-    # let's enable later
     enabled: false
   markdownlint:
-    # let's enable later
     enabled: false
   rubocop:
     enabled: true
-    config: '.rubocop_cc.yml'
+    config: ".rubocop_cc.yml"
+    channel: rubocop-0-69
 checks:
   method-complexity:
     enabled: true
@@ -47,9 +44,9 @@ checks:
       threshold: 8
 prepare:
   fetch:
-  - url: "https://raw.githubusercontent.com/ManageIQ/guides/master/.rubocop_base.yml"
+  - 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"
+  - url: https://raw.githubusercontent.com/ManageIQ/guides/master/.rubocop_cc_base.yml
     path: ".rubocop_cc_base.yml"
 ratings:
   paths:

data/lib/MiqVm/MiqRhevmVm.rb

@@ -25,11 +25,11 @@ class MiqRhevmVm < MiqVm
   end
 
   def getCfg(_snap = nil)
-    cfg_props = @rhevmVm.attributes
+    cfg_props = @rhevmVm.as_json.with_indifferent_access
 
     raise MiqException::MiqVimError, "Failed to retrieve configuration information for VM" if cfg_props.nil?
 
-    storage_domains = @rhevm.storagedomains
+    storage_domains = @rhevm.collect_storagedomains
     $log.debug "MiqRhevmVm#getCfg: storage_domains = #{storage_domains.inspect}"
 
     cfg_hash = {}
@@ -39,15 +39,15 @@ class MiqRhevmVm < MiqVm
     cfg_hash['numvcpu']     = cfg_props.fetch_path(:cpu, :sockets)
 
     # Collect disk information
-    @rhevmVm.attributes[:disks] = @rhevmVm.send(:disks, :disk) if @rhevmVm[:disks].nil?
-    @rhevmVm.disks.each_with_index do |disk, idx|
+    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"
+        $log.info("Disk <#{disk.name}> is skipped due to unassigned storage domain")
         next
       end
-      storage_id     = storage_domain && storage_domain[:id]
+      storage_id     = storage_domain.id
       storage_obj    = storage_domains_by_id[storage_id]
 
       file_path = file_path_for_storage_type(storage_obj, disk)
@@ -56,13 +56,13 @@ class MiqRhevmVm < MiqVm
       cfg_hash["#{tag}.present"]    = "true"
       cfg_hash["#{tag}.devicetype"] = "disk"
       cfg_hash["#{tag}.filename"]   = file_path.to_s
-      cfg_hash["#{tag}.format"]     = disk[:format]
+      cfg_hash["#{tag}.format"]     = disk.format
     end
     cfg_hash
   end
 
   def file_path_for_storage_type(storage_obj, disk)
-    storage_type = storage_obj && storage_obj.attributes[:storage][:type]
+    storage_type = storage_obj&.storage&.type
 
     # TODO: account for other storage types here.
     case storage_type
@@ -75,38 +75,38 @@ class MiqRhevmVm < MiqVm
   end
 
   def nfs_mount_root
-    @nfs_mount_root ||= @ost.nfs_mount_root || "/mnt/#{@rhevmVm.attributes[:id]}"
+    @nfs_mount_root ||= @ost.nfs_mount_root || "/mnt/#{@rhevmVm.id}"
   end
 
   def fs_file_path(storage_obj, disk)
-    storage_id  = storage_obj.attributes[:id]
-    disk_id     = disk.attributes[:id]
-    image_id    = disk.attributes[:image_id]
+    storage_id  = storage_obj.id
+    disk_id     = disk.id
+    image_id    = disk.image_id
     mount_point = nfs_mounts[storage_id][:mount_point]
 
     ::File.join(mount_point, storage_id, 'images', disk_id, image_id)
   end
 
   def lun_file_path(storage_obj, disk)
-    storage_id = storage_obj.attributes[:id]
-    disk_id    = disk[:image_id].blank? ? disk.attributes[:id] : disk.attributes[:image_id]
+    storage_id = storage_obj.id
+    disk_id    = disk.image_id || disk.id
 
     ::File.join('/dev', storage_id, disk_id)
   end
 
   def storage_domains_by_id
-    @storage_domains_by_id ||= @rhevm.storagedomains.each_with_object({}) { |sd, sdh| sdh[sd.attributes[:id]] = sd }
+    @storage_domains_by_id ||= @rhevm.collect_storagedomains.each_with_object({}) { |sd, sdh| sdh[sd.id] = sd }
   end
 
   #
   # Returns uri and mount points, hashed by storage ID.
   #
   def add_fs_mount(storage_obj)
-    storage_id = storage_obj.attributes[:id]
+    storage_id = storage_obj.id
     return if nfs_mounts[storage_id]
 
     mount_point = ::File.join(nfs_mount_root, nfs_mount_dir(storage_obj))
-    type = storage_obj.attributes[:storage][:type]
+    type = storage_obj.storage.type
     nfs_mounts[storage_id] = {
       :uri         => "#{type}://#{nfs_uri(storage_obj)}",
       :mount_point => mount_point,
@@ -116,8 +116,8 @@ class MiqRhevmVm < MiqVm
   end
 
   def nfs_uri(storage_obj)
-    storage = storage_obj.attributes[:storage]
-    "#{storage[:address]}:#{storage[:path]}"
+    storage = storage_obj.storage
+    "#{storage.address}:#{storage.path}"
   end
 
   def nfs_mounts

data/lib/MiqVm/MiqVm.rb

@@ -42,7 +42,7 @@ class MiqVm
     elsif (@rhevm = @ost.miqRhevm)
       $log.debug "MiqVm::initialize: accessing VM through RHEVM server" if $log.debug?
       $log.debug "MiqVm::initialize: vmCfg = #{vmCfg}"
-      @rhevmVm = @rhevm.get_vm(vmCfg)
+      @rhevmVm = @rhevm.vm_or_template_by_path(vmCfg)
       $log.debug "MiqVm::initialize: setting @ost.miqRhevmVm = #{@rhevmVm.class}" if $log.debug?
       @ost.miqRhevmVm = @rhevmVm
       @vmConfig = VmConfig.new(getCfg(@ost.snapId))

data/lib/manageiq/smartstate/version.rb

@@ -1,5 +1,5 @@
 module ManageIQ
   module Smartstate
-    VERSION = "0.2.24".freeze
+    VERSION = "0.3.0".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: manageiq-smartstate
 version: !ruby/object:Gem::Version
-  version: 0.2.24
+  version: 0.3.0
 platform: ruby
 authors:
 - ManageIQ Developers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-26 00:00:00.000000000 Z
+date: 2019-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: azure-armrest