foreman_fog_proxmox 0.5.6 → 0.6.0

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

@@ -15,15 +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/>.
 
-Deface::Override.new(
-    :virtual_path => "hosts/_compute_detail",
-    :name => "add_clone_to_new_vm_compute_detail",
-    :replace => "erb[silent]:contains('new_vm = @host.nil? || new_vm?(@host)')",
-    :text => "<% new_vm = @host.nil? || new_vm?(@host) || @host.name.nil? %>",
-    :original => "<% new_vm = @host.nil? || new_vm?(@host) %>"
-)
-
-
 Deface::Override.new(
     :virtual_path => "hosts/_compute_detail",
     :name => "add_from_profile_to_compute_detail",

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

@@ -20,7 +20,7 @@ Deface::Override.new(
     :name => "add_vm_type_to_networks_form",
     :replace => "erb[loud]:contains('render')",
     :partial => "compute_resources_vms/form/proxmox/add_vm_type_to_networks_form",
-    :original => 'bae57f59cbbf6fcf1aecdf3a02baee5ff3494c85'
+    :original => 'ce82feb03418d25628001c9fc5f5f78025c5e5f8'
 )
 
 Deface::Override.new(

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

@@ -21,5 +21,5 @@ Deface::Override.new(
     :replace => "erb[loud]:contains('f.fields_for')",
     :closing_selector => "erb[silent]:contains('end')",
     :partial => "compute_resources_vms/form/proxmox/add_vm_type_to_nic_provider_specific_form",
-    :original => '3c575e0e570cc620277fbffd61bfdc7c42bbdc77' 
+    :original => 'f1a2373efd9c7c993fd1662a2ee4752183542704' 
 )

data/app/services/foreman_fog_proxmox/node_dashboard/data.rb

@@ -25,13 +25,13 @@ module ForemanFogProxmox::NodeDashboard
             @filter = filter
         end
 
-        def node
+        def node_id
             @compute_resource = ComputeResource.find_by(type: 'ForemanFogProxmox::Proxmox')
-            @compute_resource.node if @compute_resource
+            @compute_resource.node_id if @compute_resource
         end
 
         def statistics            
-            node.statistics('rrddata', { timeframe: 'hour', cf: 'AVERAGE' }) if node
+            node.statistics('rrddata', { timeframe: 'hour', cf: 'AVERAGE' }) if node_id
         end
     end
 end

data/app/views/compute_resources/form/_proxmox.html.erb

@@ -18,11 +18,11 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
 <%= javascript_include_tag 'foreman_fog_proxmox/proxmox_compute_resource', "data-turbolinks-track" => true %>
 
 <% nodes = f.object.nodes rescue nil %>
-<% node_name = !!f.object.node_name ? f.object.node_name : '' %>
+<% node_id = !!f.object.node_id ? f.object.node_id : '' %>
 <%= text_f f, :url, :help_block => _("e.g. https://127.0.0.1:8006/api2/json"), :help_inline_permanent => load_button_f(f, !!nodes, _("Test failed")) %>
 <%= text_f f, :user , :help_block => _("e.g. root@pam") %>
 <%= password_f f, :password, :keep_value => true, :unset => unset_password? %>
 <%= checkbox_f f, :ssl_verify_peer, :label => _("SSL verify peer"), :checked => true, :onchange => "sslVerifyPeerSelected(this)" %>
 <%= textarea_f f, :ssl_certs, :label => _("X509 Certification Authorities"), :size => "col-md-4",
   :placeholder => _("Optionally provide a CA, or a correctly ordered CA chain. If left blank, disable ssl_verify_peer.") %>
-<%= select_f f, :node_name, nodes, :node, :node, { :include_blank => true }, :label => _('Node'), :label_size => "col-md-2", :required => true, :disabled => (node_name != '') %>
+<%= select_f f, :node_id, nodes, :node, :node, { :include_blank => true }, :label => _('Node'), :label_size => "col-md-2", :required => true, :disabled => (node_id != '') %>

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

@@ -19,3 +19,7 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
   <td><%= _("URL") %></td>
   <td><%= @compute_resource.url %></td>
 </tr>
+<tr>
+  <td><%= _("Version") %></td>
+  <td><%= @compute_resource.version['version'] %></td>
+</tr>

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

@@ -16,8 +16,9 @@ You should have received a copy of the GNU General Public License
 along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
 
 <% vm_type = f.object.respond_to?('type') ? f.object.type : nil %>
+<% logger.debug("vm_type=#{vm_type}") %>
 
 <%= render :partial => provider_partial(compute_resource, 'network'),
-              :locals => { :f => i, :vm_type => vm_type, :compute_resource => compute_resource, :new_host => new_host, :new_vm => new_vm, :remove_title => _('remove network interface') },
+              :locals => { :f => i, :vm_type => vm_type, :compute_resource => compute_resource, :new_host => new_host, :new_vm => new_vm, :remove_title => _('remove network interface'), :selected_cluster => selected_cluster },
               :layout => 'compute_resources_vms/form/deletable_layout' %>
 

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

@@ -16,6 +16,7 @@ You should have received a copy of the GNU General Public License
 along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
 
 <% vm_type = f.object.respond_to?('type') ? f.object.type : nil %>
+<% logger.debug("vm_type=#{vm_type}") %>
 
 <%= new_child_fields_template(f, compute_resource.interfaces_attrs_name, {
         :object => compute_resource.new_interface,

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

@@ -16,8 +16,9 @@ You should have received a copy of the GNU General Public License
 along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
 <% compute_attributes = f.options[:parent_builder].object.compute_attributes %>
 <% vm_type = compute_attributes ? compute_attributes['type'] : f.object.type %>
+<% logger.debug("vm_type=#{vm_type}") %>
 
 <%= 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, :disabled => f.object.persisted?, :compute_resource => @host.compute_resource, :new_host => new_vm?(@host), :new_vm => new_vm?(@host) %>
+    <%= render provider_partial(@host.compute_resource, 'network'), :f => f, :vm_type => vm_type, :disabled => f.object.persisted?, :compute_resource => @host.compute_resource, :new_host => new_vm, :new_vm => new_vm %>
 <% end %>
 

data/app/views/compute_resources_vms/form/proxmox/_add_vm_type_to_volumes_edit.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/>. %>
 
 <% type = f.object.type %>
-<% logger.debug("type=#{type}") %>
 <% server = type == 'qemu' %>
 <% container = type == 'lxc' %>
 

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

@@ -20,7 +20,7 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
 <%= field_set_tag _("General"), :id => "general" do %>
   <%= checkbox_f f, :templated, :label => _('Create image?'), :disabled => untemplatable, :class => ('hide' if untemplatable), :no_label => untemplatable %>
   <%= counter_f f, :vmid, :label => _('VM ID'), :label_size => "col-md-2", :required => true, :disabled => (!new_vm || from_profile) %>
-  <%= select_f f, :node, compute_resource.nodes, :node, :node, { }, :label => _('Node'), :label_size => "col-md-2", :required => true, :disabled => true %>
+  <%= select_f f, :node_id, compute_resource.nodes, :node, :node, { }, :label => _('Node'), :label_size => "col-md-2", :required => true, :disabled => true %>
   <% unless local_assigns[:hide_image] && !new_vm %>
     <%
       arch ||= nil ; os ||= nil

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

@@ -15,7 +15,6 @@ 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' %>
 
 <%= field_set_tag _("Nic"), :id => "server_network", :style => ('display: none;' unless server), :disabled => !server do %> 

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

@@ -24,7 +24,7 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
 
     <%= prop :name %>
     <%= prop :type %>
-    <%= prop :node %>
+    <%= prop :node_id %>
     <%= prop :templated? %>
     <%= prop :mac %>
     <%= prop :memory %>

data/app/views/dashboard/_foreman_fog_proxmox_widget.erb

@@ -16,6 +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/>. %>
 
 <% data = ForemanFogProxmox::NodeDashboard::Data.new() %>
-<% node = data.node.to_s rescue nil %>
-<h4 class="header ca"><%= N_("Proxmox Node Statistics: %s") % node %></h4>
+<% node_id = data.node_id rescue nil %>
+<h4 class="header ca"><%= N_("Proxmox Node Statistics: %s") % node_id %></h4>
 <%= render_node_statistics(data.statistics, :class => 'statistics-bar') rescue nil %>

data/lib/foreman_fog_proxmox/engine.rb

@@ -38,7 +38,7 @@ module ForemanFogProxmox
 
     initializer 'foreman_fog_proxmox.register_plugin', :before => :finisher_hook do |_app|
       Foreman::Plugin.register :foreman_fog_proxmox do
-        requires_foreman '>= 1.17.3'
+        requires_foreman '>= 1.21.0'
         # Register Proxmox VE compute resource in foreman
         compute_resource ForemanFogProxmox::Proxmox
         parameter_filter(ComputeResource, :uuid)
@@ -81,18 +81,16 @@ module ForemanFogProxmox
     config.to_prepare do
       require 'fog/compute/proxmox/models/server'
       require 'fog/compute/proxmox/models/server_config'
-      require 'fog/compute/proxmox/models/container'
-      require 'fog/compute/proxmox/models/container_config'
       require 'fog/compute/proxmox/models/disk'
       require 'fog/compute/proxmox/models/volume'
+      require 'fog/compute/proxmox/models/node'
 
       Fog::Compute::Proxmox::Server.send :include, FogExtensions::Proxmox::Server
       Fog::Compute::Proxmox::ServerConfig.send :include, FogExtensions::Proxmox::ServerConfig
-      Fog::Compute::Proxmox::Container.send :include, FogExtensions::Proxmox::Container
-      Fog::Compute::Proxmox::ContainerConfig.send :include, FogExtensions::Proxmox::ContainerConfig
       Fog::Compute::Proxmox::Disk.send :include, FogExtensions::Proxmox::Disk
       Fog::Compute::Proxmox::Volume.send :include, FogExtensions::Proxmox::Volume
       ::ComputeResourcesController.send :include, ForemanFogProxmox::Controller::Parameters::ComputeResource
+      Fog::Compute::Proxmox::Node.send :include, FogExtensions::Proxmox::Node
     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.5.6'.freeze
+  VERSION = '0.6.0'.freeze
 end

data/test/factories/proxmox_factory.rb

@@ -29,7 +29,7 @@ FactoryBot.define do
       user 'root@pam'
       password 'proxmox01'
       url 'https://192.168.56.101:8006/api2/json'
-      node_name 'pve'
+      node_id 'pve'
     end
 
     factory :proxmox_cr, :class => ForemanFogProxmox::Proxmox, :traits => [:proxmox]
@@ -41,7 +41,10 @@ FactoryBot.define do
     trait :pve do
       identity 'pve'
     end
-    factory :pve_node, :class => Fog::Compute::Proxmox::Node, :traits => [:pve]
+    trait :service do
+      service :proxmox_cr
+    end
+    factory :pve_node, :class => Fog::Compute::Proxmox::Node, :traits => [:pve, :service]
   end
 
   def deferred_nic_attrs
@@ -68,6 +71,10 @@ FactoryBot.define do
   factory :host_empty, :class => Host do
     sequence(:name) { |n| "host#{n}" }
     sequence(:hostname) { |n| "host#{n}" }
+    trait :compute_attributes do
+      { 'type' => 'qemu' }
+    end
+    compute_attributes { { 'type' => 'qemu' } }
   end
 
 end

data/test/unit/foreman_fog_proxmox/helpers/proxmox_container_helper_test.rb

@@ -22,6 +22,7 @@ require 'test_plugin_helper'
 module ForemanFogProxmox
 class ProxmoxContainerHelperTest < ActiveSupport::TestCase
   include ProxmoxContainerHelper
+  include ProxmoxVmHelper
 
   describe 'parse' do
 
@@ -32,7 +33,7 @@ class ProxmoxContainerHelperTest < ActiveSupport::TestCase
       { 'vmid' => '100', 
         'name' =>  'test', 
         'type' =>  'lxc', 
-        'node' => 'pve',
+        'node_id' => 'pve',
         'ostemplate_storage' => 'local',
         'ostemplate_file' => 'local:vztmpl/alpine-3.7-default_20171211_amd64.tar.xz',
         'password' => 'proxmox01',
@@ -68,8 +69,8 @@ class ProxmoxContainerHelperTest < ActiveSupport::TestCase
         'name' =>  'test', 
         'type' =>  'lxc', 
         :type =>  'lxc', 
-        'node' => 'pve',
-        :node => {name: 'pve'},
+        'node_id' => 'pve',
+        :node_id => 'pve',
         :memory => 536870912, 
         'templated' => 0, 
         :onboot => 0,
@@ -92,6 +93,7 @@ class ProxmoxContainerHelperTest < ActiveSupport::TestCase
       { 'vmid' => '100', 
         'name' =>  'test', 
         'type' =>  'lxc', 
+        'node_id' => 'pve',
         'volumes_attributes' => { '0' => { '_delete' => '1', 'device' => '0', 'storage' => 'local-lvm', 'size' => '1073741824' }}, 
         'interfaces_attributes' => { '0' => { '_delete' => '1', 'id' => 'net0', 'name' => 'eth0' } } 
       }
@@ -151,8 +153,6 @@ class ProxmoxContainerHelperTest < ActiveSupport::TestCase
         :net1 => 'name=eth1,bridge=vmbr0,ip=dhcp,ip6=dhcp',
         :rootfs => 'local-lvm:1073741824', 
         :mp0 => 'local-lvm:1073741824' )
-      assert_equal expected_vm.length, vm.length
-      assert_equal expected_vm.keys, vm.keys
       assert_equal expected_vm, vm
     end   
 

data/test/unit/foreman_fog_proxmox/helpers/proxmox_server_helper_test.rb

@@ -22,6 +22,7 @@ require 'test_plugin_helper'
 module ForemanFogProxmox
 class ProxmoxServerHelperTest < ActiveSupport::TestCase
   include ProxmoxServerHelper
+  include ProxmoxVmHelper
 
   describe 'parse' do
 
@@ -31,7 +32,7 @@ class ProxmoxServerHelperTest < ActiveSupport::TestCase
     let(:host) do 
       { 'vmid' => '100', 
         'name' =>  'test', 
-        'node' => 'pve',
+        'node_id' => 'pve',
         'type' => 'qemu',
         'config_attributes' => { 
           'memory' => '536870912', 

data/test/unit/foreman_fog_proxmox/helpers/proxmox_vm_helper_test.rb

@@ -20,23 +20,27 @@
 require 'test_plugin_helper'
 require 'fog/compute/proxmox/models/server'
 require 'fog/compute/proxmox/models/server_config'
-require 'fog/compute/proxmox/models/container'
-require 'fog/compute/proxmox/models/container_config'
 require 'fog/compute/proxmox/models/interface'
 require 'fog/compute/proxmox/models/interfaces'
 require 'fog/compute/proxmox/models/disk'
 require 'fog/compute/proxmox/models/disks'
+require 'fog/compute/proxmox/models/snapshots'
+require 'fog/compute/proxmox/models/tasks'
 
 module ForemanFogProxmox
 class ProxmoxVmHelperTest < ActiveSupport::TestCase
   include ProxmoxVmHelper
 
   let(:container) do 
-    Fog::Compute::Proxmox::Container.new(
+    service = mock('service')
+    service.stubs(:get_server_config).returns(nil)
+    service.stubs(:list_tasks).returns([])
+    Fog::Compute::Proxmox::Server.new(
     { 'vmid' => '100', 
       'hostname' =>  'test', 
-      'type' =>  'lxc', 
-      'node' => 'pve',
+      :type =>  'lxc', 
+      :node_id => 'pve',
+      :service => service,
       'templated' => '0', 
       'memory' => '536870912', 
       'swap' => '',
@@ -51,11 +55,15 @@ class ProxmoxVmHelperTest < ActiveSupport::TestCase
   end
 
   let(:server) do 
+    service = mock('service')
+    service.stubs(:get_server_config).returns(nil)
+    service.stubs(:list_tasks).returns([])
     Fog::Compute::Proxmox::Server.new(
     { 'vmid' => '100', 
       'name' =>  'test', 
-      'node' => 'pve', 
-      'type' => 'qemu',
+      :node_id => 'pve', 
+      :service => service,
+      :type => 'qemu',
       'templated' => '0', 
       'ide2' => 'local-lvm:iso/debian-netinst.iso,media=cdrom',
       'memory' => '536870912', 
@@ -76,7 +84,7 @@ class ProxmoxVmHelperTest < ActiveSupport::TestCase
   let(:host_server) do 
     { 'vmid' => '100', 
       'name' =>  'test', 
-      'node' => 'pve',
+      'node_id' => 'pve',
       'type' => 'qemu',
       'config_attributes' => { 
         'memory' => '536870912', 
@@ -103,7 +111,7 @@ class ProxmoxVmHelperTest < ActiveSupport::TestCase
     { 'vmid' => '100', 
       'name' =>  'test', 
       'type' =>  'lxc', 
-      'node' => 'pve',
+      'node_id' => 'pve',
       'ostemplate_storage' => 'local',
       'ostemplate_file' => 'local:vztmpl/alpine-3.7-default_20171211_amd64.tar.xz',
       'password' => 'proxmox01',
@@ -138,30 +146,30 @@ class ProxmoxVmHelperTest < ActiveSupport::TestCase
     setup { Fog.mock! }
     teardown { Fog.unmock! }
 
-    it '#server qemu' do       
+    it '#server qemu' do            
       config_hash = object_to_config_hash(server,'qemu')
-      expected_config_hash = ActiveSupport::HashWithIndifferentAccess.new(server.config.attributes).reject { |key,_value| %w[templated node type ide2 scsi0 net0 net1].include? key }
+      expected_config_hash = ActiveSupport::HashWithIndifferentAccess.new(server.config.attributes).reject { |key,_value| %w[templated ide2 scsi0 net0 net1].include? key }
       assert_equal expected_config_hash, config_hash['config_attributes']
     end  
 
     it '#server lxc' do       
       config_hash = object_to_config_hash(server,'lxc')
       assert config_hash.has_key?('config_attributes')
-      expected_config_hash = ActiveSupport::HashWithIndifferentAccess.new(server.config.attributes).reject { |key,_value| %w[templated node type ide2 scsi0 net0 net1].include? key }
+      expected_config_hash = ActiveSupport::HashWithIndifferentAccess.new(server.config.attributes).reject { |key,_value| %w[templated ide2 scsi0 net0 net1].include? key }
       assert_equal expected_config_hash, config_hash['config_attributes']
     end    
 
     it '#container qemu' do       
       config_hash = object_to_config_hash(container,'qemu')
       assert config_hash.has_key?('config_attributes')
-      expected_config_hash = ActiveSupport::HashWithIndifferentAccess.new(container.config.attributes).reject { |key,_value| %w[templated node type rootfs mp0 net0 net1].include? key }
+      expected_config_hash = ActiveSupport::HashWithIndifferentAccess.new(container.config.attributes).reject { |key,_value| %w[templated rootfs mp0 net0 net1].include? key }
       assert_equal expected_config_hash, config_hash['config_attributes']
     end  
 
     it '#container lxc' do       
       config_hash = object_to_config_hash(container,'lxc')
       assert config_hash.has_key?('config_attributes')
-      expected_config_hash = ActiveSupport::HashWithIndifferentAccess.new(container.config.attributes).reject { |key,_value| %w[templated node type rootfs mp0 net0 net1].include? key }
+      expected_config_hash = ActiveSupport::HashWithIndifferentAccess.new(container.config.attributes).reject { |key,_value| %w[templated rootfs mp0 net0 net1].include? key }
       assert_equal expected_config_hash, config_hash['config_attributes']
     end    
   end

data/test/unit/foreman_fog_proxmox/proxmox_test.rb

@@ -30,7 +30,7 @@ module ForemanFogProxmox
     should validate_presence_of(:url)
     should validate_presence_of(:user)
     should validate_presence_of(:password)
-    should validate_presence_of(:node_name)
+    should validate_presence_of(:node_id)
     should allow_value('root@pam').for(:user)
     should_not allow_value('root').for(:user)
     should_not allow_value('a').for(:url)
@@ -60,18 +60,16 @@ module ForemanFogProxmox
     end
 
     describe "find_vm_by_uuid" do
-      it "raises Foreman::Exception when the uuid does not match" do
-        cr = mock_node_servers(ForemanFogProxmox::Proxmox.new, empty_servers)
-        assert_raises Foreman::Exception do
-          cr.find_vm_by_uuid('100')
-        end
+      it "returns nil when the uuid does not match" do
+        cr = mock_node_servers_containers(ForemanFogProxmox::Proxmox.new, empty_servers, empty_servers)
+        assert cr.find_vm_by_uuid('100').nil?
       end
   
-      it "raises RecordNotFound when the compute raises retrieve error" do
-        exception = Fog::Proxmox::Errors::ServiceError.new(StandardError.new('VM not found'))
+      it "raises RecordNotFound when the compute raises error" do
+        exception = Fog::Errors::Error.new
         cr = mock_node_servers(ForemanFogProxmox::Proxmox.new, servers_raising_exception(exception))
         assert_raises ActiveRecord::RecordNotFound do
-          cr.find_vm_by_uuid('qemu_100')
+          cr.find_vm_by_uuid('100')
         end
       end
     end
@@ -80,16 +78,7 @@ module ForemanFogProxmox
       before do
         @cr = FactoryBot.build_stubbed(:proxmox_cr)
       end
-  
-      it "raises Foreman::Exception when physical identifier is empty" do
-        physical_nic = FactoryBot.build(:nic_base_empty)
-        host = FactoryBot.build(:host_empty, :interfaces => [physical_nic])
-        err = assert_raises Foreman::Exception do
-          @cr.host_interfaces_attrs(host)
-        end
-        assert err.message.end_with?('Identifier interface[0] required.')
-      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])
@@ -103,7 +92,7 @@ module ForemanFogProxmox
         ip = IPAddr.new(1, Socket::AF_INET).to_s
         ip6 = Array.new(4) { '%x' % rand(16**4) }.join(':') + '::1'
         physical_nic = FactoryBot.build(:nic_base_empty, :identifier => 'net0', :ip => ip, :ip6 => ip6)
-        host = FactoryBot.build(:host_empty, :interfaces => [physical_nic])
+        host = FactoryBot.build(:host_empty, :interfaces => [physical_nic], :compute_attributes => {'type' => 'qemu'})
         nic_attributes = @cr.host_interfaces_attrs(host).values.select(&:present?)
         nic_attr = nic_attributes.first
         assert_equal 'net0', nic_attr[:id]
@@ -141,12 +130,12 @@ module ForemanFogProxmox
         @cr = FactoryBot.build_stubbed(:proxmox_cr)
       end
   
-      it "converts to hash a server" do
+      it "converts a server to hash" do
         vm, config_attributes, volume_attributes, interface_attributes  = mock_server_vm
         vm_attrs = @cr.vm_compute_attributes(vm)
         assert !vm_attrs.has_key?(:config)
         assert vm_attrs.has_key?(:config_attributes)
-        assert_equal config_attributes.reject { |key,value| [:disks,:interfaces].include?(key) || value.to_s.empty?}, vm_attrs[:config_attributes]
+        assert_equal config_attributes.reject { |key,value| [:vmid,:disks,:interfaces].include?(key) || value.to_s.empty?}, vm_attrs[:config_attributes]
         assert !vm_attrs[:config_attributes].has_key?(:disks)
         assert vm_attrs.has_key?(:volumes_attributes)
         assert_equal volume_attributes, vm_attrs[:volumes_attributes]['0']
@@ -155,13 +144,13 @@ module ForemanFogProxmox
         assert_equal interface_attributes, vm_attrs[:interfaces_attributes]['0']
       end
   
-      it "converts to hash a container" do
+      it "converts a container to hash" do
         vm, config_attributes, volume_attributes, interface_attributes  = mock_container_vm
         vm_attrs = @cr.vm_compute_attributes(vm)
         assert !vm_attrs.has_key?(:config)
         assert vm_attrs.has_key?(:config_attributes)
-        assert_equal config_attributes.reject { |key,value| [:mount_points,:interfaces].include?(key) || value.to_s.empty?}, vm_attrs[:config_attributes]
-        assert !vm_attrs[:config_attributes].has_key?(:mount_points)
+        assert_equal config_attributes.reject { |key,value| [:vmid,:disks,:interfaces].include?(key) || value.to_s.empty?}, vm_attrs[:config_attributes]
+        assert !vm_attrs[:config_attributes].has_key?(:disks)
         assert vm_attrs.has_key?(:volumes_attributes)
         assert_equal volume_attributes, vm_attrs[:volumes_attributes]['0']
         assert vm_attrs.has_key?(:interfaces_attributes)
@@ -176,12 +165,13 @@ module ForemanFogProxmox
     end
 
     it 'saves modified server config' do
-      uuid = 'qemu_100'
+      uuid = '100'
       config = mock('config')
       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)
       attr = { 'templated' => '0', 'config_attributes' => { 'cores' => '1', 'cpulimit' => '1' } }
       @cr.stubs(:parse_server_vm).returns({ 'vmid' => '100', 'type' => 'qemu', 'cores' => '1', 'cpulimit' => '1' })
@@ -191,12 +181,13 @@ module ForemanFogProxmox
     end
 
     it 'saves modified container config' do
-      uuid = 'lxc_100'
+      uuid = '100'
       config = mock('config')
       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)
       attr = { 'templated' => '0', 'config_attributes' => { 'cores' => '1', 'cpulimit' => '1' } }
       @cr.stubs(:parse_container_vm).returns({ 'vmid' => '100', 'type' => 'qemu', 'cores' => '1', 'cpulimit' => '1' })
@@ -228,7 +219,7 @@ module ForemanFogProxmox
       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[:type]}_#{args[:vmid]}").returns(vm)
+      cr.stubs(:find_vm_by_uuid).with("#{args[:vmid]}").returns(vm)
       cr.create_vm(args)
     end
 
@@ -242,7 +233,7 @@ module ForemanFogProxmox
       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[:type]}_#{args[:vmid]}").returns(vm)
+      cr.stubs(:find_vm_by_uuid).with("#{args[:vmid]}").returns(vm)
       cr.create_vm(args)
     end
 
@@ -261,7 +252,7 @@ module ForemanFogProxmox
       servers.stubs(:get).with('999').returns(image)
       clone.stubs(:update).with(name: 'name')
       vm = mock('vm')
-      cr.stubs(:find_vm_by_uuid).with("#{args[:type]}_#{args[:vmid]}").returns(vm)
+      cr.stubs(:find_vm_by_uuid).with("#{args[:vmid]}").returns(vm)
       cr.create_vm(args)
     end
 
@@ -281,7 +272,7 @@ module ForemanFogProxmox
       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[:type]}_#{args[:vmid]}").returns(vm)
+      cr.stubs(:find_vm_by_uuid).with("#{args[:vmid]}").returns(vm)
       cr.create_vm(args)
     end
   end