foreman_fog_proxmox 0.13.4 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e42832dc77d338bb20585f27678bc2207c23a610f7c7b478f24f3791ca65a414
-  data.tar.gz: 1385bea7eed802496ae7ab85ca013e75dc0343a8a433a347d8811b59fd620cd0
+  metadata.gz: 19b7f2f30af319dbc8881900c660bf9ddc5026eb8762ace34dcd6b4ac7fa85f8
+  data.tar.gz: 5430f62a1d7db829fddb142c468d5c3741a0090131f0a3d26746bec75f6b943e
 SHA512:
-  metadata.gz: 91a262ffeb2b720fae01136cdcd158cd8c577702fafbea36d550eae859c6734f7a7ec1c390b39077852100d4507d9b3502bb7f3f1cb5c7d22c02cd7b012c51cf
-  data.tar.gz: 25512a916934966d9b5e66494f1b294c5b13d69ba326ed61170e330bff616111103984701a6311b150fb444dab3f0a48920c8debe193b7698a2ec43a0110cdd1
+  metadata.gz: ceac1a672eb780a7c7e8e05d8024f70d74d129a3ff48ad5d65f9947c78d60778a3697c7a70e030eff53346f3f56587a726fa71b5a719bb448bbea573d7970e47
+  data.tar.gz: cd477463a37e43ce80db0986f08d8203b225cfc5abae4f31b5c165cfc149197c99be2b2d8687b6e217246609c77d781658d93c119b37c41bfebc6049be852b4a

data/README.md

@@ -38,9 +38,27 @@ You can support the plugin development via the following methods:
 
 ## Installation
 
-### Prerequisites
+### From OS packages
 
-You need [nodejs](https://nodejs.org/en/download/package-manager/) installed in order to use foreman-assets package.
+Please see the Foreman manual for complete instructions:
+
+* [Foreman: How to Install a Plugin from package](https://theforeman.org/plugins/#2.Installation)
+
+[Install from package](https://theforeman.org/plugins/#2.2Packageinstallation) is the easiest way to install the plugin. Choose the latest release plugins repository. If you don't find it in the same foreman release repository, get it from the `nightly` repository.
+
+Then you can install it with the package manager, in Debian/Ubuntu:
+
+```shell
+sudo apt-get install ruby-foreman-fog-proxmox
+```
+
+and in Fedora/Redhat Linux:
+
+```shell
+sudo dnf install rubygem-foreman_fog_proxmox
+```
+
+Redhat, CentOS or Fedora users should also [setup Selinux](https://projects.theforeman.org/projects/foreman/wiki/SELinux) to allow foreman and all its plugins to work.
 
 ### From gem
 
@@ -69,6 +87,8 @@ sudo -u foreman /usr/bin/foreman-ruby /usr/bin/bundle install
 
 * Precompile plugin assets:
 
+You need [nodejs](https://nodejs.org/en/download/package-manager/) installed in order to use foreman-assets package.
+
 ```shell
 /usr/bin/foreman-ruby /usr/bin/bundle exec bin/rake plugin:assets:precompile[foreman_fog_proxmox]
 ```
@@ -99,28 +119,6 @@ Then you can check plugin installation after login into your new foreman server
 ![About resources](.github/images/about_resources.png)
 ![About greffon](.github/images/about_greffon.png)
 
-### From OS packages
-
-Please see the Foreman manual for complete instructions:
-
-* [Foreman: How to Install a Plugin from package](https://theforeman.org/plugins/#2.Installation)
-
-[Install from package](https://theforeman.org/plugins/#2.2Packageinstallation) is the easiest way to install the plugin. Choose the latest release plugins repository. If you don't find it in the same foreman release repository, get it from the `nightly` repository.
-
-Then you can install it with the package manager, in Debian/Ubuntu:
-
-```shell
-sudo apt-get install ruby-foreman-fog-proxmox
-```
-
-and in Fedora/Redhat Linux:
-
-```shell
-sudo dnf install rubygem-foreman_fog_proxmox
-```
-
-Redhat, CentOS or Fedora users should also [setup Selinux](https://projects.theforeman.org/projects/foreman/wiki/SELinux) to allow foreman and all its plugins to work.
-
 ## Usage
 
 * [Compute resource](.github/compute_resource.md)

data/app/assets/javascripts/foreman_fog_proxmox/proxmox_compute_resource.js

@@ -15,8 +15,6 @@
 // You should have received a copy of the GNU General Public License
 // along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>.
 
-$(document).on('ContentLoad', tfm.numFields.initAll);
-
 $(document).ready(function () {
   sslVerifyPeerSelected();
   authMethodSelected();

data/app/assets/javascripts/foreman_fog_proxmox/proxmox_vm.js

@@ -15,7 +15,6 @@
 // You should have received a copy of the GNU General Public License
 // along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>.
 
-$(document).on('ContentLoad', tfm.numFields.initAll);
 $(document).ready(vmTypeSelected);
 
 function vmTypeSelected() {

data/app/assets/javascripts/foreman_fog_proxmox/proxmox_vm_server.js

@@ -46,7 +46,6 @@ function controllerSelected(item) {
   var device = $(device_selector).limitedSpinner('value');
   var id = controller + device;
   $(id_selector).val(id);
-  tfm.numFields.initAll();
 }
 
 function deviceSelected(item) {
@@ -58,7 +57,6 @@ function deviceSelected(item) {
   var controller = $(controller_selector).val();
   var id = controller + device;
   $(id_selector).val(id);
-  tfm.numFields.initAll();
 }
 
 function computeControllerMaxDevice(controller) {

data/app/assets/javascripts/foreman_fog_proxmox/proxmox_volume_cloudinit.js

@@ -21,5 +21,4 @@ function cloudinitControllerSelected(item) {
   var max = computeControllerMaxDevice(controller);
   var device_selector = 'host_compute_attributes_volumes_attributes_' + index + 'device';
   $(device_selector).attr('data-soft-max', max);
-  tfm.numFields.initAll();
 }

data/app/controllers/concerns/foreman_fog_proxmox/hosts_controller.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+# Copyright 2021 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/>.
+
+module ForemanFogProxmox
+  module HostsController
+    extend ActiveSupport::Concern
+    included do
+      prepend Overrides
+    end
+    module Overrides
+      include ForemanFogProxmox::ProxmoxVmNew
+      # Clone the host
+      def clone
+        super
+        return true unless @host.compute_resource.class == ForemanFogProxmox::Proxmox
+
+        @host.compute_attributes[:vmid] = next_vmid
+        @host.compute_attributes[:interfaces_attributes].each { |index, interface_attributes| @host.compute_attributes[:interfaces_attributes][index] = interface_attributes.merge(macaddr: nil).merge(hwaddr: nil).merge(ip: nil).merge(ip6: nil) }
+        @host.compute_attributes[:volumes_attributes].each { |index, volume_attributes| @host.compute_attributes[:volumes_attributes][index] = volume_attributes.merge(volid: nil) }
+      end
+
+      private
+
+      def bridges
+        @host.compute_resource.bridges
+      end
+
+      def nodes
+        @host.compute_resource.nodes
+      end
+
+      def storages
+        @host.compute_resource.storages
+      end
+    end
+  end
+end

data/app/helpers/proxmox_form_helper.rb

@@ -66,7 +66,7 @@ module ProxmoxFormHelper
     opts[:"data-association"] = (type + '_' + association.to_s).to_sym
     hide = ''
     hide += '$("[data-association=' + type + '_volumes]").hide();' unless ['hard_disk', 'mp'].include?(type)
-    link_to_function(name.to_s, 'add_child_node(this);tfm.numFields.initAll();' + hide, opts)
+    link_to_function(name.to_s, 'add_child_node(this);' + hide, opts)
   end
 
   def remove_child_link_typed(name, f, type, opts = {})

data/app/models/concerns/fog_extensions/proxmox/server.rb

@@ -63,7 +63,7 @@ module FogExtensions
       end
 
       def select_nic(fog_nics, nic)
-        fog_nics.find { |fog_nic| fog_nic.identity.to_s == nic.identifier }
+        fog_nics.find { |fog_nic| fog_nic.identity.to_s == nic.compute_attributes[:id] }
       end
 
       delegate :interfaces, to: :config

data/app/models/foreman_fog_proxmox/proxmox_interfaces.rb

@@ -27,8 +27,10 @@ module ForemanFogProxmox
     end
 
     def set_nic_identifier(nic, index)
-      nic.identifier = format('net%<index>s', index: index) if nic.identifier.empty?
-      raise ::Foreman::Exception, _(format('Invalid identifier interface[%<index>s]. Must be net[n] with n integer >= 0', index: index)) unless Fog::Proxmox::NicHelper.nic?(nic.identifier)
+      nic.compute_attributes[:id] = format('net%<index>s', index: index) if nic.compute_attributes[:id].empty?
+      raise ::Foreman::Exception, _(format('Invalid proxmox NIC id on interface[%<index>s]. Must be net[n] with n integer >= 0', index: index)) unless Fog::Proxmox::NicHelper.nic?(nic.compute_attributes[:id])
+
+      nic.identifier = nic.compute_attributes['id'] if nic.identifier.empty?
     end
 
     def vm_type(host)
@@ -112,17 +114,16 @@ module ForemanFogProxmox
       host.interfaces.select(&:physical?).each.with_index.reduce({}) do |hash, (nic, index)|
         set_nic_identifier(nic, index)
         set_container_interface_name(host, nic, index) if container?(host)
-        nic_compute_attributes = nic.compute_attributes.merge(id: nic.identifier)
-        ForemanFogProxmox::HashCollection.remove_empty_values(nic_compute_attributes)
+        ForemanFogProxmox::HashCollection.remove_empty_values(nic.compute_attributes)
         mac = nic.mac
         mac ||= nic.attributes['mac']
-        set_mac(nic_compute_attributes, mac, vm_type(host)) if mac.present?
-        interface_compute_attributes = host.compute_attributes['interfaces_attributes'] ? host.compute_attributes['interfaces_attributes'].select { |_k, v| v['id'] == nic.identifier } : {}
-        nic_compute_attributes.store(:_delete, interface_compute_attributes[interface_compute_attributes.keys[0]]['_delete']) unless interface_compute_attributes.empty?
-        set_ip(host, nic, nic_compute_attributes)
-        set_ip(host, nic, nic_compute_attributes, true)
-        ForemanFogProxmox::HashCollection.remove_keys(nic_compute_attributes, ['dhcp', 'dhcp6', 'cidr', 'cidr6'])
-        hash.merge(index.to_s => nic_compute_attributes)
+        set_mac(nic.compute_attributes, mac, vm_type(host)) if mac.present?
+        interface_compute_attributes = host.compute_attributes['interfaces_attributes'] ? host.compute_attributes['interfaces_attributes'].select { |_k, v| v['id'] == nic.compute_attributes[:id] } : {}
+        nic.compute_attributes.store(:_delete, interface_compute_attributes[interface_compute_attributes.keys[0]]['_delete']) unless interface_compute_attributes.empty?
+        set_ip(host, nic, nic.compute_attributes)
+        set_ip(host, nic, nic.compute_attributes, true)
+        ForemanFogProxmox::HashCollection.remove_keys(nic.compute_attributes, ['dhcp', 'dhcp6', 'cidr', 'cidr6'])
+        hash.merge(index.to_s => nic.compute_attributes)
       end
     end
   end

data/app/overrides/compute_resources_vms/form/add_clone_to_new_vm_compute_detail.rb

@@ -20,6 +20,6 @@ Deface::Override.new(
   :name => 'add_from_profile_to_compute_detail',
   :replace => "erb[loud]:contains('provider_partial')",
   :partial => 'compute_resources_vms/form/proxmox/add_from_profile_to_hosts_compute_detail_form',
-  :original => '448e3b265e4dc1789f0efbbc6076e32216ac3a24',
+  :original => '8902a49136f750d781dcaa44e7ffa8a29c1a94df',
   :namespaced => true
 )

data/app/views/compute_resources_vms/form/proxmox/_add_from_profile_to_compute_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 compute_resource.class == ForemanFogProxmox::Proxmox %>
 <%= render :partial => provider_partial(compute_resource, 'base'),
-        :locals => { :f => f, :compute_resource => compute_resource, :new_host => true, :new_vm => true, :hide_image => true, :from_profile => from_profile }.merge(args_for_compute_resource_partial(@host)) %>
+        :locals => { :f => f, :host => nil, :compute_resource => compute_resource, :new_host => true, :new_vm => true, :from_profile => from_profile } %>
 <% else %>
 <%= render :partial => provider_partial(compute_resource, 'base'),
-            :locals => { :f => f, :compute_resource => compute_resource, :new_host => true, :new_vm => true, :hide_image => true }.merge(args_for_compute_resource_partial(@host)) %>
+            :locals => { :f => f, :host => nil, :compute_resource => compute_resource, :new_host => true, :new_vm => true } %>
 <% end %>

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

@@ -17,8 +17,10 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
 
 <% if compute_resource.class == ForemanFogProxmox::Proxmox %>
 <%= render :partial => provider_partial(compute_resource, 'base'),
-            :locals => { :f => f, :compute_resource => compute_resource, :new_host => new_vm, :new_vm => new_vm, :from_profile => false }.merge(args_for_compute_resource_partial(@host)) %>
+            locals: { f: f, host: host, compute_resource: compute_resource, new_host: host.new_record?, new_vm: new_vm,
+                     arch: host.architecture_id, os: host.operatingsystem_id, from_profile: false } %>
 <% else %>
 <%= render :partial => provider_partial(compute_resource, 'base'),
-            :locals => { :f => f, :compute_resource => compute_resource, :new_host => new_vm, :new_vm => new_vm }.merge(args_for_compute_resource_partial(@host)) %>
+            locals: { f: f, host: host, compute_resource: compute_resource, new_host: host.new_record?, new_vm: new_vm,
+                     arch: host.architecture_id, os: host.operatingsystem_id } %>
 <% end %>

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

@@ -16,7 +16,6 @@ You should have received a copy of the GNU General Public License
 along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
 
 <%= javascript_include_tag 'foreman_fog_proxmox/proxmox_vm', "data-turbolinks-track" => true %>
-<%= javascript_tag("$(document).on('ContentLoad', tfm.numFields.initAll)"); %>
 
 <%= select_f f, :type, proxmox_types_map, :id, :name, { }, :label => _('Type'), :label_size => "col-md-2", :required => true, :onchange => "vmTypeSelected()", :disabled => !new_vm %>
 

data/app/views/compute_resources_vms/form/proxmox/container/_network.html.erb

@@ -19,7 +19,7 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
 <% index = f.index ? f.index.present? : 0 %>
 
 <%= field_set_tag _("Nic"), :id => "container_network_#{index}", :style => ('display: none;' unless container), :disabled => !container do %>  
-    <%= f.hidden_field :id if !new_vm %>
+    <%= text_f f, :id, :label => _('Identifier'), :label_size => "col-md-2", :required => true, :label_help => _("net[n] with n integer >= 0, e.g. net0") %>
     <%= text_f f, :name, :label => _('Name'), :label_size => "col-md-2", :required => true, :label_help => _("eth[n] with n integer >= 0, e.g. eth0") %>
     <%= checkbox_f f, :dhcp, :label => _('DHCP IPv4') %>
     <%= text_f f, :cidr, :label => _('CIDR IPv4'), :label_size => "col-md-2", :label_help => _("integer within [0..32]") %>

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

@@ -18,8 +18,8 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
 <% server = vm_type == 'qemu' %>
 <% index = f.index ? f.index.present? : 0 %>
 
-<%= field_set_tag _("Nic"), :id => "server_network_#{index}", :style => ('display: none;' unless server), :disabled => !server do %> 
-    <%= f.hidden_field :id if !new_vm %>
+<%= field_set_tag _("Nic"), :id => "server_network_#{index}", :style => ('display: none;' unless server), :disabled => !server do %>
+    <%= text_f f, :id, :label => _('Identifier'), :label_size => "col-md-2", :required => true, :label_help => _("net[n] with n integer >= 0, e.g. net0") %>
     <%= select_f f, :model, proxmox_networkcards_map, :id, :name, { }, :label => _('Card'), :label_size => "col-md-2" %>
     <%= select_f f, :bridge, compute_resource.bridges(node_id), :iface, :iface, { }, :label => _('Bridge'), :label_size => "col-md-2" %>
     <%= counter_f f, :tag, :class => "input-mini", :label => _('VLAN tag'), :label_size => "col-md-2" %>

data/lib/foreman_fog_proxmox/engine.rb

@@ -105,6 +105,7 @@ module ForemanFogProxmox
       Fog::Proxmox::Compute::Node.include FogExtensions::Proxmox::Node
       ::ComputeResourcesController.include ForemanFogProxmox::Controller::Parameters::ComputeResource
       ::ComputeResourcesVmsController.include ForemanFogProxmox::ComputeResourcesVmsController
+      ::HostsController.include ForemanFogProxmox::HostsController
       ::Host::Managed.include Orchestration::Proxmox::Compute
       ::Host::Managed.include HostExt::Proxmox::Interfaces
       ::Host::Managed.include HostExt::Proxmox::Associator

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.13.4'
+  VERSION = '0.14.0'
 end

data/test/unit/foreman_fog_proxmox/proxmox_interfaces_test.rb

@@ -37,29 +37,30 @@ module ForemanFogProxmox
         @cr = FactoryBot.build_stubbed(:proxmox_cr)
       end
 
-      it 'raises Foreman::Exception when physical identifier does not match net[k] with k integer' do
-        physical_nic = FactoryBot.build(:nic_base_empty, :identifier => 'eth0')
-        host = FactoryBot.build(:host_empty, :interfaces => [physical_nic])
+      it 'raises Foreman::Exception when server proxmox NIC id does not match net[k] with k integer' do
+        compute_attributes = ActiveSupport::HashWithIndifferentAccess.new({ 'id' => 'dsfqsfqzef' })
+        physical_nic = FactoryBot.build(:nic_base_empty, :identifier => 'eth0', :compute_attributes => compute_attributes)
+        host = FactoryBot.build(
+          :host_empty,
+          :interfaces => [physical_nic],
+          :compute_attributes => ActiveSupport::HashWithIndifferentAccess.new({ type: 'qemu' })
+        )
         err = assert_raises Foreman::Exception do
           @cr.host_interfaces_attrs(host)
         end
-        assert err.message.end_with?('Invalid identifier interface[0]. Must be net[n] with n integer >= 0')
+        assert err.message.end_with?('Invalid proxmox NIC id on interface[0]. Must be net[n] with n integer >= 0')
       end
 
-      it 'sets server compute id with identifier, ip and ip6 and mac adress' do
+      it 'sets interface identifier with server compute id, ip and ip6 and mac adress' do
         ip = '192.168.56.100'
         mac_address = '36:25:8c:53:0c:50'
         ip6 = Array.new(4) { format('%<x>s', x: rand(16**4)) }.join(':') + '::1'
-        physical_nic = FactoryBot.build(:nic_base_empty, :identifier => 'net0', :ip => ip, :ip6 => ip6, :mac => mac_address)
+        compute_attributes = ActiveSupport::HashWithIndifferentAccess.new({ 'id' => 'net0' })
+        physical_nic = FactoryBot.build(:nic_base_empty, :identifier => 'net0', :ip => ip, :ip6 => ip6, :mac => mac_address, :compute_attributes => compute_attributes)
         host = FactoryBot.build(
           :host_empty,
           :interfaces => [physical_nic],
-          :compute_attributes => {
-            'type' => 'qemu',
-            'interfaces_attributes' => {
-              '0' => physical_nic
-            }
-          }
+          :compute_attributes => ActiveSupport::HashWithIndifferentAccess.new({ type: 'qemu' })
         )
         nic_attributes = @cr.host_interfaces_attrs(host).values.select(&:present?)
         nic_attr = nic_attributes.first
@@ -69,20 +70,30 @@ module ForemanFogProxmox
         assert_equal mac_address, nic_attr[:macaddr]
       end
 
-      it 'sets container compute id with identifier, ip/CIDR, gw and ip6' do
+      it 'raises Foreman::Exception when container proxmox NIC id does not match net[k] with k integer' do
+        compute_attributes = ActiveSupport::HashWithIndifferentAccess.new({ 'id' => 'dsfqsfqzef' })
+        physical_nic = FactoryBot.build(:nic_base_empty, :identifier => 'eth0', :compute_attributes => compute_attributes)
+        host = FactoryBot.build(
+          :host_empty,
+          :interfaces => [physical_nic],
+          :compute_attributes => ActiveSupport::HashWithIndifferentAccess.new({ type: 'lxc' })
+        )
+        err = assert_raises Foreman::Exception do
+          @cr.host_interfaces_attrs(host)
+        end
+        assert err.message.end_with?('Invalid proxmox NIC id on interface[0]. Must be net[n] with n integer >= 0')
+      end
+
+      it 'sets container compute ip/CIDR, gw and ip6' do
         ip = '192.168.56.100'
         cidr = '31'
         ip6 = Array.new(4) { format('%<x>s', x: rand(16**4)) }.join(':') + '::1'
-        physical_nic = FactoryBot.build(:nic_base_empty, :identifier => 'net0', :ip => ip, :ip6 => ip6, :compute_attributes => { 'cidr' => cidr, 'gw' => ip, 'ip' => ip, 'dhcp6' => '1' })
+        compute_attributes = ActiveSupport::HashWithIndifferentAccess.new({ 'id' => 'net0', 'cidr' => cidr, 'gw' => ip, 'ip' => ip, 'dhcp6' => '1' })
+        physical_nic = FactoryBot.build(:nic_base_empty, :identifier => 'net0', :ip => ip, :ip6 => ip6, :compute_attributes => compute_attributes)
         host = FactoryBot.build(
           :host_empty,
           :interfaces => [physical_nic],
-          :compute_attributes => {
-            'type' => 'lxc',
-            'interfaces_attributes' => {
-              '0' => physical_nic
-            }
-          }
+          :compute_attributes => ActiveSupport::HashWithIndifferentAccess.new({ type: 'lxc' })
         )
         nic_attributes = @cr.host_interfaces_attrs(host).values.select(&:present?)
         nic_attr = nic_attributes.first
@@ -92,20 +103,16 @@ module ForemanFogProxmox
         assert_equal 'dhcp', nic_attr[:ip6]
       end
 
-      it 'sets container compute id with identifier, ip DHCP, gw6 and ip6' do
+      it 'sets container compute ip DHCP, gw6 and ip6' do
         ip = '192.168.56.100'
         cidr6 = '100'
         ip6 = '2001:0:1234::c1c0:abcd:876'
-        physical_nic = FactoryBot.build(:nic_base_empty, :identifier => 'net0', :ip => ip, :ip6 => ip6, :compute_attributes => { 'cidr6' => cidr6, 'dhcp' => '1', 'gw6' => ip6 })
+        compute_attributes = ActiveSupport::HashWithIndifferentAccess.new({ 'id' => 'net0', 'cidr6' => cidr6, 'dhcp' => '1', 'gw6' => ip6 })
+        physical_nic = FactoryBot.build(:nic_base_empty, :identifier => 'net0', :ip => ip, :ip6 => ip6, :compute_attributes => compute_attributes)
         host = FactoryBot.build(
           :host_empty,
           :interfaces => [physical_nic],
-          :compute_attributes => {
-            'type' => 'lxc',
-            'interfaces_attributes' => {
-              '0' => physical_nic
-            }
-          }
+          :compute_attributes => ActiveSupport::HashWithIndifferentAccess.new({ type: 'lxc' })
         )
         nic_attributes = @cr.host_interfaces_attrs(host).values.select(&:present?)
         nic_attr = nic_attributes.first
@@ -115,22 +122,17 @@ module ForemanFogProxmox
         assert_equal ip6, nic_attr['gw6']
       end
 
-      it 'sets container compute id with identifier, ip DHCP, mac adress and firewall' do
+      it 'sets container compute ip DHCP, mac adress and firewall' do
         ip = '192.168.56.100'
         mac_address = '36:25:8c:53:0c:50'
         ip6 = '2001:0:1234::c1c0:abcd:876'
         firewall = '1'
-        compute_attributes = { 'dhcp' => '1', 'ip6' => ip6, 'firewall' => firewall }
+        compute_attributes = ActiveSupport::HashWithIndifferentAccess.new({ 'id' => 'net0', 'dhcp' => '1', 'ip6' => ip6, 'firewall' => firewall })
         physical_nic = FactoryBot.build(:nic_base_empty, :identifier => 'net0', :ip => ip, :ip6 => ip6, :mac => mac_address, :compute_attributes => compute_attributes)
         host = FactoryBot.build(
           :host_empty,
           :interfaces => [physical_nic],
-          :compute_attributes => {
-            'type' => 'lxc',
-            'interfaces_attributes' => {
-              '0' => physical_nic
-            }
-          }
+          :compute_attributes => ActiveSupport::HashWithIndifferentAccess.new({ type: 'lxc' })
         )
         nic_attributes = @cr.host_interfaces_attrs(host).values.select(&:present?)
         nic_attr = nic_attributes.first

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_fog_proxmox
 version: !ruby/object:Gem::Version
-  version: 0.13.4
+  version: 0.14.0
 platform: ruby
 authors:
 - Tristan Robert
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-21 00:00:00.000000000 Z
+date: 2021-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -102,6 +102,7 @@ files:
 - app/assets/javascripts/foreman_fog_proxmox/proxmox_volume_cloudinit.js
 - app/controllers/concerns/foreman_fog_proxmox/compute_resources_vms_controller.rb
 - app/controllers/concerns/foreman_fog_proxmox/controller/parameters/compute_resource.rb
+- app/controllers/concerns/foreman_fog_proxmox/hosts_controller.rb
 - app/controllers/foreman_fog_proxmox/compute_resources_controller.rb
 - app/helpers/node_dashboard_helper.rb
 - app/helpers/proxmox_compute_controllers_helper.rb