Create Physical Infrastructure folder inside the policies

AndreyMenezes · Jun 7, 2017 · 44163f5 · 44163f5
1 parent ba8bd2e
commit 44163f5
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 21 deletions.
diff --git a/app/controllers/application_controller/tree_support.rb b/app/controllers/application_controller/tree_support.rb
@@ -24,7 +24,7 @@ def squash_toggle
   def find_record
     # TODO: This logic should probably be reversed - fixed list for VmOrTemplate.
     # (Better yet, override the method only in VmOrTemplate related controllers.)
-    if %w(host container_replicator container_group container_node container_image ext_management_system).include? controller_name
+    if %w(host container_replicator container_group container_node container_image ext_management_system physical_server).include? controller_name
       identify_record(params[:id], controller_name.classify)
     else
       identify_record(params[:id], VmOrTemplate)

diff --git a/app/controllers/miq_policy_controller.rb b/app/controllers/miq_policy_controller.rb
@@ -13,7 +13,7 @@ class MiqPolicyController < ApplicationController
   after_action :cleanup_action
   after_action :set_session_data
 
-  UI_FOLDERS = [Host, Vm, ContainerReplicator, ContainerGroup, ContainerNode, ContainerImage, ExtManagementSystem].freeze
+  UI_FOLDERS = [Host, Vm, ContainerReplicator, ContainerGroup, ContainerNode, ContainerImage, ExtManagementSystem, PhysicalServer].freeze
 
   def export
     @breadcrumbs = []

diff --git a/app/controllers/miq_policy_controller/policies.rb b/app/controllers/miq_policy_controller/policies.rb
@@ -33,7 +33,9 @@ def policy_edit
 
     case params[:button]
     when "save", "add"
+      $log.info("===> Checking privileges...")
       assert_privileges("policy_#{@policy.id ? "edit" : "new"}")
+      $log.info("===> Privileges checked")
       policy = @policy.id.blank? ? MiqPolicy.new : MiqPolicy.find(@policy.id) # Get new or existing record
       policy.mode = @edit[:new][:mode]
       policy.towhat = @edit[:new][:towhat] if @policy.id.blank?               # Set model if new record

diff --git a/app/decorators/miq_policy_decorator.rb b/app/decorators/miq_policy_decorator.rb
@@ -15,6 +15,8 @@ def fonticon
              'pficon pficon-image'
            when 'ExtManagementSystem'
              'pficon pficon-server'
+           when 'PhysicalServer'
+             'pficon pficon-enterprise'
            end
     "#{icon}#{active ? '' : ' fa-inactive'}"
   end

diff --git a/app/presenters/tree_builder_buttons.rb b/app/presenters/tree_builder_buttons.rb
@@ -46,6 +46,7 @@ def buttons_node_image(node)
     when 'Service'             then {:icon  => 'pficon pficon-service'}
     when 'Storage'             then {:icon  => 'fa fa-database'}
     when 'Vm'                  then {:icon  => 'pficon pficon-virtual-machine'}
+    when 'PhysicalServer'      then {:icon  => 'pficon pficon-enterprise'}
     end
   end
 end
diff --git a/app/presenters/tree_builder_condition.rb b/app/presenters/tree_builder_condition.rb
@@ -26,7 +26,8 @@ def x_get_tree_roots(count_only, _options)
                  :ContainerGroup      => _("Pod Conditions"),
                  :ContainerNode       => _("Container Node Conditions"),
                  :ContainerImage      => _("Container Image Conditions"),
-                 :ExtManagementSystem => _("Provider Conditions")}
+                 :ExtManagementSystem => _("Provider Conditions"),
+                 :PhysicalServer      => _("Physical Infrastructure Conditions")}
 
     objects = MiqPolicyController::UI_FOLDERS.collect do |model|
       text = text_i18n[model.name.to_sym]
@@ -45,6 +46,8 @@ def x_get_tree_roots(count_only, _options)
                'pficon pficon-image'
              when 'ExtManagementSystem'
                'pficon pficon-server'
+             when 'PhysicalServer'
+               'pficon pficon-enterprise'
              end
       {
         :id   => model.name.camelize(:lower),

diff --git a/app/presenters/tree_builder_policy.rb b/app/presenters/tree_builder_policy.rb
@@ -21,14 +21,16 @@ def compliance_control_kids(mode)
                                  :ContainerGroup      => _("Pod Compliance Policies"),
                                  :ContainerNode       => _("Container Node Compliance Policies"),
                                  :ContainerImage      => _("Container Image Compliance Policies"),
-                                 :ExtManagementSystem => _("Provider Compliance Policies")},
+                                 :ExtManagementSystem => _("Provider Compliance Policies"),
+                                 :PhysicalServer      => _("Physical Infrastructure Compliance Policies")},
                  :control    => {:Host                => _("Host Control Policies"),
                                  :Vm                  => _("Vm Control Policies"),
                                  :ContainerReplicator => _("Replicator Control Policies"),
                                  :ContainerGroup      => _("Pod Control Policies"),
                                  :ContainerNode       => _("Container Node Control Policies"),
                                  :ContainerImage      => _("Container Image Control Policies"),
-                                 :ExtManagementSystem => _("Provider Control Policies")}}
+                                 :ExtManagementSystem => _("Provider Control Policies"),
+                                 :PhysicalServer      => _("Physical Infrastructure Control Policies")}}
 
     MiqPolicyController::UI_FOLDERS.collect do |model|
       text = text_i18n[mode.to_sym][model.name.to_sym]
@@ -47,6 +49,8 @@ def compliance_control_kids(mode)
                'pficon pficon-image'
              when 'ExtManagementSystem'
                'pficon pficon-server'
+             when 'PhysicalServer'
+               'pficon pficon-enterprise'
              end
       {
         :id   => "#{mode}-#{model.name.camelize(:lower)}",

diff --git a/app/presenters/tree_builder_protect.rb b/app/presenters/tree_builder_protect.rb
@@ -55,6 +55,8 @@ def x_get_tree_hash_kids(parent, count_only)
                'pficon pficon-image'
              when 'ExtManagementSystem'
                'pficon pficon-server'
+             when 'PhysicalServer'
+               'pficon pficon-enterprise'
              end
       {
         :id           => "policy_#{policy.id}",

diff --git a/app/views/miq_policy/_policy_folders.html.haml b/app/views/miq_policy/_policy_folders.html.haml
@@ -1,20 +1,22 @@
 - if @folders
-  - folders_i18n = {"Compliance"                       => _("Compliance Policies"),
-                    "Control"                          => _("Control Policies"),
-                    "Host Compliance"                  => _("Host Compliance Policies"),
-                    "Vm Compliance"                    => _("Vm Compliance Policies"),
-                    "Container Replicator Compliance"  => _("Replicator Compliance Policies"),
-                    "Container Group Compliance"       => _("Pod Compliance Policies"),
-                    "Container Node Compliance"        => _("Container Node Compliance Policies"),
-                    "Container Image Compliance"       => _("Container Image Compliance Policies"),
-                    "Ext Management System Compliance" => _("Provider Compliance Policies"),
-                    "Host Control"                     => _("Host Control Policies"),
-                    "Vm Control"                       => _("Vm Control Policies"),
-                    "Container Replicator Control"     => _("Replicator Control Policies"),
-                    "Container Group Control"          => _("Pod Control Policies"),
-                    "Container Node Control"           => _("Container Node Control Policies"),
-                    "Container Image Control"          => _("Container Image Control Policies"),
-                    "Ext Management System Control"    => _("Provider Control Policies"),
+  - folders_i18n = {"Compliance"                         => _("Compliance Policies"),
+                    "Control"                            => _("Control Policies"),
+                    "Host Compliance"                    => _("Host Compliance Policies"),
+                    "Vm Compliance"                      => _("Vm Compliance Policies"),
+                    "Container Replicator Compliance"    => _("Replicator Compliance Policies"),
+                    "Container Group Compliance"         => _("Pod Compliance Policies"),
+                    "Container Node Compliance"          => _("Container Node Compliance Policies"),
+                    "Container Image Compliance"         => _("Container Image Compliance Policies"),
+                    "Ext Management System Compliance"   => _("Provider Compliance Policies"),
+                    "Physical Infrastructure Compliance" => _("Physical Infrastructure Compliance Policies"),
+                    "Host Control"                       => _("Host Control Policies"),
+                    "Vm Control"                         => _("Vm Control Policies"),
+                    "Container Replicator Control"       => _("Replicator Control Policies"),
+                    "Container Group Control"            => _("Pod Control Policies"),
+                    "Container Node Control"             => _("Container Node Control Policies"),
+                    "Container Image Control"            => _("Container Image Control Policies"),
+                    "Ext Management System Control"      => _("Provider Control Policies"),
+                    "Physical Infrastructure Control"    => _("Physical Infrastructure Control Policies"),
                     }
   = render :partial => "layouts/flash_msg"
   %table.table.table-striped.table-bordered.table-hover