unified shared network manager code

ManageIQ · May 19, 2017 · d0b95ce · d0b95ce
1 parent 1e37bef
commit d0b95ce
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 17 deletions.
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -48,6 +48,7 @@ class ApplicationController < ActionController::Base
   include_concern 'Explorer'
   include_concern 'Filter'
   include_concern 'MiqRequestMethods'
+  include_concern 'Network'
   include_concern 'Performance'
   include_concern 'PolicySupport'
   include_concern 'Tags'

diff --git a/app/controllers/application_controller/network.rb b/app/controllers/application_controller/network.rb
@@ -0,0 +1,11 @@
+module ApplicationController::Network
+  extend ActiveSupport::Concern
+
+  def network_managers
+    ExtManagementSystem.where(:type => "ManageIQ::Providers::Openstack::CloudManager").collect { |ems|
+      if ems.respond_to?(:network_manager) && ems.network_manager
+        ems.network_manager
+      end
+    }.compact
+  end
+end
diff --git a/app/controllers/cloud_network_controller.rb b/app/controllers/cloud_network_controller.rb
@@ -154,10 +154,8 @@ def new
     @network = CloudNetwork.new
     @in_a_form = true
     @network_ems_provider_choices = {}
-    ExtManagementSystem.where(:type => "ManageIQ::Providers::Openstack::CloudManager").find_each do |ems|
-      if ems.respond_to?(:network_manager) && ems.network_manager
-        @network_ems_provider_choices[ems.network_manager.name] = ems.network_manager.id
-      end
+    network_managers.each do |network_manager|
+      @network_ems_provider_choices[network_manager.name] = network_manager.id
     end
     @network_provider_network_type_choices = PROVIDERS_NETWORK_TYPES
 

diff --git a/app/controllers/floating_ip_controller.rb b/app/controllers/floating_ip_controller.rb
@@ -165,10 +165,8 @@ def new
     @floating_ip = FloatingIp.new
     @in_a_form = true
     @ems_choices = {}
-    ExtManagementSystem.where(:type => "ManageIQ::Providers::Openstack::CloudManager").find_each do |ems|
-      if ems.respond_to?(:network_manager) && ems.network_manager
-        @ems_choices[ems.network_manager.name] = ems.network_manager.id
-      end
+    network_managers.each do |network_manager|
+      @ems_choices[network_manager.name] = network_manager.id
     end
     drop_breadcrumb(
       :name => _("Add New Floating IP"),

diff --git a/app/controllers/network_router_controller.rb b/app/controllers/network_router_controller.rb
@@ -94,10 +94,8 @@ def new
     assert_privileges("network_router_new")
     @in_a_form = true
     @network_provider_choices = {}
-    ExtManagementSystem.where(:type => "ManageIQ::Providers::Openstack::CloudManager").find_each do |ems|
-      if ems.respond_to?(:network_manager) && ems.network_manager
-        @network_provider_choices[ems.network_manager.name] = ems.network_manager.id
-      end
+    network_managers.each do |network_manager|
+      @network_provider_choices[network_manager.name] = network_manager.id
     end
     drop_breadcrumb(
       :name => _("Add New Router") % {:model => ui_lookup(:table => 'network_router')},

diff --git a/app/controllers/security_group_controller.rb b/app/controllers/security_group_controller.rb
@@ -155,12 +155,9 @@ def new
     assert_privileges("security_group_new")
     @security_group = SecurityGroup.new
     @in_a_form = true
-
     @ems_choices = {}
-    ExtManagementSystem.where(:type => "ManageIQ::Providers::Openstack::CloudManager").find_each do |ems|
-      if ems.respond_to?(:network_manager) && ems.network_manager
-        @ems_choices[ems.network_manager.name] = ems.network_manager.id
-      end
+    network_managers.each do |network_manager|
+      @ems_choices[network_manager.name] = network_manager.id
     end
 
     drop_breadcrumb(:name => _("Add New Security Group"), :url => "/security_group/new")