foreman_fog_proxmox 0.13.4 → 0.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e42832dc77d338bb20585f27678bc2207c23a610f7c7b478f24f3791ca65a414
-  data.tar.gz: 1385bea7eed802496ae7ab85ca013e75dc0343a8a433a347d8811b59fd620cd0
+  metadata.gz: 70a0629dba4c5afe29ddca15cbe49df9325edb80ca73d076c41c3fc1d283ecff
+  data.tar.gz: f680eed4c519701ecdc5bc38117ca62eb846551ab972aa8e5f38869b17fe414e
 SHA512:
-  metadata.gz: 91a262ffeb2b720fae01136cdcd158cd8c577702fafbea36d550eae859c6734f7a7ec1c390b39077852100d4507d9b3502bb7f3f1cb5c7d22c02cd7b012c51cf
-  data.tar.gz: 25512a916934966d9b5e66494f1b294c5b13d69ba326ed61170e330bff616111103984701a6311b150fb444dab3f0a48920c8debe193b7698a2ec43a0110cdd1
+  metadata.gz: 6c8d56b7e0a4e02ac2195fdd248aa12f5934b8a9746763d1aff59d0df1316f09abb3dbfe212f99e7a39307132065550871bb84a7fcab04787e3e8ca9bd70e50d
+  data.tar.gz: 883ee296ceea79f15e220c8fe9cad273aed8201862be59b41b79761ae01d8cc837adcbe3dae54e9e24d1f30f34dee3d85e7eb8c83ccaa94d0522f27bc28925b3

data/README.md

@@ -2,7 +2,7 @@
 
 ![CI](https://github.com/theforeman/foreman_fog_proxmox/workflows/CI/badge.svg)
 [![Maintainability](https://api.codeclimate.com/v1/badges/922162c278e0fa9207ba/maintainability)](https://codeclimate.com/github/theforeman/foreman_fog_proxmox/maintainability)
-[![Test Coverage](https://api.codeclimate.com/v1/badges/922162c278e0fa9207ba/test_coverage)](https://codeclimate.com/github/theforeman/foreman_fog_proxmox/test_coverage)
+[![Test Coverage](https://api.codeclimate.com/v1/badges/a6446cf7b1cf09b83de6/test_coverage)](https://codeclimate.com/github/theforeman/foreman_fog_proxmox/test_coverage)
 [![Gem Version](https://badge.fury.io/rb/foreman_fog_proxmox.svg)](https://badge.fury.io/rb/foreman_fog_proxmox)
 
 # ForemanFogProxmox
@@ -38,9 +38,27 @@ You can support the plugin development via the following methods:
 
 ## Installation
 
-### Prerequisites
+### From OS packages (required)
 
-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)
@@ -130,15 +128,17 @@ Redhat, CentOS or Fedora users should also [setup Selinux](https://projects.thef
 
 ### Dev prerequisites
 
-* You need a Proxmox VE 5.4+ server running.
-* You need ruby >= 2.5. You can install it with [asdf-vm](https://asdf-vm.com).
-* You also need nodejs in your dev machine to run webpack-dev-server. You can install it with [asdf-vm](https://asdf-vm.com).
+> See [Foreman dev setup](https://github.com/theforeman/foreman/blob/develop/developer_docs/foreman_dev_setup.asciidoc)
+
+* You need a Proxmox VE 6.2+ server running.
+* You need ruby 2.7. You can install it with [asdf-vm](https://asdf-vm.com).
+* You also need nodejs 14 in your dev machine to run webpack-dev-server. You can install it with [asdf-vm](https://asdf-vm.com).
 
 ### Platform
 
 * Fork this github repo.
 * Clone it on your local machine
-* Install foreman v1.22+ on your machine:
+* Install foreman v2.5+ on your machine:
 
 ```shell
 git clone https://github.com/theforeman/foreman -b develop
@@ -160,9 +160,9 @@ gem 'simplecov' # test
 
 ```shell
 gem install bundler
-# prerequisites postgresql-XX-client library on OS (XX=major release installed in OS)
-bundle config set without 'libvirt ovirt mysql2'
-bundle config build.pg --with-pg-config=/usr/pgsql-XX/bin/pg_config
+# prerequisites libraries on Ubuntu OS:
+# sudo apt install postgresql-client-13 libpq-dev libsystemd-dev
+bundle config set without 'libvirt ovirt'
 bundle install
 ```
 
@@ -180,6 +180,12 @@ add these lines to config/settings.yml:
 
 ```yaml
     :webpack_dev_server: true
+    :destroy_vm_on_host_delete: true # optional, could be set on UI
+    :logging:
+      :level: debug
+    :loggers:
+      :sql:
+       :enabled: false
 ```
 
 * SQLite is no more default rails dev or test database, instead add:
@@ -191,45 +197,42 @@ DATABASE_URL=nulldb://nohost
 * (Optional) test and dev with postgresql database:
 
 ```shell
-cp config/model.mappings.example config/model.mappings
 cp config/database.yml.example config/database.yml
 ```
 
 add these lines to each environment in config/database.yml:
 
 ```yaml
+    host: localhost
     username: foreman
     password: foreman
 ```
 
 ```shell
 cp config/ignored_environments.yml.sample config/ignored_environments.yml
-docker run --name foreman-db -v foreman_data:/var/lib/postgresql/data -e POSTGRES_DB=foreman -e POSTGRES_USER=foreman -e POSTGRES_PASSWORD=foreman -p 5432:5432 -d postgres
+docker run --name foreman-db -v foreman_data:/var/lib/postgresql/data -e POSTGRES_DB=foreman -e POSTGRES_USER=foreman -e POSTGRES_PASSWORD=foreman -p 5432:5432 -d postgres:13
 bundle exec bin/rake db:migrate
-# reboot if settings.NAME error in schema
-bundle exec bin/rake db:seed assets:precompile locale:pack webpack:compile
+RAILS_ENV=development bundle exec bin/rake db:seed assets:precompile locale:pack webpack:compile
 ```
 
-* You can reset admin password if needed:
+* You can reset and change your admin password if needed:
 
 ```shell
-bundle exec bin/rake permissions:reset
+RAILS_ENV=development bundle exec bin/rake permissions:reset password=changeme
 ```
 
 * You should write tests and you can execute those specific to this plugin:
 
-first, create database `foreman-test` with psql commands:
+first, create database `foreman-test`:
 
 ```shell
-docker exec -it foreman-db psql -U foreman
-foreman=# create database "foreman-test";
+RAILS_ENV=test bundle exec rake db:create
 ```
 
 then add test schema and seeds:
 
 ```shell
 RAILS_ENV=test bundle exec bin/rake db:migrate
-# reboot if error: "ActiveRecord::RecordNotFound: Couldn't find Setting with [WHERE "settings"."name" = $1]"
 RAILS_ENV=test bundle exec bin/rake db:seed
 ```
 
@@ -247,10 +250,22 @@ export DISABLE_SPRING=true
 bundle exec bin/rake test TEST=../foreman_fog_proxmox/test/functional/compute_resources_controller_test.rb DATABASE_URL=nulldb://nohost
 ```
 
-* Check code syntax with rubocop and foreman rules:
+* In foreman_fog_proxmox source directory, check code syntax with rubocop and foreman rules:
+
+```shell
+bundle exec rubocop
+```
+
+safe autocorrect:
+
+```shell
+bundle exec rubocop -a
+```
+
+Temporary ignore offenses:
 
 ```shell
-bundle exec bin/rake foreman_fog_proxmox:rubocop
+bundle exec rubocop --auto-gen-config
 ```
 
 * See deface overrides result:
@@ -267,14 +282,16 @@ bundle exec bin/rake plugin:assets:precompile[foreman_fog_proxmox]
 
 * In foreman directory, after you modify foreman_fog_proxmox translations (language, texts in new files, etc) you have to compile it:
 
+Prerequisites: [Transifex CLI](https://github.com/transifex/cli)
+
 ```shell
-bundle exec bin/rake plugin:gettext[foreman_fog_proxmox]
+bundle exec bin/rake plugin:gettext\[foreman_fog_proxmox\]
 ```
 
 * In foreman directory, run in a new terminal the webpack-dev-server:
 
 ```shell
-./node_modules/.bin/webpack-dev-server --config config/webpack.config.js
+./node_modules/.bin/webpack-dev-server-without-h2 --config config/webpack.config.js
 ```
 
 * Or without webpack-dev-server, add this line in config/settings.yml:
@@ -301,12 +318,6 @@ bundle exec bin/rails server
 bundle exec foreman start
 ```
 
-If you want to delete vm on host destroy, add this line in config/settings.yml:
-
-```yml
-:destroy_vm_on_host_delete: false
-```
-
 See details in [foreman plugin development](https://projects.theforeman.org/projects/foreman/wiki/How_to_Create_a_Plugin)
 
 ## Contributing

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/compute_resources_vms_controller.rb

@@ -26,15 +26,20 @@ module ForemanFogProxmox
     module Overrides
       def associate
         if Host.for_vm_uuid(@compute_resource, @vm).any?
-          process_error(:error_msg => _("VM already associated with a host"), :redirect => compute_resource_vm_path(:compute_resource_id => params[:compute_resource_id], :id => proxmox_vm_id(@compute_resource, @vm)))
+          process_error(:error_msg => _("VM already associated with a host"),
+            :redirect => compute_resource_vm_path(:compute_resource_id => params[:compute_resource_id],
+              :id => proxmox_vm_id(@compute_resource, @vm)))
           return
         end
         host = @compute_resource.associated_host(@vm) if @compute_resource.respond_to?(:associated_host)
         if host.present?
           host.associate!(@compute_resource, @vm)
-          process_success(:success_msg => _("VM associated to host %s") % host.name, :success_redirect => host_path(host))
+          process_success(:success_msg => _("VM associated to host %s") % host.name,
+            :success_redirect => host_path(host))
         else
-          process_error(:error_msg => _("No host found to associate this VM with"), :redirect => compute_resource_vm_path(:compute_resource_id => params[:compute_resource_id], :id => proxmox_vm_id(@compute_resource, @vm)))
+          process_error(:error_msg => _("No host found to associate this VM with"),
+            :redirect => compute_resource_vm_path(:compute_resource_id => params[:compute_resource_id],
+              :id => proxmox_vm_id(@compute_resource, @vm)))
         end
       end
 
@@ -51,14 +56,15 @@ module ForemanFogProxmox
                  'hosts/console/log'
                end
       rescue StandardError => e
-        process_error :redirect => compute_resource_vm_path(@compute_resource, proxmox_vm_id(@compute_resource, @vm)), :error_msg => (_("Failed to set console: %s") % e), :object => @vm
+        process_error :redirect => compute_resource_vm_path(@compute_resource, proxmox_vm_id(@compute_resource, @vm)),
+          :error_msg => (_("Failed to set console: %s") % e), :object => @vm
       end
 
       private
 
       def proxmox_vm_id(compute_resource, vm)
         id = vm.identity
-        id = vm.unique_cluster_identity(compute_resource) if compute_resource.class == ForemanFogProxmox::Proxmox
+        id = vm.unique_cluster_identity(compute_resource) if compute_resource.instance_of?(ForemanFogProxmox::Proxmox)
         id
       end
 
@@ -69,11 +75,15 @@ module ForemanFogProxmox
         else
           error format(_("failed to %<action>s %<vm>s"), { :action => _(action), :vm => @vm })
         end
-        redirect_back(:fallback_location => compute_resource_vm_path(:compute_resource_id => params[:compute_resource_id], :id => proxmox_vm_id(@compute_resource, @vm)))
+        redirect_back(:fallback_location => compute_resource_vm_path(
+          :compute_resource_id => params[:compute_resource_id], :id => proxmox_vm_id(@compute_resource, @vm)
+        ))
       # This should only rescue Fog::Errors, but Fog returns all kinds of errors...
       rescue StandardError => e
         error format(_("Error - %<message>s"), { :message => _(e.message) })
-        redirect_back(:fallback_location => compute_resource_vm_path(:compute_resource_id => params[:compute_resource_id], :id => proxmox_vm_id(@compute_resource, @vm)))
+        redirect_back(:fallback_location => compute_resource_vm_path(
+          :compute_resource_id => params[:compute_resource_id], :id => proxmox_vm_id(@compute_resource, @vm)
+        ))
       end
     end
   end

data/app/controllers/concerns/foreman_fog_proxmox/controller/parameters/compute_resource.rb

@@ -27,7 +27,7 @@ module ForemanFogProxmox
           def compute_resource_params_filter
             super.tap do |filter|
               filter.permit :ssl_verify_peer,
-                            :ssl_certs, :disable_proxy, :auth_method, :token_id, :token
+                :ssl_certs, :disable_proxy, :auth_method, :token_id, :token
             end
           end
 

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

@@ -0,0 +1,58 @@
+# 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.instance_of?(ForemanFogProxmox::Proxmox)
+
+        @host.compute_attributes[:vmid] = next_vmid
+        @host.compute_attributes[:interfaces_attributes].each do |index, interface_attributes|
+          @host.compute_attributes[:interfaces_attributes][index] =
+            interface_attributes.merge(macaddr: nil).merge(hwaddr: nil).merge(ip: nil).merge(ip6: nil)
+        end
+        @host.compute_attributes[:volumes_attributes].each do |index, volume_attributes|
+          @host.compute_attributes[:volumes_attributes][index] = volume_attributes.merge(volid: nil)
+        end
+      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/controllers/foreman_fog_proxmox/compute_resources_controller.rb

@@ -21,7 +21,8 @@ module ForemanFogProxmox
   class ComputeResourcesController < ::ApplicationController
     # GET foreman_fog_proxmox/isos/:compute_resource_id/:node_id/:storage
     def isos_by_id_and_node_and_storage
-      volumes = load_compute_resource(params[:compute_resource_id]).images_by_storage(params[:node_id], params[:storage], 'iso')
+      volumes = load_compute_resource(params[:compute_resource_id]).images_by_storage(params[:node_id],
+        params[:storage], 'iso')
       respond_to do |format|
         format.json { render :json => volumes }
       end
@@ -29,7 +30,8 @@ module ForemanFogProxmox
 
     # GET foreman_fog_proxmox/ostemplates/:compute_resource_id/:node_id/:storage
     def ostemplates_by_id_and_node_and_storage
-      volumes = load_compute_resource(params[:compute_resource_id]).images_by_storage(params[:node_id], params[:storage], 'vztmpl')
+      volumes = load_compute_resource(params[:compute_resource_id]).images_by_storage(params[:node_id],
+        params[:storage], 'vztmpl')
       respond_to do |format|
         format.json { render :json => volumes }
       end
@@ -37,7 +39,8 @@ module ForemanFogProxmox
 
     # GET foreman_fog_proxmox/isos/:compute_resource_id/:node_id
     def isos_by_id_and_node
-      volumes = load_compute_resource(params[:compute_resource_id]).images_by_storage(params[:node_id], params[:storage], 'iso')
+      volumes = load_compute_resource(params[:compute_resource_id]).images_by_storage(params[:node_id],
+        params[:storage], 'iso')
       respond_to do |format|
         format.json { render :json => volumes }
       end

data/app/helpers/proxmox_compute_controllers_helper.rb

@@ -19,7 +19,8 @@
 
 module ProxmoxComputeControllersHelper
   def proxmox_controllers_map
-    proxmox_controllers_cloudinit_map << ForemanFogProxmox::OptionsSelect.new(name: 'VirtIO Block', id: 'virtio', range: 15)
+    proxmox_controllers_cloudinit_map << ForemanFogProxmox::OptionsSelect.new(name: 'VirtIO Block', id: 'virtio',
+      range: 15)
   end
 
   def proxmox_controllers_cloudinit_map

data/app/helpers/proxmox_compute_resources_helper.rb

@@ -21,9 +21,9 @@ module ProxmoxComputeResourcesHelper
   def user_token_expiration_date(compute_resource)
     expire = compute_resource.current_user_token_expire
   rescue ::Foreman::Exception => e
-    return 'Has already expired. Please edit the compute resource to set a new valid one.' if e.message == 'User token expired'
+    'Has already expired. Please edit the compute resource to set a new valid one.' if e.message == 'User token expired'
   rescue StandardError => e
-    logger.warn(format(_('failed to get identity client version: %<e>s'), e: e))
+    logger.warn("failed to get identity client version: #{e}")
     raise e
   else
     return 'Never' if expire == 0
@@ -36,7 +36,7 @@ module ProxmoxComputeResourcesHelper
   rescue ::Foreman::Exception => e
     return [] if e.message == 'User token expired'
   rescue StandardError => e
-    logger.warn(format(_('failed to get cluster nodes: %<e>s'), e: e))
+    logger.warn("failed to get cluster nodes: #{e}")
     raise e
   else
     nodes

data/app/helpers/proxmox_compute_resources_vms_helper.rb

@@ -20,7 +20,7 @@
 module ProxmoxComputeResourcesVmsHelper
   def proxmox_vm_id(compute_resource, vm)
     id = vm.identity
-    id = vm.unique_cluster_identity(compute_resource) if compute_resource.class == ForemanFogProxmox::Proxmox
+    id = vm.unique_cluster_identity(compute_resource) if compute_resource.instance_of?(ForemanFogProxmox::Proxmox)
     id
   end
 
@@ -32,7 +32,9 @@ module ProxmoxComputeResourcesVmsHelper
   end
 
   def vm_power_action(vm, authorizer = nil)
-    opts = hash_for_power_compute_resource_vm_path(:compute_resource_id => @compute_resource, :id => proxmox_vm_id(@compute_resource, vm)).merge(:auth_object => @compute_resource, :permission => 'power_compute_resources_vms', :authorizer => authorizer)
+    opts = hash_for_power_compute_resource_vm_path(:compute_resource_id => @compute_resource, :id => proxmox_vm_id(@compute_resource, vm)).merge(
+      :auth_object => @compute_resource, :permission => 'power_compute_resources_vms', :authorizer => authorizer
+    )
     html = power_action_html(vm)
 
     display_link_if_authorized "Power #{action_string(vm)}", opts, html.merge(:method => :put)
@@ -46,7 +48,8 @@ module ProxmoxComputeResourcesVmsHelper
         :id => proxmox_vm_id(@compute_resource, vm)
       ).merge(
         :auth_object => @compute_resource,
-        :permission => 'edit_compute_resources'),
+        :permission => 'edit_compute_resources'
+      ),
       :title => _('Associate VM to a Foreman host'),
       :method => :put,
       :class => 'btn btn-default'
@@ -62,7 +65,8 @@ module ProxmoxComputeResourcesVmsHelper
       hash_for_import_compute_resource_vm_path(
         :compute_resource_id => @compute_resource,
         :id => proxmox_vm_id(@compute_resource, vm),
-        :type => 'managed'),
+        :type => 'managed'
+      ),
       html_options
     )
     import_unmanaged_link = display_link_if_authorized(
@@ -70,7 +74,8 @@ module ProxmoxComputeResourcesVmsHelper
       hash_for_import_compute_resource_vm_path(
         :compute_resource_id => @compute_resource,
         :id => proxmox_vm_id(@compute_resource, vm),
-        :type => 'unmanaged'),
+        :type => 'unmanaged'
+      ),
       html_options
     )
 
@@ -88,12 +93,16 @@ module ProxmoxComputeResourcesVmsHelper
       ),
       {
         :id => 'console-button',
-        :class => 'btn btn-info'
+        :class => 'btn btn-info',
       }
     )
   end
 
   def vm_delete_action(vm, authorizer = nil)
-    display_delete_if_authorized(hash_for_compute_resource_vm_path(:compute_resource_id => @compute_resource, :id => proxmox_vm_id(@compute_resource, vm)).merge(:auth_object => @compute_resource, :authorizer => authorizer), :class => 'btn btn-danger')
+    display_delete_if_authorized(
+      hash_for_compute_resource_vm_path(:compute_resource_id => @compute_resource, :id => proxmox_vm_id(@compute_resource, vm)).merge(
+        :auth_object => @compute_resource, :authorizer => authorizer
+      ), :class => 'btn btn-danger'
+    )
   end
 end

data/app/helpers/proxmox_form_helper.rb

@@ -29,9 +29,11 @@ module ProxmoxFormHelper
         options[:value] = value if value.present?
         addClass options, 'form-control'
         pass = f.password_field(attr, options) +
-               tag(:span, '', class: 'glyphicon glyphicon-warning-sign input-addon', title: 'Caps lock ON', style: 'display:none')
+               tag(:span, '', class: 'glyphicon glyphicon-warning-sign input-addon', title: 'Caps lock ON',
+style: 'display:none')
         if unset_button
-          button = link_to_function(icon_text('edit', '', :kind => 'pficon'), 'toggle_input_group(this)', :id => 'disable-pass-btn', :class => 'btn btn-default', :title => _('Change the password'))
+          button = link_to_function(icon_text('edit', '', :kind => 'pficon'), 'toggle_input_group(this)',
+            :id => 'disable-pass-btn', :class => 'btn btn-default', :title => _('Change the password'))
           input_group(pass, input_group_btn(button))
         else
           pass
@@ -53,10 +55,12 @@ module ProxmoxFormHelper
     options[:form_builder_local] ||= :f
     options[:form_builder_attrs] ||= {}
 
-    content_tag(:div, :class => "#{options[:type]}_#{association}_fields_template form_template", :style => 'display: none;') do
-      form_builder.fields_for(association, options[:object], :child_index => "new_#{options[:type]}_#{association}") do |f|
+    content_tag(:div, :class => "#{options[:type]}_#{association}_fields_template form_template",
+:style => 'display: none;') do
+      form_builder.fields_for(association, options[:object],
+        :child_index => "new_#{options[:type]}_#{association}") do |f|
         render(:partial => options[:partial], :layout => options[:layout],
-               :locals => { options[:form_builder_local] => f }.merge(options[:form_builder_attrs]))
+          :locals => { options[:form_builder_local] => f }.merge(options[:form_builder_attrs]))
       end
     end
   end
@@ -66,7 +70,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 = {})