foreman_datacenter 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b91579d55f787d836801e7f57f7503d6ec51229
-  data.tar.gz: ff7936c077ac1dea3c476738378760537054e918
+  metadata.gz: 55c54f423e2c5622ddac9c470546d27f08649452
+  data.tar.gz: 5551738810f1db7684a93a2eaf1fa43233210f17
 SHA512:
-  metadata.gz: da0d848f8495e5899407713c142b65729e7f7a1b00680d2874f5f212d56a22167e84e0b170df6acac353ae3f28e769b6ff120698a4d10c30092d015abf1f7918
-  data.tar.gz: 789e0a3632b324a440bfdc82282963846dcd6cdfee162682e244ac107a243e88b83942e14a2a9dd08c9f797e80a39084c895114b853a690f8baf3c6a6b1b6ae4
+  metadata.gz: e188f2ccc8702b861b6127d8df91d9dd06da2c1b3a3af69b20e092c46454a2155625e19a1f8ae77fc07eaf31ce243ed87185f975bf9a2fef0ef0a82a6c9fa669
+  data.tar.gz: 538df56b14e630eef7535cc2c2ce1806d3f31c88b76dc632b099cada2f4309e79feb55986810a7659b45da30a31b625a7c55a8270b8bf022f5f0167235920ff6

data/app/controllers/foreman_datacenter/devices_controller.rb

@@ -1,9 +1,17 @@
 module ForemanDatacenter
   class DevicesController < ApplicationController
-    before_action :set_device, only: [:update, :destroy, :inventory]
+    include Foreman::Controller::AutoCompleteSearch
+
+    before_action :set_device, only: [:update, :destroy, :inventory, :destroy_interfaces]
 
     def index
-      @devices = Device.includes(:ipmi_interface, :device_role, :device_type, rack: [:site]).
+      begin
+        search = resource_base.search_for(params[:search], :order => params[:order])
+      rescue => e
+        error e.to_s
+        search = resource_base.search_for ''
+      end
+      @devices = search.includes(:ipmi_interface, :device_role, :device_type, :site, :rack).
         paginate(:page => params[:page])
     end
 
@@ -71,6 +79,13 @@ module ForemanDatacenter
       render partial: 'for_rack'
     end
 
+    def destroy_interfaces
+      @device.non_management_interfaces.
+        where(id: params[:interfaces]).
+        destroy_all
+      redirect_to device_url(@device)
+    end
+
     private
 
     def set_device

data/app/controllers/foreman_datacenter/racks_controller.rb

@@ -5,6 +5,7 @@ module ForemanDatacenter
     def index
       @racks = ForemanDatacenter::Rack.
         includes(:site, :rack_group, :devices).
+        order(:name).
         all
     end
 

data/app/models/foreman_datacenter/device.rb

@@ -1,5 +1,7 @@
 module ForemanDatacenter
   class Device < ActiveRecord::Base
+    include ScopedSearchExtensions
+
     belongs_to :device_type, :class_name => 'ForemanDatacenter::DeviceType'
     belongs_to :device_role, :class_name => 'ForemanDatacenter::DeviceRole'
     belongs_to :platform, :class_name => 'ForemanDatacenter::Platform'
@@ -22,13 +24,14 @@ module ForemanDatacenter
             :class_name => 'ForemanDatacenter::DeviceInterface'
     belongs_to_host
     has_one :management_device, :class_name => 'ForemanDatacenter::ManagementDevice'
+    has_one :site, :through => :rack
 
     enum face: [:front, :rear]
     enum status: [:active, :offline]
 
     validates :device_type_id, presence: true
     validates :device_role_id, presence: true
-    validates :name, presence: true, uniqueness: true, length: { maximum: 50 }
+    validates :name, presence: true, length: { maximum: 50 }
     validates :serial, length: { maximum: 50 }
     validates :rack_id, presence: true
     validates :position, numericality: { only_integer: true }, allow_nil: true
@@ -41,38 +44,24 @@ module ForemanDatacenter
     after_create :create_power_outlets
     after_create :create_device_bays
 
-    def site_id
-      rack.try(:site_id)
-    end
+    scoped_search on: :name, complete_value: true, default_order: true
+    scoped_search on: :status, complete_value: { active: 0, offline: 1 },
+                  default_order: true
+    scoped_search in: :site, on: :name, complete_value: true, rename: :site
+    scoped_search in: :rack, on: :name, complete_value: true, rename: :rack
+    scoped_search in: :device_role, on: :name, complete_value: true, rename: :role
+    scoped_search in: :device_type, on: :model, complete_value: true, rename: :type
 
-    def site
-      rack.site
-    end
+    delegate :site_id, to: :rack, allow_nil: true
+    delegate :mac_address, to: :ipmi_interface, allow_nil: true
+    delegate :manufacturer_id, :is_console_server, :is_pdu, :is_network_device,
+             to: :device_type, allow_nil: true
+    delegate :console_url, :login, :password, to: :management_device
 
     def ip_address
       ipmi_interface.try(:ip_address) || primary_ip4
     end
 
-    def mac_address
-      ipmi_interface.try(:mac_address)
-    end
-
-    def manufacturer_id
-      device_type.try(:manufacturer_id)
-    end
-
-    def is_console_server
-      device_type.try(:is_console_server)
-    end
-
-    def is_pdu
-      device_type.try(:is_pdu)
-    end
-
-    def is_network_device
-      device_type.try(:is_network_device)
-    end
-
     def parent?
       device_type.try(:subdevice_role) == 'Parent'
     end

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

@@ -1,6 +1,7 @@
 <tr>
   <% if interface.connected? %>
       <td>
+        <%= check_box_tag 'interfaces[]', interface.id %>
         <span class="glyphicon glyphicon-transfer"></span>
         <%= interface.name %>
       </td>
@@ -45,6 +46,7 @@
       </td>
   <% else %>
       <td>
+        <%= check_box_tag 'interfaces[]', interface.id %>
         <span class="glyphicon glyphicon-transfer"></span>
         <%= interface.name %>
       </td>

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

@@ -219,62 +219,63 @@
             <% end %>
           </td>
         </tr>
-        </tbody>
-      </table>
-    </div>
 
-    <!-- Management device -->
-    <div class="panel panel-default">
-      <div class="panel-heading">
-        <strong>Management Device</strong>
-      </div>
-      <table class="table table-hover panel-body">
-        <tbody>
+        <!-- Management device -->
+        <tr>
+          <td><strong>Management device</strong></td>
+          <td></td>
+        </tr>
         <% if @device.management_device %>
             <tr>
               <td>Console URL</td>
-              <td><%= h @device.management_device.console_url %></td>
+              <td><%= h @device.console_url %></td>
             </tr>
             <tr>
               <td>Login</td>
-              <td><%= h @device.management_device.login %></td>
+              <td><%= h @device.login %></td>
             </tr>
             <tr>
               <td>Password</td>
               <td>
-                <button class="btn btn-primary btn-xs" data-reveal-password data-password="<%= h @device.management_device.password %>">
+                <button class="btn btn-primary btn-xs" data-reveal-password data-password="<%= h @device.password %>">
                   Reveal
                 </button>
               </td>
             </tr>
+            <tr>
+              <td></td>
+              <td class="text-right">
+                <%= link_to edit_management_device_path(@device.management_device),
+                            class: 'btn btn-success btn-xs' do %>
+                    <span class="glyphicon glyphicon-pencil"></span>
+                    Edit
+                <% end %>
+                <%= link_to management_device_path(@device.management_device),
+                            class: 'btn btn-danger btn-xs',
+                            data: { confirm: 'Are you sure?' }, method: :delete do %>
+                    <i class="glyphicon glyphicon-trash"></i>
+                    Destroy
+                <% end %>
+              </td>
+            </tr>
         <% else %>
             <tr>
               <td>None</td>
+              <td></td>
+            </tr>
+            <tr>
+              <td></td>
+              <td class="text-right">
+                <%= link_to new_device_management_device_path(@device),
+                            class: 'btn btn-primary btn-xs' do %>
+                    <span class="glyphicon glyphicon-plus"></span>
+                    Add
+                <% end %>
+              </td>
             </tr>
         <% end %>
         </tbody>
       </table>
-      <div class="panel-footer text-right">
-        <% if @device.management_device %>
-            <%= link_to edit_management_device_path(@device.management_device),
-                        class: 'btn btn-success btn-xs' do %>
-                <span class="glyphicon glyphicon-pencil"></span>
-                Edit
-            <% end %>
-            <%= link_to management_device_path(@device.management_device),
-                        class: 'btn btn-danger btn-xs',
-                        data: { confirm: 'Are you sure?' }, method: :delete do %>
-                <i class="glyphicon glyphicon-trash"></i>
-                Destroy
-            <% end %>
-        <% else %>
-            <%= link_to new_device_management_device_path(@device),
-                        class: 'btn btn-primary btn-xs' do %>
-                <span class="glyphicon glyphicon-plus"></span>
-                Add
-            <% end %>
-        <% end %>
-      </div>
     </div>
 
     <!-- Comments -->
@@ -317,19 +318,24 @@
           <div class="panel-heading">
             <strong>Interfaces</strong>
           </div>
-          <% if @device.non_management_interfaces.empty? %>
-              <div class="panel-body">None</div>
-          <% else %>
-              <table class="table table-hover panel-body">
-                <tbody>
-                <%= render partial: 'interface', collection: @device.non_management_interfaces %>
-                </tbody>
-              </table>
+          <%= form_tag destroy_interfaces_device_path(@device), method: :delete do %>
+              <% if @device.non_management_interfaces.empty? %>
+                  <div class="panel-body">None</div>
+              <% else %>
+                  <table class="table table-hover panel-body">
+                    <tbody>
+                    <%= render partial: 'interface', collection: @device.non_management_interfaces %>
+                    </tbody>
+                  </table>
+              <% end %>
+              <div class="panel-footer text-right">
+                <%= link_to 'Add an interface', new_device_device_interface_path(@device),
+                            class: 'btn btn-primary btn-xs' %>
+                <%= button_tag 'Destroy selected interfaces',
+                               class: 'btn btn-danger btn-xs',
+                               data: {confirm: 'Are you sure?'} %>
+              </div>
           <% end %>
-          <div class="panel-footer text-right">
-            <%= link_to 'Add an interface', new_device_device_interface_path(@device),
-                        class: 'btn btn-primary btn-xs' %>
-          </div>
         </div>
     <% end %>
 

data/config/routes.rb

@@ -31,9 +31,11 @@ Foreman::Application.routes.draw do
     resources :devices do
       collection do
         get :device_types, :racks, :for_rack
+        get :auto_complete_search
       end
       member do
         get :inventory
+        delete :destroy_interfaces
       end
       resources :device_bays, except: [:show, :index], shallow: true do
         member do

data/db/migrate/20160909205537_add_name_index_to_racks.rb

@@ -0,0 +1,5 @@
+class AddNameIndexToRacks < ActiveRecord::Migration
+  def change
+    add_index :racks, :name
+  end
+end

data/db/migrate/20160920221011_remove_index_from_devices.rb

@@ -0,0 +1,5 @@
+class RemoveIndexFromDevices < ActiveRecord::Migration
+  def change
+    remove_index :devices, :name
+  end
+end

data/lib/foreman_datacenter/version.rb

@@ -1,3 +1,3 @@
 module ForemanDatacenter
-  VERSION = '0.1.4'.freeze
+  VERSION = '0.1.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_datacenter
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Pavel Ivanov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-07 00:00:00.000000000 Z
+date: 2016-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -280,6 +280,8 @@ files:
 - db/migrate/20160828200938_add_ip_address_to_device_interfaces.rb
 - db/migrate/20160905211522_create_management_devices.rb
 - db/migrate/20160906205605_rename_field_in_management_devices.rb
+- db/migrate/20160909205537_add_name_index_to_racks.rb
+- db/migrate/20160920221011_remove_index_from_devices.rb
 - lib/foreman_datacenter/engine.rb
 - lib/foreman_datacenter/version.rb
 - lib/foreman_datacenter.rb