foreman_datacenter 1.19.5 → 1.19.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3379f15bc6b2cdd363625a0bf9fdeef9ec6faf0cd09448afe36dcb833da5dfcb
-  data.tar.gz: 1ffa1280a6d03ffb2e7a53af1abff6399f11a2d4c216e8a8d400fc257c2ffb7e
+  metadata.gz: 3c390e3b2775db92120cd05376f05728bf32133009d91c69433a241da1fcfc4e
+  data.tar.gz: e2a724cd89bd2ddc56196580ee065344c75b3af093495951017503ce4d25d4e0
 SHA512:
-  metadata.gz: fa8feef431143d629cdc55f9487f390b051fbd917d2d190fa8b874636913e57461b09a5f4aaf18ef231fa5343940c9a9dde2a7d48de8d4d4460dc8830339f9e1
-  data.tar.gz: 5e40dc171c0284703efc741cbb1febb2948c726b2f5bbe566b3d1c0e109377ec23b325abda30e05506c70a6a93b482559548281183cd26f821240302230daccb
+  metadata.gz: a3e72115f3610d69e28d5e0b303b2ac76b21e08223e3b5dabdaf35b54e2bb4dea0df7d8b9a3fc6b125c8812bbc4ceea4b25485fb786f3fc8b24d7c6a7572974a
+  data.tar.gz: 8008f4a898b4661e6a4c728ba11cf347fa68cc221972c943f87e425aa00e184fcc38be291f3dce243d83a99b40b5b5e83e05cc8d25dc06189cbc158321a425aa

data/app/assets/javascripts/foreman_datacenter/modal.js

@@ -10,7 +10,8 @@ $(window).click(function(event) {
     var patt = new RegExp(str);
     var token = $('meta[name="csrf-token"]').attr('content');
     if (object_type == 'device') {
-      var checkbox_label = 'Delete associated host ONLY and keep current device as UNASSIGNED!'
+      // var checkbox_label = 'Delete associated host ONLY and keep current device as UNASSIGNED!'
+      var checkbox_label = ''
     } else {
       var checkbox_label = 'Delete ' +  object_type + ' ONLY'
     }
@@ -18,11 +19,18 @@ $(window).click(function(event) {
     if (!(patt.test(pathname))) {
       pathname = pathname + str
     }
-
     var move = "<p></p>"
-    if (object_type == "device" || object_type == "site" || object_type == "rack" || object_type == "rack_group") {
+    var checkbox = ""
+    var text = "You will permanently delete the"
+    text_ao = ""
+    if (object_type == "site" || object_type == "rack" || object_type == "rack_group") {
       move = '<p>You also can move associated object to another <strong>' + object_type + '</strong> before you destroy it.</p> \
           <a class="btn btn-block btn-primary modal-btn modal-btn-primary marginbottomsixteen" href="/datacenter/' + object_type + 's/' + object_id + '/move">Move associated objects</a>'
+      checkbox = '<input type="checkbox" name="object_only" id="object_only" value="true" checked="checked">'
+      text = "By unselecting checkbox you will permanently delete the"
+      text_ao = 'with \
+            <strong>ALL</strong> \
+            associated objects' + ao
     }
 
     var form = '<div id="myModal" class="modal"> \
@@ -37,16 +45,15 @@ $(window).click(function(event) {
         <div class="modal-body"> \
           <p>This action \
             <strong>cannot</strong> \
-            be undone. By unselecting checkbox you will permanently delete the \
+            be undone. \
+            ' + text + ' \
             <strong>' + object_name + '</strong> \
-            with \
-            <strong>ALL</strong> \
-            associated objects' + ao + ' \
+            ' + text_ao + ' \
           </p> \
           <form class="modal-form nonpaddingbottom" action=' + pathname + ' accept-charset="UTF-8" method="post"> \
             <input type="hidden" name="_method" value="delete"> \
             <input type="hidden" name="authenticity_token" value=' + token + '> \
-            <input type="checkbox" name="object_only" id="object_only" value="true" checked="checked"> \
+            ' + checkbox + ' \
             <label>' + checkbox_label + '</label> \
             <input type="submit" name="commit" value="I understand the consequences, delete this ' + object_type + '" class="btn btn-block btn-danger modal-btn modal-btn-danger"> \
 	  </form> \

data/app/assets/stylesheets/foreman_datacenter/horizontal-scroll.css

@@ -0,0 +1,9 @@
+.horizontal-scroll {
+  overflow: auto;
+  white-space: nowrap;
+}
+
+.horizontal-scroll > div.col-md-4 {
+  display: inline-block;
+  float: none;
+}

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

@@ -34,7 +34,7 @@ module Api
 
 	def create
 	  @management_device = ::ForemanDatacenter::ManagementDevice.new(management_device_params)#.merge(device_id: params[]))
-	  @management_device.save
+          process_response @management_device.save
 	end
 
 	api :PUT, "/foreman_datacenter/management_devices/:id/", N_("Update a management_device")

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

@@ -2,14 +2,14 @@ module Api
   module V2
     module ForemanDatacenter
       class PowerOutletsController < ForemanDatacenter::BaseController
-	include ::ForemanDatacenter::Controller::Parameters::PowerOutlet
+        include ::ForemanDatacenter::Controller::Parameters::PowerOutlet
 
         before_action :find_resource, :only => %w{show update destroy connect disconnect}
         add_scoped_search_description_for(::ForemanDatacenter::PowerOutletTemplate)
         param_group :search_and_pagination, ::Api::V2::BaseController
 
         api :GET, "/foreman_datacenter/power_outlets/", N_("List all PowerOutlets")
-        
+
         def index
           @power_outlets = resource_scope_for_index
         end
@@ -20,57 +20,57 @@ module Api
         def show
         end
 
-	def_param_group :power_outlet do
-	  param :power_outlet, Hash, :required => true, :action_aware => true do
-	    param :name, String, :required => true
-	    param :device_id, :number, :desc => N_("Device ID")
-	  end
-	end
+        def_param_group :power_outlet do
+          param :power_outlet, Hash, :required => true, :action_aware => true do
+            param :name, String, :required => true
+            param :device_id, :number, :desc => N_("Device ID")
+          end
+        end
 
-	api :POST, "/foreman_datacenter/power_outlets", N_("Create a PowerOutlet")
-	param_group :power_outlet, :as => :create
+        api :POST, "/foreman_datacenter/power_outlets", N_("Create a PowerOutlet")
+        param_group :power_outlet, :as => :create
 
-	def create
-	  @power_outlet = ::ForemanDatacenter::PowerOutlet.new(power_outlet_params)
-	  @power_outlet.save
-	end
+        def create
+          @power_outlet = ::ForemanDatacenter::PowerOutlet.new(power_outlet_params)
+          process_response @power_outlet.save
+        end
 
-	api :PUT, "/foreman_datacenter/power_outlets/:id/", N_("Update a PowerOutlet")
-	param :id, :identifier, :required => true
-	param_group :power_outlet
+        api :PUT, "/foreman_datacenter/power_outlets/:id/", N_("Update a PowerOutlet")
+        param :id, :identifier, :required => true
+        param_group :power_outlet
 
-	def update
-	  process_response @power_outlet.update(power_outlet_params)
-	end
+        def update
+          process_response @power_outlet.update(power_outlet_params)
+        end
 
-	api :DELETE, "/foreman_datacenter/power_outlets/:id/", N_("Delete a PowerOutlet")
-	param :id, :identifier, :required => true
+        api :DELETE, "/foreman_datacenter/power_outlets/:id/", N_("Delete a PowerOutlet")
+        param :id, :identifier, :required => true
 
-	def destroy
-	  process_response @power_outlet.destroy
-	end
+        def destroy
+          process_response @power_outlet.destroy
+        end
 
-	api :PATCH, "/foreman_datacenter/power_outlets/:id/connect", N_("Connect")
-	param :id, :identifier, :required => true
-	param_group :power_outlet
+        api :PATCH, "/foreman_datacenter/power_outlets/:id/connect", N_("Connect")
+        param :id, :identifier, :required => true
+        param_group :power_outlet
         param :console_server_port_id, :number, :desc => N_("ConsoleServerPort ID"), :required => true
         param :connection_status, :number, :desc => N_("Connections status"), :required => true
 
-	def connect
+        def connect
           power_port = ::ForemanDatacenter::PowerPort.find(params[:power_port_id])
           power_port.connect(
             @power_outlet,
             params[:connection_status]
           )
-	end
+        end
 
-	api :PATCH, "/foreman_datacenter/power_outlets/:id/disconnect", N_("Disconnect")
-	param :id, :identifier, :required => true
-	param_group :power_outlet
+        api :PATCH, "/foreman_datacenter/power_outlets/:id/disconnect", N_("Disconnect")
+        param :id, :identifier, :required => true
+        param_group :power_outlet
 
-	def disconnect
+        def disconnect
           process_response @power_outlet.power_port.disconnect
-	end
+        end
       end
     end
   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]
+    before_action :find_resource, only: [:destroy, :planned, :connected, :edit]
 
     def index
-      @device_interface_connections = resource_base_search_and_page.includes(:second_interface, first_interface: [:device])
+      @device_interface_connections = resource_base_search_and_page.includes(second_interface: [:device], first_interface: [:device])
     end
 
     def new
@@ -15,6 +15,10 @@ 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
@@ -52,5 +56,9 @@ module ForemanDatacenter
     def get_device_interface
       ForemanDatacenter::DeviceInterface.find(params[:device_interface_id])
     end
+
+    def device_interface_connection_params
+      params[:foreman_datacenter_device_interface_connetction].permit(:speed)
+    end
   end
 end

data/app/controllers/foreman_datacenter/devices_controller.rb

@@ -17,11 +17,8 @@ module ForemanDatacenter
 
     def show
       @device = ForemanDatacenter::Device.includes(
-        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],
+        power_ports: [:power_outlet],
+        console_ports: [:console_server_port],
         comments: [:user]
       ).find(params[:id])
       @comments = @device.comments
@@ -63,21 +60,10 @@ module ForemanDatacenter
     end
 
     def destroy
-      unless params['object_only']
-        if @device.destroy
-          process_success success_redirect: "/datacenter/devices"
-        else
-          process_error object: @device
-        end
+      if @device.destroy
+        process_success success_redirect: "/datacenter/devices"
       else
-        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
+        process_error object: @device
       end
     end
 
@@ -154,4 +140,3 @@ module ForemanDatacenter
     end
   end
 end
-

data/app/controllers/foreman_datacenter/rack_groups_controller.rb

@@ -59,7 +59,7 @@ module ForemanDatacenter
     end
 
     def racks
-      @racks = @rack_group.racks.includes(:devices)
+      @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
 

data/app/controllers/foreman_datacenter/sites_controller.rb

@@ -51,8 +51,9 @@ module ForemanDatacenter
     end
 
     def racks
-      @racks = @site.racks.includes(:devices)
-      process_error redirect: site_path(@site), error_msg: 'Current site haven\'t any Racks.' if @racks.empty?
+      @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

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
-      first_interface.device
+      self.try(:first_interface).try(:device)
     end
 
     def first_rack
@@ -35,7 +35,7 @@ module ForemanDatacenter
     end
 
     def second_device
-      first_interface.device
+      self.try(:second_interface).try(:device)
     end
 
     def second_rack

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

@@ -14,12 +14,34 @@
     <% for port in @console_ports %>
       <tr>
         <td>
-          <%= link_to port.console_server_port.device.name,
-                      device_path(port.console_server_port.device) %>
+          <% 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 %>
         </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,15 +15,35 @@
     <% for connection in @device_interface_connections %>
       <tr>
         <td>
-          <%= link_to connection.first_device.name,
+          <% if connection.first_device %>
+            <%= 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>

data/app/views/foreman_datacenter/devices/_interface.html.erb

@@ -8,11 +8,19 @@
       <td><%= h interface.mac_address %></td>
       <td><%= h interface.ip_address %></td>
       <td>
-        <%= link_to interface.connected_interface.device.name,
-                    device_path(interface.connected_interface.device) %>
+        <% if interface.connected_interface %>
+          <%= link_to interface.connected_interface.device.name,
+                      device_path(interface.connected_interface.device) %>
+        <% else %>
+            <%= muted_text("Device not found", "span") %>
+        <% end %>
       </td>
       <td>
-        <%= h interface.connected_interface.name %>
+        <% if interface.connected_interface %>
+          <%= h interface.connected_interface.name %>
+        <% else %>
+            <%= muted_text("Interface not found", "span") %>
+        <% end %>
       </td>
       <td>
         <%= h interface.connection.id %>

data/app/views/foreman_datacenter/platforms/show.html.erb

@@ -12,14 +12,14 @@
                    :class => 'btn btn-warning'
                  ),
                  display_fake_delete_if_authorized(
-                    hash_for_platform_path(id: @platform),
-                    class: 'btn btn-danger',
-                    id: 'init-modal',
-                    href: '#',
-                    data: { objecttype: 'platform',
-                            objectid: @platform.id,
-                            objectname: @platform.to_label,
-                            associatedobjects: associated_objects('platform') }
+                   hash_for_platform_path(:id => @platform).merge(:auth_object => @platform, :authorizer => authorizer),
+                   class: 'btn btn-danger',
+                   id: 'init-modal',
+                   href: '#',
+                   data: { objecttype: 'platform',
+                           objectid: @platform.id,
+                           objectname: @platform.to_label,
+                           associatedobjects: associated_objects('platform') }
                  )
                  help_path %>
 

data/app/views/foreman_datacenter/rack_groups/racks.html.erb

@@ -1,20 +1,18 @@
 <% stylesheet 'foreman_datacenter/datacenter' %>
 <% stylesheet 'foreman_datacenter/device_roles' %>
+<% stylesheet 'foreman_datacenter/horizontal-scroll' %>
 
 <% title h(@rack_group.name) %>
 
 <%= breadcrumbs(items: [{caption: _('Rack Group %s')   % @rack_group.name, url: rack_group_path(@rack_group)}, {caption: _('Racks Overview')}]) %>
 
-<% @racks.in_groups_of(3).each do |g| %>
-  <div class="row">
-    <% g.compact.each do |rack| %>
-      <div class="col-md-4">
-        <!-- Devices -->
-        <%= render "foreman_datacenter/racks/device_position", rack: rack %>
-      </div>
-    <% end %>
-  </div>
-<% end %>
+<div class="row horizontal-scroll">
+  <% @racks.each do |rack| %>
+    <div class="col-md-4">
+      <%= render "foreman_datacenter/racks/device_position", rack: rack %>
+    </div>
+  <% end %>
+</div>
+
 <div><h6 class="text-right"><%= _("* side is not defined") %></h6></div>
 <div><h6 class="text-right"><%= _("** size is not defined") %></h6></div>
-

data/app/views/foreman_datacenter/racks/_device_position.html.erb

@@ -25,7 +25,7 @@
       <% end %>
       <% unless rack.unpositioned_devices.empty? %>
         <tr>
-          <td class="col-md-1">Unpositioned Devices</td>
+          <td class="col-md-1">Unpositioned</br>Devices</td>
           <td class="col-md-4" style="text-align:center">
             <% rack.unpositioned_devices.each do |d| %>
               <div class="<%= "label " + d.device_role.color.downcase.gsub(" ","") %>" style="border-radius:40px;border:0px;">&nbsp;&nbsp;</div>

data/app/views/foreman_datacenter/sites/racks.html.erb

@@ -1,17 +1,36 @@
 <% stylesheet 'foreman_datacenter/datacenter' %>
 <% stylesheet 'foreman_datacenter/device_roles' %>
+<% stylesheet 'foreman_datacenter/horizontal-scroll' %>
 
 <% title h(@site.name) %>
 
-<% @racks.in_groups_of(3).each do |g| %>
-  <div class="row">
-    <% g.compact.each do |rack| %>
+<%= breadcrumbs(items: [{caption: _('Site %s') % @site.name, url: site_path(@site)}, {caption: _('Racks Overview')}]) %>
+
+<% unless @rack_groups.empty? %>
+  <% @rack_groups.each do |rg| %>
+    <h2>
+      <%= rg.name %>
+    </h2>
+    <div class="row horizontal-scroll">
+      <% rg.racks.each do |rack| %>
+        <div class="col-md-4">
+          <%= render "foreman_datacenter/racks/device_position", rack: rack %>
+        </div>
+      <% end %>
+    </div>
+  <% end %>
+<% end %>
+
+<% unless @ungrouped_racks.empty? %>
+  <h2>Ungrouped Racks</h2>
+  <div class="row horizontal-scroll">
+    <% @ungrouped_racks.each do |rack| %>
       <div class="col-md-4">
-        <!-- Devices -->
         <%= render "foreman_datacenter/racks/device_position", rack: rack %>
       </div>
     <% end %>
   </div>
 <% end %>
+
 <div><h6 class="text-right"><%= _("* side is not defined") %></h6></div>
 <div><h6 class="text-right"><%= _("** size is not defined") %></h6></div>

data/db/migrate/20180725201545_add_location_id_and_organization_id_columns_to_devices.rb

@@ -1,4 +1,4 @@
-class AddLocationIdAndOrganizationIdColumnsToDevices < ActiveRecord::Migration
+class AddLocationIdAndOrganizationIdColumnsToDevices < ActiveRecord::Migration[4.2]
   def change
     add_column :devices, :organization_id, :integer
     add_column :devices, :location_id, :integer

data/lib/foreman_datacenter/version.rb

@@ -1,3 +1,3 @@
 module ForemanDatacenter
-  VERSION = '1.19.5'.freeze
+  VERSION = '1.19.6'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_datacenter
 version: !ruby/object:Gem::Version
-  version: 1.19.5
+  version: 1.19.6
 platform: ruby
 authors:
 - Pavel Ivanov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-25 00:00:00.000000000 Z
+date: 2019-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prawn
@@ -90,6 +90,7 @@ files:
 - app/assets/stylesheets/foreman_datacenter/device_interface_connections.css
 - app/assets/stylesheets/foreman_datacenter/device_roles.css
 - app/assets/stylesheets/foreman_datacenter/devices.css
+- app/assets/stylesheets/foreman_datacenter/horizontal-scroll.css
 - app/assets/stylesheets/foreman_datacenter/modal.css
 - app/assets/stylesheets/foreman_datacenter/title_filter.css
 - app/controllers/api/v2/foreman_datacenter/base_controller.rb
@@ -593,7 +594,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A plugin that lets you document your servers in a datacenter