foreman_datacenter 0.1.49 → 0.1.50

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b07e0a47d71b4b05a50a937eea06dabbd2b0131
-  data.tar.gz: 1c365a909465a75aab9cf4e4c605448ac66d0245
+  metadata.gz: f096d8e5995364d2ad1919c1fd50a41dcf71870f
+  data.tar.gz: 48a775014252e6ce5ca677fc92daa83e9bae43c7
 SHA512:
-  metadata.gz: 624f0c12cd663ad9b3d89c133d42ac4a76573266794f7e312994a5140089a2eba784541e8d9812eb4195cc87ac404deef6429c2caa6a719f88f1f9e0e41904be
-  data.tar.gz: 17e8c4a7c91f1668848337db91d1ac0b50e8d6874429ce2170549c15e9a175469e86af1ae2390c40b41713d1e71bd323deda188129f1ab738118080d18848575
+  metadata.gz: 290a279214d80f987edc40122003d1f2fa3446ef5cdf6130fa53212d01a1f0f35a937ab23b71aa9583d2c019d3525fadfd5d93f04d30e343383fd4eabaecff28
+  data.tar.gz: f6fba572bb44dc45c8be0c5b4f1b161586e357212bf0ba6b5b9f518300d514a5dff4e4f0c7456f38982927e603805d76cac98b1ed716cba6cb8854de2ad94f4d

data/README.md

@@ -16,10 +16,68 @@ Foreman Datacenter plugin documents following:
 * **Power connections** - lists all connections of power cables
 * **Interface connections** - lists all connections between interfaces
 
-## Installation
+## Introduction Video presentation
+
+* https://www.youtube.com/watch?v=HVmJ6UYPaz0
+
+## Installation by package
 
 See [Plugins Installation](https://theforeman.org/plugins/#2.Installation) for how to install Foreman plugins.
 
+### Ubuntu/Debian instructions
+```
+apt-get install ruby-foreman-datacenter
+```
+
+### Redhat/Centos instructions
+```
+yum install ruby-foreman-datacenter
+```
+
+NOTE: on both platforms, after the plugin is installed you have to precompile assets!
+```
+foreman-rake assets:precompile
+```
+
+## Installation by gem
+
+### Redhat/Centos instructions (confirmed on Katello 3.4/Foreman 1.15.6 and 1.16)
+
+You may need to install additional Gems and feed db:
+```
+# Install some required gems for precompile assets
+gem install --ignore-dependencies sprockets
+gem install --ignore-dependencies sass
+gem install --ignore-dependencies sass-listen
+gem install --ignore-dependencies rb-fsevent
+gem install --ignore-dependencies rb-inotify
+gem install --ignore-dependencies ffi
+
+# Add repo cause ffi needs ruby22-ruby-devel
+cat > /etc/yum.repos.d/CentOS-SCLo-scl.repo << EOF
+[centos-sclo-sclo-rh]
+name=CentOS-7 - SCLo sclo ruby22
+baseurl=http://mirror.centos.org/centos/7/sclo/x86_64/rh/
+gpgcheck=1
+enabled=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-SCLo
+EOF
+
+# Install ruby22-ruby-devel for ruby gem ffi
+yum install rh-ruby22-ruby-devel
+gem install --ignore-dependencies ffi
+
+# Precompile assets should work now
+foreman-rake assets:precompile
+
+# Now feed database
+RAILS_ENV=production rake db:migrate
+
+# If it fails
+cd /opt/rh/rh-ruby22/root/usr/local/share/gems/gems/foreman_datacenter-0.1.49/db/migrate
+for F in `ls`;do  sed -i ${F} -e 's/\[4.2\]//';done;
+```
+
 ## Usage
 
 ### Create a device type
@@ -30,15 +88,27 @@ Here you can create a particular device type, for example a model of switch and
 
 You can either just create a device - then you have to create first Manufacturer, Device Type, Device Role, Platform; or you can import device from Puppet facts (this feature is still in development phase) - you just click **Devices** -> **Import from host** and then will search your host and click **Import to device**. Then you will get a page with additional information about the machine to be filled like location, position in rack, etc. Once device is created, you can list it in **Devices** section and when you click on this device, you can fill in additional information, e.g. connect its interfaces to a switch, etc.
 
+### Bugs
+
+Sometimes you may encounter a problem that does not work dropdown select field(like this https://github.com/theforeman/foreman_datacenter/issues/12 or this https://github.com/theforeman/foreman_datacenter/issues/9)
+
+Please make assets precompilation manually as following in foreman installation dir:
+```
+foreman-rake assets:precompile
+```
+
+We are working on this problem
+
 ## Contributing
 
 Fork and send a Pull Request. Thanks!
 
 ## Copyright
 
-Copyright (c) *cloudevelops, Inc.*
+Copyright (c) *cloudevelops, s.r.o.*, https://www.cloudinfrastack.com
 
 Authors: *Pavel Ivanov* and *Eugene Loginov*
+Contributors: *Michal Vesely*, *Michal Cila*, *Zdenek Janda*
 
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
 

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

@@ -14,3 +14,20 @@ function connectionsNewRackSelected(item) {
     });
   }
 }
+
+function connectionsNewSiteSelected(item) {
+  var $item = $(item);
+  var site = $item.val();
+  if (site === '') {
+    return false;
+  } else {
+    tfm.tools.showSpinner();
+    var url = $item.data('url');
+    var params = $.param({ site_id: site });
+    var $container = $('#dic-container');
+    $container.load(url, params, function () {
+      $container.find('select').select2({allowClear: true});
+      tfm.tools.hideSpinner();
+    });
+  }
+}

data/app/controllers/foreman_datacenter/devices_controller.rb

@@ -90,6 +90,11 @@ module ForemanDatacenter
       render partial: 'racks'
     end
 
+    def site_racks
+      @site = Site.find(params[:site_id])
+      render partial: 'site_racks'
+    end
+
     def for_rack
       @rack = ForemanDatacenter::Rack.find(params[:rack_id])
       render partial: 'for_rack'

data/app/helpers/foreman_datacenter/shared_helper.rb

@@ -25,5 +25,15 @@ module ForemanDatacenter
       render partial: 'foreman_datacenter/shared/rack_device_select',
              locals: { site: site, options: options }
     end
+
+   def sites_for_connection_form(site_id)
+      collection = Site.select(:id, :name).all
+      select_tag :site_id,
+                 options_from_collection_for_select(collection, 'id', 'name', site_id),
+                 { :include_blank => 'Choose a site',
+                   :onchange => 'connectionsNewSiteSelected(this)',
+                   :'data-url' => site_racks_devices_path,
+                   :class => 'form-control' }
+    end
   end
 end

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

@@ -12,6 +12,13 @@
           <div class="panel-heading text-center"><strong>A Side</strong></div>
 
           <div class="panel-body">
+            <div class="clearfix">
+              <div class="form-group">
+                <label class="col-md-2 control-label required">Site</label>
+                <div class="col-md-4"><%= @device_interface_connection.first_rack.site.name %></div>
+              </div>
+            </div>
+
             <div class="clearfix">
               <div class="form-group">
                 <label class="col-md-2 control-label required">Rack</label>
@@ -47,9 +54,21 @@
           <div class="panel-heading text-center"><strong>B Side</strong></div>
 
           <div class="panel-body">
-            <%= rack_device_select @device_interface_connection.first_site,
+             <div class="clearfix">
+               <div class="form-group">
+                 <label class="col-md-2 control-label required">Site</label>
+                 <div class="col-md-4">
+                   <%= sites_for_connection_form @device_interface_connection.first_site.id %>
+                 </div>
+                 <span class="help-block help-inline">First, you need to select a site</span>
+               </div>
+             </div>
+
+            <div id="dic-container">
+              <%= rack_device_select @device_interface_connection.first_site,
                                    url: interfaces_device_interface_connections_path,
                                    target: '#interfaces-container' %>
+            </div>
 
             <div id="interfaces-container">
               <%= interfaces_for_connection_form f, [] %>

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

@@ -0,0 +1,5 @@
+<%= rack_device_select @site,
+											 url: interfaces_device_interface_connections_path,
+											 target: '#interfaces-container' %>
+
+

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

@@ -1,4 +1,5 @@
 <% javascript 'foreman_datacenter/devices' %>
+<% javascript 'foreman_datacenter/pagination' %>
 <% stylesheet 'foreman_datacenter/comments' %>
 
 <% title _('Devices') %>

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

@@ -336,7 +336,7 @@
                   </table>
               <% end %>
               <div class="panel-footer text-right">
-		<%= link_to 'Sync', sync_interfaces_with_host_device_path(@device),
+                <%= link_to 'Sync', sync_interfaces_with_host_device_path(@device),
                             class: 'btn btn-primary btn-xs' if @device.host %>
                 <%= link_to 'Add an interface', new_device_device_interface_path(@device),
                             class: 'btn btn-primary btn-xs' %>

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

@@ -14,6 +14,9 @@
                     <% if d.side.nil? %>
                       *
                     <% end %>
+                    <% if d.size.nil? %>
+                      **
+                    <% end %>
                   </div>
                 <% end %>
             <% end %>

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

@@ -78,6 +78,7 @@
     <!-- Unpositioned Devices -->
     <%= render "unpositioned_devices", rack: @rack if @rack.unpositioned_devices.count != 0 %>
     <div><h6 class="text-right">* side is not defined</h6></div>
+    <div><h6 class="text-right">** size is not defined</h6></div>
   </div>
 
 </div>

data/app/views/foreman_datacenter/shared/_rack_device_select.html.erb

@@ -1,10 +1,12 @@
-<div class="clearfix">
-  <div class="form-group">
-    <label class="col-md-2 control-label required">Rack</label>
-    <div class="col-md-4">
-      <%= racks_list_for_site site %>
+<div id="racks-container">
+  <div class="clearfix">
+    <div class="form-group">
+      <label class="col-md-2 control-label required">Rack</label>
+      <div class="col-md-4">
+        <%= racks_list_for_site site %>
+      </div>
+      <span class="help-block help-inline">First, you need to select a rack</span>
     </div>
-    <span class="help-block help-inline">First, you need to select a rack</span>
   </div>
 </div>
 

data/lib/foreman_datacenter/version.rb

@@ -1,3 +1,3 @@
 module ForemanDatacenter
-  VERSION = '0.1.49'.freeze
+  VERSION = '0.1.50'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_datacenter
 version: !ruby/object:Gem::Version
-  version: 0.1.49
+  version: 0.1.50
 platform: ruby
 authors:
 - Pavel Ivanov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-13 00:00:00.000000000 Z
+date: 2018-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -232,6 +232,7 @@ files:
 - app/views/foreman_datacenter/device_types/new.html.erb
 - app/views/foreman_datacenter/device_types/show.html.erb
 - app/views/foreman_datacenter/device_types/welcome.html.erb
+- app/views/foreman_datacenter/devices/_aracks.html.erb
 - app/views/foreman_datacenter/devices/_console_port.html.erb
 - app/views/foreman_datacenter/devices/_console_server_port.html.erb
 - app/views/foreman_datacenter/devices/_device_bay.html.erb