foreman_datacenter 1.16.12 → 1.19.0

data/app/controllers/api/v2/foreman_datacenter/power_ports_controller.rb

@@ -7,6 +7,7 @@ module Api
         before_action :find_resource, :only => %w{show update destroy connect connected planned disconnect}
 
         param_group :search_and_pagination, ::Api::V2::BaseController
+        add_scoped_search_description_for(::ForemanDatacenter::PowerPort)
 
         api :GET, "/foreman_datacenter/power_ports/", N_("List all PowerPorts")
 

data/app/controllers/api/v2/foreman_datacenter/rack_groups_controller.rb

@@ -8,6 +8,7 @@ module Api
         before_action :find_resource, :only => %w{show update destroy}
 
         param_group :search_and_pagination, ::Api::V2::BaseController
+        add_scoped_search_description_for(::ForemanDatacenter::Rack)
 
         api :GET, "/foreman_datacenter/rack_groups/", N_("List all rack groups")
 
@@ -21,35 +22,35 @@ module Api
         def show
         end
 
-	def_param_group :rack_group do
-	  param :rack_group, Hash, :required => true, :action_aware => true do
-	    param :name, String, :required => true
-            param :site_id, String, :desc => N_("Site ID")
-	  end
-	end
+        def_param_group :rack_group do
+          param :rack_group, Hash, :required => true, :action_aware => true do
+            param :name, String, :required => true
+                  param :site_id, String, :desc => N_("Site ID")
+          end
+        end
 
-	api :POST, "/foreman_datacenter/rack_groups", N_("Create a rack group")
-	param_group :rack_group, :as => :create
+        api :POST, "/foreman_datacenter/rack_groups", N_("Create a rack group")
+        param_group :rack_group, :as => :create
 
-	def create
-	  @rack_group = ::ForemanDatacenter::RackGroup.new(rack_group_params)
-	  process_response @rack_group.save
-	end
+        def create
+          @rack_group = ::ForemanDatacenter::RackGroup.new(rack_group_params)
+          process_response @rack_group.save
+        end
 
-	api :PUT, "/foreman_datacenter/rack_groups/:id/", N_("Update a rack group")
-	param :id, :identifier, :required => true
-	param_group :rack_group
+        api :PUT, "/foreman_datacenter/rack_groups/:id/", N_("Update a rack group")
+        param :id, :identifier, :required => true
+        param_group :rack_group
 
-	def update
-	  process_response @rack_group.update(rack_group_params)
-	end
+        def update
+          process_response @rack_group.update(rack_group_params)
+        end
 
-	api :DELETE, "/foreman_datacenter/rack_groups/:id/", N_("Delete a rack group")
-	param :id, :identifier, :required => true
+        api :DELETE, "/foreman_datacenter/rack_groups/:id/", N_("Delete a rack group")
+        param :id, :identifier, :required => true
 
-	def destroy
-	  process_response @rack_group.destroy
-	end
+        def destroy
+          process_response @rack_group.destroy
+        end
 
         private
 

data/app/controllers/api/v2/foreman_datacenter/racks_controller.rb

@@ -8,6 +8,7 @@ module Api
         before_action :find_resource, :only => %w{show update destroy}
 
         param_group :search_and_pagination, ::Api::V2::BaseController
+        add_scoped_search_description_for(::ForemanDatacenter::Rack)
 
         api :GET, "/foreman_datacenter/racks/", N_("List all racks")
 
@@ -55,12 +56,6 @@ module Api
 	  process_response @rack.destroy
 	end
 
-        private
-
-        def allowed_nested_id
-          %w(site_id)
-        end
-
       end
     end
   end

data/app/controllers/api/v2/foreman_datacenter/sites_controller.rb

@@ -2,13 +2,14 @@ module Api
   module V2
     module ForemanDatacenter
       class SitesController < ForemanDatacenter::BaseController
-        include ::ForemanDatacenter::Controller::Parameters::Site
+	include ::ForemanDatacenter::Controller::Parameters::Site
 
         before_action :find_optional_nested_object
         before_action :find_resource, :only => %w{show update destroy}
 
         api :GET, "/foreman_datacenter/sites/", N_("List all sites")
         param_group :search_and_pagination, ::Api::V2::BaseController
+        add_scoped_search_description_for(::ForemanDatacenter::Site)
 
         # api!
         def index
@@ -21,36 +22,42 @@ module Api
         def show
         end
 
-        def_param_group :site do
-          param :site, Hash, :required => true, :action_aware => true do
-            param :name, String, :required => true
-            param :rack_ids, Array, :desc => N_("Rack IDs")
-            param :rack_group_ids, Array, :desc => N_("RackGroup IDs")
-          end
-        end
+	def_param_group :site do
+	  param :site, Hash, :required => true, :action_aware => true do
+	    param :name, String, :required => true
+	    param :rack_ids, Array, :desc => N_("Rack IDs")
+	    param :rack_group_ids, Array, :desc => N_("RackGroup IDs")
+	  end
+	end
 
-        api :POST, "/foreman_datacemter/sites", N_("Create a site")
-        param_group :site, :as => :create
+	api :POST, "/foreman_datacemter/sites", N_("Create a site")
+	param_group :site, :as => :create
 
-        def create
-          @site = ::ForemanDatacenter::Site.new(site_params)
-          process_response @site.save
-        end
+	def create
+	  @site = ::ForemanDatacenter::Site.new(site_params)
+	  process_response @site.save
+	end
 
-        api :PUT, "/foreman_datacenter/sites/:id/", N_("Update a site")
-        param :id, :identifier, :required => true
-        param_group :site
+	api :PUT, "/foreman_datacenter/sites/:id/", N_("Update a site")
+	param :id, :identifier, :required => true
+	param_group :site
 
-        def update
-          process_response @site.update(site_params)
-        end
+	def update
+	  process_response @site.update(site_params)
+	end
 
-        api :DELETE, "/foreman_datacenter/sites/:id/", N_("Delete a site")
-        param :id, :identifier, :required => true
+	api :DELETE, "/foreman_datacenter/sites/:id/", N_("Delete a site")
+	param :id, :identifier, :required => true
 
-        def destroy
-          process_response @site.destroy
-        end
+	def destroy
+	  process_response @site.destroy
+	end
+
+	private
+
+	# def allowed_nested_id
+	#   %w(operatingsystem_id)
+	# end
 
       end
     end

data/app/controllers/concerns/foreman_datacenter/controller/parameters/comment.rb

@@ -1,4 +1,4 @@
-module ForemanDatacenter::Controller::Parameters::Comment
+  module ForemanDatacenter::Controller::Parameters::Comment
   extend ActiveSupport::Concern
 
   class_methods do

data/app/controllers/concerns/foreman_datacenter/controller/parameters/console_port.rb

@@ -1,4 +1,4 @@
-module ForemanDatacenter::Controller::Parameters::ConsolePort
+  module ForemanDatacenter::Controller::Parameters::ConsolePort
   extend ActiveSupport::Concern
 
   class_methods do

data/app/controllers/concerns/foreman_datacenter/controller/parameters/console_port_template.rb

@@ -1,4 +1,4 @@
-module ForemanDatacenter::Controller::Parameters::ConsolePortTemplate
+  module ForemanDatacenter::Controller::Parameters::ConsolePortTemplate
   extend ActiveSupport::Concern
 
   class_methods do

data/app/controllers/concerns/foreman_datacenter/controller/parameters/console_server_port.rb

@@ -1,4 +1,4 @@
-module ForemanDatacenter::Controller::Parameters::ConsoleServerPort
+  module ForemanDatacenter::Controller::Parameters::ConsoleServerPort
   extend ActiveSupport::Concern
 
   class_methods do

data/app/controllers/concerns/foreman_datacenter/controller/parameters/console_server_port_template.rb

@@ -1,4 +1,4 @@
-module ForemanDatacenter::Controller::Parameters::ConsoleServerPortTemplate
+  module ForemanDatacenter::Controller::Parameters::ConsoleServerPortTemplate
   extend ActiveSupport::Concern
 
   class_methods do

data/app/controllers/concerns/foreman_datacenter/controller/parameters/device_bay.rb

@@ -1,4 +1,4 @@
-module ForemanDatacenter::Controller::Parameters::DeviceBay
+  module ForemanDatacenter::Controller::Parameters::DeviceBay
   extend ActiveSupport::Concern
 
   class_methods do

data/app/controllers/concerns/foreman_datacenter/controller/parameters/device_bay_template.rb

@@ -1,4 +1,4 @@
-module ForemanDatacenter::Controller::Parameters::DeviceBayTemplate
+  module ForemanDatacenter::Controller::Parameters::DeviceBayTemplate
   extend ActiveSupport::Concern
 
   class_methods do

data/app/controllers/concerns/foreman_datacenter/controller/parameters/device_interface.rb

@@ -1,4 +1,4 @@
-module ForemanDatacenter::Controller::Parameters::DeviceInterface
+  module ForemanDatacenter::Controller::Parameters::DeviceInterface
   extend ActiveSupport::Concern
 
   class_methods do

data/app/controllers/concerns/foreman_datacenter/controller/parameters/device_interface_connection.rb

@@ -1,4 +1,4 @@
-module ForemanDatacenter::Controller::Parameters::DeviceInterfaceConnection
+  module ForemanDatacenter::Controller::Parameters::DeviceInterfaceConnection
   extend ActiveSupport::Concern
 
   class_methods do

data/app/controllers/concerns/foreman_datacenter/controller/parameters/device_module.rb

@@ -1,4 +1,4 @@
-module ForemanDatacenter::Controller::Parameters::DeviceModule
+  module ForemanDatacenter::Controller::Parameters::DeviceModule
   extend ActiveSupport::Concern
 
   class_methods do

data/app/controllers/concerns/foreman_datacenter/controller/parameters/device_role.rb

@@ -1,4 +1,4 @@
-module ForemanDatacenter::Controller::Parameters::DeviceRole
+  module ForemanDatacenter::Controller::Parameters::DeviceRole
   extend ActiveSupport::Concern
 
   class_methods do

data/app/controllers/concerns/foreman_datacenter/controller/parameters/device_type.rb

@@ -1,4 +1,4 @@
-module ForemanDatacenter::Controller::Parameters::DeviceType
+  module ForemanDatacenter::Controller::Parameters::DeviceType
   extend ActiveSupport::Concern
 
   class_methods do

data/app/controllers/foreman_datacenter/application_controller.rb

@@ -90,8 +90,6 @@ module ForemanDatacenter
           'populate'
         when 'move'
           'move'
-        when 'racks'
-          'racks'
         else
           super
       end

data/app/controllers/foreman_datacenter/console_ports_controller.rb

@@ -72,12 +72,14 @@ module ForemanDatacenter
         console_server_port,
         params[:console_port][:connection_status]
       )
-      process_success(success_msg: "Console port was successfully connected.", success_redirect: device_url(id: @console_port.device_id))
+      redirect_to device_url(id: @console_port.device_id),
+                  notice: 'Console port was successfully connected.'
     end
 
     def disconnect
       @console_port.disconnect
-      process_success(success_msg: "Console port was successfully disconnected.", success_redirect: device_url(id: @console_port.device_id))
+      redirect_to device_url(id: @console_port.device_id),
+                  notice: 'Console port was successfully disconnected.'
     end
   end
 end

data/app/controllers/foreman_datacenter/console_server_ports_controller.rb

@@ -18,7 +18,8 @@ module ForemanDatacenter
       @console_server_port = ForemanDatacenter::ConsoleServerPort.new(console_server_port_params.merge(device_id: params[:device_id]))
 
       if @console_server_port.save
-        process_success(success_msg: "Console server port was successfully created.", success_redirect: device_url(id: @console_server_port.device_id))
+        redirect_to device_url(id: @console_server_port.device_id),
+                    notice: 'Console server port was successfully created.'
       else
         process_error object: @console_server_port
       end
@@ -26,7 +27,8 @@ module ForemanDatacenter
 
     def update
       if @console_server_port.update(console_server_port_params)
-        process_success(success_msg: "Console server port was successfully updated.", success_redirect: device_url(id: @console_server_port.device_id))
+        redirect_to device_url(id: @console_server_port.device_id),
+                    notice: 'Console server port was successfully updated.'
       else
         process_error object: @console_server_port
       end
@@ -34,7 +36,8 @@ module ForemanDatacenter
 
     def destroy
       if @console_server_port.destroy
-        process_success(success_msg: "Console server port was successfully destroyed.", success_redirect: device_url(id: @console_server_port.device_id))
+        redirect_to device_url(id: @console_server_port.device_id),
+                    notice: 'Console server port was successfully destroyed.'
       else
         process_error object: @console_server_port
       end
@@ -49,12 +52,14 @@ module ForemanDatacenter
         @console_server_port,
         params[:console_port][:connection_status]
       )
-      process_success(success_msg: "Console server port was successfully connected.", success_redirect: device_url(id: @console_server_port.device_id))
+      redirect_to device_url(id: @console_server_port.device_id),
+                  notice: 'Console server port was successfully connected.'
     end
 
     def disconnect
       @console_server_port.console_port.disconnect
-      process_success(success_msg: "Console server port was successfully disconnected.", success_redirect: device_url(id: @console_server_port.device_id))
+      redirect_to device_url(id: @console_server_port.device_id),
+                  notice: 'Console server port was successfully disconnected.'
     end
 
     def for_device

data/app/controllers/foreman_datacenter/device_bays_controller.rb

@@ -17,7 +17,8 @@ module ForemanDatacenter
       @device_bay = ForemanDatacenter::DeviceBay.new(device_bay_params.merge(device_id: params[:device_id]))
 
       if @device_bay.save
-        process_success(success_msg: "New device bay was successfully created.", success_redirect: device_url(id: @device_bay.device))
+        redirect_to device_url(@device_bay.device),
+                    notice: 'New device bay was successfully created'
       else
         process_error object: @device_bay
       end
@@ -25,7 +26,8 @@ module ForemanDatacenter
 
     def update
       if @device_bay.update(device_bay_params)
-        process_success(success_msg: "Device bay was successfully updated.", success_redirect: device_url(id: @device_bay.device))
+        redirect_to device_url(@device_bay.device),
+                    notice: 'Device bay was successfully updated'
       else
         process_error object: @device_bay
       end
@@ -33,7 +35,8 @@ module ForemanDatacenter
 
     def destroy
       if @device_bay.destroy
-        process_success(success_msg: "Device bay was successfully destroyed.", success_redirect: device_url(id: @device_bay.device))
+        redirect_to device_url(@device_bay.device),
+                    notice: 'Device bay was successfully destroyed'
       else
         process_error object: @device_bay
       end
@@ -45,7 +48,8 @@ module ForemanDatacenter
     def populate
       device_id = params[:device_bay][:installed_device_id]
       if @device_bay.update(installed_device_id: device_id)
-        process_success(success_msg: "Device bay was successfully populated.", success_redirect: device_url(id: @device_bay.device))
+        redirect_to device_url(@device_bay.device),
+                    notice: 'Device bay was successfully populated'
       else
         process_error object: @device_bay
       end
@@ -53,7 +57,8 @@ module ForemanDatacenter
 
     def depopulate
       if @device_bay.update(installed_device_id: nil)
-        process_success(success_msg: "Device bay was successfully depopulated.", success_redirect: device_url(id: @device_bay.device))
+        redirect_to device_url(@device_bay.device),
+                    notice: 'Device bay was successfully depopulated'
       else
         process_error object: @device_bay
       end

data/app/controllers/foreman_datacenter/device_interface_connections_controller.rb

@@ -3,10 +3,10 @@ module ForemanDatacenter
     include Foreman::Controller::AutoCompleteSearch
     include ForemanDatacenter::Controller::Parameters::DeviceInterfaceConnection
 
-    before_action :find_resource, only: [:destroy, :planned, :connected, :edit]
+    before_action :find_resource, only: [:destroy, :planned, :connected]
 
     def index
-      @device_interface_connections = resource_base_search_and_page.includes(second_interface: [:device], first_interface: [:device])
+      @device_interface_connections = resource_base_search_and_page.includes(:second_interface, first_interface: [:device])
     end
 
     def new
@@ -15,16 +15,13 @@ module ForemanDatacenter
       )
     end
 
-    def edit
-      @device = @device_interface_connection.first_device
-    end
-
     def create
       @device_interface_connection = ForemanDatacenter::DeviceInterfaceConnection.new(device_interface_connection_params.merge(interface_a: params[:device_interface_id]))
       @device_interface_connection.first_interface = get_device_interface
 
       if @device_interface_connection.save
-        process_success(success_msg: "Connection was successfully created.", success_redirect: device_url(id: @device_interface_connection.first_interface.device))
+        redirect_to device_url(@device_interface_connection.first_interface.device),
+                    notice: 'Connection was successfully created.'
       else
         process_error object: @device_interface_connection
       end

data/app/controllers/foreman_datacenter/device_interfaces_controller.rb

@@ -28,7 +28,8 @@ module ForemanDatacenter
       @device_interface = ForemanDatacenter::DeviceInterface.new(device_interface_params.merge(device_id: params[:device_id]))
 
       if @device_interface.save
-        process_success(success_msg: "Device interface was successfully created.", success_redirect: device_url(id: @device_interface.device.id))
+        redirect_to device_url(id: @device_interface.device_id),
+                    notice: 'Device interface was successfully created.'
       else
         process_error object: @device_interface
       end
@@ -36,7 +37,8 @@ module ForemanDatacenter
 
     def update
       if @device_interface.update(device_interface_params)
-        process_success(success_msg: "Device interface was successfully updated.", success_redirect: device_url(id: @device_interface.device.id))
+        redirect_to device_url(id: @device_interface.device_id),
+                    notice: 'Device interface was successfully updated.'
       else
         process_error object: @device_interface
       end
@@ -44,7 +46,8 @@ module ForemanDatacenter
 
     def destroy
       if @device_interface.destroy
-        process_success(success_msg: "Device interface was successfully destroyed.", success_redirect: device_url(id: @device_interface.device.id))
+        redirect_to device_url(id: @device_interface.device_id),
+                    notice: 'Device interface was successfully destroyed.'
       else
         process_error object: @device_interface
       end

data/app/controllers/foreman_datacenter/device_modules_controller.rb

@@ -15,8 +15,10 @@ module ForemanDatacenter
 
     def create
       @device_module = ForemanDatacenter::DeviceModule.new(device_module_params.merge(device_id: params[:device_id]))
+
       if @device_module.save
-        process_success(success_msg: "Device module was successfully created.", success_redirect: inventory_device_url(id: @device_module.device_id))
+        redirect_to inventory_device_url(id: @device_module.device_id),
+                    notice: 'Device module was successfully created.'
       else
         process_error object: @device_module
       end
@@ -24,7 +26,8 @@ module ForemanDatacenter
 
     def update
       if @device_module.update(device_module_params)
-        process_success(success_msg: "Device module was successfully updated.", success_redirect: inventory_device_url(id: @device_module.device_id))
+        redirect_to inventory_device_url(id: @device_module.device_id),
+                    notice: 'Device module was successfully updated.'
       else
         process_error object: @device_module
       end
@@ -32,7 +35,8 @@ module ForemanDatacenter
 
     def destroy
       if @device_module.destroy
-        process_success(success_msg: "Device module was successfully destroyed.", success_redirect: inventory_device_url(id: @device_module.device_id))
+        redirect_to inventory_device_url(id: @device_module.device_id),
+                    notice: 'Device module was successfully destroyed.'
       else
         process_error object: @device_module
       end