foreman_fog_proxmox 0.8.0 → 0.8.2

data/test/factories/proxmox_factory.rb

@@ -20,29 +20,29 @@
 require 'fog/compute/proxmox/models/node'
 
 FactoryBot.define do
-  
   factory :proxmox_resource, :class => ComputeResource do
     sequence(:name) { |n| "compute_resource#{n}" }
+    organizations { [Organization.find_by(name: 'Organization 1')] }
+    locations { [Location.find_by(name: 'Location 1')] }
 
     trait :proxmox do
-      provider 'Proxmox'
-      user 'root@pam'
-      password 'proxmox01'
-      url 'https://192.168.56.101:8006/api2/json'
-      node_id 'pve'
+      provider { 'Proxmox' }
+      user { 'root@pam' }
+      password { 'proxmox01' }
+      url { 'https://192.168.56.101:8006/api2/json' }
+      node_id { 'pve' }
     end
 
     factory :proxmox_cr, :class => ForemanFogProxmox::Proxmox, :traits => [:proxmox]
-
   end
 
   factory :node, :class => Fog::Proxmox::Compute::Node do
     sequence(:identity) { |n| "node#{n}" }
     trait :pve do
-      identity 'pve'
+      identity { 'pve' }
     end
     trait :service do
-      service :proxmox_cr
+      service { :proxmox_cr }
     end
     factory :pve_node, :class => Fog::Proxmox::Compute::Node, :traits => [:pve, :service]
   end
@@ -50,22 +50,23 @@ FactoryBot.define do
   def deferred_nic_attrs
     [:ip, :ip6, :mac, :subnet, :domain]
   end
-  
+
   def set_nic_attributes(host, attributes, evaluator)
     attributes.each do |nic_attribute|
-      next unless evaluator.send(nic_attribute).present?
+      next if evaluator.send(nic_attribute).blank?
+
       host.primary_interface.send(:"#{nic_attribute}=", evaluator.send(nic_attribute))
     end
     host
   end
 
   factory :nic_base_empty, :class => Nic::Base do
-    type 'Nic::Base'
+    type { 'Nic::Base' }
   end
 
   factory :nic_managed_empty, :class => Nic::Managed, :parent => :nic_base_empty do
-    type 'Nic::Managed'
-    identifier 'net0'  
+    type { 'Nic::Managed' }
+    identifier { 'net0' }
   end
 
   factory :host_empty, :class => Host do
@@ -76,5 +77,4 @@ FactoryBot.define do
     end
     compute_attributes { { 'type' => 'qemu' } }
   end
-
 end

data/test/functional/compute_resources_controller_test.rb

@@ -18,17 +18,19 @@
 # along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>.
 require 'test_plugin_helper'
 
-class ::ForemanFogProxmox::ComputeResourcesControllerTest < ActionController::TestCase
+module ForemanFogProxmox
+  class ComputeResourcesControllerTest < ActionController::TestCase
     test 'should get isos' do
-        get :isos, params: { :storage => 'local' }
-        assert_response :found
-        show_response = @response.body
-        assert !show_response.empty?
+      get :isos, params: { :storage => 'local' }
+      assert_response :found
+      show_response = @response.body
+      assert_not show_response.empty?
     end
     test 'should get ostemplates' do
-        get :ostemplates, params: { :storage => 'local' }
-        assert_response :found
-        show_response = @response.body
-        assert !show_response.empty?
+      get :ostemplates, params: { :storage => 'local' }
+      assert_response :found
+      show_response = @response.body
+      assert_not show_response.empty?
     end
-end
+  end
+end

data/test/test_plugin_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # This calls the main test_helper in Foreman-core
 
 require 'simplecov'

data/test/unit/foreman_fog_proxmox/helpers/proxmox_container_helper_test.rb

@@ -20,189 +20,185 @@
 require 'test_plugin_helper'
 
 module ForemanFogProxmox
-class ProxmoxContainerHelperTest < ActiveSupport::TestCase
-  include ProxmoxContainerHelper
-  include ProxmoxVmHelper
-
-  describe 'parse' do
-
-    setup { Fog.mock! }
-    teardown { Fog.unmock! }
-
-    let(:host) do 
-      { 'vmid' => '100', 
-        'name' =>  'test', 
-        'type' =>  'lxc', 
-        'node_id' => 'pve',
-        'ostemplate_storage' => 'local',
-        'ostemplate_file' => 'local:vztmpl/alpine-3.7-default_20171211_amd64.tar.xz',
-        'password' => 'proxmox01',
-        'config_attributes' => { 
-          'onboot' => '0', 
-          'description' => '', 
-          'memory' => '536870912', 
-          'swap' => '536870912',
+  class ProxmoxContainerHelperTest < ActiveSupport::TestCase
+    include ProxmoxContainerHelper
+    include ProxmoxVmHelper
+
+    describe 'parse' do
+      setup { Fog.mock! }
+      teardown { Fog.unmock! }
+
+      let(:host) do
+        { 'vmid' => '100',
+          'name' => 'test',
+          'type' => 'lxc',
+          'node_id' => 'pve',
+          'ostemplate_storage' => 'local',
+          'ostemplate_file' => 'local:vztmpl/alpine-3.7-default_20171211_amd64.tar.xz',
+          'password' => 'proxmox01',
+          'config_attributes' => {
+            'onboot' => '0',
+            'description' => '',
+            'memory' => '536870912',
+            'swap' => '536870912',
+            'cores' => '1',
+            'cpulimit' => '',
+            'cpuunits' => '',
+            'arch' => 'amd64',
+            'ostype' => 'debian',
+            'hostname' => '',
+            'nameserver' => '',
+            'searchdomain' => ''
+
+          },
+          'volumes_attributes' => {
+            '0' => { 'id' => 'rootfs', 'storage' => 'local-lvm', 'size' => '1073741824', 'cache' => '' },
+            '1' => { 'id' => 'mp0', 'storage' => 'local-lvm', 'size' => '1073741824', 'mp' => '/opt/path' }
+          },
+          'interfaces_attributes' => {
+            '0' => { 'id' => 'net0', 'name' => 'eth0', 'bridge' => 'vmbr0', 'ip' => 'dhcp', 'ip6' => 'dhcp', 'rate' => '' },
+            '1' => { 'id' => 'net1', 'name' => 'eth1', 'bridge' => 'vmbr0', 'ip' => 'dhcp', 'ip6' => 'dhcp' }
+          } }
+      end
+
+      let(:container) do
+        { 'vmid' => '100',
+          :vmid => '100',
+          'name' => 'test',
+          'type' => 'lxc',
+          :type => 'lxc',
+          'node_id' => 'pve',
+          :node_id => 'pve',
+          :memory => 536_870_912,
+          'templated' => 0,
+          :onboot => 0,
+          :swap => 536_870_912,
           'cores' => '1',
-          'cpulimit' => '',
-          'cpuunits' => '',
-          'arch' => 'amd64',
-          'ostype' => 'debian',
-          'hostname' => '',
-          'nameserver' => '',
-          'searchdomain' => '',
-          
-        },
-        'volumes_attributes' => {
-          '0'=> { 'id' => 'rootfs', 'storage' => 'local-lvm', 'size' => '1073741824', 'cache' => '' },
-          '1'=> { 'id' => 'mp0', 'storage' => 'local-lvm', 'size' => '1073741824', 'mp' => '/opt/path' }
-        }, 
-        'interfaces_attributes' => { 
-          '0' => { 'id' => 'net0', 'name' => 'eth0', 'bridge' => 'vmbr0', 'ip' => 'dhcp', 'ip6' => 'dhcp', 'rate' => '' },
-          '1' => { 'id' => 'net1', 'name' => 'eth1', 'bridge' => 'vmbr0', 'ip' => 'dhcp', 'ip6' => 'dhcp' } 
-        } 
-      }
+          :arch => 'amd64',
+          :ostype => 'debian',
+          'ostemplate' => 'local:vztmpl/alpine-3.7-default_20171211_amd64.tar.xz',
+          'ostemplate_storage' => 'local',
+          'ostemplate_file' => 'local:vztmpl/alpine-3.7-default_20171211_amd64.tar.xz',
+          'password' => 'proxmox01',
+          :rootfs => 'local-lvm:1073741824',
+          :mp0 => 'local-lvm:1073741824,mp=/opt/path',
+          'net0' => 'name=eth0,bridge=vmbr0,ip=dhcp,ip6=dhcp',
+          'net1' => 'model=eth1,bridge=vmbr0,ip=dhcp,ip6=dhcp' }
+      end
+
+      let(:host_delete) do
+        { 'vmid' => '100',
+          'name' => 'test',
+          'type' => 'lxc',
+          'node_id' => 'pve',
+          'volumes_attributes' => { '0' => { '_delete' => '1', 'device' => '0', 'storage' => 'local-lvm', 'size' => '1073741824', 'mp' => '/opt/path' } },
+          'interfaces_attributes' => { '0' => { '_delete' => '1', 'id' => 'net0', 'name' => 'eth0' } } }
+      end
+
+      test '#memory' do
+        memory = parse_container_memory(host['config_attributes'])
+        assert memory.key?(:memory)
+        assert_equal 536_870_912, memory[:memory]
+        assert memory.key?(:swap)
+        assert_equal 536_870_912, memory[:swap]
+      end
+
+      test '#cpu' do
+        cpu = parse_container_cpu(host['config_attributes'])
+        assert cpu.key?(:cores)
+        assert_equal 1, cpu[:cores]
+        assert cpu.key?(:arch)
+        assert_equal 'amd64', cpu[:arch]
+      end
+
+      test '#ostemplate' do
+        ostemplate = parse_container_ostemplate(host)
+        expected_ostemplate = {
+          :ostemplate => 'local:vztmpl/alpine-3.7-default_20171211_amd64.tar.xz',
+          :ostemplate_storage => 'local',
+          :ostemplate_file => 'local:vztmpl/alpine-3.7-default_20171211_amd64.tar.xz'
+        }
+        assert_equal expected_ostemplate, ostemplate
+      end
+
+      test '#vm host' do
+        vm = parse_container_vm(host)
+        assert_equal 536_870_912, vm[:memory]
+        assert_equal 'local-lvm:1073741824', vm[:rootfs]
+        assert_equal 'name=eth0,bridge=vmbr0,ip=dhcp,ip6=dhcp', vm[:net0]
+        assert_not vm.key?(:config)
+        assert_not vm.key?(:node)
+        assert_not vm.key?(:type)
+      end
+
+      test '#vm container' do
+        vm = parse_container_vm(host)
+        expected_vm = ActiveSupport::HashWithIndifferentAccess.new(
+          :vmid => '100',
+          :password => 'proxmox01',
+          :onboot => '0',
+          :ostype => 'debian',
+          :arch => 'amd64',
+          :cores => 1,
+          :memory => 536_870_912,
+          :swap => 536_870_912,
+          :ostemplate => 'local:vztmpl/alpine-3.7-default_20171211_amd64.tar.xz',
+          :ostemplate_file => 'local:vztmpl/alpine-3.7-default_20171211_amd64.tar.xz',
+          :ostemplate_storage => 'local',
+          :net0 => 'name=eth0,bridge=vmbr0,ip=dhcp,ip6=dhcp',
+          :net1 => 'name=eth1,bridge=vmbr0,ip=dhcp,ip6=dhcp',
+          :rootfs => 'local-lvm:1073741824',
+          :mp0 => 'local-lvm:1073741824,mp=/opt/path'
+        )
+        assert_equal expected_vm, vm
+      end
+
+      test '#volume with rootfs 1Gb' do
+        volumes = parse_container_volumes(host['volumes_attributes'])
+        assert_not volumes.empty?
+        assert_equal 2, volumes.size
+        assert rootfs = volumes.first
+        assert rootfs.key?(:rootfs)
+        assert_equal 'local-lvm:1073741824', rootfs[:rootfs]
+        assert mp0 = volumes[1]
+        assert mp0.key?(:mp0)
+        assert_equal 'local-lvm:1073741824,mp=/opt/path', mp0[:mp0]
+      end
+
+      test '#interface with name eth0 and bridge' do
+        deletes = []
+        nics = []
+        add_container_interface(host['interfaces_attributes']['0'], deletes, nics)
+        assert 1, nics.length
+        assert nics[0].key?(:net0)
+        assert_equal 'name=eth0,bridge=vmbr0,ip=dhcp,ip6=dhcp', nics[0][:net0]
+      end
+
+      test '#interface with name eth1 and bridge' do
+        deletes = []
+        nics = []
+        add_container_interface(host['interfaces_attributes']['1'], deletes, nics)
+        assert 1, nics.length
+        assert nics[0].key?(:net1)
+        assert_equal 'name=eth1,bridge=vmbr0,ip=dhcp,ip6=dhcp', nics[0][:net1]
+      end
+
+      test '#interface delete net0' do
+        deletes = []
+        nics = []
+        add_container_interface(host_delete['interfaces_attributes']['0'], deletes, nics)
+        assert nics.empty?
+        assert_equal 1, deletes.length
+        assert_equal 'net0', deletes[0]
+      end
+
+      test '#interfaces' do
+        interfaces_to_add, interfaces_to_delete = parse_container_interfaces(host['interfaces_attributes'])
+        assert interfaces_to_delete.empty?
+        assert_equal 2, interfaces_to_add.length
+        assert interfaces_to_add.include?(net0: 'name=eth0,bridge=vmbr0,ip=dhcp,ip6=dhcp')
+        assert interfaces_to_add.include?(net1: 'name=eth1,bridge=vmbr0,ip=dhcp,ip6=dhcp')
+      end
     end
-
-    let(:container) do 
-      { 'vmid' => '100',
-        :vmid => '100',  
-        'name' =>  'test', 
-        'type' =>  'lxc', 
-        :type =>  'lxc', 
-        'node_id' => 'pve',
-        :node_id => 'pve',
-        :memory => 536870912, 
-        'templated' => 0, 
-        :onboot => 0,
-        :swap => 536870912,
-        'cores' => '1',
-        :arch => 'amd64',
-        :ostype => 'debian',
-        'ostemplate' => 'local:vztmpl/alpine-3.7-default_20171211_amd64.tar.xz',
-        'ostemplate_storage' => 'local',
-        'ostemplate_file' => 'local:vztmpl/alpine-3.7-default_20171211_amd64.tar.xz',
-        'password' => 'proxmox01',
-        :rootfs => 'local-lvm:1073741824',
-        :mp0 => 'local-lvm:1073741824,mp=/opt/path',
-        'net0' => 'name=eth0,bridge=vmbr0,ip=dhcp,ip6=dhcp',
-        'net1' => 'model=eth1,bridge=vmbr0,ip=dhcp,ip6=dhcp'
-      }
-    end
-
-    let(:host_delete) do 
-      { 'vmid' => '100', 
-        'name' =>  'test', 
-        'type' =>  'lxc', 
-        'node_id' => 'pve',
-        'volumes_attributes' => { '0' => { '_delete' => '1', 'device' => '0', 'storage' => 'local-lvm', 'size' => '1073741824', 'mp' => '/opt/path' }}, 
-        'interfaces_attributes' => { '0' => { '_delete' => '1', 'id' => 'net0', 'name' => 'eth0' } } 
-      }
-    end
-
-    test '#memory' do       
-      memory = parse_container_memory(host['config_attributes'])
-      assert memory.has_key?(:memory)
-      assert_equal 536870912, memory[:memory]
-      assert memory.has_key?(:swap)
-      assert_equal 536870912, memory[:swap]
-    end   
-
-    test '#cpu' do       
-      cpu = parse_container_cpu(host['config_attributes'])
-      assert cpu.has_key?(:cores)
-      assert_equal 1, cpu[:cores]
-      assert cpu.has_key?(:arch)
-      assert_equal 'amd64', cpu[:arch]
-    end    
-
-    test '#ostemplate' do       
-      ostemplate = parse_container_ostemplate(host)
-      expected_ostemplate = { 
-        :ostemplate =>  'local:vztmpl/alpine-3.7-default_20171211_amd64.tar.xz',
-        :ostemplate_storage =>  'local',
-        :ostemplate_file =>  'local:vztmpl/alpine-3.7-default_20171211_amd64.tar.xz'
-       }
-      assert_equal expected_ostemplate, ostemplate
-    end   
-
-    test '#vm host' do       
-      vm = parse_container_vm(host)
-      assert_equal 536870912, vm[:memory]
-      assert_equal 'local-lvm:1073741824', vm[:rootfs]
-      assert_equal 'name=eth0,bridge=vmbr0,ip=dhcp,ip6=dhcp', vm[:net0]
-      assert !vm.has_key?(:config)
-      assert !vm.has_key?(:node)
-      assert !vm.has_key?(:type)
-    end   
-
-    test '#vm container' do       
-      vm = parse_container_vm(host)
-      expected_vm = ActiveSupport::HashWithIndifferentAccess.new( 
-        :vmid => '100', 
-        :password => 'proxmox01', 
-        :onboot => '0', 
-        :ostype => 'debian', 
-        :arch => 'amd64', 
-        :cores => 1, 
-        :memory => 536870912, 
-        :swap => 536870912, 
-        :ostemplate => 'local:vztmpl/alpine-3.7-default_20171211_amd64.tar.xz',
-        :ostemplate_file => 'local:vztmpl/alpine-3.7-default_20171211_amd64.tar.xz',
-        :ostemplate_storage => 'local',
-        :net0 => 'name=eth0,bridge=vmbr0,ip=dhcp,ip6=dhcp',
-        :net1 => 'name=eth1,bridge=vmbr0,ip=dhcp,ip6=dhcp',
-        :rootfs => 'local-lvm:1073741824', 
-        :mp0 => 'local-lvm:1073741824,mp=/opt/path' )
-      assert_equal expected_vm, vm
-    end   
-
-    test '#volume with rootfs 1Gb' do       
-      volumes = parse_container_volumes(host['volumes_attributes'])
-      assert !volumes.empty?
-      assert_equal 2, volumes.size
-      assert rootfs = volumes.first
-      assert rootfs.has_key?(:rootfs)
-      assert_equal 'local-lvm:1073741824', rootfs[:rootfs]
-      assert mp0 = volumes[1]
-      assert mp0.has_key?(:mp0)
-      assert_equal 'local-lvm:1073741824,mp=/opt/path', mp0[:mp0]
-    end    
-    
-    test '#interface with name eth0 and bridge' do       
-      deletes = []
-      nics = []    
-      add_container_interface(host['interfaces_attributes']['0'], deletes, nics)
-      assert 1, nics.length
-      assert nics[0].has_key?(:net0)
-      assert_equal 'name=eth0,bridge=vmbr0,ip=dhcp,ip6=dhcp', nics[0][:net0]
-    end
-    
-    test '#interface with name eth1 and bridge' do          
-      deletes = []
-      nics = []    
-      add_container_interface(host['interfaces_attributes']['1'], deletes, nics)
-      assert 1, nics.length
-      assert nics[0].has_key?(:net1)
-      assert_equal 'name=eth1,bridge=vmbr0,ip=dhcp,ip6=dhcp', nics[0][:net1]
-    end
-    
-    test '#interface delete net0' do         
-      deletes = []
-      nics = []    
-      add_container_interface(host_delete['interfaces_attributes']['0'], deletes, nics)
-      assert nics.empty?
-      assert_equal 1, deletes.length
-      assert_equal 'net0', deletes[0]
-    end
-    
-    test '#interfaces' do       
-      interfaces_to_add, interfaces_to_delete = parse_container_interfaces(host['interfaces_attributes'])
-      assert interfaces_to_delete.empty?
-      assert_equal 2, interfaces_to_add.length
-      assert interfaces_to_add.include?({ net0: 'name=eth0,bridge=vmbr0,ip=dhcp,ip6=dhcp'})
-      assert interfaces_to_add.include?({ net1: 'name=eth1,bridge=vmbr0,ip=dhcp,ip6=dhcp'})
-    end
-
   end
 end
-end