foreman_netbox 1.1.0 → 1.2.0

data/test/interactors/foreman_netbox/sync_host/sync_virtual_machine/sync_interfaces/sync_ip_addresses/update_test.rb

@@ -17,13 +17,13 @@ class UpdateVirtualMachineIpAddressesTest < ActiveSupport::TestCase
       {
         id: 1,
         address: host.netbox_facet.netbox_params[:ip_addresses].first[:address],
-        tags: default_tags.map { |t| { id: t.id, name: t.name, slug: t.slug } }
+        tags: default_tags.map { |t| { id: t.id, name: t.name, slug: t.slug } },
       },
       {
         id: 2,
         address: host.netbox_facet.netbox_params[:ip_addresses].second[:address],
-        tags: []
-      }
+        tags: [],
+      },
     ]
   end
   let(:host) do
@@ -37,7 +37,7 @@ class UpdateVirtualMachineIpAddressesTest < ActiveSupport::TestCase
           ip6: '1600:0:2d0:202::17',
           subnet: FactoryBot.build_stubbed(:subnet_ipv4, organizations: [], locations: []),
           subnet6: FactoryBot.build_stubbed(:subnet_ipv6, organizations: [], locations: [])
-        )
+        ),
       ]
     )
   end
@@ -50,7 +50,7 @@ class UpdateVirtualMachineIpAddressesTest < ActiveSupport::TestCase
       status: 200, headers: { 'Content-Type': 'application/json' },
       body: {
         count: ip_addresses_data.count,
-        results: ip_addresses_data
+        results: ip_addresses_data,
       }.to_json
     )
   end
@@ -59,7 +59,7 @@ class UpdateVirtualMachineIpAddressesTest < ActiveSupport::TestCase
     stub_unexpected_patch = stub_request(:patch, "#{Setting[:netbox_url]}/api/ipam/ip-addresses/#{ip_addresses_data.first[:id]}.json")
     stub_expected_patch = stub_request(:patch, "#{Setting[:netbox_url]}/api/ipam/ip-addresses/#{ip_addresses_data.second[:id]}.json").with(
       body: {
-        tags: default_tags.map(&:id)
+        tags: default_tags.map(&:id),
       }.to_json
     ).to_return(
       status: 200, headers: { 'Content-Type': 'application/json' },

data/test/interactors/foreman_netbox/sync_host/sync_virtual_machine/sync_interfaces/update_test.rb

@@ -18,7 +18,7 @@ class UpdateVirtualMachineInterfacesTest < ActiveSupport::TestCase
     FactoryBot.build_stubbed(
       :host,
       interfaces: [
-        FactoryBot.build_stubbed(:nic_base, mac: old_mac)
+        FactoryBot.build_stubbed(:nic_base, mac: old_mac),
       ]
     )
   end
@@ -42,15 +42,15 @@ class UpdateVirtualMachineInterfacesTest < ActiveSupport::TestCase
               id: 1,
               name: host.interfaces.first.netbox_name,
               mac_address: new_mac,
-              tags: []
-            }
-          ]
+              tags: [],
+            },
+          ],
         }.to_json
       )
       stub_patch = stub_request(:patch, "#{Setting[:netbox_url]}/api/virtualization/interfaces/1.json").with(
         body: {
           mac_address: host.interfaces.first.mac.upcase,
-          tags: default_tags.map(&:id)
+          tags: default_tags.map(&:id),
         }.to_json
       ).to_return(
         status: 200, headers: { 'Content-Type': 'application/json' },
@@ -78,9 +78,9 @@ class UpdateVirtualMachineInterfacesTest < ActiveSupport::TestCase
               mac_address: old_mac,
               tags: default_tags.map do |tag|
                 { id: tag.id }
-              end
-            }
-          ]
+              end,
+            },
+          ],
         }.to_json
       )
       stub_patch = stub_request(:patch, "#{Setting[:netbox_url]}/api/virtualization/interfaces/1.json")

data/test/interactors/foreman_netbox/sync_host/sync_virtual_machine/update_test.rb

@@ -30,14 +30,14 @@ class UpdateVirtualMachineTest < ActiveSupport::TestCase
           'primary_ip4' => {
             'id' => 1,
             'family' => 4,
-            'address' => '10.0.0.1/24'
+            'address' => '10.0.0.1/24',
           },
           'primary_ip6' => {
             'id' => 2,
             'family' => 6,
-            'address' => '1600:0:2d0:201::18/64'
+            'address' => '1600:0:2d0:201::18/64',
           },
-          'tags' => virtual_machine_tags
+          'tags' => virtual_machine_tags,
         }
       )
     end
@@ -78,7 +78,7 @@ class UpdateVirtualMachineTest < ActiveSupport::TestCase
           cpus: virtual_machine_data[:vcpus],
           memory_mb: virtual_machine_data[:memory],
           volumes: [
-            OpenStruct.new(size_gb: virtual_machine_data[:disk])
+            OpenStruct.new(size_gb: virtual_machine_data[:disk]),
           ]
         )
       )
@@ -95,8 +95,8 @@ class UpdateVirtualMachineTest < ActiveSupport::TestCase
         count: 2,
         results: [
           { id: primary_ip4.id, address: primary_ip4.address.address },
-          { id: primary_ip6.id, address: primary_ip6.address.address }
-        ]
+          { id: primary_ip6.id, address: primary_ip6.address.address },
+        ],
       }.to_json
     )
   end
@@ -142,7 +142,7 @@ class UpdateVirtualMachineTest < ActiveSupport::TestCase
             cpus: 4,
             memory_mb: 256,
             volumes: [
-              OpenStruct.new(size_gb: 1024)
+              OpenStruct.new(size_gb: 1024),
             ]
           )
         )
@@ -160,7 +160,7 @@ class UpdateVirtualMachineTest < ActiveSupport::TestCase
           primary_ip6: primary_ip6.id,
           tenant: tenant.id,
           vcpus: host.compute_object.cpus,
-          tags: virtual_machine_tags.map { |t| t['id'] } | default_tags.map(&:id)
+          tags: virtual_machine_tags.map { |t| t['id'] } | default_tags.map(&:id),
         }.to_json
       ).to_return(
         status: 200, headers: { 'Content-Type': 'application/json' },

data/test/models/foreman_netbox/netbox_facet_test.rb

@@ -152,7 +152,7 @@ module ForemanNetbox
                 memory_mb: memory,
                 volumes: [
                   OpenStruct.new(size_gb: disk / 2),
-                  OpenStruct.new(size_gb: disk / 2)
+                  OpenStruct.new(size_gb: disk / 2),
                 ]
               )
             )

data/test/models/foreman_netbox/nics/base_test.rb

@@ -73,7 +73,7 @@ module ForemanNetbox
         context 'without ip and ip6' do
           let(:nic) { FactoryBot.build_stubbed(:nic_base) }
 
-          it { assert_equal [], nic.netbox_ips }
+          it { assert_empty nic.netbox_ips }
         end
       end
     end

data/test/services/foreman_netbox/netbox_attributes_test.rb

@@ -16,7 +16,7 @@ module ForemanNetbox
       let(:expected) do
         {
           name: 'Tenant Name',
-          slug: 'tenant-name'
+          slug: 'tenant-name',
         }
       end
 
@@ -33,7 +33,7 @@ module ForemanNetbox
       let(:expected) do
         {
           name: 'device_name',
-          serial: 'abc123'
+          serial: 'abc123',
         }
       end
 
@@ -62,7 +62,7 @@ module ForemanNetbox
       let(:expected) do
         {
           model: 'Product Name',
-          slug: 'product-name'
+          slug: 'product-name',
         }
       end
 
@@ -74,7 +74,7 @@ module ForemanNetbox
         let(:expected) do
           {
             model: 'Unknown',
-            slug: 'unknown'
+            slug: 'unknown',
           }
         end
 
@@ -120,7 +120,7 @@ module ForemanNetbox
       let(:expected) do
         {
           name: 'Site Name',
-          slug: 'site-name'
+          slug: 'site-name',
         }
       end
 
@@ -137,7 +137,7 @@ module ForemanNetbox
               :nic_base,
               identifier: expected.first[:name],
               mac: expected.first[:mac_address]
-            )
+            ),
           ]
         )
       end
@@ -147,8 +147,8 @@ module ForemanNetbox
           name: 'eth1',
           mac_address: 'FE:13:C6:44:29:24',
           type: {
-            value: 'virtual'
-          }
+            value: 'virtual',
+          },
         ]
       end
 
@@ -178,7 +178,7 @@ module ForemanNetbox
                 :subnet_ipv6,
                 cidr: expected.second[:address].split('/').second
               )
-            )
+            ),
           ]
         )
       end
@@ -188,15 +188,15 @@ module ForemanNetbox
           {
             address: '10.0.0.1/24',
             interface: {
-              name: 'eth1'
-            }
+              name: 'eth1',
+            },
           },
           {
             address: '1500:0:2d0:201::1/64',
             interface: {
-              name: 'eth2'
-            }
-          }
+              name: 'eth2',
+            },
+          },
         ]
       end
 
@@ -213,7 +213,7 @@ module ForemanNetbox
               memory_mb: expected[:memory],
               volumes: [
                 OpenStruct.new(size_gb: expected[:disk] / 2),
-                OpenStruct.new(size_gb: expected[:disk] / 2)
+                OpenStruct.new(size_gb: expected[:disk] / 2),
               ]
             )
           )
@@ -225,7 +225,7 @@ module ForemanNetbox
           name: 'virtual_machine_name',
           vcpus: 2,
           memory: 128,
-          disk: 20
+          disk: 20,
         }
       end
 

data/test/services/foreman_netbox/netbox_parameters_comparator_test.rb

@@ -10,8 +10,8 @@ module ForemanNetbox
       let(:my_hash) do
         {
           device: {
-            name: 'My device'
-          }
+            name: 'My device',
+          },
         }
       end
       let(:old_hash) { my_hash }
@@ -25,82 +25,82 @@ module ForemanNetbox
       let(:old_hash) do
         {
           device: {
-            name: 'Old name'
+            name: 'Old name',
           },
           device_role: {
-            name: 'SERVER'
+            name: 'SERVER',
           },
           manufacturer: {
-            name: 'Manufacturer'
+            name: 'Manufacturer',
           },
           interfaces: [
             {
               name: 'eth0',
               type: {
-                value: 'virtual'
-              }
+                value: 'virtual',
+              },
             },
             {
               name: 'eth1',
               type: {
-                value: 'virtual'
-              }
+                value: 'virtual',
+              },
             },
             {
               name: 'eth2',
               type: {
-                value: 'virtual'
-              }
+                value: 'virtual',
+              },
             },
             {
               name: 'eth4',
               mac_address: '00:50:56:84:6D:84',
               type: {
-                value: 'virtual'
-              }
-            }
-          ]
+                value: 'virtual',
+              },
+            },
+          ],
         }
       end
 
       let(:new_hash) do
         {
           device: {
-            name: 'New name'
+            name: 'New name',
           },
           device_type: {
-            model: 'Model name'
+            model: 'Model name',
           },
           manufacturer: {
-            name: 'Manufacturer'
+            name: 'Manufacturer',
           },
           interfaces: [
             {
               name: 'eth0',
               type: {
-                value: 'virtual'
-              }
+                value: 'virtual',
+              },
             },
             {
               name: 'eth1',
               type: {
-                value: 'new_type'
-              }
+                value: 'new_type',
+              },
             },
             {
               name: 'eth3',
               type: {
-                value: 'virtual'
-              }
+                value: 'virtual',
+              },
             },
             {
               name: 'eth4',
               mac_address: '00:50:56:84:6D:84',
               type: {
-                value: 'virtual'
-              }
-            }
-          ]
+                value: 'virtual',
+              },
+            },
+          ],
         }
       end
 
@@ -111,12 +111,12 @@ module ForemanNetbox
           device: {
             name: {
               old: old_hash.dig(:device, :name), new: new_hash.dig(:device, :name)
-            }
+            },
           },
           interfaces: {
             added: new_hash[:interfaces].select { |i| %w[eth1 eth3].include?(i[:name]) },
-            removed: old_hash[:interfaces].select { |i| %w[eth1 eth2].include?(i[:name]) }
-          }
+            removed: old_hash[:interfaces].select { |i| %w[eth1 eth2].include?(i[:name]) },
+          },
         }
       end
 

data/test/test_plugin_helper.rb

@@ -10,15 +10,10 @@ FactoryBot.definition_file_paths << File.join(File.dirname(__FILE__), 'factories
 FactoryBot.reload
 
 def setup_default_netbox_settings(netbox_url: 'https://netbox.example.com', netbox_api_token: 'api_key')
-  if Gem::Version.new(SETTINGS[:version].notag) < Gem::Version.new('2.6')
-    FactoryBot.create(:setting, name: 'netbox_url', value: netbox_url, category: 'Setting::Netbox')
-    FactoryBot.create(:setting, name: 'netbox_api_token', value: netbox_api_token, category: 'Setting::Netbox')
-    FactoryBot.create(:setting, name: 'netbox_orchestration_enabled', value: true, category: 'Setting::Netbox')
-  else
-    Setting[:netbox_url] = netbox_url
-    Setting[:netbox_api_token] = netbox_api_token
-    Setting[:netbox_orchestration_enabled] = true
-  end
+  Setting[:netbox_url] = netbox_url
+  Setting[:netbox_api_token] = netbox_api_token
+  Setting[:netbox_orchestration_enabled] = true
+  Setting[:netbox_skip_site_update] = false
 end
 
 def setup_netbox_integration_test