foreman_fog_proxmox 0.8.2 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a89e9ca117817df602b86ef2526b7b9609ada877f243537dafa986bfd914ba1d
-  data.tar.gz: d446b8b4fa4ec604e8c6a883c5c1ded87787df79dc1243c445e3c5e6bc3a811e
+  metadata.gz: 88c0db5bfdca9f434f07d13fd1d18b55b4cb041d093a75e30698182f8f16d533
+  data.tar.gz: 3e9cf561af0f98223a17edbe1a7bf0489379a26eada8152d62990476bce30091
 SHA512:
-  metadata.gz: b0623b6a0ab2b6d8b9b247e3bad1808fc07cf49edf58997a3199161567c151aea9e464eba9f60724aa6d0d3192f93f59c621e3b3aad45e3c1c262bb163f12b3a
-  data.tar.gz: 48c023299b4d8801b6b6a2784530a52e92ba74ddb4a8c288a5ccc1b7ae9db9be2cafcd6ee35cf8239aa757d4f975fddc60b0e160fb1db4489a90a3fb86425b46
+  metadata.gz: f505da06a2573c212f4438d82fa0da3c565ca23747c03d6716ae1dafa82f4dd9aae20ddfa31994fea759ba068a1490cd0f8f38426c9de3906da7854902452eeb
+  data.tar.gz: 3c5c3d8d77c936b8368ce68c1b5ede56c9933bcded2b225976cd75b0cbf85f049a63d5015933de7261a544bcd300f628a142fe859b14faae87118fbfe4131824

data/README.md

@@ -10,7 +10,14 @@
 
 It is intended to satisfy this [feature](http://projects.theforeman.org/issues/2186).
 
-If you like it and need more features you can [support](.github/SUPPORT.md) it.
+If you like it and need more features you can [contribute](.github/CONTRIBUTING.md) or simply [support](.github/SUPPORT.md) it:
+
+## Support
+
+You can support the plugin development via the following methods:
+
+* [Donate by PayPal](https://paypal.me/TristanRobert)
+* [Sponsor by Github](https://github.com/sponsors/tristanrobert)
 
 ## Compatibility versions
 
@@ -18,7 +25,8 @@ If you like it and need more features you can [support](.github/SUPPORT.md) it.
 |--|--|--|--|--|
 |<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.8 |=5.4|>=0.7|>=1.22|>=2.3|
+|>=0.9 |>=5.4|>=0.9|>=1.22|>=2.3|
 
 ## Installation
 
@@ -100,7 +108,7 @@ Redhat, CentOS or Fedora users should also [setup Selinux](https://projects.thef
 
 ### Prerequisites
 
-* You need a Proxmox VE 5.4 server running.
+* You need a Proxmox VE 5.4+ server running.
 * You need ruby >= 2.3. You can install it with [rbenv](https://github.com/rbenv/rbenv).
 * You also need nodejs in your dev machine to run webpack-dev-server. You can install it with [nvm](https://github.com/creationix/nvm).
 
@@ -108,7 +116,7 @@ Redhat, CentOS or Fedora users should also [setup Selinux](https://projects.thef
 
 * Fork this github repo.
 * Clone it on your local machine
-* Install foreman v1.22 on your machine:
+* Install foreman v1.22+ on your machine:
 
 ```shell
 git clone https://github.com/theforeman/foreman -b develop
@@ -213,6 +221,8 @@ See details in [foreman plugin development](https://projects.theforeman.org/proj
 
 ## Contributing
 
+If you like it and still want to improve it, [sponsor me](https://github.com/sponsors/tristanrobert)!
+
 You can reach the [contributors](.github/CONTRIBUTORS.md).
 Bug reports and pull requests are welcome on GitHub at [ForemanFogProxmox](https://github.com/theforeman/foreman_fog_proxmox).
 

data/app/models/foreman_fog_proxmox/proxmox_images.rb

@@ -44,10 +44,13 @@ module ForemanFogProxmox
 
     def clone_from_image(image_id, args, vmid)
       logger.debug(format(_('create_vm(): clone %<image_id>s in %<vmid>s'), image_id: image_id, vmid: vmid))
-      image = node.servers.get image_id
+      image = find_vm_by_uuid(image_id)
       image.clone(vmid)
-      clone = node.servers.get vmid
-      clone.update(name: args[:name])
+      clone = find_vm_by_uuid(vmid)
+      options = {}
+      options.store(:name, args[:name]) unless clone.container?
+      options.store(:hostname, args[:name]) if clone.container?
+      clone.update(options)
     end
   end
 end

data/app/models/foreman_fog_proxmox/proxmox_version.rb

@@ -25,7 +25,7 @@ module ForemanFogProxmox
       logger.debug(format(_('Proxmox compute resource version is %<version>s'), version: version))
       raise ::Foreman::Exception, format(_('Proxmox version %<version>s is not semver suitable'), version: version) unless ForemanFogProxmox::Semver.semver?(version)
 
-      ForemanFogProxmox::Semver.to_semver(version) >= ForemanFogProxmox::Semver.to_semver('5.3.0') && ForemanFogProxmox::Semver.to_semver(version) < ForemanFogProxmox::Semver.to_semver('5.5.0')
+      ForemanFogProxmox::Semver.to_semver(version) >= ForemanFogProxmox::Semver.to_semver('5.3.0') && ForemanFogProxmox::Semver.to_semver(version) < ForemanFogProxmox::Semver.to_semver('6.1.0')
     end
 
     def version

data/app/models/foreman_fog_proxmox/proxmox_volumes.rb

@@ -29,7 +29,14 @@ module ForemanFogProxmox
       vm.detach('unused' + device.to_s)
     end
 
-    def extend_or_move_volume(vm, id, volume_attributes)
+    def volume_options(vm, id, volume_attributes)
+      options = {}
+      options.store(:mp, volume_attributes['mp']) if vm.container? && id != 'rootfs'
+      options.store(:cache, volume_attributes['cache']) unless vm.container?
+      options
+    end
+
+    def update_volume(vm, id, volume_attributes)
       disk = vm.config.disks.get(id)
       diff_size = volume_attributes['size'].to_i - disk.size
       raise ::Foreman::Exception, format(_('Unable to shrink %<id>s size. Proxmox allows only increasing size.'), id: id) unless diff_size >= 0
@@ -39,6 +46,9 @@ module ForemanFogProxmox
         vm.extend(id, extension)
       elsif disk.storage != volume_attributes['storage']
         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)
       end
     end
 
@@ -63,8 +73,7 @@ module ForemanFogProxmox
     end
 
     def add_volume(vm, id, volume_attributes)
-      options = {}
-      options.store(:mp, volume_attributes['mp']) if vm.container?
+      options = volume_options(vm, id, volume_attributes)
       disk_attributes = { id: id, storage: volume_attributes['storage'], size: (volume_attributes['size'].to_i / GIGA).to_s }
       vm.attach(disk_attributes, options)
     end
@@ -75,7 +84,7 @@ module ForemanFogProxmox
         if volume_to_delete?(volume_attributes)
           delete_volume(vm, id)
         else
-          extend_or_move_volume(vm, id, volume_attributes)
+          update_volume(vm, id, volume_attributes)
         end
       else
         add_volume(vm, id, volume_attributes)

data/app/views/compute_resources_vms/form/proxmox/server/_volume.html.erb

@@ -23,6 +23,6 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
     <%= select_f f, :storage, compute_resource.storages, :storage, :storage, { }, :label => _('Storage'), :label_size => "col-md-2" %>
     <%= select_f f, :controller, proxmox_controllers_map, :id, :name, { }, :label => _('Controller'), :label_size => "col-md-2", :disabled => !new_volume, :onchange => 'controllerSelected(this)' %>
     <%= text_f f, :device, :label => _('Device'), :label_size => "col-md-2", :disabled => !new_volume, :'data-min' => 0, :'data-soft-max' => proxmox_max_device(f.object.controller), :onchange => 'deviceSelected(this)' %>
-    <%= select_f f, :cache, proxmox_caches_map, :id, :name, { }, :label => _('Cache'), :label_size => "col-md-2" %>
+    <%= select_f f, :cache, proxmox_caches_map, :id, :name, { include_blank: true }, :label => _('Cache'), :label_size => "col-md-2" %>
     <%= byte_size_f f, :size, :class => "input-mini", :label => _("Size"), :label_size => "col-md-2" %>
 <% end %>

data/lib/foreman_fog_proxmox/semver.rb

@@ -42,36 +42,36 @@ module ForemanFogProxmox
       def <=(other)
         raise TypeError unless other.is_a?(SemverClass)
 
-        result = @patch <= other.patch
-        result = @major <= other.major unless @major == other.major
-        result = @minor < other.minor unless @minor == other.minor
+        result = @major <= other.major
+        result = @minor <= other.minor if @major == other.major
+        result = @patch <= other.patch if @minor == other.minor && @major == other.major
         result
       end
 
       def <(other)
         raise TypeError unless other.is_a?(SemverClass)
 
-        result = @patch < other.patch
-        result = @major < other.major unless @major == other.major
-        result = @minor < other.minor unless @minor == other.minor
+        result = @major < other.major
+        result = @minor < other.minor if @major == other.major
+        result = @patch < other.patch if @minor == other.minor && @major == other.major
         result
       end
 
       def >(other)
         raise TypeError unless other.is_a?(SemverClass)
 
-        result = @patch > other.patch
-        result = @major > other.major unless @major == other.major
-        result = @minor > other.minor unless @minor > other.minor
+        result = @major > other.major
+        result = @minor > other.minor if @major == other.major
+        result = @patch > other.patch if @minor == other.minor && @major == other.major
         result
       end
 
       def >=(other)
         raise TypeError unless other.is_a?(SemverClass)
 
-        result = @patch >= other.patch
-        result = @major >= other.major unless @major == other.major
-        result = @minor >= other.minor unless @minor == other.minor
+        result = @major >= other.major
+        result = @minor >= other.minor if @major == other.major
+        result = @patch >= other.patch if @minor == other.minor && @major == other.major
         result
       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.8.2'
+  VERSION = '0.9.0'
 end

data/test/unit/foreman_fog_proxmox/proxmox_images_test.rb

@@ -0,0 +1,52 @@
+# 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 'active_support/core_ext/hash/indifferent_access'
+
+module ForemanFogProxmox
+  class ProxmoxVmCommandsServerTest < ActiveSupport::TestCase
+    include ComputeResourceTestHelpers
+
+    describe 'clone_from_image' do
+      before do
+        @cr = FactoryBot.build_stubbed(:proxmox_cr)
+        @args = {:name => 'name'}
+        @image_id = 100
+        @vmid = 101
+        @image = mock('vm')
+        @image.expects(:clone)
+        @cr.stubs(:find_vm_by_uuid).with(@image_id).returns(@image)
+        @clone = mock('vm')
+      end
+      it 'clones server from image' do
+        @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'})
+        @cr.stubs(:find_vm_by_uuid).with(@vmid).returns(@clone)
+        @cr.clone_from_image(@image_id, @args, @vmid)
+      end
+    end
+  end
+end

data/test/unit/foreman_fog_proxmox/proxmox_version_test.rb

@@ -28,7 +28,8 @@ module ForemanFogProxmox
 
     wrong_version = { version: '5.a', release: '1' }.with_indifferent_access
     supported_version = { version: '5.4', release: '3' }.with_indifferent_access
-    unsupported_version = { version: '6.0', release: '1' }.with_indifferent_access
+    supported_6_version = { version: '6.0', release: '1' }.with_indifferent_access
+    unsupported_version = { version: '6.2', release: '2' }.with_indifferent_access
 
     describe 'version' do
       before do
@@ -47,9 +48,9 @@ module ForemanFogProxmox
         assert_equal '5.4.3', @cr.version
       end
 
-      it 'returns 6.0.1 with 6.0-1' do
+      it 'returns 6.2.2 with 6.2-2' do
         @identity_client.stubs(:read_version).returns(unsupported_version)
-        assert_equal '6.0.1', @cr.version
+        assert_equal '6.2.2', @cr.version
       end
     end
 
@@ -73,7 +74,12 @@ module ForemanFogProxmox
         assert_equal true, @cr.version_suitable?
       end
 
-      it 'is false with 6.0-1' do
+      it 'is true with 6.0-1' do
+        @identity_client.stubs(:read_version).returns(supported_6_version)
+        assert_equal true, @cr.version_suitable?
+      end
+
+      it 'is false with 6.2-2' do
         @identity_client.stubs(:read_version).returns(unsupported_version)
         assert_equal false, @cr.version_suitable?
       end

data/test/unit/foreman_fog_proxmox/proxmox_vm_commands_container_test.rb

@@ -151,6 +151,51 @@ 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')
+        disks = mock('disks')
+        disk = mock('disk')
+        disk.stubs(:rootfs?).returns(false)
+        disk.stubs(:volid).returns('local-lvm:vm-100-disk-0')
+        disk.stubs(:id).returns('mp0')
+        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(true)
+        vm.stubs(:type).returns('lxc')
+        @cr.stubs(:find_vm_by_uuid).returns(vm)
+        new_attributes = {
+          'templated' => '0',
+          'config_attributes' => {
+            'cores' => '1',
+            'cpulimit' => '1'
+          },
+          'volumes_attributes' => {
+            '0' => {
+              'id' => 'mp0',
+              '_delete' => '',
+              'volid' => 'local-lvm:vm-100-disk-0',
+              'device' => '0',
+              'controller' => 'mp',
+              'storage' => 'local-lvm',
+              'size' => '1073741824',
+              'mp' => '/opt/toto'
+            }
+          }
+        }.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'}
+        vm.expects(:attach, expected_volume_attr)
+        vm.expects(:update, expected_config_attr)
+        @cr.save_vm(uuid, new_attributes)
+      end
     end
 
     describe 'create_vm' do
@@ -187,19 +232,8 @@ module ForemanFogProxmox
         args = { vmid: '100', type: 'lxc', image_id: '999', name: 'name' }
         servers = mock('servers')
         servers.stubs(:id_valid?).returns(true)
-        containers = mock('containers')
-        containers.stubs(:create).with(vmid: 100, type: 'lxc')
-        image = mock('image')
-        clone = mock('clone')
-        image.stubs(:clone).with(100)
-        servers.stubs(:get).with(100).returns(clone)
-        servers.stubs(:get).with('999').returns(image)
-        clone.stubs(:update).with(name: 'name')
-        cr = mock_node_servers_containers(ForemanFogProxmox::Proxmox.new, servers, containers)
-        cr.stubs(:convert_sizes).with(args)
-        cr.stubs(:parse_container_vm).with(args).returns(args)
-        vm = mock('vm')
-        cr.stubs(:find_vm_by_uuid).with((args[:vmid]).to_s).returns(vm)
+        cr = mock_node_servers(ForemanFogProxmox::Proxmox.new, servers)
+        cr.expects(:clone_from_image).with('999', args, 100)
         cr.create_vm(args)
       end
     end

data/test/unit/foreman_fog_proxmox/proxmox_vm_commands_server_create_test.rb

@@ -74,17 +74,7 @@ module ForemanFogProxmox
         servers = mock('servers')
         servers.stubs(:id_valid?).returns(true)
         cr = mock_node_servers(ForemanFogProxmox::Proxmox.new, servers)
-        cr.stubs(:convert_sizes).with(args)
-        cr.stubs(:parse_server_vm).with(args).returns(args)
-        servers.stubs(:create).with(args)
-        image = mock('image')
-        clone = mock('clone')
-        image.stubs(:clone).with(100)
-        servers.stubs(:get).with(100).returns(clone)
-        servers.stubs(:get).with('999').returns(image)
-        clone.stubs(:update).with(name: 'name')
-        vm = mock('vm')
-        cr.stubs(:find_vm_by_uuid).with((args[:vmid]).to_s).returns(vm)
+        cr.expects(:clone_from_image).with('999', args, 100)
         cr.create_vm(args)
       end
     end

data/test/unit/foreman_fog_proxmox/proxmox_vm_commands_server_update_test.rb

@@ -319,6 +319,50 @@ module ForemanFogProxmox
         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/semver_test.rb

@@ -59,8 +59,17 @@ module ForemanFogProxmox
     end
     # rubocop:disable Lint/UselessComparison
     describe 'semverclass comparators' do
-      it '#5.3.0 <= 5.4.0 returns true' do
-        assert ForemanFogProxmox::Semver.to_semver('5.3.0') <= ForemanFogProxmox::Semver.to_semver('5.4.0')
+      it '#5.3.0 <= 5.4.3 returns true' do
+        assert ForemanFogProxmox::Semver.to_semver('5.3.0') <= ForemanFogProxmox::Semver.to_semver('5.4.3')
+      end
+      it '#5.3.0 <= 6.0.1 returns true' do
+        assert ForemanFogProxmox::Semver.to_semver('5.3.0') <= ForemanFogProxmox::Semver.to_semver('6.0.1')
+      end
+      it '#5.4.3 < 6.1.0 returns true' do
+        assert ForemanFogProxmox::Semver.to_semver('5.4.3') < ForemanFogProxmox::Semver.to_semver('6.1.0')
+      end
+      it '#6.0.1 < 6.1.0 returns true' do
+        assert ForemanFogProxmox::Semver.to_semver('6.0.1') < ForemanFogProxmox::Semver.to_semver('6.1.0')
       end
       it '#2.4.0 >= 1.3.0 returns true' do
         assert ForemanFogProxmox::Semver.to_semver('2.4.0') >= ForemanFogProxmox::Semver.to_semver('1.3.0')
@@ -85,6 +94,17 @@ module ForemanFogProxmox
         assert ForemanFogProxmox::Semver.to_semver('1.10.2') < ForemanFogProxmox::Semver.to_semver('1.20.0')
       end
       it '#0.10.2 < 1.20.0 returns true' do
+        assert_equal 0, ForemanFogProxmox::Semver.to_semver('0.10.2').major
+        assert_equal 10, ForemanFogProxmox::Semver.to_semver('0.10.2').minor
+        assert_equal 2, ForemanFogProxmox::Semver.to_semver('0.10.2').patch
+        assert_equal 1, ForemanFogProxmox::Semver.to_semver('1.20.0').major
+        assert_equal 20, ForemanFogProxmox::Semver.to_semver('1.20.0').minor
+        assert_equal 0, ForemanFogProxmox::Semver.to_semver('1.20.0').patch
+        assert ForemanFogProxmox::Semver.to_semver('0.10.2').major < ForemanFogProxmox::Semver.to_semver('1.20.0').major
+        assert_equal false, ForemanFogProxmox::Semver.to_semver('0.10.2').major == ForemanFogProxmox::Semver.to_semver('1.20.0').major
+        assert_equal false, ForemanFogProxmox::Semver.to_semver('0.10.2').minor == ForemanFogProxmox::Semver.to_semver('1.20.0').minor
+        assert ForemanFogProxmox::Semver.to_semver('0.10.2').minor < ForemanFogProxmox::Semver.to_semver('1.20.0').minor
+        assert ForemanFogProxmox::Semver.to_semver('0.10.2').patch > ForemanFogProxmox::Semver.to_semver('1.20.0').patch
         assert ForemanFogProxmox::Semver.to_semver('0.10.2') < ForemanFogProxmox::Semver.to_semver('1.20.0')
       end
     end