foreman_datacenter 1.19.7 → 1.20.0

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

data/app/controllers/foreman_datacenter/device_types_controller.rb

@@ -33,7 +33,8 @@ module ForemanDatacenter
 
     def update
       if @device_type.update(device_type_params)
-        process_success object: @device_type
+        redirect_to device_type_url(@device_type),
+                    notice: 'Device type was successfully updated'
       else
         process_error object: @device_type
       end

data/app/controllers/foreman_datacenter/devices_controller.rb

@@ -17,8 +17,11 @@ module ForemanDatacenter
 
     def show
       @device = ForemanDatacenter::Device.includes(
-        power_ports: [:power_outlet],
-        console_ports: [:console_server_port],
+        power_ports: [:power_outlet, :device],
+        power_outlets: [:device, :power_port],
+        console_ports: [:console_server_port, :device],
+        console_server_ports: [:console_port, :device],
+        device_bays: [:installed_device],
         comments: [:user]
       ).find(params[:id])
       @comments = @device.comments
@@ -60,10 +63,21 @@ module ForemanDatacenter
     end
 
     def destroy
-      if @device.destroy
-        process_success success_redirect: "/datacenter/devices"
+      unless params['object_only']
+        if @device.destroy
+          process_success success_redirect: "/datacenter/devices"
+        else
+          process_error object: @device
+        end
       else
-        process_error object: @device
+        if @device.host
+          @device.host.destroy
+          new_device_name = "Unassigned device (former: #{@device.name})"
+          @device.update(name: new_device_name)
+          process_success success_redirect: '/datacenter/devices', success_msg: 'Associated host deleted'
+        else
+          process_error success_redirect: '/datacenter/devices', error_msg: 'Associated host not found'
+        end
       end
     end
 
@@ -96,7 +110,7 @@ module ForemanDatacenter
       @device.non_management_interfaces.
         where(id: params[:interfaces]).
         destroy_all
-      process_success(success_msg: "Selected interfaces were successfully destroyed.", success_redirect: device_url(id: @device))
+      redirect_to device_url(@device)
     end
 
     def qr_code
@@ -107,9 +121,11 @@ module ForemanDatacenter
 
     def sync_interfaces_with_host
       if @device.sync_interfaces_with_host
-        process_success(success_msg: "Device successfully synchronized.", success_redirect: device_url(id: @device))
+        notice("Device successfully synchronized.")
+        redirect_to device_url(@device)
       else
-        process_error(error_msg: "Unsuccessfully synchronization.", redirect: device_url(@device))
+        error("Unsuccessful synchronization.")
+        redirect_to device_url(@device)
       end
     end
 
@@ -138,3 +154,4 @@ module ForemanDatacenter
     end
   end
 end
+

data/app/controllers/foreman_datacenter/management_devices_controller.rb

@@ -16,7 +16,8 @@ module ForemanDatacenter
       @management_device = ManagementDevice.new(management_device_params.merge(device_id: params[:device_id]))
 
       if @management_device.save
-        process_success(success_redirect: device_url(id: @management_device.device))
+        redirect_to device_url(@management_device.device),
+                    notice: 'New management device was successfully created'
       else
         process_error object: @management_device
       end
@@ -24,7 +25,8 @@ module ForemanDatacenter
 
     def update
       if @management_device.update(management_device_params)
-        process_success(success_redirect: device_url(id: @management_device.device))
+        redirect_to device_url(@management_device.device),
+                    notice: 'Management device was successfully updated'
       else
         process_error object: @management_device
       end
@@ -32,7 +34,8 @@ module ForemanDatacenter
 
     def destroy
       if @management_device.destroy
-        process_success(success_redirect: device_url(id: @management_device.device))
+        redirect_to device_url(@management_device.device),
+                    notice: 'Management device was successfully destroyed'
       else
         process_error object: @management_device
       end

data/app/controllers/foreman_datacenter/power_outlets_controller.rb

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

data/app/controllers/foreman_datacenter/power_ports_controller.rb

@@ -24,7 +24,8 @@ module ForemanDatacenter
       @power_port = ForemanDatacenter::PowerPort.new(power_port_params.merge(device_id: params[:device_id]))
 
       if @power_port.save
-        process_success(success_redirect: device_url(id: @power_port.device_id))
+        redirect_to device_url(id: @power_port.device_id),
+                    notice: 'Power port was successfully created.'
       else
         process_error object: @power_port
       end
@@ -32,7 +33,8 @@ module ForemanDatacenter
 
     def update
       if @power_port.update(power_port_params)
-        process_success(success_redirect: device_url(id: @power_port.device_id))
+        redirect_to device_url(id: @power_port.device_id),
+                    notice: 'Power port was successfully updated.'
       else
         process_error object: @power_port
       end
@@ -40,7 +42,8 @@ module ForemanDatacenter
 
     def destroy
       if @power_port.destroy
-        process_success(success_redirect: device_url(id: @power_port.device_id))
+        redirect_to device_url(id: @power_port.device_id),
+                    notice: 'Power port was successfully destroyed.'
       else
         process_error object: @power_port
       end
@@ -70,12 +73,14 @@ module ForemanDatacenter
         power_outlet,
         params[:power_port][:connection_status]
       )
-      process_success(success_msg: "Power port was successfully connected.", success_redirect: device_url(id: @power_port.device_id))
+      redirect_to device_url(id: @power_port.device_id),
+                  notice: 'Power port was successfully connected.'
     end
 
     def disconnect
       @power_port.disconnect
-      process_success(success_msg: "Power port was successfully disconnected.", success_redirect: device_url(id: @power_port.device_id))
+      redirect_to device_url(id: @power_port.device_id),
+                  notice: 'Power port was successfully disconnected.'
     end
   end
 end

data/app/controllers/foreman_datacenter/rack_groups_controller.rb

@@ -3,7 +3,7 @@ module ForemanDatacenter
     include Foreman::Controller::AutoCompleteSearch
     include ForemanDatacenter::Controller::Parameters::RackGroup
 
-    before_action :find_resource, only: [:show, :edit, :update, :destroy, :move, :racks]
+    before_action :find_resource, only: [:show, :edit, :update, :destroy, :move]
 
     def index
       @rack_groups = resource_base_search_and_page.includes(:site, :racks)
@@ -58,11 +58,6 @@ module ForemanDatacenter
       process_error object: @rack_group, error_msg: 'Current Rack Group haven\'t any Racks.' if @racks.empty?
     end
 
-    def racks
-      @racks = @rack_group.racks.includes(devices: [:device_role])
-      process_error redirect: rack_groups_path(@rack_group), error_msg: 'Current Rack Group haven\'t any Racks.' if @racks.empty?
-    end
-
     def update_associated_objects
       begin
         @rack_group = ForemanDatacenter::RackGroup.find(request.env['HTTP_REFERER'].split('/')[-2])

data/app/controllers/foreman_datacenter/sites_controller.rb

@@ -3,7 +3,7 @@ module ForemanDatacenter
     include Foreman::Controller::AutoCompleteSearch
     include ForemanDatacenter::Controller::Parameters::Site
 
-    before_action :find_resource, only: [:show, :edit, :update, :destroy, :move, :racks]
+    before_action :find_resource, only: [:show, :edit, :update, :destroy, :move]
 
     def index
       @sites = resource_base_search_and_page
@@ -50,12 +50,6 @@ module ForemanDatacenter
       end
     end
 
-    def racks
-      @rack_groups = @site.rack_groups.includes(racks: [devices: [:device_role]])
-      @ungrouped_racks = @site.racks.where(rack_group_id: nil)#.includes(:device_role)
-      process_error redirect: site_path(@site), error_msg: 'Current site haven\'t any Racks.' if (@rack_groups.empty? && @ungrouped_racks.empty?)
-    end
-
     def move
       @sites = resource_base_search_and_page
       @rack_groups = @site.rack_groups

data/app/models/foreman_datacenter/device.rb

@@ -51,7 +51,6 @@ module ForemanDatacenter
     scoped_search in: :device_role, on: :name, complete_value: true, rename: :role
     scoped_search in: :device_type, on: :model, complete_value: true, rename: :type
     scoped_search in: :platform, on: :name, complete_value: true, rename: :platform
-    scoped_search in: :comments, on: :content, complete_value: true, rename: :comments
 
     delegate :site_id, to: :rack, allow_nil: true
     delegate :manufacturer_id, :is_console_server, :is_pdu, :is_network_device,

data/app/models/foreman_datacenter/device_interface_connection.rb

@@ -23,7 +23,7 @@ module ForemanDatacenter
     scoped_search in: :second_interface, on: :name, complete_value: true, rename: :interface_b
 
     def first_device
-      self.try(:first_interface).try(:device)
+      first_interface.device
     end
 
     def first_rack
@@ -35,7 +35,7 @@ module ForemanDatacenter
     end
 
     def second_device
-      self.try(:second_interface).try(:device)
+      first_interface.device
     end
 
     def second_rack

data/app/models/foreman_datacenter/site.rb

@@ -20,7 +20,6 @@ module ForemanDatacenter
     scoped_search on: :shipping_address, complete_value: true, default_order: true
     scoped_search on: :created_at, complete_value: true, default_order: true
     scoped_search on: :updated_at, complete_value: true, default_order: true
-    scoped_search on: :comments, complete_value: true, default_order: true
 
     def racks_count
       @racks_count ||= racks.count

data/app/views/foreman_datacenter/console_ports/index.html.erb

@@ -14,34 +14,12 @@
     <% for port in @console_ports %>
       <tr>
         <td>
-          <% if port.console_server_port %>
-            <%= link_to port.console_server_port.device.name,
-                        device_path(port.console_server_port.device) %>
-          <% else %>
-            <%= muted_text("Device not found", "span") %>
-          <% end %>
-        </td>
-        <td>
-          <% if port.console_server_port %>
-            <%= h port.console_server_port.name %>
-          <% else %>
-            <%= muted_text("Port not found", "span") %>
-          <% end %>
-        </td>
-        <td>
-          <% if port.device %>
-            <%= link_to port.device.name, device_path(port.device) %>
-          <% else %>
-            <%= muted_text("Device not found", "span") %>
-          <% end %>
-        </td>
-        <td>
-          <% if port %>
-            <%= h port.name %>
-          <% else %>
-            <%= muted_text("Port not found", "span") %>
-          <% end %>
+          <%= link_to port.console_server_port.device.name,
+                      device_path(port.console_server_port.device) %>
         </td>
+        <td><%= h port.console_server_port.name %></td>
+        <td><%= link_to port.device.name, device_path(port.device) %></td>
+        <td><%= h port.name %></td>
       </tr>
     <% end %>
   </tbody>

data/app/views/foreman_datacenter/device_interface_connections/index.html.erb

@@ -15,35 +15,15 @@
     <% for connection in @device_interface_connections %>
       <tr>
         <td>
-          <% if connection.first_device %>
-            <%= link_to connection.first_device.name,
+          <%= link_to connection.first_device.name,
                         device_path(connection.first_device) %>
-          <% else %>
-            <%= muted_text("Device not found", "span") %>
-          <% end %>
         </td>
+        <td><%= h connection.first_interface.name %></td>
         <td>
-          <% if connection.first_device %>
-            <%= h connection.first_interface.name %>
-          <% else %>
-            <%= muted_text("Interface not found", "span") %>
-          <% end %>
-        </td>
-        <td>
-          <% if connection.second_device %>
           <%= link_to connection.second_device.name,
                       device_path(connection.second_device) %>
-          <% else %>
-            <%= muted_text("Device not found", "span") %>
-          <% end %>
-        </td>
-        <td>
-          <% if connection.second_device %>
-            <%= h connection.second_interface.name %>
-          <% else %>
-            <%= muted_text("Interface not found", "span") %>
-          <% end %>
         </td>
+        <td><%= h connection.second_interface.name %></td>
       </tr>
   <% end %>
   </tbody>