make supported storage types consistent

The listed of supported storage types was different between metrics capture, vm_scan, and vm path This made them consistent.
ManageIQ · Dec 1, 2022 · c6e97ef · c6e97ef
1 parent d53db38
commit c6e97ef
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/app/models/storage.rb b/app/models/storage.rb
@@ -67,7 +67,7 @@ class Storage < ApplicationRecord
 
   delegate :queue_name_for_ems_operations, :to => :ext_management_system, :allow_nil => true
 
-  SUPPORTED_STORAGE_TYPES = %w( VMFS NFS NFS41 FCP ISCSI GLUSTERFS )
+  SUPPORTED_STORAGE_TYPES = %w[VSAN VMFS NAS NFS NFS41 ISCSI DIR FCP CSVFS NTFS GLUSTERFS].freeze
 
   supports :smartstate_analysis do
     if !ext_management_system&.class&.supports?(:smartstate_analysis)

diff --git a/app/models/vm_or_template.rb b/app/models/vm_or_template.rb
@@ -1143,14 +1143,10 @@ def path
     # Return location for RHEV-M VMs
     return rhevm_config_path if vendor.to_s.downcase == 'redhat'
 
-    case storage.store_type
-    when "VMFS"  then "[#{storage.name}] #{location}"
-    when "VSAN"  then "[#{storage.name}] #{location}"
-    when "NFS"   then "[#{storage.name}] #{location}"
-    when "NFS41" then "[#{storage.name}] #{location}"
-    when "NTFS"  then "[#{storage.name}] #{location}"
-    when "CSVFS" then "[#{storage.name}] #{location}"
-    when "NAS"   then File.join(storage.name, location)
+    if storage.store_type == "NAS"
+      File.join(storage.name, location)
+    elsif storage.storage_type_supported?
+      "[#{storage.name}] #{location}"
     else
       _log.warn("VM [#{name}] storage type [#{storage.store_type}] not supported")
       @path = location

diff --git a/app/models/vm_scan/dispatcher.rb b/app/models/vm_scan/dispatcher.rb
@@ -252,7 +252,7 @@ def get_eligible_proxies_for_job(job)
           queue_signal(job, {:args => [:abort, msg, "error"]})
           return []
         else
-          unless %w[VSAN VMFS NAS NFS NFS41 ISCSI DIR FCP CSVFS NTFS GLUSTERFS].include?(@vm.storage.store_type)
+          unless @vm.storage.storage_type_supported?
             msg = "Vm storage type [#{@vm.storage.store_type}] unsupported [#{job.target_id}], aborting job [#{job.guid}]."
             queue_signal(job, {:args => [:abort, msg, "error"]})
             return []