foreman_fog_proxmox 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88c0db5bfdca9f434f07d13fd1d18b55b4cb041d093a75e30698182f8f16d533
-  data.tar.gz: 3e9cf561af0f98223a17edbe1a7bf0489379a26eada8152d62990476bce30091
+  metadata.gz: 2037b59b19ef9a750b13401e696fb2d460f24df0c5988edc0bd3136c4ab1e836
+  data.tar.gz: 22ba3c4a47a6a2ebdb4ce05b72c2e3e6fbc44144a42cadcc1b54440c6cdf577c
 SHA512:
-  metadata.gz: f505da06a2573c212f4438d82fa0da3c565ca23747c03d6716ae1dafa82f4dd9aae20ddfa31994fea759ba068a1490cd0f8f38426c9de3906da7854902452eeb
-  data.tar.gz: 3c5c3d8d77c936b8368ce68c1b5ede56c9933bcded2b225976cd75b0cbf85f049a63d5015933de7261a544bcd300f628a142fe859b14faae87118fbfe4131824
+  metadata.gz: 1720a971f5238f516e61e669607133ae6f9662d236a41a667cba1ce3e068710e1620eac645f5e6c8f0d135320dc4fe930faa9ffb582081fb970e209e71b9516d
+  data.tar.gz: d0ccf273ed786ba2253ff9d1b39f7dacd247f83853283b115f4aa727440a9dcfff8d4e09d484aac230c1c55e5421291bff5031b2c04912e435056a0e556762e3

data/README.md

@@ -24,9 +24,10 @@ You can support the plugin development via the following methods:
 |Fog-proxmox|Proxmox|Foreman-fog-proxmox|Foreman|Ruby|
 |--|--|--|--|--|
 |<0.6|<5.3|<0.6|<=1.20|>=2.3|
-|=0.6|=5.3|=0.6|=1.21|>=2.3|
-|<=0.8 |=5.4|>=0.7|>=1.22|>=2.3|
-|>=0.9 |>=5.4|>=0.9|>=1.22|>=2.3|
+|=0.6|<5.4|=0.6|=1.21|>=2.3|
+|<=0.8 |<6.0|>=0.7|>=1.22|>=2.3|
+|<0.9 |<6.0|=0.9|>=1.22|>=2.3|
+|>=0.9 |>=5.4|>=0.9.1|>=1.22|>=2.3|
 
 ## Installation
 

data/app/models/foreman_fog_proxmox/proxmox_volumes.rb

@@ -48,7 +48,7 @@ module ForemanFogProxmox
         vm.move(id, volume_attributes['storage'])
       else
         options = volume_options(vm, id, volume_attributes)
-        vm.attach({:id => disk.id, :volid => disk.volid, :size => disk.size}, options)
+        vm.attach({ :id => disk.id, :volid => disk.volid, :size => disk.size }, options)
       end
     end
 

data/lib/foreman_fog_proxmox/version.rb

@@ -18,5 +18,5 @@
 # along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>.
 
 module ForemanFogProxmox
-  VERSION = '0.9.0'
+  VERSION = '0.9.1'
 end

data/test/unit/foreman_fog_proxmox/proxmox_images_test.rb

@@ -27,7 +27,7 @@ module ForemanFogProxmox
     describe 'clone_from_image' do
       before do
         @cr = FactoryBot.build_stubbed(:proxmox_cr)
-        @args = {:name => 'name'}
+        @args = { :name => 'name' }
         @image_id = 100
         @vmid = 101
         @image = mock('vm')
@@ -36,14 +36,14 @@ module ForemanFogProxmox
         @clone = mock('vm')
       end
       it 'clones server from image' do
-        @clone.expects(:update).with({:name => 'name'})
+        @clone.expects(:update).with(:name => 'name')
         @clone.stubs(:container?).returns(false)
         @cr.stubs(:find_vm_by_uuid).with(@vmid).returns(@clone)
         @cr.clone_from_image(@image_id, @args, @vmid)
       end
       it 'clones container from image' do
         @clone.stubs(:container?).returns(true)
-        @clone.expects(:update).with({:hostname => 'name'})
+        @clone.expects(:update).with(:hostname => 'name')
         @cr.stubs(:find_vm_by_uuid).with(@vmid).returns(@clone)
         @cr.clone_from_image(@image_id, @args, @vmid)
       end

data/test/unit/foreman_fog_proxmox/proxmox_vm_commands_container_test.rb

@@ -151,7 +151,7 @@ module ForemanFogProxmox
         vm.expects(:update, expected_config_attr)
         @cr.save_vm(uuid, new_attributes)
       end
-      
+
       it 'saves modified container config with modified volumes options' do
         uuid = '100'
         config = mock('config')
@@ -191,7 +191,7 @@ module ForemanFogProxmox
         }.with_indifferent_access
         @cr.stubs(:parse_server_vm).returns('vmid' => '100', 'type' => 'qemu', 'cores' => '1', 'cpulimit' => '1')
         expected_config_attr = { :cores => '1', :cpulimit => '1' }
-        expected_volume_attr = {:id => 'mp0', :volid => 'local-lvm:vm-100-disk-0', :size => 1_073_741_824}, {:mp => '/opt/toto'}
+        expected_volume_attr = { :id => 'mp0', :volid => 'local-lvm:vm-100-disk-0', :size => 1_073_741_824 }, { :mp => '/opt/toto' }
         vm.expects(:attach, expected_volume_attr)
         vm.expects(:update, expected_config_attr)
         @cr.save_vm(uuid, new_attributes)

data/test/unit/foreman_fog_proxmox/proxmox_vm_commands_server_update_test.rb

@@ -67,93 +67,6 @@ module ForemanFogProxmox
         @cr.save_vm(uuid, attr)
       end
 
-      it 'saves modified server config with added volumes' do
-        uuid = '100'
-        config = mock('config')
-        disks = mock('disks')
-        disk = mock('disk')
-        disk.stubs(:size).returns(1_073_741_824)
-        disk.stubs(:storage).returns('local-lvm')
-        disk.stubs(:id).returns('scsi0')
-        disks.stubs(:get).returns
-        config.stubs(:disks).returns(disks)
-        config.stubs(:attributes).returns(:cores => '')
-        vm = mock('vm')
-        vm.stubs(:config).returns(config)
-        vm.stubs(:container?).returns(false)
-        vm.stubs(:type).returns('qemu')
-        @cr.stubs(:find_vm_by_uuid).returns(vm)
-        new_attributes = {
-          'templated' => '0',
-          'config_attributes' => {
-            'cores' => '1',
-            'cpulimit' => '1'
-          },
-          'volumes_attributes' => {
-            '0' => {
-              'id' => 'scsi0',
-              '_delete' => '',
-              'device' => '0',
-              'controller' => 'scsi',
-              'storage' => 'local-lvm',
-              'size' => '2147483648',
-              'cache' => 'none'
-            }
-          }
-        }.with_indifferent_access
-        @cr.stubs(:parse_server_vm).returns('vmid' => '100', 'type' => 'qemu', 'cores' => '1', 'cpulimit' => '1', 'onboot' => '0')
-        expected_config_attr = { :cores => '1', :cpulimit => '1' }
-        expected_volume_attr = { id: 'scsi0', storage: 'local:lvm', size: (2_147_483_648 / GIGA).to_s }
-        vm.expects(:attach, expected_volume_attr)
-        vm.expects(:update, expected_config_attr)
-        @cr.save_vm(uuid, new_attributes)
-      end
-
-      it 'saves modified server config with removed volumes' do
-        uuid = '100'
-        config = mock('config')
-        disks = mock('disks')
-        disk = mock('disk')
-        disk.stubs(:size).returns(1_073_741_824)
-        disk.stubs(:storage).returns('local-lvm')
-        disk.stubs(:id).returns('virtio0')
-        disks.stubs(:get).returns(disk)
-        config.stubs(:disks).returns(disks)
-        config.stubs(:attributes).returns(:cores => '')
-        vm = mock('vm')
-        vm.stubs(:config).returns(config)
-        vm.stubs(:container?).returns(false)
-        vm.stubs(:templated?).returns(false)
-        vm.stubs(:type).returns('qemu')
-        @cr.stubs(:find_vm_by_uuid).returns(vm)
-        new_attributes = {
-          'templated' => '0',
-          'config_attributes' => {
-            'cores' => '1',
-            'cpulimit' => '1'
-          },
-          'volumes_attributes' => {
-            '0' => {
-              '_delete' => '1',
-              'id' => 'scsi0',
-              'volid' => 'local-lvm:vm-100-disk-0',
-              'device' => '0',
-              'controller' => 'scsi',
-              'storage' => 'local-lvm',
-              'size' => '2147483648',
-              'cache' => 'none'
-            }
-          }
-        }.with_indifferent_access
-        @cr.stubs(:parse_server_vm).returns('vmid' => '100', 'type' => 'qemu', 'cores' => '1', 'cpulimit' => '1', 'config_attributes' => { 'onboot' => '0' })
-        expected_config_attr = { :cores => '1', :cpulimit => '1' }
-        expected_volume_attr = 'scsi0'
-        vm.expects(:detach, expected_volume_attr)
-        vm.expects(:detach, 'unused0')
-        vm.expects(:update, expected_config_attr)
-        @cr.save_vm(uuid, new_attributes)
-      end
-
       it 'saves modified server config with removed interfaces' do
         uuid = '100'
         config = mock('config')
@@ -193,176 +106,6 @@ module ForemanFogProxmox
         vm.expects(:update, expected_config_attr)
         @cr.save_vm(uuid, new_attributes)
       end
-
-      it 'saves modified server config with resized volumes' do
-        uuid = '100'
-        config = mock('config')
-        disks = mock('disks')
-        disk = mock('disk')
-        disk.stubs(:size).returns(1_073_741_824)
-        disk.stubs(:storage).returns('local-lvm')
-        disks.stubs(:get).returns(disk)
-        config.stubs(:disks).returns(disks)
-        config.stubs(:attributes).returns(:cores => '')
-        vm = mock('vm')
-        vm.stubs(:config).returns(config)
-        vm.stubs(:container?).returns(false)
-        vm.stubs(:templated?).returns(false)
-        vm.stubs(:type).returns('qemu')
-        @cr.stubs(:find_vm_by_uuid).returns(vm)
-        new_attributes = {
-          'templated' => '0',
-          'config_attributes' => {
-            'cores' => '1',
-            'cpulimit' => '1'
-          },
-          'volumes_attributes' => {
-            '0' => {
-              'id' => 'scsi0',
-              '_delete' => '',
-              'volid' => 'local-lvm:vm-100-disk-0',
-              'device' => '0',
-              'controller' => 'scsi',
-              'storage' => 'local-lvm',
-              'size' => '2147483648',
-              'cache' => 'none'
-            }
-          }
-        }.with_indifferent_access
-        @cr.stubs(:parse_server_vm).returns('vmid' => '100', 'type' => 'qemu', 'cores' => '1', 'cpulimit' => '1')
-        expected_config_attr = { :cores => '1', :cpulimit => '1' }
-        expected_volume_attr = ['scsi0', '+1G']
-        vm.expects(:extend, expected_volume_attr)
-        vm.expects(:update, expected_config_attr)
-        @cr.save_vm(uuid, new_attributes)
-      end
-
-      it 'raises error unable to shrink volumes' do
-        uuid = '100'
-        config = mock('config')
-        disks = mock('disks')
-        disk = mock('disk')
-        disk.stubs(:size).returns(1_073_741_824)
-        disk.stubs(:storage).returns('local-lvm')
-        disks.stubs(:get).returns(disk)
-        config.stubs(:disks).returns(disks)
-        config.stubs(:attributes).returns(:cores => '')
-        vm = mock('vm')
-        vm.stubs(:config).returns(config)
-        vm.stubs(:container?).returns(false)
-        vm.stubs(:type).returns('qemu')
-        @cr.stubs(:find_vm_by_uuid).returns(vm)
-        new_attributes = {
-          'templated' => '0',
-          'config_attributes' => {
-            'cores' => '1',
-            'cpulimit' => '1'
-          },
-          'volumes_attributes' => {
-            '0' => {
-              'id' => 'scsi0',
-              '_delete' => '',
-              'volid' => 'local-lvm:vm-100-disk-0',
-              'device' => '0',
-              'controller' => 'scsi',
-              'storage' => 'local-lvm',
-              'size' => '2',
-              'cache' => 'none'
-            }
-          }
-        }.with_indifferent_access
-        @cr.stubs(:parse_server_vm).returns('vmid' => '100', 'type' => 'qemu', 'cores' => '1', 'cpulimit' => '1')
-        err = assert_raises Foreman::Exception do
-          @cr.save_vm(uuid, new_attributes)
-        end
-        assert err.message.end_with?('Unable to shrink scsi0 size. Proxmox allows only increasing size.')
-      end
-
-      it 'saves modified server config with moved volumes' do
-        uuid = '100'
-        config = mock('config')
-        disks = mock('disks')
-        disk = mock('disk')
-        disk.stubs(:size).returns(1_073_741_824)
-        disk.stubs(:storage).returns('local-lvm')
-        disks.stubs(:get).returns(disk)
-        config.stubs(:disks).returns(disks)
-        config.stubs(:attributes).returns(:cores => '')
-        vm = mock('vm')
-        vm.stubs(:config).returns(config)
-        vm.stubs(:container?).returns(false)
-        vm.stubs(:type).returns('qemu')
-        @cr.stubs(:find_vm_by_uuid).returns(vm)
-        new_attributes = {
-          'templated' => '0',
-          'config_attributes' => {
-            'cores' => '1',
-            'cpulimit' => '1'
-          },
-          'volumes_attributes' => {
-            '0' => {
-              'id' => 'scsi0',
-              '_delete' => '',
-              'volid' => 'local-lvm:vm-100-disk-0',
-              'device' => '0',
-              'controller' => 'scsi',
-              'storage' => 'local-lvm2',
-              'size' => '1073741824',
-              'cache' => 'none'
-            }
-          }
-        }.with_indifferent_access
-        @cr.stubs(:parse_server_vm).returns('vmid' => '100', 'type' => 'qemu', 'cores' => '1', 'cpulimit' => '1')
-        expected_config_attr = { :cores => '1', :cpulimit => '1' }
-        expected_volume_attr = ['scsi0', 'local-lvm2']
-        vm.expects(:move, expected_volume_attr)
-        vm.expects(:update, expected_config_attr)
-        @cr.save_vm(uuid, new_attributes)
-      end
-
-      it 'saves modified server config with modified volumes options' do
-        uuid = '100'
-        config = mock('config')
-        disks = mock('disks')
-        disk = mock('disk')
-        disk.stubs(:size).returns(1_073_741_824)
-        disk.stubs(:storage).returns('local-lvm')
-        disk.stubs(:volid).returns('local-lvm:vm-100-disk-0')
-        disk.stubs(:id).returns('scsi0')
-        disks.stubs(:get).returns(disk)
-        config.stubs(:disks).returns(disks)
-        config.stubs(:attributes).returns(:cores => '')
-        vm = mock('vm')
-        vm.stubs(:config).returns(config)
-        vm.stubs(:container?).returns(false)
-        vm.stubs(:type).returns('qemu')
-        @cr.stubs(:find_vm_by_uuid).returns(vm)
-        new_attributes = {
-          'templated' => '0',
-          'config_attributes' => {
-            'cores' => '1',
-            'cpulimit' => '1'
-          },
-          'volumes_attributes' => {
-            '0' => {
-              'id' => 'scsi0',
-              '_delete' => '',
-              'volid' => 'local-lvm:vm-100-disk-0',
-              'device' => '0',
-              'controller' => 'scsi',
-              'storage' => 'local-lvm',
-              'size' => '1073741824',
-              'cache' => 'directsync'
-            }
-          }
-        }.with_indifferent_access
-        @cr.stubs(:parse_server_vm).returns('vmid' => '100', 'type' => 'qemu', 'cores' => '1', 'cpulimit' => '1')
-        expected_config_attr = { :cores => '1', :cpulimit => '1' }
-        expected_volume_attr = {:id => 'scsi0', :volid => 'local-lvm:vm-100-disk-0', :size => 1_073_741_824}, {:cache => 'directsync'}
-        vm.expects(:attach, expected_volume_attr)
-        vm.expects(:update, expected_config_attr)
-        @cr.save_vm(uuid, new_attributes)
-      end
     end
   end
 end

data/test/unit/foreman_fog_proxmox/proxmox_vm_commands_server_update_volumes_test.rb

@@ -0,0 +1,296 @@
+# frozen_string_literal: true
+
+# Copyright 2018 Tristan Robert
+
+# This file is part of ForemanFogProxmox.
+
+# ForemanFogProxmox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# ForemanFogProxmox is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>.
+
+require 'test_plugin_helper'
+require 'models/compute_resources/compute_resource_test_helpers'
+require 'factories/foreman_fog_proxmox/proxmox_node_mock_factory'
+require 'factories/foreman_fog_proxmox/proxmox_server_mock_factory'
+require 'active_support/core_ext/hash/indifferent_access'
+
+module ForemanFogProxmox
+  class ProxmoxVmCommandsServerUpdateTest < ActiveSupport::TestCase
+    include ComputeResourceTestHelpers
+    include ProxmoxNodeMockFactory
+    include ProxmoxServerMockFactory
+    include ProxmoxVmHelper
+
+    describe 'save_vm' do
+      before do
+        @cr = FactoryBot.build_stubbed(:proxmox_cr)
+      end
+
+      it 'saves modified server config with added volumes' do
+        uuid = '100'
+        config = mock('config')
+        disks = mock('disks')
+        disk = mock('disk')
+        disk.stubs(:size).returns(1_073_741_824)
+        disk.stubs(:storage).returns('local-lvm')
+        disk.stubs(:id).returns('scsi0')
+        disks.stubs(:get).returns
+        config.stubs(:disks).returns(disks)
+        config.stubs(:attributes).returns(:cores => '')
+        vm = mock('vm')
+        vm.stubs(:config).returns(config)
+        vm.stubs(:container?).returns(false)
+        vm.stubs(:type).returns('qemu')
+        @cr.stubs(:find_vm_by_uuid).returns(vm)
+        new_attributes = {
+          'templated' => '0',
+          'config_attributes' => {
+            'cores' => '1',
+            'cpulimit' => '1'
+          },
+          'volumes_attributes' => {
+            '0' => {
+              'id' => 'scsi0',
+              '_delete' => '',
+              'device' => '0',
+              'controller' => 'scsi',
+              'storage' => 'local-lvm',
+              'size' => '2147483648',
+              'cache' => 'none'
+            }
+          }
+        }.with_indifferent_access
+        @cr.stubs(:parse_server_vm).returns('vmid' => '100', 'type' => 'qemu', 'cores' => '1', 'cpulimit' => '1', 'onboot' => '0')
+        expected_config_attr = { :cores => '1', :cpulimit => '1' }
+        expected_volume_attr = { id: 'scsi0', storage: 'local:lvm', size: (2_147_483_648 / GIGA).to_s }
+        vm.expects(:attach, expected_volume_attr)
+        vm.expects(:update, expected_config_attr)
+        @cr.save_vm(uuid, new_attributes)
+      end
+
+      it 'saves modified server config with removed volumes' do
+        uuid = '100'
+        config = mock('config')
+        disks = mock('disks')
+        disk = mock('disk')
+        disk.stubs(:size).returns(1_073_741_824)
+        disk.stubs(:storage).returns('local-lvm')
+        disk.stubs(:id).returns('virtio0')
+        disks.stubs(:get).returns(disk)
+        config.stubs(:disks).returns(disks)
+        config.stubs(:attributes).returns(:cores => '')
+        vm = mock('vm')
+        vm.stubs(:config).returns(config)
+        vm.stubs(:container?).returns(false)
+        vm.stubs(:templated?).returns(false)
+        vm.stubs(:type).returns('qemu')
+        @cr.stubs(:find_vm_by_uuid).returns(vm)
+        new_attributes = {
+          'templated' => '0',
+          'config_attributes' => {
+            'cores' => '1',
+            'cpulimit' => '1'
+          },
+          'volumes_attributes' => {
+            '0' => {
+              '_delete' => '1',
+              'id' => 'scsi0',
+              'volid' => 'local-lvm:vm-100-disk-0',
+              'device' => '0',
+              'controller' => 'scsi',
+              'storage' => 'local-lvm',
+              'size' => '2147483648',
+              'cache' => 'none'
+            }
+          }
+        }.with_indifferent_access
+        @cr.stubs(:parse_server_vm).returns('vmid' => '100', 'type' => 'qemu', 'cores' => '1', 'cpulimit' => '1', 'config_attributes' => { 'onboot' => '0' })
+        expected_config_attr = { :cores => '1', :cpulimit => '1' }
+        expected_volume_attr = 'scsi0'
+        vm.expects(:detach, expected_volume_attr)
+        vm.expects(:detach, 'unused0')
+        vm.expects(:update, expected_config_attr)
+        @cr.save_vm(uuid, new_attributes)
+      end
+
+      it 'saves modified server config with resized volumes' do
+        uuid = '100'
+        config = mock('config')
+        disks = mock('disks')
+        disk = mock('disk')
+        disk.stubs(:size).returns(1_073_741_824)
+        disk.stubs(:storage).returns('local-lvm')
+        disks.stubs(:get).returns(disk)
+        config.stubs(:disks).returns(disks)
+        config.stubs(:attributes).returns(:cores => '')
+        vm = mock('vm')
+        vm.stubs(:config).returns(config)
+        vm.stubs(:container?).returns(false)
+        vm.stubs(:templated?).returns(false)
+        vm.stubs(:type).returns('qemu')
+        @cr.stubs(:find_vm_by_uuid).returns(vm)
+        new_attributes = {
+          'templated' => '0',
+          'config_attributes' => {
+            'cores' => '1',
+            'cpulimit' => '1'
+          },
+          'volumes_attributes' => {
+            '0' => {
+              'id' => 'scsi0',
+              '_delete' => '',
+              'volid' => 'local-lvm:vm-100-disk-0',
+              'device' => '0',
+              'controller' => 'scsi',
+              'storage' => 'local-lvm',
+              'size' => '2147483648',
+              'cache' => 'none'
+            }
+          }
+        }.with_indifferent_access
+        @cr.stubs(:parse_server_vm).returns('vmid' => '100', 'type' => 'qemu', 'cores' => '1', 'cpulimit' => '1')
+        expected_config_attr = { :cores => '1', :cpulimit => '1' }
+        expected_volume_attr = ['scsi0', '+1G']
+        vm.expects(:extend, expected_volume_attr)
+        vm.expects(:update, expected_config_attr)
+        @cr.save_vm(uuid, new_attributes)
+      end
+
+      it 'raises error unable to shrink volumes' do
+        uuid = '100'
+        config = mock('config')
+        disks = mock('disks')
+        disk = mock('disk')
+        disk.stubs(:size).returns(1_073_741_824)
+        disk.stubs(:storage).returns('local-lvm')
+        disks.stubs(:get).returns(disk)
+        config.stubs(:disks).returns(disks)
+        config.stubs(:attributes).returns(:cores => '')
+        vm = mock('vm')
+        vm.stubs(:config).returns(config)
+        vm.stubs(:container?).returns(false)
+        vm.stubs(:type).returns('qemu')
+        @cr.stubs(:find_vm_by_uuid).returns(vm)
+        new_attributes = {
+          'templated' => '0',
+          'config_attributes' => {
+            'cores' => '1',
+            'cpulimit' => '1'
+          },
+          'volumes_attributes' => {
+            '0' => {
+              'id' => 'scsi0',
+              '_delete' => '',
+              'volid' => 'local-lvm:vm-100-disk-0',
+              'device' => '0',
+              'controller' => 'scsi',
+              'storage' => 'local-lvm',
+              'size' => '2',
+              'cache' => 'none'
+            }
+          }
+        }.with_indifferent_access
+        @cr.stubs(:parse_server_vm).returns('vmid' => '100', 'type' => 'qemu', 'cores' => '1', 'cpulimit' => '1')
+        err = assert_raises Foreman::Exception do
+          @cr.save_vm(uuid, new_attributes)
+        end
+        assert err.message.end_with?('Unable to shrink scsi0 size. Proxmox allows only increasing size.')
+      end
+
+      it 'saves modified server config with moved volumes' do
+        uuid = '100'
+        config = mock('config')
+        disks = mock('disks')
+        disk = mock('disk')
+        disk.stubs(:size).returns(1_073_741_824)
+        disk.stubs(:storage).returns('local-lvm')
+        disks.stubs(:get).returns(disk)
+        config.stubs(:disks).returns(disks)
+        config.stubs(:attributes).returns(:cores => '')
+        vm = mock('vm')
+        vm.stubs(:config).returns(config)
+        vm.stubs(:container?).returns(false)
+        vm.stubs(:type).returns('qemu')
+        @cr.stubs(:find_vm_by_uuid).returns(vm)
+        new_attributes = {
+          'templated' => '0',
+          'config_attributes' => {
+            'cores' => '1',
+            'cpulimit' => '1'
+          },
+          'volumes_attributes' => {
+            '0' => {
+              'id' => 'scsi0',
+              '_delete' => '',
+              'volid' => 'local-lvm:vm-100-disk-0',
+              'device' => '0',
+              'controller' => 'scsi',
+              'storage' => 'local-lvm2',
+              'size' => '1073741824',
+              'cache' => 'none'
+            }
+          }
+        }.with_indifferent_access
+        @cr.stubs(:parse_server_vm).returns('vmid' => '100', 'type' => 'qemu', 'cores' => '1', 'cpulimit' => '1')
+        expected_config_attr = { :cores => '1', :cpulimit => '1' }
+        expected_volume_attr = ['scsi0', 'local-lvm2']
+        vm.expects(:move, expected_volume_attr)
+        vm.expects(:update, expected_config_attr)
+        @cr.save_vm(uuid, new_attributes)
+      end
+
+      it 'saves modified server config with modified volumes options' do
+        uuid = '100'
+        config = mock('config')
+        disks = mock('disks')
+        disk = mock('disk')
+        disk.stubs(:size).returns(1_073_741_824)
+        disk.stubs(:storage).returns('local-lvm')
+        disk.stubs(:volid).returns('local-lvm:vm-100-disk-0')
+        disk.stubs(:id).returns('scsi0')
+        disks.stubs(:get).returns(disk)
+        config.stubs(:disks).returns(disks)
+        config.stubs(:attributes).returns(:cores => '')
+        vm = mock('vm')
+        vm.stubs(:config).returns(config)
+        vm.stubs(:container?).returns(false)
+        vm.stubs(:type).returns('qemu')
+        @cr.stubs(:find_vm_by_uuid).returns(vm)
+        new_attributes = {
+          'templated' => '0',
+          'config_attributes' => {
+            'cores' => '1',
+            'cpulimit' => '1'
+          },
+          'volumes_attributes' => {
+            '0' => {
+              'id' => 'scsi0',
+              '_delete' => '',
+              'volid' => 'local-lvm:vm-100-disk-0',
+              'device' => '0',
+              'controller' => 'scsi',
+              'storage' => 'local-lvm',
+              'size' => '1073741824',
+              'cache' => 'directsync'
+            }
+          }
+        }.with_indifferent_access
+        @cr.stubs(:parse_server_vm).returns('vmid' => '100', 'type' => 'qemu', 'cores' => '1', 'cpulimit' => '1')
+        expected_config_attr = { :cores => '1', :cpulimit => '1' }
+        expected_volume_attr = { :id => 'scsi0', :volid => 'local-lvm:vm-100-disk-0', :size => 1_073_741_824 }, { :cache => 'directsync' }
+        vm.expects(:attach, expected_volume_attr)
+        vm.expects(:update, expected_config_attr)
+        @cr.save_vm(uuid, new_attributes)
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_fog_proxmox
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Tristan Robert
@@ -29,14 +29,14 @@ dependencies:
   name: fog-proxmox
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.8'
 - !ruby/object:Gem::Dependency
@@ -192,6 +192,7 @@ files:
 - test/unit/foreman_fog_proxmox/proxmox_vm_commands_container_test.rb
 - test/unit/foreman_fog_proxmox/proxmox_vm_commands_server_create_test.rb
 - test/unit/foreman_fog_proxmox/proxmox_vm_commands_server_update_test.rb
+- test/unit/foreman_fog_proxmox/proxmox_vm_commands_server_update_volumes_test.rb
 - test/unit/foreman_fog_proxmox/proxmox_vm_commands_test.rb
 - test/unit/foreman_fog_proxmox/proxmox_vm_new_test.rb
 - test/unit/foreman_fog_proxmox/proxmox_vm_queries_test.rb
@@ -224,6 +225,7 @@ test_files:
 - test/functional/compute_resources_controller_test.rb
 - test/unit/foreman_fog_proxmox/proxmox_vm_commands_container_test.rb
 - test/unit/foreman_fog_proxmox/proxmox_vm_commands_test.rb
+- test/unit/foreman_fog_proxmox/proxmox_vm_commands_server_update_volumes_test.rb
 - test/unit/foreman_fog_proxmox/proxmox_version_test.rb
 - test/unit/foreman_fog_proxmox/proxmox_vm_queries_test.rb
 - test/unit/foreman_fog_proxmox/proxmox_compute_attributes_test.rb