foreman_fog_proxmox 0.12.2 → 0.13.3

data/test/factories/foreman_fog_proxmox/proxmox_server_mock_factory.rb

@@ -19,9 +19,8 @@
 
 module ForemanFogProxmox
   module ProxmoxServerMockFactory
-    def mock_server_vm
-      interface_attributes = {
-        id: 'net0',
+    def mock_server_interface_attributes
+      compute_attributes = {
         macaddr: '36:25:8C:53:0C:50',
         model: 'virtio',
         name: nil,
@@ -34,8 +33,19 @@ module ForemanFogProxmox
         queues: nil,
         tag: nil
       }
+      interface_attributes = {
+        id: 'net0',
+        mac: '36:25:8C:53:0C:50',
+        ip: nil,
+        ip6: nil,
+        compute_attributes: compute_attributes
+      }
+      interface_attributes
+    end
+
+    def mock_server_vm
       interface = mock('interface')
-      interface.stubs(:attributes).returns(interface_attributes)
+      interface.stubs(:attributes).returns(mock_server_interface_attributes)
       interfaces = [interface]
       volume_attributes = {
         id: 'scsi0',
@@ -94,12 +104,12 @@ module ForemanFogProxmox
       vm.stubs(:config).returns(config)
       vm.stubs(:type).returns('qemu')
       vm.stubs(:identity).returns(100)
-      vm.stubs(:node_id).returns('pve')
+      vm.stubs(:node_id).returns('proxmox')
       service = mock('service')
       vm_attributes = {
         vmid: 100,
         id: 'qemu/100',
-        node_id: 'pve',
+        node_id: 'proxmox',
         config: config,
         service: service,
         name: 'test',
@@ -128,7 +138,7 @@ module ForemanFogProxmox
       }
       vm.stubs(:attributes).returns(vm_attributes)
       vm.stubs(:container?).returns(false)
-      [vm, config_attributes, volume_attributes, interface_attributes]
+      [vm, config_attributes, volume_attributes, mock_server_interface_attributes]
     end
   end
 end

data/test/factories/proxmox_factory.rb

@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>.
 
-require 'fog/compute/proxmox/models/node'
+require 'fog/proxmox/compute/models/node'
 
 FactoryBot.define do
   factory :proxmox_resource, :class => ComputeResource do
@@ -37,13 +37,13 @@ FactoryBot.define do
 
   factory :node, :class => Fog::Proxmox::Compute::Node do
     sequence(:identity) { |n| "node#{n}" }
-    trait :pve do
-      identity { 'pve' }
+    trait :proxmox do
+      identity { 'proxmox' }
     end
     trait :service do
       service { :proxmox_cr }
     end
-    factory :pve_node, :class => Fog::Proxmox::Compute::Node, :traits => [:pve, :service]
+    factory :proxmox_node, :class => Fog::Proxmox::Compute::Node, :traits => [:proxmox, :service]
   end
 
   def deferred_nic_attrs

data/test/functional/compute_resources_controller_test.rb

@@ -21,25 +21,25 @@ require 'test_plugin_helper'
 module ForemanFogProxmox
   class ComputeResourcesControllerTest < ActionController::TestCase
     test 'should get isos by node and storage' do
-      get :isos_by_node_and_storage, params: { :node_id => 'pve', :storage => 'local' }
+      get :isos_by_id_and_node_and_storage, params: { :compute_resource_id => 1, :node_id => 'proxmox', :storage => 'local' }
       assert_response :found
       show_response = @response.body
       assert_not show_response.empty?
     end
     test 'should get ostemplates by node and storage' do
-      get :ostemplates_by_node_and_storage, params: { :node_id => 'pve', :storage => 'local' }
+      get :ostemplates_by_id_and_node_and_storage, params: { :compute_resource_id => 1, :node_id => 'proxmox', :storage => 'local' }
       assert_response :found
       show_response = @response.body
       assert_not show_response.empty?
     end
     test 'should get isos by node' do
-      get :isos_by_node, params: { :node_id => 'pve' }
+      get :isos_by_id_and_node, params: { :compute_resource_id => 1, :node_id => 'proxmox' }
       assert_response :found
       show_response = @response.body
       assert_not show_response.empty?
     end
     test 'should get ostemplates by node' do
-      get :ostemplates_by_node, params: { :node_id => 'pve' }
+      get :ostemplates_by_id_and_node, params: { :compute_resource_id => 1, :node_id => 'proxmox' }
       assert_response :found
       show_response = @response.body
       assert_not show_response.empty?

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

@@ -21,18 +21,20 @@ 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
+      let(:type) do
+        'lxc'
+      end
+
+      let(:host_form) do
         { 'vmid' => '100',
-          'name' => 'test',
           'type' => 'lxc',
-          'node_id' => 'pve',
+          'node_id' => 'proxmox',
           'ostemplate_storage' => 'local',
           'ostemplate_file' => 'local:vztmpl/alpine-3.7-default_20171211_amd64.tar.xz',
           'password' => 'proxmox01',
@@ -46,7 +48,7 @@ module ForemanFogProxmox
             'cpuunits' => '',
             'arch' => 'amd64',
             'ostype' => 'debian',
-            'hostname' => '',
+            'hostname' => 'toto-tata.pve',
             'nameserver' => '',
             'searchdomain' => ''
 
@@ -56,19 +58,40 @@ module ForemanFogProxmox
             '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' => '', 'gw' => '192.168.56.100', 'gw6' => '2001:0:1234::c1c0:abcd:876' },
-            '1' => { 'id' => 'net1', 'name' => 'eth1', 'bridge' => 'vmbr0', 'ip' => 'dhcp', 'ip6' => 'dhcp', 'gw' => '192.168.56.100', 'gw6' => '2001:0:1234::c1c0:abcd:876' }
+            '0' => {
+              'id' => 'net0',
+              'compute_attributes' => {
+                'name' => 'eth0',
+                'bridge' => 'vmbr0',
+                'ip' => 'dhcp',
+                'ip6' => 'dhcp',
+                'rate' => '',
+                'gw' => '192.168.56.100',
+                'gw6' => '2001:0:1234::c1c0:abcd:876'
+              }
+            },
+            '1' => {
+              'id' => 'net1',
+              'compute_attributes' => {
+                'name' => 'eth1',
+                'bridge' => 'vmbr0',
+                'ip' => 'dhcp',
+                'ip6' => 'dhcp',
+                'gw' => '192.168.56.100',
+                'gw6' => '2001:0:1234::c1c0:abcd:876'
+              }
+            }
           } }
       end
 
       let(:container) do
         { 'vmid' => '100',
           :vmid => '100',
-          'name' => 'test',
+          'hostname' => 'toto-tata.pve',
           'type' => 'lxc',
           :type => 'lxc',
-          'node_id' => 'pve',
-          :node_id => 'pve',
+          'node_id' => 'proxmox',
+          :node_id => 'proxmox',
           :memory => 536_870_912,
           'templated' => 0,
           :onboot => 0,
@@ -90,13 +113,13 @@ module ForemanFogProxmox
         { 'vmid' => '100',
           'name' => 'test',
           'type' => 'lxc',
-          'node_id' => 'pve',
+          'node_id' => 'proxmox',
           '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'])
+        memory = parse_typed_memory(host_form['config_attributes'], type)
         assert memory.key?(:memory)
         assert_equal 536_870_912, memory[:memory]
         assert memory.key?(:swap)
@@ -104,47 +127,45 @@ module ForemanFogProxmox
       end
 
       test '#cpu' do
-        cpu = parse_container_cpu(host['config_attributes'])
+        cpu = parse_typed_cpu(host_form['config_attributes'], type)
         assert cpu.key?(:cores)
-        assert_equal 1, cpu[:cores]
+        assert_equal '1', cpu[:cores]
         assert cpu.key?(:arch)
         assert_equal 'amd64', cpu[:arch]
       end
 
       test '#ostemplate' do
-        ostemplate = parse_container_ostemplate(host)
+        ostemplate = parse_container_ostemplate(host_form)
         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'
+          :ostemplate => '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)
+      test '#vm host_form' do
+        vm = parse_typed_vm(host_form, type)
         assert_equal 536_870_912, vm[:memory]
         assert_equal 'local-lvm:1073741824', vm[:rootfs]
         assert_equal 'name=eth0,bridge=vmbr0,ip=dhcp,ip6=dhcp,gw=192.168.56.100,gw6=2001:0:1234::c1c0:abcd:876', vm[:net0]
+        assert_equal 'toto-tata.pve', vm[:hostname]
         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)
+        vm = parse_typed_vm(host_form, type)
         expected_vm = ActiveSupport::HashWithIndifferentAccess.new(
           :vmid => '100',
           :password => 'proxmox01',
+          :ostemplate => 'local:vztmpl/alpine-3.7-default_20171211_amd64.tar.xz',
           :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',
+          :cores => '1',
+          :arch => 'amd64',
+          :ostype => 'debian',
+          :hostname => 'toto-tata.pve',
           :net0 => 'name=eth0,bridge=vmbr0,ip=dhcp,ip6=dhcp,gw=192.168.56.100,gw6=2001:0:1234::c1c0:abcd:876',
           :net1 => 'name=eth1,bridge=vmbr0,ip=dhcp,ip6=dhcp,gw=192.168.56.100,gw6=2001:0:1234::c1c0:abcd:876',
           :rootfs => 'local-lvm:1073741824',
@@ -154,7 +175,7 @@ module ForemanFogProxmox
       end
 
       test '#volume with rootfs 1Gb' do
-        volumes = parse_container_volumes(host['volumes_attributes'])
+        volumes = parse_typed_volumes(host_form['volumes_attributes'], type)
         assert_not volumes.empty?
         assert_equal 2, volumes.size
         assert rootfs = volumes.first
@@ -168,7 +189,7 @@ module ForemanFogProxmox
       test '#interface with name eth0 and bridge' do
         deletes = []
         nics = []
-        add_container_interface(host['interfaces_attributes']['0'], deletes, nics)
+        add_or_delete_typed_interface(host_form['interfaces_attributes']['0'], deletes, nics, type)
         assert 1, nics.length
         assert nics[0].key?(:net0)
         assert_equal 'name=eth0,bridge=vmbr0,ip=dhcp,ip6=dhcp,gw=192.168.56.100,gw6=2001:0:1234::c1c0:abcd:876', nics[0][:net0]
@@ -177,7 +198,7 @@ module ForemanFogProxmox
       test '#interface with name eth1 and bridge' do
         deletes = []
         nics = []
-        add_container_interface(host['interfaces_attributes']['1'], deletes, nics)
+        add_or_delete_typed_interface(host_form['interfaces_attributes']['1'], deletes, nics, type)
         assert 1, nics.length
         assert nics[0].key?(:net1)
         assert_equal 'name=eth1,bridge=vmbr0,ip=dhcp,ip6=dhcp,gw=192.168.56.100,gw6=2001:0:1234::c1c0:abcd:876', nics[0][:net1]
@@ -186,14 +207,14 @@ module ForemanFogProxmox
       test '#interface delete net0' do
         deletes = []
         nics = []
-        add_container_interface(host_delete['interfaces_attributes']['0'], deletes, nics)
+        add_or_delete_typed_interface(host_delete['interfaces_attributes']['0'], deletes, nics, type)
         assert_empty nics
         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'])
+        interfaces_to_add, interfaces_to_delete = parse_typed_interfaces(host_form, type)
         assert_empty interfaces_to_delete
         assert_equal 2, interfaces_to_add.length
         assert_includes interfaces_to_add, { net0: 'name=eth0,bridge=vmbr0,ip=dhcp,ip6=dhcp,gw=192.168.56.100,gw6=2001:0:1234::c1c0:abcd:876' }

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

@@ -21,63 +21,89 @@ require 'test_plugin_helper'
 
 module ForemanFogProxmox
   class ProxmoxServerHelperTest < ActiveSupport::TestCase
-    include ProxmoxServerHelper
     include ProxmoxVmHelper
 
     describe 'parse' do
       setup { Fog.mock! }
       teardown { Fog.unmock! }
 
-      let(:host) do
+      let(:type) do
+        'qemu'
+      end
+
+      let(:host_form) do
         { 'vmid' => '100',
-          'name' => 'test',
-          'node_id' => 'pve',
+          'name' => 'toto-tata.pve',
+          'node_id' => 'proxmox',
           'type' => 'qemu',
           'config_attributes' => {
+            'name' => 'toto-tata.pve',
             'memory' => '536870912',
             'balloon' => '268435456',
             'shares' => '5',
             'cpu_type' => 'kvm64',
-            'spectre' => '1',
+            'spectre' => '+1',
             'pcid' => '0',
             'cores' => '1',
             'sockets' => '1'
           },
           'volumes_attributes' => {
-            '0' => { 'controller' => 'scsi', 'device' => '0', 'storage' => 'local-lvm', 'size' => '1073741824', 'cache' => 'none' },
-            '1' => { 'controller' => 'virtio', 'device' => '0', 'storage' => 'local-lvm', 'size' => '1073741824', 'cache' => 'none' }
+            '0' => { 'id' => 'scsi0', 'storage_type' => 'hard_disk', 'controller' => 'scsi', 'device' => '0', 'storage' => 'local-lvm', 'size' => '1073741824', 'cache' => 'none' },
+            '1' => { 'id' => 'virtio0', 'storage_type' => 'hard_disk', 'controller' => 'virtio', 'device' => '0', 'storage' => 'local-lvm', 'size' => '1073741824', 'cache' => 'none' },
+            '2' => { 'id' => 'ide2', 'storage_type' => 'cdrom', 'controller' => 'ide', 'device' => '2', 'storage' => 'local-lvm', 'cdrom' => 'none' }
           },
           'interfaces_attributes' => {
-            '0' => { 'id' => 'net0', 'model' => 'virtio', 'bridge' => 'vmbr0', 'firewall' => '0', 'link_down' => '0', 'rate' => nil },
-            '1' => { 'id' => 'net1', 'model' => 'e1000', 'bridge' => 'vmbr0', 'firewall' => '0', 'link_down' => '0' }
+            '0' => { 'id' => 'net0', 'compute_attributes' => { 'model' => 'virtio', 'bridge' => 'vmbr0', 'firewall' => '0', 'link_down' => '0', 'rate' => nil } },
+            '1' => { 'id' => 'net1', 'compute_attributes' => { 'model' => 'e1000', 'bridge' => 'vmbr0', 'firewall' => '0', 'link_down' => '0' } }
           } }
       end
 
       let(:host_delete) do
         { 'vmid' => '100',
-          'node_id' => 'pve',
+          'node_id' => 'proxmox',
           'name' => 'test',
           'type' => 'qemu',
-          'cdrom' => 'image',
-          'cdrom_iso' => 'local-lvm:iso/debian-netinst.iso',
-          'volumes_attributes' => { '0' => { '_delete' => '1', 'controller' => 'scsi', 'device' => '0', 'storage' => 'local-lvm', 'size' => '1073741824' } },
-          'interfaces_attributes' => { '0' => { '_delete' => '1', 'id' => 'net0', 'model' => 'virtio' } } }
+          'volumes_attributes' => {
+            '0' => { '_delete' => '1', 'storage_type' => 'hard_disk', 'controller' => 'scsi', 'device' => '0', 'storage' => 'local-lvm', 'size' => '1073741824' },
+            '1' => { '_delete' => '', 'storage_type' => 'cdrom', 'controller' => 'ide', 'device' => '2', 'storage' => 'local-lvm', 'volid' => 'local-lvm:iso/debian-netinst.iso', 'cdrom' => 'image' }
+          },
+          'interfaces_attributes' => { '0' => { '_delete' => '1', 'id' => 'net0', 'compute_attributes' => { 'model' => 'virtio' } } } }
       end
 
       test '#memory' do
-        memory = parse_server_memory(host['config_attributes'])
+        memory = parse_typed_memory(host_form['config_attributes'], type)
         assert memory.key?(:memory)
         assert_equal 536_870_912, memory[:memory]
       end
 
       test '#cpu' do
-        cpu = parse_server_cpu(host['config_attributes'])
+        cpu = parse_typed_cpu(host_form['config_attributes'], type)
         assert cpu.key?(:cpu)
         assert_equal 'cputype=kvm64,flags=+spec-ctrl', cpu[:cpu]
       end
 
+      test '#cdrom none' do
+        cdrom = parse_server_cdrom(host_form['volumes_attributes']['2'])
+        assert cdrom.key?(:id)
+        assert_equal 'ide2', cdrom[:id]
+        assert cdrom.key?(:volid)
+        assert_equal 'none', cdrom[:volid]
+        assert cdrom.key?(:media)
+        assert_equal 'cdrom', cdrom[:media]
+      end
+
+      test '#cdrom image' do
+        cdrom = parse_server_cdrom(host_delete['volumes_attributes']['1'])
+        assert cdrom.key?(:id)
+        assert_equal 'ide2', cdrom[:id]
+        assert cdrom.key?(:volid)
+        assert_equal 'local-lvm:iso/debian-netinst.iso', cdrom[:volid]
+        assert cdrom.key?(:media)
+        assert_equal 'cdrom', cdrom[:media]
+      end
+
       test '#vm' do
-        vm = parse_server_vm(host)
+        vm = parse_typed_vm(host_form, type)
         assert_equal '1', vm['cores']
         assert_equal '1', vm['sockets']
         assert_equal 'cputype=kvm64,flags=+spec-ctrl', vm[:cpu]
@@ -86,32 +112,31 @@ module ForemanFogProxmox
         assert_equal 5, vm[:shares]
         assert_equal 'local-lvm:1073741824,cache=none', vm[:scsi0]
         assert_equal 'model=virtio,bridge=vmbr0,firewall=0,link_down=0', vm[:net0]
+        assert_equal 'toto-tata.pve', vm[:name]
         assert_not vm.key?(:config)
         assert_not vm.key?(:node)
       end
 
       test '#volume with scsi 1Gb' do
-        volumes = parse_server_volumes(host['volumes_attributes'])
+        volumes = parse_typed_volumes(host_form['volumes_attributes'], type)
         assert_not volumes.empty?
-        assert volumes.size, 2
-        assert volume = volumes.first
-        assert volume.key?(:scsi0)
-        assert_equal 'local-lvm:1073741824,cache=none', volume[:scsi0]
+        assert volumes.size, 3
+        scsi0 = (volumes.select { |volume| volume.key?(:scsi0) }).first
+        assert_equal 'local-lvm:1073741824,cache=none', scsi0[:scsi0]
       end
 
       test '#volume with virtio 1Gb' do
-        volumes = parse_server_volumes(host['volumes_attributes'])
+        volumes = parse_typed_volumes(host_form['volumes_attributes'], type)
         assert_not volumes.empty?
-        assert volumes.size, 2
-        assert volume = volumes[1]
-        assert volume.key?(:virtio0)
-        assert_equal 'local-lvm:1073741824,cache=none', volume[:virtio0]
+        assert volumes.size, 3
+        virtio0 = (volumes.select { |volume| volume.key?(:virtio0) }).first
+        assert_equal 'local-lvm:1073741824,cache=none', virtio0[:virtio0]
       end
 
       test '#interface with model virtio and bridge' do
         interfaces_to_delete = []
         interfaces_to_add = []
-        add_server_interface(host['interfaces_attributes']['0'], interfaces_to_delete, interfaces_to_add)
+        add_or_delete_typed_interface(host_form['interfaces_attributes']['0'], interfaces_to_delete, interfaces_to_add, type)
         assert_empty interfaces_to_delete
         assert_equal 1, interfaces_to_add.length
         assert interfaces_to_add[0].key?(:net0)
@@ -121,7 +146,7 @@ module ForemanFogProxmox
       test '#interface with model e1000 and bridge' do
         interfaces_to_delete = []
         interfaces_to_add = []
-        add_server_interface(host['interfaces_attributes']['1'], interfaces_to_delete, interfaces_to_add)
+        add_or_delete_typed_interface(host_form['interfaces_attributes']['1'], interfaces_to_delete, interfaces_to_add, type)
         assert_empty interfaces_to_delete
         assert_equal 1, interfaces_to_add.length
         assert interfaces_to_add[0].key?(:net1)
@@ -131,14 +156,14 @@ module ForemanFogProxmox
       test '#interface delete net0' do
         interfaces_to_delete = []
         interfaces_to_add = []
-        add_server_interface(host_delete['interfaces_attributes']['0'], interfaces_to_delete, interfaces_to_add)
+        add_or_delete_typed_interface(host_delete['interfaces_attributes']['0'], interfaces_to_delete, interfaces_to_add, type)
         assert_empty interfaces_to_add
         assert_equal 1, interfaces_to_delete.length
         assert_equal 'net0', interfaces_to_delete[0]
       end
 
       test '#interfaces' do
-        interfaces_to_add, interfaces_to_delete = parse_server_interfaces(host['interfaces_attributes'])
+        interfaces_to_add, interfaces_to_delete = parse_typed_interfaces(host_form, type)
         assert_empty interfaces_to_delete
         assert_equal 2, interfaces_to_add.length
         assert_includes interfaces_to_add, { net0: 'model=virtio,bridge=vmbr0,firewall=0,link_down=0' }