foreman_fog_proxmox 0.11.1 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6bb8fe5df4bb574ffc4870265793222d2704c7d43412e087493306b7b599cc3
-  data.tar.gz: 48a5e82861e06306ad0ab8614c86fdab34ddbf73eb97ca08705c7cc788974822
+  metadata.gz: ce063ca3e1f223b49897b86d1a310bad8c15e1c25baa9eabb2304520e1904001
+  data.tar.gz: a44facfbc190a729c68d2ef82ae37de9d8b91fcd0f49e7808f85bd05911bcd44
 SHA512:
-  metadata.gz: e0b68b69c292fbc33284c18bd81e975d226eb82047ea7880a9ce97cf04ccbdddc9125c195ad75f60db923604f4c8ca480c45d5840c0eb41c9c5c9e1c1d60e985
-  data.tar.gz: aed1ca445f09e2fa6237641be539958d83e3537f9508169c23a0320e0f7365e587cc279fa231cb5a01d59ceeb7357bfa2f35678b144fed9b820a4c6d00b2b0c7
+  metadata.gz: 3b2c86fade0bcf232ca6c29e162a5baba2d02083d078b401f0d3d3e9c23ecd7ffcb41ba8b07e2980ce09186956d19537ee51b26bed3a126d908ee56ef05187d1
+  data.tar.gz: 757d04ed4a596e1d0ea80424ef4d405b258b3d6b9c0bbcc1cc4081e945f087cfbe910043290a341b2cd821dfbdb73f9423683606ae2ee35c93e0928740c4a9e1

data/README.md

@@ -141,6 +141,8 @@ gem 'simplecov' # test
 * In foreman directory, install dependencies:
 
 ```shell
+gem install bundler
+# prerequisites postgresql-client library on OS
 bundle config set without 'libvirt ovirt mysql2'
 bundle install
 ```
@@ -155,6 +157,12 @@ npm install
 cp config/settings.yaml.test config/settings.yaml
 ```
 
+add these lines to config/settings.yml:
+
+```yaml
+    :webpack_dev_server: true
+```
+
 * SQLite is no more default rails dev or test database, instead add:
 
 ```shell

data/app/helpers/proxmox_compute_selectors_helper.rb

@@ -176,4 +176,9 @@ module ProxmoxComputeSelectorsHelper
      OpenStruct.new(id: 'rtl8139', name: 'Realtek RTL8139'),
      OpenStruct.new(id: 'vmxnet3', name: 'VMware vmxnet3')]
   end
+
+  def proxmox_bios_map
+    [OpenStruct.new(id: 'seabios', name: '(Default) Seabios'),
+     OpenStruct.new(id: 'ovmf', name: 'OVMF (UEFI)')]
+  end
 end

data/app/helpers/proxmox_vm_helper.rb

@@ -85,12 +85,4 @@ module ProxmoxVmHelper
     memory = (config_hash[key].to_i / MEGA).to_s == '0' ? config_hash[key] : (config_hash[key].to_i / MEGA).to_s
     config_hash.store(key, memory)
   end
-
-  def vm_type(host)
-    host.compute_object.type
-  end
-
-  def node_id(host)
-    host.compute_object.node_id
-  end
 end

data/app/models/foreman_fog_proxmox/proxmox_compute_attributes.rb

@@ -38,12 +38,25 @@ module ForemanFogProxmox
       [:disks, :interfaces, :vmid, :node_id, :node, :type].include?(key) || !vm.config.respond_to?(key)
     end
 
+    def interface_compute_attributes(interface_attributes)
+      vm_attrs = {}
+      vm_attrs.store(:mac, interface_attributes[:macaddr])
+      vm_attrs.store(:id, interface_attributes[:id])
+      vm_attrs.store(:identifier, interface_attributes[:id])
+      vm_attrs.store(:ip, interface_attributes[:ip])
+      vm_attrs.store(:ip6, interface_attributes[:ip6])
+      vm_attrs[:compute_attributes] = interface_attributes.reject { |k, _v| [:macaddr, :id].include?(k) }
+      vm_attrs
+    end
+
     def vm_compute_attributes(vm)
       vm_attrs = {}
       if vm.respond_to?(:config)
         vm_attrs = vm_attrs.merge(vmid: vm.identity, node_id: vm.node_id, type: vm.type)
         vm_attrs[:volumes_attributes] = Hash[vm.config.disks.each_with_index.map { |disk, idx| [idx.to_s, disk.attributes] }] if vm.config.respond_to?(:disks)
-        vm_attrs[:interfaces_attributes] = Hash[vm.config.interfaces.each_with_index.map { |interface, idx| [idx.to_s, interface.attributes] }] if vm.config.respond_to?(:interfaces)
+        if vm.config.respond_to?(:interfaces)
+          vm_attrs[:interfaces_attributes] = Hash[vm.config.interfaces.each_with_index.map { |interface, idx| [idx.to_s, interface_compute_attributes(interface.attributes)] }]
+        end
         vm_attrs[:config_attributes] = vm.config.attributes.reject do |key, value|
           not_config_key?(vm, key) || ForemanFogProxmox::Value.empty?(value.to_s) || Fog::Proxmox::DiskHelper.disk?(key.to_s) || Fog::Proxmox::NicHelper.nic?(key.to_s)
         end

data/app/models/foreman_fog_proxmox/proxmox_operating_systems.rb

@@ -39,7 +39,7 @@ module ForemanFogProxmox
     end
 
     def os_linux_types_mapping(host)
-      ['Debian', 'Redhat', 'Suse', 'Altlinux', 'Archlinux', 'CoreOs', 'Gentoo'].include?(host.operatingsystem.type) ? available_linux_operating_systems : []
+      ['Debian', 'Redhat', 'Suse', 'Altlinux', 'Archlinux', 'Coreos', 'Gentoo'].include?(host.operatingsystem.type) ? available_linux_operating_systems : []
     end
 
     def os_windows_types_mapping(host)

data/app/models/foreman_fog_proxmox/proxmox_vm_commands.rb

@@ -32,6 +32,7 @@ module ForemanFogProxmox
       vmid = args[:vmid].to_i
       type = args[:type]
       node = client.nodes.get(args[:node_id])
+      vmid = node.servers.next_id.to_i if vmid < 1
       raise ::Foreman::Exception, format(N_('invalid vmid=%<vmid>s'), vmid: vmid) unless node.servers.id_valid?(vmid)
 
       image_id = args[:image_id]

data/app/views/compute_resources_vms/form/proxmox/_add_vm_type_to_nic_provider_specific_form.html.erb

@@ -16,8 +16,8 @@ You should have received a copy of the GNU General Public License
 along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
 <% if @host.compute_resource.class == ForemanFogProxmox::Proxmox %>
 <% compute_attributes = f.object.compute_attributes %>
-<% vm_type = vm_type(@host) %>
-<% node_id = node_id(@host) %>
+<% vm_type = f.object.respond_to?('type') ? f.object.type : nil %>
+<% node_id = f.object.respond_to?('node_id') ? f.object.node_id : nil %>
 
 <%= f.fields_for 'compute_attributes', OpenStruct.new(f.object.compute_attributes) do |f| %>
     <%= render provider_partial(@host.compute_resource, 'network'), :f => f, :vm_type => vm_type, :node_id => node_id, :disabled => f.object.persisted?, :compute_resource => @host.compute_resource, :new_host => new_vm, :new_vm => new_vm %>

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

@@ -28,6 +28,7 @@ along with ForemanFogProxmox. If not, see . %>
   <%= select_f f, :keyboard, proxmox_keyboards_map, :id,  :name, { }, :label => _('Keyboard'), :label_size => "col-md-2" %>
   <%= select_f f, :vga, proxmox_vgas_map, :id, :name, { :include_blank => true }, :label => _('VGA'), :label_size => "col-md-2" %>
   <%= select_f f, :scsihw, proxmox_scsi_controllers_map, :id, :name, { }, :label => _('SCSI Controller'), :label_size => "col-md-2" %>
+  <%= select_f f, :bios, proxmox_bios_map, :id, :name, { }, :label => _('BIOS'), :label_size => "col-md-2" %>
 <% end %>
 <%= field_set_tag _("CPU"), :id => "server_config_cpu", :class => 'hide', :disabled => !server do %>
   <%= select_f f, :cpu_type, proxmox_cpus_map, :id, :name, { }, :label => _('Type'), :label_size => "col-md-2" %>

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.11.1'
+  VERSION = '0.12.0'
 end

data/test/unit/foreman_fog_proxmox/proxmox_compute_attributes_test.rb

@@ -96,7 +96,11 @@ module ForemanFogProxmox
         assert_equal volume_attributes, vm_attrs[:volumes_attributes]['0']
         assert_not vm_attrs[:config_attributes].key?(:interfaces)
         assert vm_attrs.key?(:interfaces_attributes)
-        assert_equal interface_attributes, vm_attrs[:interfaces_attributes]['0']
+        assert_equal interface_attributes[:id], vm_attrs[:interfaces_attributes]['0'][:id]
+        assert_equal interface_attributes[:id], vm_attrs[:interfaces_attributes]['0'][:identifier]
+        assert_equal interface_attributes[:macaddr], vm_attrs[:interfaces_attributes]['0'][:mac]
+        assert_equal interface_attributes[:model], vm_attrs[:interfaces_attributes]['0'][:compute_attributes][:model]
+        assert_equal interface_attributes[:bridge], vm_attrs[:interfaces_attributes]['0'][:compute_attributes][:bridge]
       end
 
       it 'converts a container to hash' do
@@ -109,7 +113,11 @@ module ForemanFogProxmox
         assert vm_attrs.key?(:volumes_attributes)
         assert_equal volume_attributes, vm_attrs[:volumes_attributes]['0']
         assert vm_attrs.key?(:interfaces_attributes)
-        assert_equal interface_attributes, vm_attrs[:interfaces_attributes]['0']
+        assert_equal interface_attributes[:id], vm_attrs[:interfaces_attributes]['0'][:id]
+        assert_equal interface_attributes[:id], vm_attrs[:interfaces_attributes]['0'][:identifier]
+        assert_equal interface_attributes[:name], vm_attrs[:interfaces_attributes]['0'][:compute_attributes][:name]
+        assert_equal interface_attributes[:mac], vm_attrs[:interfaces_attributes]['0'][:compute_attributes][:mac]
+        assert_equal interface_attributes[:bridge], vm_attrs[:interfaces_attributes]['0'][:compute_attributes][:bridge]
       end
     end
   end

data/test/unit/foreman_fog_proxmox/proxmox_vm_commands_server_create_test.rb

@@ -31,7 +31,7 @@ module ForemanFogProxmox
     include ProxmoxVmHelper
 
     describe 'create_vm' do
-      it 'raises Foreman::Exception when vmid is invalid' do
+      it 'raises Foreman::Exception when vmid <= 100 and vmid > 0' do
         args = { vmid: '100' }
         servers = mock('servers')
         servers.stubs(:id_valid?).returns(false)
@@ -42,6 +42,20 @@ module ForemanFogProxmox
         assert err.message.end_with?('invalid vmid=100')
       end
 
+      it 'computes next vmid when vmid == 0 and creates server' do
+        args = { vmid: '0', type: 'qemu', node_id: 'pve', start_after_create: '0' }
+        servers = mock('servers')
+        servers.stubs(:id_valid?).returns(true)
+        servers.stubs(:next_id).returns('101')
+        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)
+        vm = mock('vm')
+        cr.stubs(:find_vm_by_uuid).with((args[:vmid]).to_s).returns(vm)
+        cr.create_vm(args)
+      end
+
       it 'creates server without bootstart' do
         args = { vmid: '100', type: 'qemu', node_id: 'pve', start_after_create: '0' }
         servers = mock('servers')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_fog_proxmox
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.12.0
 platform: ruby
 authors:
 - Tristan Robert
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-15 00:00:00.000000000 Z
+date: 2020-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0.13'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -225,25 +225,25 @@ signing_key:
 specification_version: 4
 summary: Foreman plugin that adds Proxmox VE compute resource using fog-proxmox
 test_files:
-- test/functional/compute_resources_controller_test.rb
-- test/unit/foreman_fog_proxmox/proxmox_vm_commands_server_create_test.rb
-- test/unit/foreman_fog_proxmox/proxmox_vm_new_test.rb
-- test/unit/foreman_fog_proxmox/proxmox_version_test.rb
-- test/unit/foreman_fog_proxmox/helpers/proxmox_vm_helper_test.rb
-- test/unit/foreman_fog_proxmox/helpers/proxmox_server_helper_test.rb
-- test/unit/foreman_fog_proxmox/helpers/proxmox_container_helper_test.rb
-- test/unit/foreman_fog_proxmox/proxmox_compute_attributes_test.rb
+- test/test_plugin_helper.rb
+- test/factories/proxmox_factory.rb
+- test/factories/foreman_fog_proxmox/proxmox_node_mock_factory.rb
+- test/factories/foreman_fog_proxmox/proxmox_server_mock_factory.rb
+- test/factories/foreman_fog_proxmox/proxmox_container_mock_factory.rb
+- test/unit/foreman_fog_proxmox/proxmox_interfaces_test.rb
 - test/unit/foreman_fog_proxmox/proxmox_vm_commands_server_update_volumes_test.rb
+- test/unit/foreman_fog_proxmox/proxmox_images_test.rb
+- test/unit/foreman_fog_proxmox/proxmox_test.rb
+- test/unit/foreman_fog_proxmox/proxmox_compute_attributes_test.rb
+- test/unit/foreman_fog_proxmox/proxmox_vm_commands_container_test.rb
+- test/unit/foreman_fog_proxmox/semver_test.rb
+- test/unit/foreman_fog_proxmox/proxmox_version_test.rb
+- test/unit/foreman_fog_proxmox/proxmox_vm_commands_server_create_test.rb
 - test/unit/foreman_fog_proxmox/proxmox_vm_queries_test.rb
+- test/unit/foreman_fog_proxmox/proxmox_vm_new_test.rb
 - test/unit/foreman_fog_proxmox/proxmox_vm_commands_server_update_test.rb
-- test/unit/foreman_fog_proxmox/proxmox_interfaces_test.rb
 - test/unit/foreman_fog_proxmox/proxmox_vm_commands_test.rb
-- test/unit/foreman_fog_proxmox/proxmox_images_test.rb
-- test/unit/foreman_fog_proxmox/semver_test.rb
-- test/unit/foreman_fog_proxmox/proxmox_vm_commands_container_test.rb
-- test/unit/foreman_fog_proxmox/proxmox_test.rb
-- test/factories/proxmox_factory.rb
-- test/factories/foreman_fog_proxmox/proxmox_server_mock_factory.rb
-- test/factories/foreman_fog_proxmox/proxmox_node_mock_factory.rb
-- test/factories/foreman_fog_proxmox/proxmox_container_mock_factory.rb
-- test/test_plugin_helper.rb
+- test/unit/foreman_fog_proxmox/helpers/proxmox_server_helper_test.rb
+- test/unit/foreman_fog_proxmox/helpers/proxmox_container_helper_test.rb
+- test/unit/foreman_fog_proxmox/helpers/proxmox_vm_helper_test.rb
+- test/functional/compute_resources_controller_test.rb