foreman_fog_proxmox 0.12.2 → 0.13.3

data/test/unit/foreman_fog_proxmox/proxmox_vm_commands_server_update_test.rb

@@ -44,9 +44,9 @@ module ForemanFogProxmox
         vm.stubs(:container?).returns(false)
         vm.stubs(:templated?).returns(false)
         vm.stubs(:type).returns('qemu')
-        vm.stubs(:node_id).returns('pve')
+        vm.stubs(:node_id).returns('proxmox')
         @cr.stubs(:find_vm_by_uuid).returns(vm)
-        attr = { 'templated' => '0', 'node_id' => 'pve2' }
+        attr = { 'templated' => '0', 'node_id' => 'proxmox2' }
         vm.expects(:migrate)
         @cr.save_vm(uuid, attr)
       end
@@ -60,10 +60,10 @@ module ForemanFogProxmox
         vm.stubs(:container?).returns(false)
         vm.stubs(:templated?).returns(false)
         vm.stubs(:type).returns('qemu')
-        vm.stubs(:node_id).returns('pve')
+        vm.stubs(:node_id).returns('proxmox')
         @cr.stubs(:find_vm_by_uuid).returns(vm)
-        attr = { 'templated' => '0', 'node_id' => 'pve', 'config_attributes' => { 'cores' => '1', 'cpulimit' => '1', 'onboot' => '0' } }.with_indifferent_access
-        @cr.stubs(:parse_server_vm).returns('vmid' => '100', 'node_id' => 'pve', 'type' => 'qemu', 'cores' => '1', 'cpulimit' => '1', 'onboot' => '0')
+        attr = { 'templated' => '0', 'node_id' => 'proxmox', 'config_attributes' => { 'cores' => '1', 'cpulimit' => '1', 'onboot' => '0' } }.with_indifferent_access
+        @cr.stubs(:parse_typed_vm).returns('vmid' => '100', 'node_id' => 'proxmox', 'type' => 'qemu', 'cores' => '1', 'cpulimit' => '1', 'onboot' => '0')
         expected_attr = { :cores => '1', :cpulimit => '1' }.with_indifferent_access
         vm.expects(:update, expected_attr)
         @cr.save_vm(uuid, attr)
@@ -97,11 +97,11 @@ module ForemanFogProxmox
         vm.stubs(:config).returns(config)
         vm.stubs(:container?).returns(false)
         vm.stubs(:type).returns('qemu')
-        vm.stubs(:node_id).returns('pve')
+        vm.stubs(:node_id).returns('proxmox')
         @cr.stubs(:find_vm_by_uuid).returns(vm)
         new_attributes = {
           'templated' => '0',
-          'node_id' => 'pve',
+          'node_id' => 'proxmox',
           'config_attributes' => {
             'cores' => '1',
             'cpulimit' => '1'
@@ -113,9 +113,9 @@ module ForemanFogProxmox
             }
           }
         }.with_indifferent_access
-        @cr.stubs(:parse_server_vm).returns(
+        @cr.stubs(:parse_typed_vm).returns(
           'vmid' => '100',
-          'node_id' => 'pve',
+          'node_id' => 'proxmox',
           'type' => 'qemu',
           'cores' => '1',
           'cpulimit' => '1',
@@ -136,7 +136,7 @@ module ForemanFogProxmox
         vm.stubs(:config).returns(config)
         vm.stubs(:container?).returns(false)
         vm.stubs(:type).returns('qemu')
-        vm.stubs(:node_id).returns('pve')
+        vm.stubs(:node_id).returns('proxmox')
         vm.stubs(:vmid).returns(uuid)
         @cr.stubs(:find_vm_by_uuid).returns(vm)
         identity_client = mock('identity_client')
@@ -154,9 +154,9 @@ module ForemanFogProxmox
         pools.expects(:get).with('pool2').returns(pool2)
         identity_client.stubs(:pools).returns(pools)
         @cr.stubs(:identity_client).returns(identity_client)
-        attr = { 'templated' => '0', 'node_id' => 'pve', 'pool' => 'pool2', 'config_attributes' => { 'cores' => '1', 'cpulimit' => '1', 'onboot' => '0' } }.with_indifferent_access
-        @cr.stubs(:parse_server_vm).returns('vmid' => '100', 'node_id' => 'pve', 'type' => 'qemu', 'cores' => '1', 'cpulimit' => '1', 'onboot' => '0', 'pool' => 'pool2')
-        vm.expects(:update).with({ 'node_id' => 'pve', 'type' => 'qemu', 'cores' => '1', 'cpulimit' => '1', 'onboot' => '0' }.with_indifferent_access)
+        attr = { 'templated' => '0', 'node_id' => 'proxmox', 'pool' => 'pool2', 'config_attributes' => { 'cores' => '1', 'cpulimit' => '1', 'onboot' => '0' } }.with_indifferent_access
+        @cr.stubs(:parse_typed_vm).returns('vmid' => '100', 'node_id' => 'proxmox', 'type' => 'qemu', 'cores' => '1', 'cpulimit' => '1', 'onboot' => '0', 'pool' => 'pool2')
+        vm.expects(:update).with({ 'node_id' => 'proxmox', 'type' => 'qemu', 'cores' => '1', 'cpulimit' => '1', 'onboot' => '0' }.with_indifferent_access)
         @cr.save_vm(uuid, attr)
       end
 
@@ -169,7 +169,7 @@ module ForemanFogProxmox
         vm.stubs(:config).returns(config)
         vm.stubs(:container?).returns(false)
         vm.stubs(:type).returns('qemu')
-        vm.stubs(:node_id).returns('pve')
+        vm.stubs(:node_id).returns('proxmox')
         vm.stubs(:vmid).returns(uuid)
         @cr.stubs(:find_vm_by_uuid).returns(vm)
         identity_client = mock('identity_client')
@@ -183,9 +183,9 @@ module ForemanFogProxmox
         pools.expects(:get).with('').returns(nil)
         identity_client.stubs(:pools).returns(pools)
         @cr.stubs(:identity_client).returns(identity_client)
-        attr = { 'templated' => '0', 'node_id' => 'pve', 'pool' => '', 'config_attributes' => { 'cores' => '1', 'cpulimit' => '1', 'onboot' => '0' } }.with_indifferent_access
-        @cr.stubs(:parse_server_vm).returns('vmid' => '100', 'node_id' => 'pve', 'type' => 'qemu', 'cores' => '1', 'cpulimit' => '1', 'onboot' => '0', 'pool' => '')
-        vm.expects(:update).with({ 'node_id' => 'pve', 'type' => 'qemu', 'cores' => '1', 'cpulimit' => '1', 'onboot' => '0' }.with_indifferent_access)
+        attr = { 'templated' => '0', 'node_id' => 'proxmox', 'pool' => '', 'config_attributes' => { 'cores' => '1', 'cpulimit' => '1', 'onboot' => '0' } }.with_indifferent_access
+        @cr.stubs(:parse_typed_vm).returns('vmid' => '100', 'node_id' => 'proxmox', 'type' => 'qemu', 'cores' => '1', 'cpulimit' => '1', 'onboot' => '0', 'pool' => '')
+        vm.expects(:update).with({ 'node_id' => 'proxmox', 'type' => 'qemu', 'cores' => '1', 'cpulimit' => '1', 'onboot' => '0' }.with_indifferent_access)
         @cr.save_vm(uuid, attr)
       end
 
@@ -198,7 +198,7 @@ module ForemanFogProxmox
         vm.stubs(:config).returns(config)
         vm.stubs(:container?).returns(false)
         vm.stubs(:type).returns('qemu')
-        vm.stubs(:node_id).returns('pve')
+        vm.stubs(:node_id).returns('proxmox')
         vm.stubs(:vmid).returns(uuid)
         @cr.stubs(:find_vm_by_uuid).returns(vm)
         identity_client = mock('identity_client')
@@ -212,9 +212,9 @@ module ForemanFogProxmox
         pools.expects(:get).with('').returns(nil)
         identity_client.stubs(:pools).returns(pools)
         @cr.stubs(:identity_client).returns(identity_client)
-        attr = { 'templated' => '0', 'node_id' => 'pve', 'pool' => 'pool2', 'config_attributes' => { 'cores' => '1', 'cpulimit' => '1', 'onboot' => '0' } }.with_indifferent_access
-        @cr.stubs(:parse_server_vm).returns('vmid' => '100', 'node_id' => 'pve', 'type' => 'qemu', 'cores' => '1', 'cpulimit' => '1', 'onboot' => '0', 'pool' => 'pool2')
-        vm.expects(:update).with({ 'node_id' => 'pve', 'type' => 'qemu', 'cores' => '1', 'cpulimit' => '1', 'onboot' => '0' }.with_indifferent_access)
+        attr = { 'templated' => '0', 'node_id' => 'proxmox', 'pool' => 'pool2', 'config_attributes' => { 'cores' => '1', 'cpulimit' => '1', 'onboot' => '0' } }.with_indifferent_access
+        @cr.stubs(:parse_typed_vm).returns('vmid' => '100', 'node_id' => 'proxmox', 'type' => 'qemu', 'cores' => '1', 'cpulimit' => '1', 'onboot' => '0', 'pool' => 'pool2')
+        vm.expects(:update).with({ 'node_id' => 'proxmox', 'type' => 'qemu', 'cores' => '1', 'cpulimit' => '1', 'onboot' => '0' }.with_indifferent_access)
         @cr.save_vm(uuid, attr)
       end
     end

data/test/unit/foreman_fog_proxmox/proxmox_vm_new_test.rb

@@ -43,7 +43,7 @@ module ForemanFogProxmox
         config = mock('config')
         config.stubs(:inspect).returns('config')
         vm.stubs(:config).returns(config)
-        @cr.stubs(:new_server_vm).with(attr).returns(vm)
+        @cr.stubs(:new_typed_vm).with(attr, 'qemu').returns(vm)
         assert_equal vm, @cr.new_vm(attr)
       end
 
@@ -53,7 +53,7 @@ module ForemanFogProxmox
         config = mock('config')
         config.stubs(:inspect).returns('config')
         vm.stubs(:config).returns(config)
-        @cr.stubs(:new_server_vm).with(attr).returns(vm)
+        @cr.stubs(:new_typed_vm).with(attr, 'qemu').returns(vm)
         assert_equal vm, @cr.new_vm(attr)
       end
 
@@ -63,7 +63,7 @@ module ForemanFogProxmox
         config = mock('config')
         config.stubs(:inspect).returns('config')
         vm.stubs(:config).returns(config)
-        @cr.stubs(:new_container_vm).with(attr).returns(vm)
+        @cr.stubs(:new_typed_vm).with(attr, 'lxc').returns(vm)
         assert_equal vm, @cr.new_vm(attr)
       end
     end

data/test/unit/foreman_fog_proxmox/proxmox_vm_queries_test.rb

@@ -35,14 +35,14 @@ module ForemanFogProxmox
     describe 'find_vm_by_uuid' do
       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?
+        assert cr.find_vm_by_uuid('1_100').nil?
       end
 
       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('100')
+          cr.find_vm_by_uuid('1_100')
         end
       end
 
@@ -61,7 +61,7 @@ module ForemanFogProxmox
           empty_servers, empty_servers, # node1
           servers, empty_servers        # node2
         )
-        assert_equal vm, cr.find_vm_by_uuid(args[:vmid])
+        assert_equal vm, cr.find_vm_by_uuid('1_' + args[:vmid])
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_fog_proxmox
 version: !ruby/object:Gem::Version
-  version: 0.12.2
+  version: 0.13.3
 platform: ruby
 authors:
 - Tristan Robert
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-25 00:00:00.000000000 Z
+date: 2021-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.14'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -97,20 +97,30 @@ files:
 - app/assets/javascripts/foreman_fog_proxmox/proxmox_vm.js
 - app/assets/javascripts/foreman_fog_proxmox/proxmox_vm_container.js
 - app/assets/javascripts/foreman_fog_proxmox/proxmox_vm_server.js
+- app/assets/javascripts/foreman_fog_proxmox/proxmox_volume.js
+- app/assets/javascripts/foreman_fog_proxmox/proxmox_volume_cdrom.js
+- app/assets/javascripts/foreman_fog_proxmox/proxmox_volume_cloudinit.js
 - app/controllers/concerns/foreman_fog_proxmox/controller/parameters/compute_resource.rb
 - app/controllers/foreman_fog_proxmox/compute_resources_controller.rb
 - app/helpers/node_dashboard_helper.rb
+- app/helpers/proxmox_compute_controllers_helper.rb
+- app/helpers/proxmox_compute_resources_helper.rb
 - app/helpers/proxmox_compute_selectors_helper.rb
-- app/helpers/proxmox_container_helper.rb
 - app/helpers/proxmox_form_helper.rb
-- app/helpers/proxmox_server_helper.rb
+- app/helpers/proxmox_storages_helper.rb
+- app/helpers/proxmox_vm_cdrom_helper.rb
+- app/helpers/proxmox_vm_cloudinit_helper.rb
+- app/helpers/proxmox_vm_config_helper.rb
 - app/helpers/proxmox_vm_helper.rb
+- app/helpers/proxmox_vm_interfaces_helper.rb
+- app/helpers/proxmox_vm_os_template_helper.rb
+- app/helpers/proxmox_vm_uuid_helper.rb
+- app/helpers/proxmox_vm_volumes_helper.rb
 - app/models/concerns/fog_extensions/proxmox/disk.rb
 - app/models/concerns/fog_extensions/proxmox/interface.rb
 - app/models/concerns/fog_extensions/proxmox/node.rb
 - app/models/concerns/fog_extensions/proxmox/server.rb
 - app/models/concerns/fog_extensions/proxmox/server_config.rb
-- app/models/concerns/fog_extensions/proxmox/volume.rb
 - app/models/concerns/host_ext/proxmox/interfaces.rb
 - app/models/concerns/orchestration/proxmox/compute.rb
 - app/models/foreman_fog_proxmox/options_select.rb
@@ -122,7 +132,6 @@ files:
 - app/models/foreman_fog_proxmox/proxmox_interfaces.rb
 - app/models/foreman_fog_proxmox/proxmox_operating_systems.rb
 - app/models/foreman_fog_proxmox/proxmox_pools.rb
-- app/models/foreman_fog_proxmox/proxmox_token_expiration.rb
 - app/models/foreman_fog_proxmox/proxmox_version.rb
 - app/models/foreman_fog_proxmox/proxmox_vm_commands.rb
 - app/models/foreman_fog_proxmox/proxmox_vm_new.rb
@@ -162,14 +171,18 @@ files:
 - app/views/compute_resources_vms/form/proxmox/server/_advanced.html.erb
 - app/views/compute_resources_vms/form/proxmox/server/_config.html.erb
 - app/views/compute_resources_vms/form/proxmox/server/_network.html.erb
-- app/views/compute_resources_vms/form/proxmox/server/_volume.html.erb
+- app/views/compute_resources_vms/form/proxmox/server/_volume_cdrom.html.erb
+- app/views/compute_resources_vms/form/proxmox/server/_volume_cloud_init.html.erb
+- app/views/compute_resources_vms/form/proxmox/server/_volume_hard_disk.html.erb
 - app/views/compute_resources_vms/index/_proxmox.html.erb
 - app/views/compute_resources_vms/show/_proxmox.html.erb
 - app/views/dashboard/_foreman_fog_proxmox_widget.erb
 - app/views/images/form/_proxmox.html.erb
 - config/routes.rb
+- db/migrate/20210312105013_update_proxmox_uuid_host.rb
 - lib/foreman_fog_proxmox.rb
 - lib/foreman_fog_proxmox/engine.rb
+- lib/foreman_fog_proxmox/hash_collection.rb
 - lib/foreman_fog_proxmox/semver.rb
 - lib/foreman_fog_proxmox/value.rb
 - lib/foreman_fog_proxmox/version.rb
@@ -188,6 +201,8 @@ files:
 - test/unit/foreman_fog_proxmox/helpers/proxmox_container_helper_test.rb
 - test/unit/foreman_fog_proxmox/helpers/proxmox_server_helper_test.rb
 - test/unit/foreman_fog_proxmox/helpers/proxmox_vm_helper_test.rb
+- test/unit/foreman_fog_proxmox/helpers/proxmox_vm_uuid_helper_test.rb
+- test/unit/foreman_fog_proxmox/helpers/proxmox_vm_volumes_helper_test.rb
 - test/unit/foreman_fog_proxmox/proxmox_compute_attributes_test.rb
 - test/unit/foreman_fog_proxmox/proxmox_images_test.rb
 - test/unit/foreman_fog_proxmox/proxmox_interfaces_test.rb
@@ -195,8 +210,10 @@ files:
 - test/unit/foreman_fog_proxmox/proxmox_version_test.rb
 - test/unit/foreman_fog_proxmox/proxmox_vm_commands_container_test.rb
 - test/unit/foreman_fog_proxmox/proxmox_vm_commands_server_create_test.rb
+- test/unit/foreman_fog_proxmox/proxmox_vm_commands_server_update_cdrom_test.rb
+- test/unit/foreman_fog_proxmox/proxmox_vm_commands_server_update_cloudinit_test.rb
+- test/unit/foreman_fog_proxmox/proxmox_vm_commands_server_update_hard_disk_test.rb
 - test/unit/foreman_fog_proxmox/proxmox_vm_commands_server_update_test.rb
-- test/unit/foreman_fog_proxmox/proxmox_vm_commands_server_update_volumes_test.rb
 - test/unit/foreman_fog_proxmox/proxmox_vm_commands_test.rb
 - test/unit/foreman_fog_proxmox/proxmox_vm_new_test.rb
 - test/unit/foreman_fog_proxmox/proxmox_vm_queries_test.rb
@@ -220,30 +237,34 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: Foreman plugin that adds Proxmox VE compute resource using fog-proxmox
 test_files:
-- test/factories/proxmox_factory.rb
-- test/factories/foreman_fog_proxmox/proxmox_node_mock_factory.rb
 - test/factories/foreman_fog_proxmox/proxmox_container_mock_factory.rb
+- test/factories/foreman_fog_proxmox/proxmox_node_mock_factory.rb
 - test/factories/foreman_fog_proxmox/proxmox_server_mock_factory.rb
-- test/test_plugin_helper.rb
+- test/factories/proxmox_factory.rb
 - test/functional/compute_resources_controller_test.rb
+- test/test_plugin_helper.rb
 - test/unit/foreman_fog_proxmox/helpers/proxmox_container_helper_test.rb
 - test/unit/foreman_fog_proxmox/helpers/proxmox_server_helper_test.rb
 - test/unit/foreman_fog_proxmox/helpers/proxmox_vm_helper_test.rb
-- test/unit/foreman_fog_proxmox/proxmox_vm_new_test.rb
+- test/unit/foreman_fog_proxmox/helpers/proxmox_vm_uuid_helper_test.rb
+- test/unit/foreman_fog_proxmox/helpers/proxmox_vm_volumes_helper_test.rb
+- test/unit/foreman_fog_proxmox/proxmox_compute_attributes_test.rb
+- test/unit/foreman_fog_proxmox/proxmox_images_test.rb
+- test/unit/foreman_fog_proxmox/proxmox_interfaces_test.rb
+- test/unit/foreman_fog_proxmox/proxmox_test.rb
 - test/unit/foreman_fog_proxmox/proxmox_version_test.rb
-- test/unit/foreman_fog_proxmox/semver_test.rb
-- test/unit/foreman_fog_proxmox/proxmox_vm_commands_server_update_test.rb
 - test/unit/foreman_fog_proxmox/proxmox_vm_commands_container_test.rb
-- test/unit/foreman_fog_proxmox/proxmox_test.rb
 - test/unit/foreman_fog_proxmox/proxmox_vm_commands_server_create_test.rb
-- test/unit/foreman_fog_proxmox/proxmox_compute_attributes_test.rb
-- test/unit/foreman_fog_proxmox/proxmox_interfaces_test.rb
-- test/unit/foreman_fog_proxmox/proxmox_vm_queries_test.rb
-- test/unit/foreman_fog_proxmox/proxmox_vm_commands_server_update_volumes_test.rb
+- test/unit/foreman_fog_proxmox/proxmox_vm_commands_server_update_cdrom_test.rb
+- test/unit/foreman_fog_proxmox/proxmox_vm_commands_server_update_cloudinit_test.rb
+- test/unit/foreman_fog_proxmox/proxmox_vm_commands_server_update_hard_disk_test.rb
+- test/unit/foreman_fog_proxmox/proxmox_vm_commands_server_update_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/proxmox_vm_new_test.rb
+- test/unit/foreman_fog_proxmox/proxmox_vm_queries_test.rb
+- test/unit/foreman_fog_proxmox/semver_test.rb

data/app/helpers/proxmox_container_helper.rb

@@ -1,163 +0,0 @@
-# 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 'fog/proxmox/helpers/disk_helper'
-require 'fog/proxmox/helpers/nic_helper'
-require 'foreman_fog_proxmox/value'
-
-module ProxmoxContainerHelper
-  def config_keys
-    general_a = ['node_id', 'name', 'type', 'config_attributes', 'volumes_attributes', 'interfaces_attributes']
-    general_a += ['firmware_type', 'provision_method', 'container_volumes', 'server_volumes', 'start_after_create']
-    keys = { general: general_a }
-    keys.store(:main, ['name', 'type', 'node_id', 'vmid', 'interfaces', 'mount_points', 'disks'])
-    keys.store(:cpu, ['arch', 'cpulimit', 'cpuunits', 'cores'])
-    keys.store(:memory, ['memory', 'swap'])
-    keys
-  end
-
-  def ostemplate_keys
-    ['ostemplate', 'ostemplate_storage', 'ostemplate_file']
-  end
-
-  def parse_ostemplate_without_keys(args)
-    parse_container_ostemplate(args.select { |key, _value| ostemplate_keys.include? key })
-  end
-
-  def config_general_or_ostemplate_key?(key)
-    config_keys[:general].include?(key) || ostemplate_keys.include?(key)
-  end
-
-  def parse_container_vm(args)
-    logger.debug("parse_container_vm args=#{args}")
-    args = ActiveSupport::HashWithIndifferentAccess.new(args)
-    return {} unless args
-    return {} if args.empty?
-    return {} unless args['type'] == 'lxc'
-
-    config = args['config_attributes']
-    config ||= args.reject { |key, _value| config_keys[:main].include? key }
-    ostemplate = parse_ostemplate_without_keys(args)
-    ostemplate = parse_ostemplate_without_keys(config) unless ostemplate[:ostemplate]
-    volumes = parse_container_volumes(args['volumes_attributes'])
-    cpu = parse_container_cpu(config.select { |key, _value| config_keys[:cpu].include? key })
-    memory = parse_container_memory(config.select { |key, _value| config_keys[:memory].include? key })
-    interfaces_attributes = args['interfaces_attributes']
-    interfaces_to_add, interfaces_to_delete = parse_container_interfaces(interfaces_attributes)
-    logger.debug("config_keys[:general]: #{config_keys[:general]}")
-    parsed_vm = args.reject { |key, value| config_general_or_ostemplate_key?(key) || ForemanFogProxmox::Value.empty?(value) }
-    parsed_config = config.reject { |key, value| config_keys.include?(key) || ForemanFogProxmox::Value.empty?(value) }
-    logger.debug("parse_container_config(): #{parsed_config}")
-    parsed_vm = parsed_vm.merge(parsed_config).merge(cpu).merge(memory).merge(ostemplate)
-    interfaces_to_add.each { |interface| parsed_vm = parsed_vm.merge(interface) }
-    parsed_vm = parsed_vm.merge(delete: interfaces_to_delete.join(',')) unless interfaces_to_delete.empty?
-    volumes.each { |volume| parsed_vm = parsed_vm.merge(volume) }
-    logger.debug("parse_container_vm(): #{parsed_vm}")
-    parsed_vm
-  end
-
-  def parse_container_memory(args)
-    memory = {}
-    args.delete_if { |_key, value| ForemanFogProxmox::Value.empty?(value) }
-    memory.store(:memory, args['memory'].to_i) if args['memory']
-    memory.store(:swap, args['swap'].to_i) if args['swap']
-    logger.debug("parse_container_memory(): #{memory}")
-    memory
-  end
-
-  def parse_container_cpu(args)
-    cpu = {}
-    args.delete_if { |_key, value| ForemanFogProxmox::Value.empty?(value) }
-    cpu.store(:arch, args['arch'].to_s) if args['arch']
-    cpu.store(:cpulimit, args['cpulimit'].to_i) if args['cpulimit']
-    cpu.store(:cpuunits, args['cpuunits'].to_i) if args['cpuunits']
-    cpu.store(:cores, args['cores'].to_i) if args['cores']
-    logger.debug("parse_container_cpu(): #{cpu}")
-    cpu
-  end
-
-  def parse_container_ostemplate(args)
-    ostemplate = args['ostemplate']
-    ostemplate_file = args['ostemplate_file']
-    ostemplate ||= ostemplate_file
-    ostemplate_storage = args['ostemplate_storage']
-    ostemplate_storage, ostemplate_file, _size = Fog::Proxmox::DiskHelper.extract_storage_volid_size(ostemplate) unless ForemanFogProxmox::Value.empty?(ostemplate)
-    parsed_ostemplate = { ostemplate: ostemplate, ostemplate_file: ostemplate_file, ostemplate_storage: ostemplate_storage }
-    logger.debug("parse_container_ostemplate(): #{parsed_ostemplate}")
-    parsed_ostemplate
-  end
-
-  def parse_container_volume(args)
-    disk = {}
-    id = args['id']
-    id = "mp#{args['device']}" if args.key?('device')
-    logger.debug("parse_container_volume() args=#{args}")
-    return args if ForemanFogProxmox::Value.empty?(id) || Fog::Proxmox::DiskHelper.server_disk?(id)
-
-    args.delete_if { |_key, value| ForemanFogProxmox::Value.empty?(value) }
-    disk.store(:id, id)
-    disk.store(:volid, args['volid'])
-    disk.store(:storage, args['storage'].to_s)
-    disk.store(:size, args['size'].to_i)
-    options = args.reject { |key, _value| ['id', 'volid', 'device', 'storage', 'size', '_delete'].include? key }
-    disk.store(:options, options)
-    logger.debug("parse_container_volume(): disk=#{disk}")
-    Fog::Proxmox::DiskHelper.flatten(disk)
-  end
-
-  def parse_container_volumes(args)
-    logger.debug("parse_container_volumes() args=#{args}")
-    volumes = []
-    args&.each_value { |value| volumes.push(parse_container_volume(value)) }
-    logger.debug("parse_container_volumes(): volumes=#{volumes}")
-    volumes
-  end
-
-  def parse_container_interfaces(interfaces_attributes)
-    interfaces_to_add = []
-    interfaces_to_delete = []
-    interfaces_attributes&.each_value { |value| add_container_interface(value, interfaces_to_delete, interfaces_to_add) }
-    logger.debug("parse_container_interfaces(): interfaces_to_add=#{interfaces_to_add}, interfaces_to_delete=#{interfaces_to_delete}")
-    [interfaces_to_add, interfaces_to_delete]
-  end
-
-  def add_container_interface(interface_attributes, interfaces_to_delete, interfaces_to_add)
-    interface_attributes.delete_if { |_key, value| ForemanFogProxmox::Value.empty?(value) }
-    nic = {}
-    id = interface_attributes['id']
-    logger.debug("parse_container_interface(): id=#{id}")
-    delete = interface_attributes['_delete'].to_i == 1
-    if delete
-      interfaces_to_delete.push(id.to_s)
-    else
-      nic.store(:id, id)
-      nic.store(:hwaddr, interface_attributes['macaddr']) if interface_attributes['macaddr']
-      nic.store(:name, interface_attributes['name'].to_s)
-      nic.store(:bridge, interface_attributes['bridge'].to_s) if interface_attributes['bridge']
-      nic.store(:ip, interface_attributes['ip'].to_s) if interface_attributes['ip']
-      nic.store(:ip6, interface_attributes['ip6'].to_s) if interface_attributes['ip6']
-      nic.store(:gw, interface_attributes['gw'].to_s) if interface_attributes['gw']
-      nic.store(:gw6, interface_attributes['gw6'].to_s) if interface_attributes['gw6']
-      nic.store(:rate, interface_attributes['rate'].to_i) if interface_attributes['rate']
-      nic.store(:tag, interface_attributes['tag'].to_i) if interface_attributes['tag']
-      logger.debug("parse_container_interface(): add nic=#{nic}")
-      interfaces_to_add.push(Fog::Proxmox::NicHelper.flatten(nic))
-    end
-  end
-end