foreman_netbox 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b8ad442bf38c2bf5ac0ed5b94580b108a16d267a2ae2a37f456a73ebb1f8cd6
-  data.tar.gz: e31f39d22ea73a0bda27093a4f8474740836899c4d0379cc8763a1b9ec766e24
+  metadata.gz: 0c6e291e619bba70de7b1c7c67832419452ef5342d2bd008961be87a2152ee86
+  data.tar.gz: 9bad853a3329b00878bfaea36939fa2ab02b0957540d2b2bae1b30781a7ddc0c
 SHA512:
-  metadata.gz: ab087e119d4a0fd10f4847a4e6aaa829e55e2b1036393058ccc90363a098ea12fa156fd7f62c1eba98d0e2a15e0f3fd0aeec77d65f4a78a515ff6b16b6739f13
-  data.tar.gz: 47561411ae532f4229a45ce71443f89fadc94aae271d25be9e201148500cfa7f013ff7e24c94c1134738e95f7a200ed204378a4dee65cd72e7694e64f81c5911
+  metadata.gz: 3612479271e7bec9c1499e482691cae0e4e2f7aed0b3d8de93085d98630d3faef83fd82ba4200c377b4ab497ebba63106c6ef4542c28a4c6cecd0c4d638161c9
+  data.tar.gz: ca1bfcace00f154324c72738a75059f66103ad200548c5314e5303ce6be656d1e21a2627f95f4c648ecf26c8e821cd6a28ebc92d78c381c49b78dce0acc267b2

data/app/interactors/foreman_netbox/delete_host/organizer.rb

@@ -6,7 +6,7 @@ module ForemanNetbox
       include ::Interactor::Organizer
 
       organize DeleteHost::DeleteVirtualMachine,
-               DeleteHost::DeleteDevice
+        DeleteHost::DeleteDevice
     end
   end
 end

data/app/interactors/foreman_netbox/sync_host/organizer.rb

@@ -11,7 +11,7 @@ module ForemanNetbox
       end
 
       organize SyncHost::SyncVirtualMachine::Organizer,
-               SyncHost::SyncDevice::Organizer
+        SyncHost::SyncDevice::Organizer
 
       def call
         super

data/app/interactors/foreman_netbox/sync_host/sync_device/find.rb

@@ -7,9 +7,7 @@ module ForemanNetbox
         include ::Interactor
 
         def call
-          # rubocop:disable Rails/DynamicFindBy
           context.device = find_by_serial || find_by_mac || find_by_name
-          # rubocop:enable Rails/DynamicFindBy
         rescue NetboxClientRuby::LocalError, NetboxClientRuby::ClientError, NetboxClientRuby::RemoteError => e
           ::Foreman::Logging.logger('foreman_netbox/import').error("#{self.class} error #{e}: #{e.backtrace}")
           context.fail!(error: "#{self.class}: #{e}")

data/app/interactors/foreman_netbox/sync_host/sync_device/organizer.rb

@@ -15,16 +15,16 @@ module ForemanNetbox
         end
 
         organize SyncDevice::Validate,
-                 SyncHost::SyncTags::Organizer,
-                 SyncHost::SyncTenant::Organizer,
-                 SyncDevice::SyncSite::Organizer,
-                 SyncDevice::SyncDeviceRole::Organizer,
-                 SyncDevice::SyncDeviceType::Organizer,
-                 SyncDevice::Find,
-                 SyncDevice::Create,
-                 SyncDevice::SyncInterfaces::Organizer,
-                 SyncDevice::Update,
-                 SyncDevice::SaveNetboxUrl
+          SyncHost::SyncTags::Organizer,
+          SyncHost::SyncTenant::Organizer,
+          SyncDevice::SyncSite::Organizer,
+          SyncDevice::SyncDeviceRole::Organizer,
+          SyncDevice::SyncDeviceType::Organizer,
+          SyncDevice::Find,
+          SyncDevice::Create,
+          SyncDevice::SyncInterfaces::Organizer,
+          SyncDevice::Update,
+          SyncDevice::SaveNetboxUrl
       end
     end
   end

data/app/interactors/foreman_netbox/sync_host/sync_device/sync_device_role/organizer.rb

@@ -12,7 +12,7 @@ module ForemanNetbox
           end
 
           organize SyncDeviceRole::Find,
-                   SyncDeviceRole::Create
+            SyncDeviceRole::Create
         end
       end
     end

data/app/interactors/foreman_netbox/sync_host/sync_device/sync_device_type/organizer.rb

@@ -12,9 +12,9 @@ module ForemanNetbox
           end
 
           organize SyncDeviceType::SyncManufacturer::Organizer,
-                   SyncDeviceType::Find,
-                   SyncDeviceType::Update,
-                   SyncDeviceType::Create
+            SyncDeviceType::Find,
+            SyncDeviceType::Update,
+            SyncDeviceType::Create
         end
       end
     end

data/app/interactors/foreman_netbox/sync_host/sync_device/sync_device_type/sync_manufacturer/find.rb

@@ -9,10 +9,9 @@ module ForemanNetbox
             include ::Interactor
 
             def call
-              # rubocop:disable Rails/DynamicFindBy
               context.manufacturer = find_by_slug || find_by_name
-              # rubocop:enable Rails/DynamicFindBy
-            rescue NetboxClientRuby::LocalError, NetboxClientRuby::ClientError, NetboxClientRuby::RemoteError => e
+            rescue NetboxClientRuby::LocalError, NetboxClientRuby::ClientError,
+                   NetboxClientRuby::RemoteError => e
               ::Foreman::Logging.logger('foreman_netbox/import').error("#{self.class} error #{e}: #{e.backtrace}")
               context.fail!(error: "#{self.class}: #{e}")
             end

data/app/interactors/foreman_netbox/sync_host/sync_device/sync_device_type/sync_manufacturer/organizer.rb

@@ -13,7 +13,7 @@ module ForemanNetbox
             end
 
             organize SyncManufacturer::Find,
-                     SyncManufacturer::Create
+              SyncManufacturer::Create
           end
         end
       end

data/app/interactors/foreman_netbox/sync_host/sync_device/sync_interfaces/find.rb

@@ -20,7 +20,7 @@ module ForemanNetbox
 
           def params
             {
-              device_id: device.id
+              device_id: device.id,
             }
           end
         end

data/app/interactors/foreman_netbox/sync_host/sync_device/sync_interfaces/organizer.rb

@@ -12,10 +12,10 @@ module ForemanNetbox
           end
 
           organize SyncInterfaces::Find,
-                   SyncInterfaces::Delete,
-                   SyncInterfaces::Create,
-                   SyncInterfaces::SyncIpAddresses::Organizer,
-                   SyncInterfaces::Update
+            SyncInterfaces::Delete,
+            SyncInterfaces::Create,
+            SyncInterfaces::SyncIpAddresses::Organizer,
+            SyncInterfaces::Update
         end
       end
     end

data/app/interactors/foreman_netbox/sync_host/sync_device/sync_interfaces/sync_ip_addresses/delete.rb

@@ -21,7 +21,9 @@ module ForemanNetbox
               ip_addresses_netbox_params = netbox_params.fetch(:ip_addresses, [])
 
               context.interfaces.each do |netbox_interface|
-                host_interface_ips = ip_addresses_netbox_params.select { |i| i.dig(:interface, :name) == netbox_interface.name }
+                host_interface_ips = ip_addresses_netbox_params.select do |i|
+                                       i.dig(:interface, :name) == netbox_interface.name
+                                     end
                                                                .map { |i| i.fetch(:address) }
 
                 context.ip_addresses

data/app/interactors/foreman_netbox/sync_host/sync_device/sync_interfaces/sync_ip_addresses/find.rb

@@ -21,7 +21,7 @@ module ForemanNetbox
 
             def params
               {
-                device_id: device.id
+                device_id: device.id,
               }
             end
           end

data/app/interactors/foreman_netbox/sync_host/sync_device/sync_interfaces/sync_ip_addresses/organizer.rb

@@ -13,9 +13,9 @@ module ForemanNetbox
             end
 
             organize SyncIpAddresses::Find,
-                     SyncIpAddresses::Delete,
-                     SyncIpAddresses::Update,
-                     SyncIpAddresses::Create
+              SyncIpAddresses::Delete,
+              SyncIpAddresses::Update,
+              SyncIpAddresses::Create
           end
         end
       end

data/app/interactors/foreman_netbox/sync_host/sync_device/sync_interfaces/update.rb

@@ -22,7 +22,9 @@ module ForemanNetbox
 
             return unless new_params
 
-            netbox_interface.mac_address = new_params[:mac_address] if netbox_interface.mac_address != new_params[:mac_address]
+            if netbox_interface.mac_address != new_params[:mac_address]
+              netbox_interface.mac_address = new_params[:mac_address]
+            end
             assign_tags_to(netbox_interface)
 
             netbox_interface.save

data/app/interactors/foreman_netbox/sync_host/sync_device/sync_site/organizer.rb

@@ -16,8 +16,8 @@ module ForemanNetbox
           end
 
           organize SyncSite::Find,
-                   SyncSite::Update,
-                   SyncSite::Create
+            SyncSite::Update,
+            SyncSite::Create
         end
       end
     end

data/app/interactors/foreman_netbox/sync_host/sync_tags/organizer.rb

@@ -7,7 +7,7 @@ module ForemanNetbox
         include ::Interactor::Organizer
 
         DEFAULT_TAGS = [
-          { name: 'foreman', slug: 'foreman' }
+          { name: 'foreman', slug: 'foreman' },
         ].freeze
 
         after do
@@ -15,7 +15,7 @@ module ForemanNetbox
         end
 
         organize SyncTags::Find,
-                 SyncTags::Create
+          SyncTags::Create
       end
     end
   end

data/app/interactors/foreman_netbox/sync_host/sync_tenant/organizer.rb

@@ -11,8 +11,8 @@ module ForemanNetbox
         end
 
         organize SyncTenant::Find,
-                 SyncTenant::Update,
-                 SyncTenant::Create
+          SyncTenant::Update,
+          SyncTenant::Create
       end
     end
   end

data/app/interactors/foreman_netbox/sync_host/sync_virtual_machine/find.rb

@@ -7,9 +7,7 @@ module ForemanNetbox
         include ::Interactor
 
         def call
-          # rubocop:disable Rails/DynamicFindBy
           context.virtual_machine = find_by_mac || find_by_name
-          # rubocop:enable Rails/DynamicFindBy
         rescue NetboxClientRuby::LocalError, NetboxClientRuby::ClientError, NetboxClientRuby::RemoteError => e
           ::Foreman::Logging.logger('foreman_netbox/import').error("#{self.class} error #{e}: #{e.backtrace}")
           context.fail!(error: "#{self.class}: #{e}")

data/app/interactors/foreman_netbox/sync_host/sync_virtual_machine/organizer.rb

@@ -15,14 +15,14 @@ module ForemanNetbox
         end
 
         organize SyncVirtualMachine::Validate,
-                 SyncHost::SyncTags::Organizer,
-                 SyncHost::SyncTenant::Organizer,
-                 SyncVirtualMachine::SyncCluster::Organizer,
-                 SyncVirtualMachine::Find,
-                 SyncVirtualMachine::Create,
-                 SyncVirtualMachine::SyncInterfaces::Organizer,
-                 SyncVirtualMachine::Update,
-                 SyncVirtualMachine::SaveNetboxUrl
+          SyncHost::SyncTags::Organizer,
+          SyncHost::SyncTenant::Organizer,
+          SyncVirtualMachine::SyncCluster::Organizer,
+          SyncVirtualMachine::Find,
+          SyncVirtualMachine::Create,
+          SyncVirtualMachine::SyncInterfaces::Organizer,
+          SyncVirtualMachine::Update,
+          SyncVirtualMachine::SaveNetboxUrl
       end
     end
   end

data/app/interactors/foreman_netbox/sync_host/sync_virtual_machine/sync_cluster/organizer.rb

@@ -12,9 +12,9 @@ module ForemanNetbox
           end
 
           organize SyncCluster::SyncClusterType::Organizer,
-                   SyncCluster::Find,
-                   SyncCluster::Update,
-                   SyncCluster::Create
+            SyncCluster::Find,
+            SyncCluster::Update,
+            SyncCluster::Create
         end
       end
     end

data/app/interactors/foreman_netbox/sync_host/sync_virtual_machine/sync_cluster/sync_cluster_type/organizer.rb

@@ -13,7 +13,7 @@ module ForemanNetbox
             end
 
             organize SyncClusterType::Find,
-                     SyncClusterType::Create
+              SyncClusterType::Create
           end
         end
       end

data/app/interactors/foreman_netbox/sync_host/sync_virtual_machine/sync_interfaces/find.rb

@@ -20,7 +20,7 @@ module ForemanNetbox
 
           def params
             {
-              virtual_machine_id: virtual_machine.id
+              virtual_machine_id: virtual_machine.id,
             }
           end
         end

data/app/interactors/foreman_netbox/sync_host/sync_virtual_machine/sync_interfaces/organizer.rb

@@ -12,10 +12,10 @@ module ForemanNetbox
           end
 
           organize SyncInterfaces::Find,
-                   SyncInterfaces::Delete,
-                   SyncInterfaces::Create,
-                   SyncInterfaces::SyncIpAddresses::Organizer,
-                   SyncInterfaces::Update
+            SyncInterfaces::Delete,
+            SyncInterfaces::Create,
+            SyncInterfaces::SyncIpAddresses::Organizer,
+            SyncInterfaces::Update
         end
       end
     end

data/app/interactors/foreman_netbox/sync_host/sync_virtual_machine/sync_interfaces/sync_ip_addresses/delete.rb

@@ -21,7 +21,9 @@ module ForemanNetbox
               ip_addresses_netbox_params = netbox_params.fetch(:ip_addresses, [])
 
               context.interfaces.each do |netbox_interface|
-                host_interface_ips = ip_addresses_netbox_params.select { |ip| ip.dig(:interface, :name) == netbox_interface.name }
+                host_interface_ips = ip_addresses_netbox_params.select do |ip|
+                                       ip.dig(:interface, :name) == netbox_interface.name
+                                     end
                                                                .map { |ip| ip.fetch(:address) }
 
                 context.ip_addresses

data/app/interactors/foreman_netbox/sync_host/sync_virtual_machine/sync_interfaces/sync_ip_addresses/find.rb

@@ -17,7 +17,7 @@ module ForemanNetbox
 
             def params
               {
-                virtual_machine_id: context.virtual_machine.id
+                virtual_machine_id: context.virtual_machine.id,
               }
             end
           end

data/app/interactors/foreman_netbox/sync_host/sync_virtual_machine/sync_interfaces/sync_ip_addresses/organizer.rb

@@ -13,9 +13,9 @@ module ForemanNetbox
             end
 
             organize SyncIpAddresses::Find,
-                     SyncIpAddresses::Delete,
-                     SyncIpAddresses::Update,
-                     SyncIpAddresses::Create
+              SyncIpAddresses::Delete,
+              SyncIpAddresses::Update,
+              SyncIpAddresses::Create
           end
         end
       end

data/app/interactors/foreman_netbox/sync_host/sync_virtual_machine/sync_interfaces/update.rb

@@ -22,7 +22,9 @@ module ForemanNetbox
 
             return unless new_params
 
-            netbox_interface.mac_address = new_params[:mac_address] if netbox_interface.mac_address != new_params[:mac_address]
+            if netbox_interface.mac_address != new_params[:mac_address]
+              netbox_interface.mac_address = new_params[:mac_address]
+            end
             assign_tags_to(netbox_interface)
 
             netbox_interface.save

data/app/models/orchestration/netbox.rb

@@ -23,8 +23,7 @@ module Orchestration
       ::Foreman::Logging.logger('foreman_netbox/import')
                         .info("Queued import of #{name} to Netbox. Changes that will be sent: #{netbox_params_diff}")
 
-      post_queue.create(name: _('Push host %s to Netbox') % self, priority: 100,
-                        action: [self, :set_netbox])
+      post_queue.create(name: _('Push host %s to Netbox') % self, priority: 100, action: [self, :set_netbox])
     end
 
     def queue_netbox_destroy
@@ -33,8 +32,7 @@ module Orchestration
       ::Foreman::Logging.logger('foreman_netbox/import')
                         .info("Queued delete of #{name} from Netbox.")
 
-      queue.create(name: _('Delete host %s from Netbox') % self, priority: 60,
-                   action: [self, :del_netbox])
+      queue.create(name: _('Delete host %s from Netbox') % self, priority: 60, action: [self, :del_netbox])
     end
 
     def set_netbox

data/app/services/foreman_netbox/cached_netbox_parameters.rb

@@ -25,7 +25,7 @@ module ForemanNetbox
     attr_accessor :result
 
     def read_interfaces
-      return unless data.keys.include?(:interfaces)
+      return unless data.key?(:interfaces)
 
       result[:interfaces] = data.fetch(:interfaces, {}).fetch(:results, []).map do |interface|
         interface.slice(:name, :mac_address)
@@ -35,7 +35,7 @@ module ForemanNetbox
     end
 
     def read_ip_addresses
-      return unless data.keys.include?(:ip_addresses)
+      return unless data.key?(:ip_addresses)
 
       result[:ip_addresses] = data.fetch(:ip_addresses, {}).fetch(:results, []).map do |ip_address|
         ip_address.slice(:address)
@@ -44,31 +44,31 @@ module ForemanNetbox
     end
 
     def read_virtual_machine
-      return unless data.keys.include?(:virtual_machine)
+      return unless data.key?(:virtual_machine)
 
       result[:virtual_machine] = data.fetch(:virtual_machine, {}).slice(:name, :vcpus, :memory, :disk)
     end
 
     def read_tenant
-      return unless data.keys.include?(:tenant)
+      return unless data.key?(:tenant)
 
       result[:tenant] = data.fetch(:tenant, {}).slice(:name, :slug)
     end
 
     def read_cluster
-      return unless data.keys.include?(:cluster)
+      return unless data.key?(:cluster)
 
       result[:cluster] = data.fetch(:cluster, {}).slice(:name)
     end
 
     def read_cluster_type
-      return unless data.keys.include?(:cluster_type)
+      return unless data.key?(:cluster_type)
 
       result[:cluster_type] = data.fetch(:cluster_type, {}).slice(:name, :slug)
     end
 
     def read_device
-      return unless data.keys.include?(:device)
+      return unless data.key?(:device)
 
       result[:device] = data.fetch(:device, {})
                             .slice(:name, :serial)
@@ -77,25 +77,25 @@ module ForemanNetbox
     end
 
     def read_device_role
-      return unless data.keys.include?(:device_role)
+      return unless data.key?(:device_role)
 
       result[:device_role] = data.fetch(:device_role, {}).slice(:name, :color, :slug)
     end
 
     def read_device_type
-      return unless data.keys.include?(:device_type)
+      return unless data.key?(:device_type)
 
       result[:device_type] = data.fetch(:device_type, {}).slice(:model, :slug)
     end
 
     def read_manufacturer
-      return unless data.keys.include?(:manufacturer)
+      return unless data.key?(:manufacturer)
 
       result[:manufacturer] = data.fetch(:manufacturer, {}).slice(:name, :slug)
     end
 
     def read_site
-      return unless data.keys.include?(:site)
+      return unless data.key?(:site)
 
       result[:site] = data.fetch(:site, {}).slice(:name, :slug)
     end

data/app/services/foreman_netbox/netbox_parameters.rb

@@ -6,15 +6,15 @@ module ForemanNetbox
     UNKNOWN = 'Unknown'
     DEFAULT_INTERFACE_TYPE = 'virtual'
     CLUSTER_TYPES = {
-      :'Foreman::Model::Vmware' => {
+      'Foreman::Model::Vmware': {
         name: 'VMware ESXi',
-        slug: 'vmware-esxi'
-      }
+        slug: 'vmware-esxi',
+      },
     }.freeze
     DEVICE_ROLE = {
       name: 'SERVER',
       color: '9e9e9e',
-      slug: 'server'
+      slug: 'server',
     }.freeze
 
     def self.call(host)
@@ -46,7 +46,7 @@ module ForemanNetbox
           vcpus: compute_object&.cpus,
           memory: compute_object&.memory_mb,
           disk: compute_object&.volumes&.map(&:size_gb)&.reduce(&:+),
-          cluster: compute_object&.cluster
+          cluster: compute_object&.cluster,
         }.compact
       end
     end
@@ -55,8 +55,8 @@ module ForemanNetbox
       {
         tenant: {
           name: host.owner&.netbox_tenant_name,
-          slug: host.owner&.netbox_tenant_slug
-        }
+          slug: host.owner&.netbox_tenant_slug,
+        },
       }
     end
 
@@ -64,14 +64,14 @@ module ForemanNetbox
       {
         device: {
           name: host.name,
-          serial: host.facts.deep_symbolize_keys[:serialnumber]
-        }
+          serial: host.facts.deep_symbolize_keys[:serialnumber],
+        },
       }
     end
 
     def device_role
       {
-        device_role: DEVICE_ROLE
+        device_role: DEVICE_ROLE,
       }
     end
 
@@ -81,8 +81,8 @@ module ForemanNetbox
       {
         device_type: {
           model: model,
-          slug: model.parameterize
-        }
+          slug: model.parameterize,
+        },
       }
     end
 
@@ -92,8 +92,8 @@ module ForemanNetbox
       {
         manufacturer: {
           name: name,
-          slug: cached_netbox_params.dig(:manufacturer, :slug) || name.parameterize
-        }
+          slug: cached_netbox_params.dig(:manufacturer, :slug) || name.parameterize,
+        },
       }
     end
 
@@ -101,8 +101,8 @@ module ForemanNetbox
       {
         site: {
           name: host.location&.netbox_site_name,
-          slug: host.location&.netbox_site_slug
-        }
+          slug: host.location&.netbox_site_slug,
+        },
       }
     end
 
@@ -116,10 +116,10 @@ module ForemanNetbox
             name: identifier || (mac_address && "Interface #{mac_address}"),
             mac_address: mac_address,
             type: {
-              value: DEFAULT_INTERFACE_TYPE
-            }
+              value: DEFAULT_INTERFACE_TYPE,
+            },
           }
-        end
+        end,
       }
     end
 
@@ -129,7 +129,7 @@ module ForemanNetbox
         ip_addresses: host.interfaces.map do |interface|
           [
             interface.ip && interface.subnet && "#{interface.ip}/#{interface.subnet.cidr}",
-            interface.ip6 && interface.subnet6 && "#{interface.ip6}/#{interface.subnet6.cidr}"
+            interface.ip6 && interface.subnet6 && "#{interface.ip6}/#{interface.subnet6.cidr}",
           ].compact.map do |ip_address|
             identifier = interface.identifier.present? && interface.identifier
             mac_address = interface.mac&.upcase
@@ -137,11 +137,11 @@ module ForemanNetbox
             {
               address: ip_address,
               interface: {
-                name: identifier || (mac_address && "Interface #{mac_address}")
-              }
+                name: identifier || (mac_address && "Interface #{mac_address}"),
+              },
             }
           end
-        end.flatten
+        end.flatten,
       }
     end
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
@@ -152,15 +152,15 @@ module ForemanNetbox
           :vcpus, :memory, :disk
         ).merge(
           name: host.name
-        )
+        ),
       }
     end
 
     def cluster
       {
         cluster: {
-          name: netbox_compute_attributes[:cluster]
-        }.compact
+          name: netbox_compute_attributes[:cluster],
+        }.compact,
       }
     end
 
@@ -168,7 +168,7 @@ module ForemanNetbox
       type = host.compute_resource&.type&.to_sym
 
       {
-        cluster_type: CLUSTER_TYPES.fetch(type, nil)
+        cluster_type: CLUSTER_TYPES.fetch(type, nil),
       }
     end
   end