foreman_datacenter 0.1.46 → 0.1.47

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ced0ea1e681f01135f5bb562ed71e13028c81fe
-  data.tar.gz: f8b9908a408b69a3f4589c3e4cebc851c85d875d
+  metadata.gz: 8d756ec7f3c2b8d5857f2b0c9c707f600bdbafd0
+  data.tar.gz: 81020401067611e0e976048b54210dc8e4a223c2
 SHA512:
-  metadata.gz: 2ef9349d13f0042eeaf26b744c2df02c08b4a8d8526b38365df68af2c556be8d637f6140a02d85fd3d38a5e8f9f7006d34c3d8cb177dd65ad898dad1c4c16e7b
-  data.tar.gz: 224c42313b6f122fa71e81d367cf4d87b65bd5846092eac4471ebe6976c5d4c1867713e061be54c610014ca7eda75cb4f13a6c8aafa173f7e62d9838a2e04a63
+  metadata.gz: c2c056dc878faf80fc08592f7e909a7c0823e5b99d710c1296179f358eedeb0677c4c2d6c06f7610bb413f64fae8c373e8fac1ebe549c7855ee9071c09db7399
+  data.tar.gz: c5d63932206c2fe0fc7cfefa06fcdb3acabe492d05e48217197bde6cdf0e235c585ad7b3dee4d4b1ea5e7e1bf4c18f0ee367603a33e2692fd9191f3028ef5708

data/app/assets/stylesheets/foreman_datacenter/datacenter.css

@@ -0,0 +1,10 @@
+.nonmarginbottom {
+  margin-bottom: 0px !important;
+}
+.nonborder {
+  border: 0px !important;
+}
+.nonbordercolor {
+  border-color: transparent !important;
+}
+

data/app/controllers/foreman_datacenter/comments_controller.rb

@@ -16,7 +16,7 @@ module ForemanDatacenter
     def create
       @comment = @commentable.comments.new(comment_params.merge(user_id: User.current.id))
       if @comment.save
-        process_success :success_redirect => "/datacenter/#{@resource}/#{@id}#comment-#{@comment.id}"
+        process_success :success_redirect => "/datacenter/#{@resource}/#{@id}#comment-#{@comment.id}", success_msg: "Comment successfully created."
       else
         process_error :redirect => "/datacenter/#{@resource}/#{@id}", :error_msg => _("Failed: %s") % (e)
       end
@@ -28,7 +28,7 @@ module ForemanDatacenter
       @submodule = parse_submodule(@comment)
       if @comment.user == @current_user or @comment.user.nil?
         if @comment.update(comment_params)
-          process_success :success_redirect => "/datacenter/#{@submodule}/#{@comment.commentable_id}#comment-#{@comment.id}"
+          process_success :success_redirect => "/datacenter/#{@submodule}/#{@comment.commentable_id}#comment-#{@comment.id}", success_msg: "Comment successfully updated."
         else
           process_error :redirect => "/datacenter/#{@submodule}/#{@comment.commentable_id}#comment-#{@comment.id}", :error_msg => _("Failed: %s") % (e)
         end
@@ -41,7 +41,7 @@ module ForemanDatacenter
       @comment = Comment.find(params[:id])
       if @comment.user == @current_user or @comment.user.nil?
         if @comment.destroy
-          process_success :success_redirect => "/datacenter/#{@resource}/#{@id}#comment-#{@comment.id}"
+          process_success :success_redirect => "/datacenter/#{@resource}/#{@id}#comment-#{@comment.id}", success_msg: "Comment successfully deleted."
         else
           process_error :redirect => "/datacenter/#{@resource}/#{@id}", :error_msg => _("Failed: %s") % (e)
         end

data/app/controllers/foreman_datacenter/devices_controller.rb

@@ -7,7 +7,8 @@ module ForemanDatacenter
     include Foreman::Controller::AutoCompleteSearch
 
     before_action :set_device, only: [:update, :destroy, :inventory,
-                                      :destroy_interfaces, :qr_code]
+                                      :destroy_interfaces, :qr_code,
+                                      :sync_interfaces_with_host]
 
     before_action :load_resource
 
@@ -107,6 +108,16 @@ module ForemanDatacenter
                 type: 'application/pdf')
     end
 
+    def sync_interfaces_with_host
+      if @device.sync_interfaces_with_host
+        notice("Device successfully synchronized.")
+        redirect_to device_url(@device)
+      else
+        error("Unsuccessful synchronization.")
+        redirect_to device_url(@device)
+      end
+    end
+
     private
 
     def set_device

data/app/models/foreman_datacenter/device.rb

@@ -149,6 +149,24 @@ module ForemanDatacenter
       end
     end
 
+    def sync_interfaces_with_host
+      if host
+        existed_names = interfaces.map(&:name)
+        # abort interfaces.map(&:identifier).inspect
+        host.interfaces.each do |interface|
+          unless existed_names.include?(interface.identifier)
+            interfaces.create(
+              name: interface.identifier,
+              form_factor: ForemanDatacenter::DeviceInterface::DEFAULT_FORM_FACTOR,
+              mac_address: interface.mac,
+              ip_address: interface.ip,
+              mgmt_only: interface.identifier == 'ipmi'
+            )
+          end
+        end
+      end
+    end
+
     def create_console_ports
       device_type.console_port_templates.each do |template|
         console_ports.create(template.attrs_to_copy)

data/app/views/foreman_datacenter/comments/_comments.html.erb

@@ -1,6 +1,6 @@
 <% stylesheet 'foreman_datacenter/comments' %>
 
-<table class="<%= table_css_classes 'table-hover panel-body' %>">
+<table class="<%= table_css_classes 'table-hover panel-body nonmarginbottom' %>">
   <% if comments == [] %>
     <div class="col-md-2">
       <small>No comments yet...</small>

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

@@ -42,7 +42,7 @@
     </div>
   <% end %>
 <% else %>
-  <%= form_for [@commentable, @comment], url: "/datacenter/devices/#{@commentable.id}/comments" do |f| %>
+  <%= form_for [@commentable, @comment], url: "/datacenter/devices/#{@commentable.id}/comments", html: {class: "form-horizontal well nonborder"} do |f| %>
     <div class="clearfix">
       <div class="form-group">
         <div class="col-md-5">

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

@@ -1,3 +1,5 @@
+<% stylesheet 'foreman_datacenter/datacenter' %>
+
 <% title h(@device_role.name) %>
 
 <% title_actions display_link_if_authorized(
@@ -20,7 +22,7 @@
       <div class="panel-heading">
         <strong>Device role</strong>
       </div>
-      <table class="<%= table_css_classes 'table-hover panel-body' %>">
+      <table class="<%= table_css_classes 'table-hover panel-body nonmarginbottom' %>">
         <tbody>
         <tr>
           <td>Name</td>
@@ -47,7 +49,7 @@
     <!-- Stats -->
     <div class="panel panel-default">
       <div class="panel-heading"><strong>Stats</strong></div>
-      <table class="<%= table_css_classes 'table-hover panel-body' %>">
+      <table class="<%= table_css_classes 'table-hover panel-body nonmarginbottom' %>">
         <tr>
           <td>Devices</td>
           <td><%= @device_role.devices.length %></td>

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

@@ -1,3 +1,5 @@
+<% stylesheet 'foreman_datacenter/datacenter' %>
+
 <% title h(@device_type.model) %>
 
 <% title_actions display_link_if_authorized(
@@ -20,7 +22,7 @@
       <div class="panel-heading">
         <strong>Chassis</strong>
       </div>
-      <table class="<%= table_css_classes 'table-hover panel-body' %>">
+      <table class="<%= table_css_classes 'table-hover panel-body nonmarginbottom' %>">
         <tbody>
         <tr>
           <td>Manufacturer</td>
@@ -47,7 +49,7 @@
       <div class="panel-heading">
         <strong>Function</strong>
       </div>
-      <table class="<%= table_css_classes 'table-hover panel-body' %>">
+      <table class="<%= table_css_classes 'table-hover panel-body nonmarginbottom' %>">
         <tbody>
         <tr>
           <td class="col-sm-3 text-right">
@@ -139,7 +141,7 @@
       <% if @device_type.console_port_templates.empty? %>
           <div class="panel-body">None</div>
       <% else %>
-          <table class="<%= table_css_classes 'table-hover panel-body' %>">
+          <table class="<%= table_css_classes 'table-hover panel-body nonmarginbottom' %>">
             <tbody>
             <% @device_type.console_port_templates.each do |console_port| %>
                 <tr>
@@ -170,7 +172,7 @@
       <% if @device_type.power_port_templates.empty? %>
           <div class="panel-body">None</div>
       <% else %>
-          <table class="<%= table_css_classes 'table-hover panel-body' %>">
+          <table class="<%= table_css_classes 'table-hover panel-body nonmarginbottom' %>">
             <tbody>
             <% @device_type.power_port_templates.each do |power_port| %>
                 <tr>
@@ -201,7 +203,7 @@
       <% if @device_type.management_interfaces.empty? %>
           <div class="panel-body">None</div>
       <% else %>
-          <table class="<%= table_css_classes 'table-hover panel-body' %>">
+          <table class="<%= table_css_classes 'table-hover panel-body nonmarginbottom' %>">
             <tbody>
             <% @device_type.management_interfaces.each do |management_interface| %>
                 <tr>
@@ -235,7 +237,7 @@
           <% if @device_type.device_bay_templates.empty? %>
               <div class="panel-body">None</div>
           <% else %>
-              <table class="<%= table_css_classes 'table-hover panel-body' %>">
+              <table class="<%= table_css_classes 'table-hover panel-body nonmarginbottom' %>">
                 <tbody>
                 <% @device_type.device_bay_templates.each do |device_bay| %>
                     <tr>
@@ -268,7 +270,7 @@
           <% if @device_type.network_interfaces.empty? %>
               <div class="panel-body">None</div>
           <% else %>
-              <table class="<%= table_css_classes 'table-hover panel-body' %>">
+              <table class="<%= table_css_classes 'table-hover panel-body nonmarginbottom' %>">
                 <tbody>
                 <% @device_type.network_interfaces.each do |interface| %>
                     <tr>
@@ -301,7 +303,7 @@
           <% if @device_type.console_server_port_templates.empty? %>
               <div class="panel-body">None</div>
           <% else %>
-              <table class="<%= table_css_classes 'table-hover panel-body' %>">
+              <table class="<%= table_css_classes 'table-hover panel-body nonmarginbottom' %>">
                 <tbody>
                 <% @device_type.console_server_port_templates.each do |console_server_port| %>
                     <tr>
@@ -334,7 +336,7 @@
           <% if @device_type.power_outlet_templates.empty? %>
               <div class="panel-body">None</div>
           <% else %>
-              <table class="<%= table_css_classes 'table-hover panel-body' %>">
+              <table class="<%= table_css_classes 'table-hover panel-body nonmarginbottom' %>">
                 <tbody>
                 <% @device_type.power_outlet_templates.each do |power_outlet| %>
                     <tr>

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

@@ -2,8 +2,10 @@
 <% stylesheet 'foreman_datacenter/comments' %>
 
 <% 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') %>
+<% title_actions display_link_if_authorized(_('Create device'), hash_for_new_device_path, class: 'btn btn-primary'),
+  display_link_if_authorized(_('Import from host'), hash_for_import_to_device_path, class: 'btn btn-success'),
+  help_button
+%>
 
 <table class="<%= table_css_classes 'table-two-pane' %>">
   <thead>

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

@@ -1,5 +1,8 @@
 <% javascript 'foreman_datacenter/ajax' %>
 <% javascript 'foreman_datacenter/management_devices' %>
+<% stylesheet 'foreman_datacenter/datacenter' %>
+
+<% content_for(:title, @device.name) %>
 
 <div class="row">
   <div class="col-md-8">
@@ -42,7 +45,8 @@
       <div class="panel-heading">
         <strong>Device</strong>
       </div>
-      <table class="<%= table_css_classes 'table-hover panel-body' %>">
+      <!-- table_css_classes removed purposely -->
+      <table class="table table-hover panel-body nonmarginbotton">
         <tbody>
         <tr>
           <td>Site</td>
@@ -81,7 +85,8 @@
       <div class="panel-heading">
         <strong>Critical Connections</strong>
       </div>
-      <table class="<%= table_css_classes 'table-hover panel-body' %>">
+      <!-- table_css_classes removed purposely -->
+      <table class="table table-hover panel-body">
         <tbody>
         <% if @device.management_interfaces.empty? %>
             <tr class="alert-warning">
@@ -143,7 +148,7 @@
         <% end %>
         </tbody>
       </table>
-      <div class="panel-footer text-right">
+      <div class="panel-footer text-right" id="pagination">
         <%= link_to new_management_device_device_interfaces_path(@device),
                     class: 'btn btn-primary btn-xs' do %>
             <span class="glyphicon glyphicon-plus"></span>
@@ -169,7 +174,8 @@
       <div class="panel-heading">
         <strong>Management</strong>
       </div>
-      <table class="<%= table_css_classes 'table-hover panel-body' %>">
+      <!-- table_css_classes removed purposely -->
+      <table class="table table-hover panel-body nonmarginbotton">
         <tbody>
         <tr>
           <td>Role</td>
@@ -322,13 +328,16 @@
               <% if @device.non_management_interfaces.empty? %>
                   <div class="panel-body">None</div>
               <% else %>
-                  <table class="<%= table_css_classes 'table-hover panel-body' %>">
+                  <!-- table_css_classes removed purposely -->
+                  <table class="table table-hover panel-body nonmarginbotton">
                     <tbody>
                     <%= render partial: 'interface', collection: @device.non_management_interfaces %>
                     </tbody>
                   </table>
               <% end %>
               <div class="panel-footer text-right">
+		<%= link_to 'Sync', sync_interfaces_with_host_device_path(@device),
+                            class: 'btn btn-primary btn-xs' %>
                 <%= link_to 'Add an interface', new_device_device_interface_path(@device),
                             class: 'btn btn-primary btn-xs' %>
                 <%= button_tag 'Destroy selected interfaces',

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

@@ -1,3 +1,5 @@
+<% stylesheet 'foreman_datacenter/datacenter' %>
+
 <% title h(@manufacturer.name) %>
 
 <% title_actions display_link_if_authorized(
@@ -20,7 +22,7 @@
       <div class="panel-heading">
         <strong>Manufacturer</strong>
       </div>
-      <table class="<%= table_css_classes 'table-hover panel-body' %>">
+      <table class="<%= table_css_classes 'table-hover panel-body nonmarginbottom' %>">
         <tbody>
         <tr>
           <td>Name</td>
@@ -43,7 +45,7 @@
     <!-- Stats -->
     <div class="panel panel-default">
       <div class="panel-heading"><strong>Stats</strong></div>
-      <table class="<%= table_css_classes 'table-hover panel-body' %>">
+      <table class="<%= table_css_classes 'table-hover panel-body nonmarginbottom' %>">
         <tr>
           <td>Devices types</td>
           <td><%= @manufacturer.device_types.length %></td>

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

@@ -1,3 +1,5 @@
+<% stylesheet 'foreman_datacenter/datacenter' %>
+
 <% title h(@platform.name) %>
 
 <% title_actions display_link_if_authorized(
@@ -20,7 +22,7 @@
       <div class="panel-heading">
         <strong>Platform</strong>
       </div>
-      <table class="<%= table_css_classes 'table-hover panel-body' %>">
+      <table class="<%= table_css_classes 'table-hover panel-body nonmarginbottom' %>">
         <tbody>
         <tr>
           <td>Name</td>
@@ -47,7 +49,7 @@
     <!-- Stats -->
     <div class="panel panel-default">
       <div class="panel-heading"><strong>Stats</strong></div>
-      <table class="<%= table_css_classes 'table-hover panel-body' %>">
+      <table class="<%= table_css_classes 'table-hover panel-body nonmarginbottom' %>">
         <tr>
           <td>Devices</td>
           <td><%= @platform.devices.length %></td>

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

@@ -1,3 +1,5 @@
+<% stylesheet 'foreman_datacenter/datacenter' %>
+
 <% title h(@rack_group.name) %>
 
 <% title_actions display_link_if_authorized(
@@ -19,7 +21,7 @@
     <div class="panel-heading">
       <strong>Rack Group</strong>
     </div>
-    <table class="<%= table_css_classes 'table-hover panel-body' %>">
+    <table class="<%= table_css_classes 'table-hover panel-body nonmarginbottom' %>">
       <tbody>
       <tr>
         <td>Name</td>
@@ -46,7 +48,7 @@
   <!-- Stats -->
   <div class="panel panel-default">
     <div class="panel-heading"><strong>Stats</strong></div>
-    <table class="<%= table_css_classes 'table-hover panel-body' %>">
+    <table class="<%= table_css_classes 'table-hover panel-body nonmarginbottom' %>">
       <tr>
         <td>Racks</td>
         <td><%= @rack_group.racks.length %></td>

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

@@ -1,6 +1,6 @@
 <div class="panel panel-default">
   <div class="panel-heading"><strong>Devices</strong></div>
-  <table class="<%= table_css_classes 'table-hover panel-body' %>">
+  <table class="<%= table_css_classes 'table-hover panel-body nonmarginbottom' %>">
     <tbody>
       <% @rack.positioned_devices.each do |positions, devices| %>
         <tr>

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

@@ -1,6 +1,6 @@
 <div class="panel panel-default">
   <div class="panel-heading"><strong>Unpositioned Devices</strong></div>
-  <table class="table table-hover panel-body">
+  <table class="table table-hover panel-body nonmarginbottom">
     <tbody>
       <% @rack.unpositioned_devices.each do |d| %>
         <tr>

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

@@ -1,4 +1,5 @@
 <% stylesheet 'foreman_datacenter/device_roles' %>
+<% stylesheet 'foreman_datacenter/datacenter' %>
 
 <% title h("Rack #{@rack.name}") %>
 
@@ -22,7 +23,7 @@
       <div class="panel-heading">
         <strong>Rack</strong>
       </div>
-      <table class="<%= table_css_classes 'table-hover panel-body' %>">
+      <table class="<%= table_css_classes 'table-hover panel-body nonmarginbottom' %>">
         <tbody>
         <tr>
           <td>Site</td>

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

@@ -1,3 +1,5 @@
+<% stylesheet 'foreman_datacenter/datacenter' %>
+
 <% title h(@site.name) %>
 
 <% title_actions display_link_if_authorized(
@@ -20,7 +22,7 @@
       <div class="panel-heading">
         <strong>Site</strong>
       </div>
-      <table class="<%= table_css_classes 'table-hover panel-body' %>">
+      <table class="<%= table_css_classes 'table-hover panel-body nonmarginbottom' %>">
         <tbody>
         <tr>
           <td>Facility</td>
@@ -56,7 +58,7 @@
       <div class="panel-heading">
         <strong>Stats</strong>
       </div>
-      <table class="<%= table_css_classes 'table-hover panel-body' %>">
+      <table class="<%= table_css_classes 'table-hover panel-body nonmarginbottom' %>">
         <tbody>
         <tr>
           <td>Racks</td>
@@ -75,7 +77,7 @@
       <div class="panel-heading">
         <strong>Rack Groups</strong>
       </div>
-      <table class="<%= table_css_classes 'table-hover panel-body' %>">
+      <table class="<%= table_css_classes 'table-hover panel-body nonmarginbottom' %>">
         <tbody>
         <% @site.rack_groups.each do |rack_group| %>
             <tr>

data/config/routes.rb

@@ -41,6 +41,7 @@ Foreman::Application.routes.draw do
         get :inventory
         delete :destroy_interfaces
         get :qr_code
+        get :sync_interfaces_with_host
       end
       resources :device_bays, except: [:show, :index], shallow: true do
         member do

data/lib/foreman_datacenter/version.rb

@@ -1,3 +1,3 @@
 module ForemanDatacenter
-  VERSION = '0.1.46'.freeze
+  VERSION = '0.1.47'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_datacenter
 version: !ruby/object:Gem::Version
-  version: 0.1.46
+  version: 0.1.47
 platform: ruby
 authors:
 - Pavel Ivanov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-19 00:00:00.000000000 Z
+date: 2018-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -113,6 +113,7 @@ files:
 - app/assets/javascripts/foreman_datacenter/racks.js
 - app/assets/javascripts/foreman_datacenter/shared.js
 - app/assets/stylesheets/foreman_datacenter/comments.css
+- app/assets/stylesheets/foreman_datacenter/datacenter.css
 - app/assets/stylesheets/foreman_datacenter/device_interface_connections.css
 - app/assets/stylesheets/foreman_datacenter/device_roles.css
 - app/controllers/concerns/foreman_datacenter/hosts_controller_extensions.rb