Remove snia_local_file_system a cim* controllers

app/controllers/application_controller.rb

@@ -76,8 +76,6 @@ def reset_toolbar
   end
 
   # Convert Controller Name to Actual Model
-  # Examples:
-  #   CimStorageExtentController => CimStorageExtent
   def self.model
     @model ||= name[0..-11].constantize
   end
@@ -86,8 +84,6 @@ def self.permission_prefix
     controller_name
   end
 
-  # Examples:
-  #   CimStorageExtentController => cim_storage_extent
   def self.table_name
     @table_name ||= model.name.underscore
   end
@@ -1446,9 +1442,7 @@ def dashboard_view
 
   def get_view_process_search_text(view)
     # Check for new search by name text entered
-    if params[:search] &&
-       # Disabled search for Storage CIs until backend is fixed to handle evm_display_name field
-       !%w(CimBaseStorageExtent SniaLocalFileSystem).include?(view.db)
+    if params[:search]
       @search_text = params[:search][:text].blank? ? nil : params[:search][:text].strip
     elsif params[:search_text] && @explorer
       @search_text = params[:search_text].blank? ? nil : params[:search_text].strip
@@ -2126,7 +2120,7 @@ def set_global_session_data
       # These controllers don't use breadcrumbs, see above get method to store URL
       when "dashboard", "report", "support", "alert", "jobs", "ui_jobs", "miq_ae_tools", "miq_policy", "miq_action", "miq_capacity", "chargeback", "service"
 
-      when "snia_local_file_system", "storage_manager", "cim_base_storage_extent"
+      when "storage_manager"
         session[:tab_bc][:sto] = @breadcrumbs.dup if ["show", "show_list", "index"].include?(action_name)
       when "ems_cloud", "availability_zone", "host_aggregate", "flavor"
         session[:tab_bc][:clo] = @breadcrumbs.dup if ["show", "show_list"].include?(action_name)

app/controllers/application_controller/ci_processing.rb

@@ -1114,66 +1114,6 @@ def show_item
     end
   end
 
-  def snia_local_file_systems
-    @db = params[:db] ? params[:db] : request.parameters[:controller]
-    session[:db] = @db unless @db.nil?
-    @db = session[:db] unless session[:db].nil?
-
-    @record = identify_record(params[:id])
-    return if record_no_longer_exists?(@record)
-
-    @view = session[:view]                  # Restore the view from the session to get column names for the display
-    @display = "snia_local_file_systems"
-    if !params[:show].nil?
-      @item = SniaLocalFileSystem.find_by_id(from_cid(params[:show]))
-      drop_breadcrumb(:name => @record.evm_display_name + " (" + ui_lookup(:tables => "snia_local_file_system") + ")", :url => "/#{@db}/snia_local_file_systems/#{@record.id}?page=#{@current_page}")
-      drop_breadcrumb(:name => @item.evm_display_name, :url => "/#{@db}/show/#{@record.id}?show=#{@item.id}")
-      show_item
-    else
-      drop_breadcrumb(:name => @record.evm_display_name + " (" + ui_lookup(:tables => "snia_local_file_system") + ")", :url => "/#{@db}/snia_local_file_systems/#{@record.id}")
-      # generate the grid/tile/list url to come back here when gtl buttons are pressed
-      @gtl_url = "/#{@db}/snia_local_file_systems/" + @record.id.to_s + "?"
-      @showtype = "details"
-
-      table_name = "snia_local_file_systems"
-      model_name = table_name.classify.constantize
-      drop_breadcrumb(:name => @record.evm_display_name + " (All #{ui_lookup(:tables => @display.singularize)})", :url => "/#{self.class.table_name}/show/#{@record.id}?display=#{@display}")
-      @view, @pages = get_view(model_name, :parent => @record, :parent_method => :local_file_systems)  # Get the records (into a view) and the paginator
-      render :action => 'show'
-    end
-  end
-
-  def cim_base_storage_extents
-    @db = params[:db] ? params[:db] : request.parameters[:controller]
-    session[:db] = @db unless @db.nil?
-    @db = session[:db] unless session[:db].nil?
-
-    @record = identify_record(params[:id])
-    return if record_no_longer_exists?(@record)
-
-    @view = session[:view]                  # Restore the view from the session to get column names for the display
-    @display = "cim_base_storage_extents"
-    if !params[:show].nil?
-      @item = CimBaseStorageExtent.find_by_id(from_cid(params[:show]))
-      drop_breadcrumb(:name => @record.evm_display_name + " (" + ui_lookup(:tables => "cim_base_storage_extent") + ")", :url => "/#{@db}/cim_base_storage_extents/#{@record.id}?page=#{@current_page}")
-      drop_breadcrumb(:name => @item.evm_display_name, :url => "/#{@db}/show/#{@record.id}?show=#{@item.id}")
-      show_item
-    else
-      drop_breadcrumb(:name => @record.evm_display_name + " (" + ui_lookup(:tables => "cim_base_storage_extent") + ")", :url => "/#{@db}/cim_base_storage_extents/#{@record.id}")
-      # generate the grid/tile/list url to come back here when gtl buttons are pressed
-      @gtl_url = "/#{@db}/cim_base_storage_extents/" + @record.id.to_s + "?"
-      @showtype = "details"
-
-      table_name = "cim_base_storage_extents"
-      model_name = table_name.classify.constantize
-      drop_breadcrumb(:name => _("%{name} (All %{tables})") % {:name   => @record.evm_display_name,
-                                                               :tables => ui_lookup(:tables => @display.singularize)},
-                      :url  => "/#{self.class.table_name}/show/#{@record.id}?display=#{@display}")
-      @view, @pages = get_view(model_name, :parent => @record, :parent_method => :base_storage_extents)  # Get the records (into a view) and the paginator
-      render :action => 'show'
-    end
-  end
-
   def get_record(db)
     if db == "host"
       @host = @record = identify_record(params[:id], Host)

app/controllers/application_controller/performance.rb

@@ -561,7 +561,7 @@ def perf_gen_init_options(refresh = nil)
       @perf_options[:typ] = "Hourly" if @perf_record.class.name.starts_with?("Vmdb")
       @perf_options[:days] = "7"
       @perf_options[:rt_minutes] = 15.minutes
-      @perf_options[:model] = @perf_record.kind_of?(MiqCimInstance) ? @perf_record.class.to_s : @perf_record.class.base_class.to_s
+      @perf_options[:model] = @perf_record.class.base_class.to_s
     end
     @perf_options[:rt_minutes] ||= 15.minutes
     @perf_options[:cats] ||= perf_build_cats(@perf_options[:model]) if ["EmsCluster", "Host", "Storage", "AvailabilityZone", "HostAggregate"].include?(@perf_options[:model])
@@ -650,26 +650,7 @@ def perf_gen_data_before_wait
       end
 
       # Get the report definition (yaml) and set the where clause based on the record type
-      if @perf_record.kind_of?(MiqCimInstance)
-        rpt = perf_get_chart_rpt(@perf_options[:model].underscore)
-        if interval_type == "hourly"
-          rpt.where_clause =  ["miq_cim_instance_id = ? and statistic_time >= ? and statistic_time <= ? and rollup_type = ?",
-                               @perf_record.id,
-                               from_dt,
-                               to_dt,
-                               interval_type]
-        elsif interval_type == "daily"
-          tz = @perf_options["tz#{@perf_options[:typ] == "Daily" ? "_daily" : ""}".to_sym]
-          tp = @perf_options[:time_profile] ||
-               TimeProfile.rollup_daily_metrics.find_all_with_entire_tz.detect { |p| p.tz_or_default == tz }.id
-          rpt.where_clause =  ["miq_cim_instance_id = ? and statistic_time >= ? and statistic_time <= ? and rollup_type = ? and time_profile_id = ?",
-                               @perf_record.id,
-                               from_dt,
-                               to_dt,
-                               interval_type,
-                               tp]
-        end
-      elsif @perf_record.kind_of?(VmdbDatabase)
+      if @perf_record.kind_of?(VmdbDatabase)
         rpt = perf_get_chart_rpt(@perf_options[:model].underscore)
         rpt.where_clause =  ["vmdb_database_id = ? and timestamp >= ? and timestamp <= ? and capture_interval_name = ?",
                              @perf_record.id,

app/controllers/ems_cluster_controller.rb

@@ -90,13 +90,6 @@ def show
                       :url  => "/ems_cluster/show/#{@ems_cluster.id}?display=storage")
       @view, @pages = get_view(Storage, :parent => @ems_cluster)  # Get the records (into a view) and the paginator
       @showtype = "storage"
-
-    when "storage_extents"
-      drop_breadcrumb(:name => @ems_cluster.name + _(" (All %{tables})") %
-        {:tables => ui_lookup(:tables => "cim_base_storage_extent")},
-                      :url  => "/ems_cluster/show/#{@ems_cluster.id}?display=storage_extents")
-      @view, @pages = get_view(CimBaseStorageExtent, :parent => @ems_cluster, :parent_method => :base_storage_extents)  # Get the records (into a view) and the paginator
-      @showtype = "storage_extents"
     end
 
     set_config(@ems_cluster)

app/controllers/mixins/start_url.rb

@@ -1,8 +1,7 @@
 module StartUrl
   extend ActiveSupport::Concern
 
-  STORAGE_START_PAGES = %w(cim_storage_extent_show_list
-                           storage_manager_show_list).to_set.freeze
+  STORAGE_START_PAGES = %w(storage_manager_show_list).to_set.freeze
   CONTAINERS_START_PAGES = %w(ems_container_show_list
                               container_node_show_list
                               container_group_show_list
@@ -41,7 +40,7 @@ def start_page_options
   private
 
   def start_page_allowed?(start_page)
-    return false if STORAGE_START_PAGES.include?(start_page) && !::Settings.product.storage
+    return false if STORAGE_START_PAGES.include?(start_page)
     return false if CONTAINERS_START_PAGES.include?(start_page) && !::Settings.product.containers
     role_allows?(:feature => start_page, :any => true)
   end

app/controllers/storage_controller.rb

@@ -88,13 +88,6 @@ def show(record = nil)
       drop_breadcrumb(:name => _("%{name} Capacity & Utilization") % {:name => @storage.name},
                       :url  => "/storage/x_show/#{@storage.id}?display=#{@display}&refresh=n")
       perf_gen_init_options               # Intialize perf chart options, charts will be generated async
-
-    when "storage_extents"
-      drop_breadcrumb(:name => _(" (All %{tables})") % {:name   => @storage.name,
-                                                        :tables => ui_lookup(:tables => "cim_base_storage_extent")},
-                      :url  => "/storage/x_show/#{@storage.id}?display=storage_extents")
-      @view, @pages = get_view(CimBaseStorageExtent, :parent => @storage, :parent_method => :base_storage_extents)  # Get the records (into a view) and the paginator
-      @showtype = "storage_extents"
     end
     @lastaction = "show"
   end

app/controllers/vm_common.rb

@@ -1619,15 +1619,15 @@ def set_right_cell_vars
       action = nil
     else
       # now take care of links on summary screen
-      if @showtype == "details"
-        partial = "layouts/x_gtl"
-      elsif @showtype == "item"
-        partial = "layouts/item"
-      elsif @showtype == "drift_history"
-        partial = "layouts/#{@showtype}"
-      else
-        partial = "#{@showtype == "compliance_history" ? "shared/views" : "vm_common"}/#{@showtype}"
-      end
+      partial = if @showtype == "details"
+                  "layouts/x_gtl"
+                elsif @showtype == "item"
+                  "layouts/item"
+                elsif @showtype == "drift_history"
+                  "layouts/#{@showtype}"
+                else
+                  "#{@showtype == "compliance_history" ? "shared/views" : "vm_common"}/#{@showtype}"
+                end
       if @showtype == "item"
         header = _("%{action} \"%{item_name}\" for %{vm_or_template} \"%{name}\"") % {
           :vm_or_template => ui_lookup(:table => table),