Merge pull request ManageIQ#18918 from GregP/remove_cloud_providers_i…

…n_load_balancing Remove Networks Load Balancer menu
xlab-si · Jul 5, 2019 · e93bf1d · e93bf1d
2 parents b74c283 + 5eb9b41
commit e93bf1d
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 43 deletions.
diff --git a/db/fixtures/miq_product_features.yml b/db/fixtures/miq_product_features.yml
@@ -4152,35 +4152,6 @@
       :feature_type: admin
       :identifier: network_router_remove_interface
 
-# Load Balancer
-- :name: Load Balancers
-  :description: Everything under Load Balancers
-  :feature_type: node
-  :identifier: load_balancer
-  :children:
-  - :name: View
-    :description: View Load Balancers
-    :feature_type: view
-    :identifier: load_balancer_view
-    :children:
-    - :name: List
-      :description: Display Lists of Load Balancers
-      :feature_type: view
-      :identifier: load_balancer_show_list
-    - :name: Show
-      :description: Display Individual Load Balancers
-      :feature_type: view
-      :identifier: load_balancer_show
-  - :name: Operate
-    :description: Perform Operations on Load Balancers
-    :feature_type: control
-    :identifier: load_balancer_control
-    :children:
-    - :name: Edit Tags
-      :description: Edit Tags of Load Balancer
-      :feature_type: control
-      :identifier: load_balancer_tag
-
 # ContainerGroup
 - :name: Pods
   :description: Everything under Pods

diff --git a/db/fixtures/miq_shortcuts.yml b/db/fixtures/miq_shortcuts.yml
@@ -314,11 +314,6 @@
   :url: /network_port/show_list
   :rbac_feature_name: network_port_show_list
   :startup: true
-- :name: load_balancers
-  :description: Networks / Load Balancers
-  :url: /load_balancer/show_list
-  :rbac_feature_name: load_balancer_show_list
-  :startup: true
 - :name: network_topology
   :description: Networks / Topology
   :url: /network_topology

diff --git a/db/fixtures/miq_user_roles.yml b/db/fixtures/miq_user_roles.yml
@@ -1044,7 +1044,6 @@
   - ems_infra
   - ems_physical_infra
   - host
-  - load_balancer
   - miq_ae_class_explorer
   - miq_ae_customization_explorer
   - miq_ae_class_import_export
@@ -1289,7 +1288,6 @@
   - infra_topology
   - instance_view
   - iso_datastore_view
-  - load_balancer_view
   - miq_ae_class_log
   - miq_ae_domain_view
   - miq_report_saved_reports_view

diff --git a/lib/rbac/filterer.rb b/lib/rbac/filterer.rb
@@ -35,7 +35,6 @@ class Filterer
       Host
       HostAggregate
       Lan
-      LoadBalancer
       MiddlewareDatasource
       MiddlewareDeployment
       MiddlewareDomain
@@ -62,7 +61,6 @@ class Filterer
       CloudNetwork
       CloudSubnet
       FloatingIp
-      LoadBalancer
       NetworkPort
       NetworkRouter
       SecurityGroup

diff --git a/locale/en.yml b/locale/en.yml
@@ -1024,7 +1024,6 @@ en:
       ems_physical_infras:         Physical Infrastructure Providers
       ems_storage:                 Storage Manager
       floating_ips:                Floating IP
-      load_balancer:               Load Balancer
       network_port:                Network Port
       network_router:              Network Router
       evm_owner:                   EVM Owner

diff --git a/spec/lib/rbac/filterer_spec.rb b/spec/lib/rbac/filterer_spec.rb
@@ -1811,8 +1811,8 @@ def get_rbac_results_for_and_expect_objects(klass, expected_objects)
               FactoryBot.create(network_model.underscore,  :ext_management_system => network_manager_1)
             end
 
-            context "when records match belogns to filter" do
-              it "lists records of #{network_model} manager according to belongsto filter" do
+            context "when records match belongs to filter" do
+              it "lists records of #{network_model} manager according to belongs to filter" do
                 User.with_user(user) do
                   results = described_class.search(:class => network_model).first
                   expect(results).to match_array([network_object])
@@ -1821,7 +1821,7 @@ def get_rbac_results_for_and_expect_objects(klass, expected_objects)
               end
             end
 
-            context "when records don't match belogns to filter" do
+            context "when records don't match belongs to filter" do
               before do
                 group.entitlement = Entitlement.new
                 group.entitlement.set_managed_filters([])
@@ -1900,7 +1900,6 @@ def get_rbac_results_for_and_expect_objects(klass, expected_objects)
         CloudNetwork
         CloudSubnet
         FloatingIp
-        LoadBalancer
         NetworkPort
         NetworkRouter
         SecurityGroup