foreman_fog_proxmox 0.12.2 → 0.13.3

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

@@ -18,19 +18,19 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
 <%= javascript_include_tag 'foreman_fog_proxmox/proxmox_vm_server', "data-turbolinks-track" => true %>
 
 <% server = type == 'qemu' %>
+<% logger.debug("_config.html.erb server_config=#{f.object.inspect}") %>
 
 <%= field_set_tag n_("Main option", "Main options", 2), :id => "server_config_options", :class => 'hide', :disabled => !server do %>
   <%= textarea_f f, :description, :label => _('Description'), :label_size => "col-md-2" %>
-  <%= text_f f, :boot, :label => _('Boot device order'), :label_size => "col-md-2", :label_help => _('Floppy disk (a), hard disk (c), cdrom (d), network (n). Default cdn')  %>
+  <%= text_f f, :boot, :label => _('Boot device order'), :label_size => "col-md-2", :label_help => _('Order your devices, e.g. order=net0;ide2;scsi0. Default empty (any)')  %>
   <%= checkbox_f f, :onboot, :label => _('Start at boot') %>
   <%= checkbox_f f, :agent, :label => _('Qemu Agent') %>
   <%= checkbox_f f, :kvm, :label => _('KVM'), :label_help => _('Enable/disable KVM hardware virtualization') %>
-  <%= 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 %>
+<%= field_set_tag _("CPUs"), :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" %>
   <%= counter_f f, :sockets, :class => "input-mini", :label => _('Sockets'), :label_size => "col-md-2" %>
   <%= counter_f f, :cores, :class => "input-mini", :label => _('Cores'), :label_size => "col-md-2" %>
@@ -38,23 +38,24 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
   <%= counter_f f, :cpulimit, :class => "input-mini", :label => _('CPU limit'), :label_size => "col-md-2" %>
   <%= counter_f f, :cpuunits, :class => "input-mini", :label => _('CPU units'), :label_size => "col-md-2" %>
   <%= checkbox_f f, :numa, :label => _('Enable NUMA') %>
-  <%= checkbox_f f, :pcid, :label => _('PCID') %>
-  <%= checkbox_f f, :spectre, :label => _('Spectre-CTRL') %>
+  <%= field_set_tag _("CPU Flags"), :id => "server_config_cpu_flags" do %>
+    <% Fog::Proxmox::CpuHelper.flags.each do |flag_key, flag_value| %>
+      <%= select_f f, flag_key, proxmox_cpu_flags_map, :id, :name, { }, :label => _(flag_value) %>
+    <% end %>
+  <% end %>
 <% end %>
 <%= field_set_tag _("Memory"), :id => "server_config_memory", :class => 'hide', :disabled => !server do %>
   <%= byte_size_f f, :memory, :class => "input-mini", :label => _('Memory'), :label_size => "col-md-2" %>
   <%= byte_size_f f, :balloon, :class => "input-mini", :label => _('Minimum memory'), :label_size => "col-md-2" %>
   <%= counter_f f, :shares, :class => "input-mini", :label => _('Shares'), :label_size => "col-md-2" %>
 <% end %>
-<%= field_set_tag _("CD-ROM"), :id => "server_config_cdrom", :class => 'hide', :disabled => !server do %>
-  <%= radio_button_f f, :cdrom, :value => 'none', :text => _('None'), :onclick => 'cdromSelected(this)' %>
-  <%= radio_button_f f, :cdrom, :value => 'cdrom' , :text => _('Physical'), :onclick => 'cdromSelected(this)' %>
-  <%= radio_button_f f, :cdrom, :value => 'image' , :text => _('Image'), :onclick => 'cdromSelected(this)' %>
-  <div id='cdrom_image_form' class='<%= 'hide' if %[none cdrom].include? f.object.cdrom %>'>
-    <%= select_f f, :cdrom_storage, compute_resource.storages(node_id,'iso'), :storage, :storage, { :include_blank => true }, :label => _('Storage'), :label_size => "col-md-2", :onchange => 'storageIsoSelected(this)' %>
-    <%= select_f f, :cdrom_iso, compute_resource.images_by_storage(f.object.cdrom_storage, 'iso'), :volid, :volid, { :include_blank => true }, :label => _('Image ISO'), :label_size => "col-md-2" %>
-  </div>
-<% end %>
 <%= field_set_tag _("Operating System"), :id => "server_config_os", :class => 'hide', :disabled => !server do %>
   <%= select_f f, :ostype, proxmox_operating_systems_map, :id, :name, { :include_blank => true }, :label => _('OS type'), :label_size => "col-md-2" %>
+<% end %>
+<%= field_set_tag _("Cloud-init"), :id => "server_config_cloud_init", :class => ('hide' unless cloudinit), :disabled => (!cloudinit) do %>
+  <%= text_f f, :ciuser, :label => _('User'), :label_size => "col-md-2" %>
+  <%= text_f f, :cipassword, :label => _('Password'), :label_size => "col-md-2" %>
+  <%= text_f f, :searchdomain, :label => _('DNS domain'), :label_size => "col-md-2" %>
+  <%= text_f f, :nameserver, :label => _('DNS servers'), :label_size => "col-md-2" %>
+  <%= textarea_f f, :sshkeys, :label => _("SSH public key"), :size => "col-md-4" %>
 <% end %>

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

@@ -25,6 +25,6 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
     <%= counter_f f, :tag, :class => "input-mini", :label => _('VLAN tag'), :label_size => "col-md-2" %>
     <%= counter_f f, :rate, :class => "input-mini", :label => _('Rate limit'), :label_size => "col-md-2" %>
     <%= counter_f f, :queues, :class => "input-mini", :label => _('Multiqueue'), :label_size => "col-md-2" %>
-    <%= checkbox_f f, :firewall, :label => _('Firewall') %>
-    <%= checkbox_f f, :link_down, :label => _('Disconnect') %>
+    <%= checkbox_f f, :firewall, { :label => _('Firewall') }, '1', '0' %>
+    <%= checkbox_f f, :link_down, { :label => _('Disconnect') }, '1', '0' %>
 <% end %>

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

@@ -0,0 +1,34 @@
+<%# 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/>. %>
+
+<%= javascript_include_tag 'foreman_fog_proxmox/proxmox_volume_cdrom', "data-turbolinks-track" => true %>
+
+<% cdrom = f.object.cdrom? %>
+<% new_volume = f.object.volid.nil? %>
+
+<%= field_set_tag _("CD-ROM"), :id => "server_volume_cdrom_#{f.index}", :class => ('hide' unless cdrom), :disabled => !cdrom do %>
+  <%= field_set_tag _("Media"), :id => "cdrom_media_form_#{f.index}" do %>
+    <%= f.hidden_field :storage_type %>
+    <%= radio_button_f f, :cdrom, :value => 'none', :text => _('None'), :onclick => 'cdromSelected(this)' %>
+    <%= radio_button_f f, :cdrom, :value => 'cdrom' , :text => _('Physical'), :onclick => 'cdromSelected(this)' %>
+    <%= radio_button_f f, :cdrom, :value => 'image' , :text => _('Image'), :onclick => 'cdromSelected(this)' %>
+  <% end %>
+  <%= field_set_tag(_("Image"), :id => "cdrom_image_form_#{f.index}", :class => ('hide' unless %[image].include? f.object.cdrom), :disabled => (%[cdrom none].include? f.object.cdrom)) do %>
+    <%= select_f f, :storage, compute_resource.storages(node_id,'iso'), :storage, :storage, { :include_blank => true }, :label => _('Storage'), :label_size => "col-md-2", :onchange => 'storageIsoSelected(this)' %>
+    <%= select_f f, :volid, compute_resource.images_by_storage(node_id, f.object.storage, 'iso'), :volid, :volid, { :include_blank => true }, :label => _('Image ISO'), :label_size => "col-md-2" %>
+  <% end %>
+<% end %>

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

@@ -0,0 +1,29 @@
+<%# 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/>. %>
+
+<%= javascript_include_tag 'foreman_fog_proxmox/proxmox_volume_cloudinit', "data-turbolinks-track" => true %>
+
+<% cloud_init = f.object.cloud_init? %>
+<% new_volume = f.object.volid.nil? %>
+
+<%= field_set_tag _("Cloud-init"), :id => "server_volume_cloud_init_#{f.index}", :class => ('hide' unless cloud_init), :disabled => !cloud_init do %>
+  <%= f.hidden_field :volid if !new_volume %>
+  <%= f.hidden_field :storage_type %>
+  <%= select_f f, :storage, compute_resource.storages(node_id), :storage, :storage, { :include_blank => true }, :label => _('Storage'), :label_size => "col-md-2", :disabled => !new_volume %>
+  <%= select_f f, :controller, proxmox_controllers_cloudinit_map, :id, :name, { :include_blank => true }, :label => _('Controller'), :label_size => "col-md-2", :onchange => 'cloudinitControllerSelected(this)', :disabled => !new_volume %>
+  <%= text_f f, :device, :label => _('Device'), :label_size => "col-md-2", :'data-min' => 0, :'data-soft-max' => proxmox_max_device(f.object.controller), :disabled => !new_volume %>
+<% end %>

data/app/views/compute_resources_vms/form/proxmox/server/{_volume.html.erb → _volume_hard_disk.html.erb}

@@ -15,11 +15,15 @@ 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/>. %>
 
-<% server = type == 'qemu' %>
+<% hard_disk = f.object.hard_disk? %>
+<% logger.debug("_volume_hard_disk.html f.object=#{f.object.inspect}") %>
+<% logger.debug("_volume_hard_disk.html f.object.hard_disk?=#{f.object.hard_disk?}") %>
+<% logger.debug("_volume_hard_disk.html f.object.storage_type=#{f.object.storage_type}") %>
 <% new_volume = f.object.volid.nil? %>
 
-<%= field_set_tag _("Disk"), :id => "server_volume_#{f.index}", :class => ('hide' unless server), :disabled => !server do %> 
-    <%= f.hidden_field :volid if !new_vm %>
+<%= field_set_tag _('Hard disk'), :id => "server_volume_hard_disk_#{f.index}", :class => ('hide' unless hard_disk), :disabled => !hard_disk do %> 
+    <%= f.hidden_field :volid if !new_volume %>    
+    <%= f.hidden_field :storage_type %>
     <%= select_f f, :storage, compute_resource.storages(node_id), :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)' %>

data/app/views/compute_resources_vms/show/_proxmox.html.erb

@@ -30,6 +30,8 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
       <%= prop :memory %>
       <% unless @vm.container? %>
         <%= prop :vga %>
+        <%= prop :cloud_init? %>
+        <%= prop :cdrom? %>
       <% end %>
       <%= prop :cpus %>
       <%= prop :uptime %>

data/config/routes.rb

@@ -19,12 +19,12 @@
 
 Rails.application.routes.draw do
   namespace :foreman_fog_proxmox do
-    match 'isos/:node_id/:storage', :to => 'compute_resources#isos_by_node_and_storage', :via => 'get'
-    match 'ostemplates/:node_id/:storage', :to => 'compute_resources#ostemplates_by_node_and_storage', :via => 'get'
-    match 'isos/:node_id', :to => 'compute_resources#isos_by_node', :via => 'get'
-    match 'ostemplates/:node_id', :to => 'compute_resources#ostemplates_by_node', :via => 'get'
-    match 'storages/:node_id', :to => 'compute_resources#storages_by_node', :via => 'get'
-    match 'isostorages/:node_id', :to => 'compute_resources#iso_storages_by_node', :via => 'get'
-    match 'bridges/:node_id', :to => 'compute_resources#bridges_by_node', :via => 'get'
+    match 'isos/:compute_resource_id/:node_id/:storage', :to => 'compute_resources#isos_by_id_and_node_and_storage', :via => 'get'
+    match 'ostemplates/:compute_resource_id/:node_id/:storage', :to => 'compute_resources#ostemplates_by_id_and_node_and_storage', :via => 'get'
+    match 'isos/:compute_resource_id/:node_id', :to => 'compute_resources#isos_by_id_and_node', :via => 'get'
+    match 'ostemplates/:compute_resource_id/:node_id', :to => 'compute_resources#ostemplates_by_id_and_node', :via => 'get'
+    match 'storages/:compute_resource_id/:node_id', :to => 'compute_resources#storages_by_id_and_node', :via => 'get'
+    match 'isostorages/:compute_resource_id/:node_id', :to => 'compute_resources#iso_storages_by_id_and_node', :via => 'get'
+    match 'bridges/:compute_resource_id/:node_id', :to => 'compute_resources#bridges_by_id_and_node', :via => 'get'
   end
 end

data/db/migrate/20210312105013_update_proxmox_uuid_host.rb

@@ -0,0 +1,29 @@
+include ProxmoxVmUuidHelper
+class UpdateProxmoxUuidHost < ActiveRecord::Migration[6.0]
+
+  def up
+    execute(sql(:concat))
+  end
+
+  def down
+    execute(sql(:substring))
+  end
+
+  private 
+
+  def concat
+    "concat(h.compute_resource_id, '_', h.uuid) "
+  end
+
+  def substring
+    "substring(h.uuid, position('_' in h.uuid) + 1, length(h.uuid)) "
+  end
+
+  def sql(func_type)
+    sql = 'update hosts h set uuid = '
+    sql += send(func_type)
+    sql += 'from compute_resources cr '
+    sql += "where cr.id = h.compute_resource_id and cr.type = 'ForemanFogProxmox::Proxmox';"
+    sql
+  end
+end

data/lib/foreman_fog_proxmox/engine.rb

@@ -45,8 +45,14 @@ module ForemanFogProxmox
         # add dashboard widget
         widget 'foreman_fog_proxmox_widget', name: N_('Foreman Fog Proxmox widget'), sizex: 8, sizey: 1
         security_block :foreman_fog_proxmox do
-          permission :view_compute_resource, { :"foreman_fog_proxmox/compute_resources" =>
-          [:ostemplates_by_node_and_storage, :isos_by_node_and_storage, :ostemplates_by_node, :isos_by_node, :storages_by_node, :iso_storages_by_node, :bridges_by_node] }
+          permission :view_compute_resource, { :compute_resources =>
+            [:ostemplates_by_id_and_node_and_storage,
+             :isos_by_id_and_node_and_storage,
+             :ostemplates_by_id_and_node,
+             :isos_by_id_and_node,
+             :storages_by_id_and_node,
+             :iso_storages_by_id_and_node,
+             :bridges_by_id_and_node] }
         end
       end
     end
@@ -84,18 +90,17 @@ module ForemanFogProxmox
     end
 
     config.to_prepare do
-      require 'fog/compute/proxmox/models/server'
-      require 'fog/compute/proxmox/models/server_config'
-      require 'fog/compute/proxmox/models/disk'
-      require 'fog/compute/proxmox/models/interface'
-      require 'fog/compute/proxmox/models/volume'
-      require 'fog/compute/proxmox/models/node'
+      require 'fog/proxmox/compute/models/server'
+      require 'fog/proxmox/compute/models/server_config'
+      require 'fog/proxmox/compute/models/disk'
+      require 'fog/proxmox/compute/models/interface'
+      require 'fog/proxmox/compute/models/volume'
+      require 'fog/proxmox/compute/models/node'
 
       Fog::Proxmox::Compute::Server.include FogExtensions::Proxmox::Server
       Fog::Proxmox::Compute::ServerConfig.include FogExtensions::Proxmox::ServerConfig
-      Fog::Proxmox::Compute::Disk.include FogExtensions::Proxmox::Disk
       Fog::Proxmox::Compute::Interface.include FogExtensions::Proxmox::Interface
-      Fog::Proxmox::Compute::Volume.include FogExtensions::Proxmox::Volume
+      Fog::Proxmox::Compute::Disk.include FogExtensions::Proxmox::Disk
       ::ComputeResourcesController.include ForemanFogProxmox::Controller::Parameters::ComputeResource
       Fog::Proxmox::Compute::Node.include FogExtensions::Proxmox::Node
       ::Host::Managed.include Orchestration::Proxmox::Compute

data/lib/foreman_fog_proxmox/hash_collection.rb

@@ -0,0 +1,69 @@
+# 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 'foreman_fog_proxmox/value'
+
+module ForemanFogProxmox
+  module HashCollection
+    def self.add_and_format_element(dest, dest_key, origin, origin_key, format = :to_s)
+      dest[dest_key] = origin[origin_key].send(format) if origin && origin[origin_key]
+    end
+
+    def self.remove_empty_values(h)
+      h.delete_if { |_key, value| ForemanFogProxmox::Value.empty?(value) }
+    end
+
+    def self.remove_keys(h, excluded_keys)
+      h.delete_if { |key, _value| excluded_keys.include?(key) }
+    end
+
+    def self.new_hash_reject_keys(h, excluded_keys)
+      h.reject { |key, _value| excluded_keys.include?(key) }
+    end
+
+    def self.new_hash_reject_empty_values(h)
+      h.reject { |_key, value| ForemanFogProxmox::Value.empty?(value) }
+    end
+
+    def self.new_hash_transform_values(h, transformation)
+      h.transform_values { |value| value.send(transformation) }
+    end
+
+    def self.equals?(h1, h2)
+      new_h1 = new_hash_transform_values(h1, :to_s)
+      new_sorted_h1 = new_h1.sort_by { |key, _value| key }.to_h
+      new_h2 = new_hash_transform_values(h2, :to_s)
+      new_sorted_h2 = new_h2.sort_by { |key, _value| key }.to_h
+      new_sorted_h1.keys == new_sorted_h2.keys && new_sorted_h1.values == new_sorted_h2.values
+    end
+
+    def self.stringify_keys(old_h)
+      h = old_h.map do |k, v|
+        v_str = if v.instance_of? Hash
+                  v.stringify_keys
+                else
+                  v
+                end
+
+        [k.to_s, v_str]
+      end
+      Hash[h]
+    end
+  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.12.2'
+  VERSION = '0.13.3'
 end

data/lib/tasks/foreman_fog_proxmox_tasks.rake

@@ -32,6 +32,3 @@ namespace :foreman_fog_proxmox do
 end
 
 Rake::Task[:test].enhance ['test:foreman_fog_proxmox']
-
-load 'tasks/jenkins.rake'
-Rake::Task['jenkins:unit'].enhance ['test:foreman_fog_proxmox', 'foreman_fog_proxmox:rubocop'] if Rake::Task.task_defined?(:'jenkins:unit')

data/test/factories/foreman_fog_proxmox/proxmox_container_mock_factory.rb

@@ -19,14 +19,15 @@
 
 module ForemanFogProxmox
   module ProxmoxContainerMockFactory
-    def mock_container_vm
-      interface_attributes = {
-        id: 'net0',
-        mac: '36:25:8C:53:0C:50',
+    def mock_container_interface_attributes
+      compute_attributes = {
         model: nil,
         name: 'eth0',
+        hwaddr: '36:25:8C:53:0C:50',
         ip: nil,
         ip6: nil,
+        gw: nil,
+        gw6: nil,
         bridge: 'vmbr0',
         firewall: nil,
         link_down: nil,
@@ -34,8 +35,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_container_vm
       interface = mock('interface')
-      interface.stubs(:attributes).returns(interface_attributes)
+      interface.stubs(:attributes).returns(mock_container_interface_attributes)
       interfaces = [interface]
       volume_attributes = {
         id: 'rootfs',
@@ -96,13 +108,13 @@ module ForemanFogProxmox
       vm.stubs(:config).returns(config)
       vm.stubs(:type).returns('lxc')
       vm.stubs(:identity).returns(100)
-      vm.stubs(:node_id).returns('pve')
+      vm.stubs(:node_id).returns('proxmox')
       vm.stubs(:identity).returns(100)
       service = mock('service')
       vm_attributes = {
         vmid: 100,
         id: 'lxc/100',
-        node_id: 'pve',
+        node_id: 'proxmox',
         service: service,
         config: config,
         name: 'test',
@@ -131,7 +143,7 @@ module ForemanFogProxmox
       }
       vm.stubs(:attributes).returns(vm_attributes)
       vm.stubs(:container?).returns(true)
-      [vm, config_attributes, volume_attributes, interface_attributes]
+      [vm, config_attributes, volume_attributes, mock_container_interface_attributes]
     end
   end
 end

data/test/factories/foreman_fog_proxmox/proxmox_node_mock_factory.rb

@@ -22,7 +22,7 @@ module ForemanFogProxmox
     def mock_node_servers(cr, servers)
       node = mock('node')
       nodes = mock('nodes')
-      node.stubs(:node).returns('pve')
+      node.stubs(:node).returns('proxmox')
       node.stubs(:servers).returns(servers)
       nodes.stubs(:get).returns(node)
       nodes.stubs(:all).returns([node])
@@ -35,7 +35,7 @@ module ForemanFogProxmox
     def mock_node_containers(cr, containers)
       node = mock('node')
       nodes = mock('nodes')
-      node.stubs(:node).returns('pve')
+      node.stubs(:node).returns('proxmox')
       node.stubs(:containers).returns(containers)
       nodes.stubs(:get).returns(node)
       nodes.stubs(:all).returns([node])
@@ -47,7 +47,7 @@ module ForemanFogProxmox
 
     def mock_node_servers_containers(cr, servers, containers)
       node = mock('node')
-      node.stubs(:node).returns('pve')
+      node.stubs(:node).returns('proxmox')
       node.stubs(:containers).returns(containers)
       node.stubs(:servers).returns(servers)
       nodes = mock('nodes')
@@ -69,8 +69,8 @@ module ForemanFogProxmox
       node2.stubs(:servers).returns(n2s)
       node2.stubs(:containers).returns(n2c)
       nodes = mock('nodes')
-      nodes.stubs(:get).with('pve').returns(node1)
-      nodes.stubs(:get).with('pve2').returns(node2)
+      nodes.stubs(:get).with('proxmox').returns(node1)
+      nodes.stubs(:get).with('proxmox2').returns(node2)
       nodes.stubs(:all).returns([node1, node2])
       client = mock('client')
       client.stubs(:nodes).returns(nodes)