foreman_datacenter 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c048b173adf99addaa42814f19a362f92cada8c8
-  data.tar.gz: b9cc2be0a908d2997e6fbb23b4c92908ea36a896
+  metadata.gz: e154fe5ab9be2e7d64a586a3395e9382c02c5722
+  data.tar.gz: 73b922e8071601cae1149d1e70044d402b02535e
 SHA512:
-  metadata.gz: 43555e997c64e07ebc6db2430d03ea9c782f9b897c629131dd399f7686185c35e5381766d1085153cce0da8bc2defe0cbfb9717f75a857a5013b95174cb5278d
-  data.tar.gz: 37228ab4368015a34892c803e5ee47113a093e3559f334b844efd84ce8e79f26a5fe0dd9cb68d82adc045e7e10c8fd54e3b65b18bac46dc05c76410e8fe3445d
+  metadata.gz: f3db7ebe2a0846f7d2a1e7550876c4ce35e0d4e9335abc2a0c452645d3e07494329b77a14eec855ef3d4eda1a165d47909ea1cc48cc4d858f6c74e6c24868f91
+  data.tar.gz: 3181025341807ee9b7a49d46731ede52571cef861606a0b562de39b0db13d7ad402ef320b9ea4dedd75e9ac326decbec3ebbab8b2a8eb0c7eb73036268d4fa71

data/app/controllers/concerns/foreman_datacenter/hosts_controller_extensions.rb

@@ -0,0 +1,37 @@
+module ForemanDatacenter
+  module HostsControllerExtensions
+    extend ActiveSupport::Concern
+
+    included do
+      before_action :set_target_device_for_import, only: :import_to_device
+    end
+
+    def import_to_device
+      begin
+        search = resource_base.search_for(params[:search], :order => params[:order])
+      rescue => e
+        error e.to_s
+        search = resource_base.search_for ''
+      end
+      @hosts = search.includes(:device, :operatingsystem, :environment, :model, :compute_resource).
+        paginate(:page => params[:page])
+    end
+
+    private
+
+    def action_permission
+      case params[:action]
+        when 'import_to_device'
+          'view'
+        else
+          super
+      end
+    end
+
+    def set_target_device_for_import
+      if params[:target_device_id]
+        @target_device = Device.find(params[:target_device_id])
+      end
+    end
+  end
+end

data/app/controllers/foreman_datacenter/device_interfaces_controller.rb

@@ -59,7 +59,7 @@ module ForemanDatacenter
 
     def device_interface_params
       params[:device_interface].
-        permit(:device_id, :name, :form_factor, :mac_address, :mgmt_only, :description)
+        permit(:device_id, :name, :form_factor, :mac_address, :mgmt_only, :description, :ip_address)
     end
   end
 end

data/app/controllers/foreman_datacenter/device_types_controller.rb

@@ -3,7 +3,8 @@ module ForemanDatacenter
     before_action :set_device_type, only: [:show, :edit, :update, :destroy]
 
     def index
-      @device_types = DeviceType.includes(:manufacturer).all
+      @device_types = DeviceType.includes(:manufacturer).
+        paginate(:page => params[:page])
     end
 
     def show

data/app/controllers/foreman_datacenter/devices_controller.rb

@@ -1,9 +1,10 @@
 module ForemanDatacenter
   class DevicesController < ApplicationController
-    before_action :set_device, only: [:edit, :update, :destroy, :inventory]
+    before_action :set_device, only: [:update, :destroy, :inventory]
 
     def index
-      @devices = Device.includes(:device_role, :device_type, rack: [:site]).all
+      @devices = Device.includes(:device_role, :device_type, rack: [:site]).
+        paginate(:page => params[:page])
     end
 
     def show
@@ -21,9 +22,12 @@ module ForemanDatacenter
 
     def new
       @device = Device.new
+      populate_from_host
     end
 
     def edit
+      @device = Device.find(params[:id])
+      populate_from_host
     end
 
     def create
@@ -76,7 +80,15 @@ module ForemanDatacenter
     def device_params
       params[:device].permit(:device_type_id, :device_role_id, :platform_id,
                              :name, :serial, :rack_id, :position, :face,
-                             :status, :primary_ip4, :primary_ip6, :comments)
+                             :status, :primary_ip4, :primary_ip6, :comments,
+                             :host_id)
+    end
+
+    def populate_from_host
+      if params[:host_id]
+        host = Host.find(params[:host_id])
+        @device.populate_from_host(host)
+      end
     end
   end
 end

data/app/models/concerns/foreman_datacenter/host_extensions.rb

@@ -0,0 +1,24 @@
+module ForemanDatacenter
+  module HostExtensions
+    extend ActiveSupport::Concern
+
+    included do
+      has_one :device, class_name: 'ForemanDatacenter::Device',
+              foreign_key: 'host_id', dependent: :nullify
+      after_destroy :update_device_on_destroy
+    end
+
+    def update_device_on_destroy
+      new_device_name = "Unassigned device (former: #{name})"
+      device.update(name: new_device_name)
+      device.interfaces.clear
+    end
+
+    def fact_value_by_name(name)
+      fact_name = FactName.find_by(name: name)
+      if fact_name
+        fact_values.find_by(fact_name: fact_name)
+      end
+    end
+  end
+end

data/app/models/foreman_datacenter/device.rb

@@ -11,12 +11,14 @@ module ForemanDatacenter
     has_many :power_ports, :class_name => 'ForemanDatacenter::PowerPort'
     has_many :console_server_ports, :class_name => 'ForemanDatacenter::ConsoleServerPort'
     has_many :console_ports, :class_name => 'ForemanDatacenter::ConsolePort'
-    has_many :interfaces, :class_name => 'ForemanDatacenter::DeviceInterface'
+    has_many :interfaces, :class_name => 'ForemanDatacenter::DeviceInterface',
+             dependent: :destroy
     has_many :management_interfaces, -> { where(mgmt_only: true) },
              :class_name => 'ForemanDatacenter::DeviceInterface'
     has_many :non_management_interfaces, -> { where(mgmt_only: false) },
              :class_name => 'ForemanDatacenter::DeviceInterface'
     has_many :modules, :class_name => 'ForemanDatacenter::DeviceModule'
+    belongs_to_host
 
     enum face: [:front, :rear]
     enum status: [:active, :offline]
@@ -29,6 +31,7 @@ module ForemanDatacenter
     validates :position, numericality: { only_integer: true }, allow_nil: true
 
     after_create :create_interfaces
+    after_create :import_interfaces_from_host
     after_create :create_console_ports
     after_create :create_power_ports
     after_create :create_console_server_ports
@@ -89,7 +92,14 @@ module ForemanDatacenter
         where(power_ports: { power_outlet_id: nil })
     end
 
-    protected
+    def populate_from_host(host)
+      self.host = host
+      self.name = host.name
+      device_type = DeviceType.for_host(host)
+      self.device_type = device_type if device_type
+    end
+
+    private
 
     def create_interfaces
       device_type.interface_templates.each do |template|
@@ -97,6 +107,19 @@ module ForemanDatacenter
       end
     end
 
+    def import_interfaces_from_host
+      if host
+        host.interfaces.each do |interface|
+          interfaces.create(
+            name: interface.identifier,
+            form_factor: ForemanDatacenter::DeviceInterface::DEFAULT_FORM_FACTOR,
+            mac_address: interface.mac,
+            ip_address: interface.ip
+          )
+        end
+      end
+    end
+
     def create_console_ports
       device_type.console_port_templates.each do |template|
         console_ports.create(template.attrs_to_copy)

data/app/models/foreman_datacenter/device_interface.rb

@@ -11,6 +11,7 @@ module ForemanDatacenter
     validates :name, presence: true, length: {maximum: 30}
     validates :form_factor, inclusion: {in: FORM_FACTORS}
     validates :mac_address, length: {maximum: 128}
+    validates :ip_address, length: {maximum: 128}
     validates :description, length: {maximum: 100}
 
     def connection

data/app/models/foreman_datacenter/device_type.rb

@@ -24,6 +24,24 @@ module ForemanDatacenter
       end
     end
 
+    def self.for_host(host)
+      fact = host.fact_value_by_name('productname')
+      if fact
+        device_type = find_by(model: fact.value)
+        if device_type
+          device_type
+        else
+          manufacturer = Manufacturer.for_host(host)
+          if manufacturer
+            create(
+              manufacturer: manufacturer,
+              model: fact.value
+            )
+          end
+        end
+      end
+    end
+
     def parent?
       subdevice_role == 'Parent'
     end

data/app/models/foreman_datacenter/manufacturer.rb

@@ -3,5 +3,17 @@ module ForemanDatacenter
     has_many :device_types, :class_name => 'ForemanDatacenter::DeviceType'
 
     validates :name, presence: true, uniqueness: true, length: { maximum: 50 }
+
+    def self.for_host(host)
+      fact = host.fact_value_by_name('manufacturer')
+      if fact
+        manufacturer = find_by(name: fact.value)
+        if manufacturer
+          manufacturer
+        else
+          create(name: fact.value)
+        end
+      end
+    end
   end
 end

data/app/views/foreman_datacenter/device_interfaces/_form.html.erb

@@ -14,6 +14,7 @@
     <%= selectable_f f, :form_factor,
                      ForemanDatacenter::DeviceInterface::FORM_FACTORS %>
     <%= text_f f, :mac_address %>
+    <%= text_f f, :ip_address %>
     <%= checkbox_f f, :mgmt_only, label: 'OOB Management',
                    help_inline: 'This interface is used only for out-of-band management' %>
     <%= text_f f, :description %>

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

@@ -34,3 +34,5 @@
   <% end %>
   </tbody>
 </table>
+
+<%= will_paginate_with_info @device_types, :more => " - "+_("<b class='select_count'>0</b> selected") %>

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

@@ -76,5 +76,7 @@
       </div>
     </div>
 
+    <%= f.hidden_field :host_id %>
+
     <%= submit_or_cancel f %>
 <% end %>

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

@@ -4,6 +4,8 @@
         <span class="glyphicon glyphicon-transfer"></span>
         <%= interface.name %>
       </td>
+      <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) %>
@@ -46,6 +48,9 @@
         <span class="glyphicon glyphicon-transfer"></span>
         <%= interface.name %>
       </td>
+      <td><%= h interface.mac_address %></td>
+      <td><%= h interface.ip_address %></td>
+      <td></td>
       <td class="text-muted">Not connected</td>
       <td></td>
       <td class="text-right">

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

@@ -1,7 +1,8 @@
 <% javascript 'foreman_datacenter/devices' %>
 
-<% title _('Devices')  %>
-<% title_actions display_link_if_authorized(_('New device'), hash_for_new_device_path, class: 'btn btn-success'), help_path %>
+<% title _('Devices') %>
+<% title_actions display_link_if_authorized(_('New device'), hash_for_new_device_path, class: 'btn btn-success'),
+                 display_link_if_authorized(_('Import from host'), hash_for_import_to_device_path, class: 'btn btn-success') %>
 
 <table class="table table-bordered table-striped table-two-pane">
   <thead>
@@ -40,7 +41,7 @@
                 ),
                 display_delete_if_authorized(
                   hash_for_device_path(:id => device).merge(:auth_object => device, :authorizer => authorizer),
-                  :data => { :confirm => 'Are you sure?'},
+                  :data => { :confirm => 'Are you sure?' },
                   :action => :destroy
                 )
               ) %>
@@ -49,3 +50,5 @@
   <% end %>
   </tbody>
 </table>
+
+<%= will_paginate_with_info @devices, :more => " - "+_("<b class='select_count'>0</b> selected") %>

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

@@ -13,6 +13,13 @@
                    :action => :destroy,
                    :class => 'btn btn-danger'
                  ),
+                 display_link_if_authorized(
+                   _('Import from host'),
+                   @device.host ?
+                     hash_for_edit_device_path(@device, host_id: @device.host.id) :
+                     hash_for_import_to_device_path(target_device_id: @device.id),
+                   :class => 'btn btn-success'
+                 ),
                  help_path %>
 
 <ul class="nav nav-tabs">

data/app/views/hosts/import_to_device.html.erb

@@ -0,0 +1,60 @@
+<div class="row form-group">
+  <div class="title_filter col-md-6">
+    <%= render "common/searchbar",
+               auto_complete_controller_name: 'import_to_device' %>
+  </div>
+</div>
+
+<% if @target_device %>
+    <div class="row form-group">
+      <div class="col-md-12">
+        <label class="col-md-2 control-label required">Target Device</label>
+        <div class="col-md-4"><%= @target_device.name %></div>
+      </div>
+    </div>
+<% end %>
+
+<table class="table table-bordered table-striped table-fixed">
+  <thead>
+  <tr>
+    <th>Name</th>
+    <th>Operating System</th>
+    <th>Environment</th>
+    <th>Model</th>
+    <th>Actions</th>
+  </tr>
+  </thead>
+  <tbody>
+  <% @hosts.each do |host| %>
+      <tr>
+        <td><%= link_to host %></td>
+        <td><%= h host.operatingsystem %></td>
+        <td><%= h host.environment %></td>
+        <td><%= model_name host %></td>
+        <td class="text-right">
+          <% if @target_device %>
+              <% if host.device %>
+                  <span class="text-muted">Already has assigned device</span>
+              <% else %>
+                  <%= link_to 'Import to device',
+                              edit_device_path(@target_device, host_id: host.id),
+                              class: 'btn btn-sm btn-success' %>
+              <% end %>
+          <% else %>
+              <% if host.device %>
+                  <%= link_to 'Update assigned device',
+                              edit_device_path(host.device, host_id: host.id),
+                              class: 'btn btn-sm btn-info' %>
+              <% else %>
+                  <%= link_to 'Import to device',
+                              new_device_path(host_id: host.id),
+                              class: 'btn btn-sm btn-success' %>
+              <% end %>
+          <% end %>
+        </td>
+      </tr>
+  <% end %>
+  </tbody>
+</table>
+
+<%= will_paginate_with_info @hosts, :more => " - "+_("<b class='select_count'>0</b> selected") %>

data/config/routes.rb

@@ -1,4 +1,8 @@
 Foreman::Application.routes.draw do
+  # TODO: find a better way to do this
+  get 'datacenter/import_to_device', to: 'hosts#import_to_device',
+      as: 'import_to_device'
+
   scope 'datacenter', module: :foreman_datacenter do
     resources :sites
     resources :racks do

data/db/migrate/20160824212010_add_host_ref_to_devices.rb

@@ -0,0 +1,5 @@
+class AddHostRefToDevices < ActiveRecord::Migration
+  def change
+    add_reference :devices, :host, index: true
+  end
+end

data/db/migrate/20160828200938_add_ip_address_to_device_interfaces.rb

@@ -0,0 +1,5 @@
+class AddIpAddressToDeviceInterfaces < ActiveRecord::Migration
+  def change
+    add_column :device_interfaces, :ip_address, :string, limit: 128, default: ''
+  end
+end

data/lib/foreman_datacenter/engine.rb

@@ -55,6 +55,16 @@ module ForemanDatacenter
       SETTINGS[:foreman_datacenter] = { assets: { precompile: assets_to_precompile } }
     end
 
+    # Include concerns in this config.to_prepare block
+    config.to_prepare do
+      begin
+        Host::Managed.send(:include, ForemanDatacenter::HostExtensions)
+        HostsController.send(:include, ForemanDatacenter::HostsControllerExtensions)
+      rescue => e
+        Rails.logger.warn "ForemanDatacenter: skipping engine hook (#{e})"
+      end
+    end
+
     rake_tasks do
       Rake::Task['db:seed'].enhance do
         ForemanDatacenter::Engine.load_seed

data/lib/foreman_datacenter/version.rb

@@ -1,3 +1,3 @@
 module ForemanDatacenter
-  VERSION = '0.0.1'.freeze
+  VERSION = '0.1.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_datacenter
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Pavel Ivanov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-17 00:00:00.000000000 Z
+date: 2016-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -80,6 +80,7 @@ files:
 - app/assets/javascripts/foreman_datacenter/racks.js
 - app/assets/javascripts/foreman_datacenter/shared.js
 - app/assets/stylesheets/foreman_datacenter/device_interface_connections.css
+- app/controllers/concerns/foreman_datacenter/hosts_controller_extensions.rb
 - app/controllers/foreman_datacenter/console_port_templates_controller.rb
 - app/controllers/foreman_datacenter/console_ports_controller.rb
 - app/controllers/foreman_datacenter/console_server_port_templates_controller.rb
@@ -116,6 +117,7 @@ files:
 - app/helpers/foreman_datacenter/power_ports_helper.rb
 - app/helpers/foreman_datacenter/racks_helper.rb
 - app/helpers/foreman_datacenter/shared_helper.rb
+- app/models/concerns/foreman_datacenter/host_extensions.rb
 - app/models/foreman_datacenter/console_port.rb
 - app/models/foreman_datacenter/console_port_template.rb
 - app/models/foreman_datacenter/console_server_port.rb
@@ -244,6 +246,7 @@ files:
 - app/views/foreman_datacenter/sites/index.html.erb
 - app/views/foreman_datacenter/sites/new.html.erb
 - app/views/foreman_datacenter/sites/show.html.erb
+- app/views/hosts/import_to_device.html.erb
 - config/routes.rb
 - db/migrate/20160727161914_create_sites.rb
 - db/migrate/20160728123353_create_rack_groups.rb
@@ -267,6 +270,8 @@ files:
 - db/migrate/20160809112815_create_console_server_ports.rb
 - db/migrate/20160809113846_create_console_ports.rb
 - db/migrate/20160816224805_create_device_modules.rb
+- db/migrate/20160824212010_add_host_ref_to_devices.rb
+- db/migrate/20160828200938_add_ip_address_to_device_interfaces.rb
 - lib/foreman_datacenter/engine.rb
 - lib/foreman_datacenter/version.rb
 - lib/foreman_datacenter.rb