foreman_datacenter 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55c54f423e2c5622ddac9c470546d27f08649452
-  data.tar.gz: 5551738810f1db7684a93a2eaf1fa43233210f17
+  metadata.gz: cfddbddaec51548c83241cb2e6f6f67d278a0deb
+  data.tar.gz: 09cb2f356f8cd03012120c692459ecd2a2824291
 SHA512:
-  metadata.gz: e188f2ccc8702b861b6127d8df91d9dd06da2c1b3a3af69b20e092c46454a2155625e19a1f8ae77fc07eaf31ce243ed87185f975bf9a2fef0ef0a82a6c9fa669
-  data.tar.gz: 538df56b14e630eef7535cc2c2ce1806d3f31c88b76dc632b099cada2f4309e79feb55986810a7659b45da30a31b625a7c55a8270b8bf022f5f0167235920ff6
+  metadata.gz: bee5f620af5ff070f5024267231923865a8481acc59acee6867c950c371164b44a9a29a872527440d208fdc442953715295d371d77e9c5a34c9838298f2343a7
+  data.tar.gz: 497286a012ffb1388c1ba95f407810a552035ecc3d43289133e5bdf8936d59b06f5295f0b6d16a1d8459d3dcbf3b9e613a609ee6129bdbe53c3c3657d34ed3bd

data/app/controllers/foreman_datacenter/devices_controller.rb

@@ -11,7 +11,7 @@ module ForemanDatacenter
         error e.to_s
         search = resource_base.search_for ''
       end
-      @devices = search.includes(:ipmi_interface, :device_role, :device_type, :site, :rack).
+      @devices = search.includes(:device_role, :device_type, :site, :rack).
         paginate(:page => params[:page])
     end
 

data/app/models/foreman_datacenter/device.rb

@@ -22,6 +22,8 @@ module ForemanDatacenter
     has_many :modules, :class_name => 'ForemanDatacenter::DeviceModule'
     has_one :ipmi_interface, -> { where(name: 'ipmi', mgmt_only: true) },
             :class_name => 'ForemanDatacenter::DeviceInterface'
+    has_one :mgmt_interface, -> { where(name: 'mgmt', mgmt_only: true) },
+            :class_name => 'ForemanDatacenter::DeviceInterface'
     belongs_to_host
     has_one :management_device, :class_name => 'ForemanDatacenter::ManagementDevice'
     has_one :site, :through => :rack
@@ -53,13 +55,17 @@ module ForemanDatacenter
     scoped_search in: :device_type, on: :model, complete_value: true, rename: :type
 
     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 mac_address
+      ipmi_interface.try(:ip_address) || mgmt_interface.try(:mac_address)
+    end
+
     def ip_address
-      ipmi_interface.try(:ip_address) || primary_ip4
+      ipmi_interface.try(:ip_address) || mgmt_interface.try(:ip_address) ||
+        primary_ip4
     end
 
     def parent?

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

@@ -13,7 +13,6 @@
     <th>Rack</th>
     <th>Role</th>
     <th>Type</th>
-    <th>IP Address</th>
     <th>Action</th>
   </tr>
   </thead>
@@ -32,7 +31,6 @@
         <td><%= h device.rack.name %></td>
         <td><%= h device.device_role.name %></td>
         <td><%= h device.device_type.model %></td>
-        <td><%= h device.ip_address %></td>
         <td>
           <%= action_buttons(
                 display_link_if_authorized(

data/lib/foreman_datacenter/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_datacenter
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Pavel Ivanov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-23 00:00:00.000000000 Z
+date: 2016-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface