foreman_fog_proxmox 0.13.1 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ee2ea48049134a2a429baa88bd6f3299c321f38a5f3532c8c17d1a3012dc277
-  data.tar.gz: 246a3ee1a5bb9f7f99e55b7f97f637cae3b49b12e7917667444238ae007e21e6
+  metadata.gz: 19b7f2f30af319dbc8881900c660bf9ddc5026eb8762ace34dcd6b4ac7fa85f8
+  data.tar.gz: 5430f62a1d7db829fddb142c468d5c3741a0090131f0a3d26746bec75f6b943e
 SHA512:
-  metadata.gz: b7ba0a9c31049f222e8cd06fd411356ae1302dcf1b9b0acfe0be8498d514c39e3c54373d8603484183c01318bff6c9ad4b18c8366f28916ffa05976e87b62914
-  data.tar.gz: 66d723e3135509e731e663438fa5d5cd3f79464641e4470c7b8f7908d744ba04d069a579c334140acc1b927c408208fa91cac5e30daf27998cb64f91575b9fc8
+  metadata.gz: ceac1a672eb780a7c7e8e05d8024f70d74d129a3ff48ad5d65f9947c78d60778a3697c7a70e030eff53346f3f56587a726fa71b5a719bb448bbea573d7970e47
+  data.tar.gz: cd477463a37e43ce80db0986f08d8203b225cfc5abae4f31b5c165cfc149197c99be2b2d8687b6e217246609c77d781658d93c119b37c41bfebc6049be852b4a

data/README.md

@@ -34,12 +34,31 @@ You can support the plugin development via the following methods:
 |>=0.12 |>=6.1|>=0.11|>=2.0|>=2.5|
 |>=0.14 |>=6.2|=0.13.0|>=2.4|>=2.7|
 |>=0.14 |>=6.2|>=0.13.1|>=2.3|>=2.5|
+|>=0.14 |>=6.2|>=0.14.0|>=2.5|>=2.5|
 
 ## Installation
 
-### Prerequisites
+### From OS packages
 
-You need [nodejs](https://nodejs.org/en/download/package-manager/) installed in order to use foreman-assets package.
+Please see the Foreman manual for complete instructions:
+
+* [Foreman: How to Install a Plugin from package](https://theforeman.org/plugins/#2.Installation)
+
+[Install from package](https://theforeman.org/plugins/#2.2Packageinstallation) is the easiest way to install the plugin. Choose the latest release plugins repository. If you don't find it in the same foreman release repository, get it from the `nightly` repository.
+
+Then you can install it with the package manager, in Debian/Ubuntu:
+
+```shell
+sudo apt-get install ruby-foreman-fog-proxmox
+```
+
+and in Fedora/Redhat Linux:
+
+```shell
+sudo dnf install rubygem-foreman_fog_proxmox
+```
+
+Redhat, CentOS or Fedora users should also [setup Selinux](https://projects.theforeman.org/projects/foreman/wiki/SELinux) to allow foreman and all its plugins to work.
 
 ### From gem
 
@@ -47,10 +66,10 @@ See complete details in [plugin installation from gem](https://theforeman.org/pl
 
 Here is a Debian sample:
 
-* Install foreman [from OS packages](https://theforeman.org/manuals/1.19/index.html#3.3InstallFromPackages):
+* Install foreman [from OS packages](https://theforeman.org/manuals/latest/index.html#3.3InstallFromPackages):
 
 ```shell
-sudo apt install -y foreman foreman-compute foreman-sqlite3 foreman-assets
+sudo apt install -y foreman foreman-pgsql
 ```
 
 * Use only foreman user (**not root!**) `sudo -u foreman ...`
@@ -68,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]
 ```
@@ -98,14 +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](http://theforeman.org/manuals/latest/index.html#6.1InstallaPlugin)
-
-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)
@@ -113,7 +126,7 @@ Redhat, CentOS or Fedora users should also [setup Selinux](https://projects.thef
 
 ## Development
 
-### Prerequisites
+### 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).
@@ -189,7 +202,7 @@ add these lines to each environment in config/database.yml:
 
 ```shell
 cp config/ignored_environments.yml.sample config/ignored_environments.yml
-docker run --name foreman-db -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
 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

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();
@@ -36,14 +34,14 @@ function sslVerifyPeerSelected() {
   }
 }
 
-function enableField(id) {
-  $(id).show();
-  $(id).removeAttr('disabled');
+function enableField(item) {
+  $(item).show();
+  $(item).removeAttr('disabled');
 }
 
-function disableField(id) {  
-  $(id).hide();
-  $(id).attr('disabled','disabled');
+function disableField(item) {  
+  $(item).hide();
+  $(item).attr('disabled','disabled');
 }
 
 function toggleFieldset(method, selected){

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() {
@@ -39,17 +38,17 @@ function vmTypeSelected() {
   return false;
 }
 
-function volumeButtonAddId(id){
-  return $("a[data-association='" + id + "_volumes']");
+function volumeButtonAddId(item){
+  return $("a[data-association='" + item + "_volumes']");
 }
 
-function volumeFieldsetId(id, type){
-  return $("fieldset[id^='" + type + "_volume_"+ id +"']").not("fieldset[id$='_new_" + id +"_volumes']");
+function volumeFieldsetId(item, type){
+  return $("fieldset[id^='" + type + "_volume_"+ item +"']").not("fieldset[id$='_new_" + item +"_volumes']");
 }
 
-function indexByIdAndType(id, storage_type, vm_type){
-  let regex = new RegExp(`${vm_type}_volume_${storage_type}_(\\d+)`);
-  return id.match(regex)[1];
+function indexByIdAndType(item, storage_type, vm_type){
+  var regex = new RegExp(vm_type +"_volume_" + storage_type +"_(\\d+)");
+  return item.match(regex)[1];
 }
 
 function volidByIndexAndTag(index, tag){
@@ -58,10 +57,10 @@ function volidByIndexAndTag(index, tag){
 
 function hasCloudinit(){
   result = false;
-  let id = volumeFieldsetId('cloud_init', 'server').attr('id');
-  if (id !== undefined){
-    let index = indexByIdAndType(id, 'cloud_init', 'server');
-    let volid = volidByIndexAndTag(index, 'input');
+  var volume_id = volumeFieldsetId('cloud_init', 'server').attr('id');
+  if (volume_id !== undefined){
+    var index = indexByIdAndType(volume_id, 'cloud_init', 'server');
+    var volid = volidByIndexAndTag(index, 'input');
     result = volid.includes("cloudinit");
   }
   return result;
@@ -69,42 +68,42 @@ function hasCloudinit(){
 
 function hasCdrom(){
   result = false;
-  let id = volumeFieldsetId('cdrom', 'server').attr('id');
-  if (id !== undefined){
-    let index = indexByIdAndType(id, 'cdrom', 'server');
-    let checked = $("input[id^='host_compute_attributes_volumes_attributes_" + index + "_cdrom']:checked").val();
-    let isCdrom = checked === 'cdrom';
+  var volume_id = volumeFieldsetId('cdrom', 'server').attr('id');
+  if (volume_id !== undefined){
+    var index = indexByIdAndType(volume_id, 'cdrom', 'server');
+    var checked = $("input[id^='host_compute_attributes_volumes_attributes_" + index + "_cdrom']:checked").val();
+    var isCdrom = checked === 'cdrom';
     result = isCdrom;
-    let isImage = checked === 'image';
+    var isImage = checked === 'image';
     if (isImage) {
-      let volid = volidByIndexAndTag(index, 'select');
+      var volid = volidByIndexAndTag(index, 'select');
       result = volid.includes("iso");
     }
   }
   return result;
 }
 
-function cloudinit(id){
-  return id === 'cloud_init' && hasCloudinit();
+function cloudinit(item){
+  return item === 'cloud_init' && hasCloudinit();
 }
 
-function cdrom(id){
-  return id === 'cdrom' && hasCdrom();
+function cdrom(item){
+  return item === 'cdrom' && hasCdrom();
 }
 
-function enableVolume(id, type){
-  volumeFieldsetId(id, type).show();
-  volumeButtonAddId(id).show();
-  if (cloudinit(id) || cdrom(id)){
-    volumeButtonAddId(id).hide();
+function enableVolume(volume_id, type){
+  volumeFieldsetId(volume_id, type).show();
+  volumeButtonAddId(volume_id).show();
+  if (cloudinit(volume_id) || cdrom(volume_id)){
+    volumeButtonAddId(volume_id).hide();
   }
-  volumeFieldsetId(id, type).removeAttr('disabled');
+  volumeFieldsetId(volume_id, type).removeAttr('disabled');
 }
 
-function disableVolume(id, type){
-  volumeFieldsetId(id, type).hide();
-  volumeButtonAddId(id).hide();
-  volumeFieldsetId(id, type).attr('disabled','disabled');
+function disableVolume(volume_id, type){
+  volumeFieldsetId(volume_id, type).hide();
+  volumeButtonAddId(volume_id).hide();
+  volumeFieldsetId(volume_id, type).attr('disabled','disabled');
 }
 
 function volumes(type){
@@ -115,44 +114,44 @@ function volume(type){
   return type === 'qemu' ? 'server' : 'container';
 }
 
-function toggleVolume(id, type1, type2){
-  type1 === type2 ? enableVolume(id, volume(type1)) : disableVolume(id, volume(type1));
+function toggleVolume(volume_id, type1, type2){
+  type1 === type2 ? enableVolume(volume_id, volume(type1)) : disableVolume(volume_id, volume(type1));
 }
 
 function toggleVolumes(selected){
    ['qemu', 'lxc'].forEach(function(type){
-    volumes(type).forEach(function(id){
-      toggleVolume(id, selected, type);
+    volumes(type).forEach(function(volume_id){
+      toggleVolume(volume_id, selected, type);
     });
   });
 }
 
-function enableFieldset(id, fieldset) {
+function enableFieldset(fieldsetId, fieldset) {
   if (fieldset.toggle && fieldset.new_vm){
-    fieldset_id(id, fieldset).show();
+    fieldset_id(fieldsetId, fieldset).show();
   }
-  fieldset_id(id, fieldset).removeAttr('disabled');
-  input_hidden_id(id).removeAttr('disabled');
+  fieldset_id(fieldsetId, fieldset).removeAttr('disabled');
+  input_hidden_id(fieldsetId).removeAttr('disabled');
 }
 
-function disableFieldset(id, fieldset) {  
+function disableFieldset(fieldsetId, fieldset) {  
   if (fieldset.toggle && fieldset.new_vm){
-    fieldset_id(id, fieldset).hide();
+    fieldset_id(fieldsetId, fieldset).hide();
   }
-  fieldset_id(id, fieldset).attr('disabled','disabled');
-  input_hidden_id(id).attr('disabled','disabled');
+  fieldset_id(fieldsetId, fieldset).attr('disabled','disabled');
+  input_hidden_id(fieldsetId).attr('disabled','disabled');
 }
 
-function toggleFieldset(id, fieldset, type1, type2) {  
-  type1 === type2 ? enableFieldset(id, fieldset) : disableFieldset(id, fieldset);
+function toggleFieldset(fieldsetId, fieldset, type1, type2) {  
+  type1 === type2 ? enableFieldset(fieldsetId, fieldset) : disableFieldset(fieldsetId, fieldset);
 }
 
-function input_hidden_id(id){
-  return $("div[id^='"+ id +"_volumes']" + " + input:hidden");
+function input_hidden_id(volume_id){
+  return $("div[id^='"+ volume_id +"_volumes']" + " + input:hidden");
 }
 
-function fieldset_id(id, fieldset){
-  return $("fieldset[id^='" + id + "_"+fieldset.id+"']");
+function fieldset_id(fieldsetId, fieldset){
+  return $("fieldset[id^='" + fieldsetId + "_"+fieldset.id+"']");
 }
 
 function fieldsets(type){
@@ -163,8 +162,8 @@ function toggleFieldsets(fieldset){
   var removable_input_hidden = $("div.removable-item[style='display: none;']" + " + input:hidden");
   removable_input_hidden.attr('disabled','disabled');  
   ['qemu', 'lxc'].forEach(function(type){
-    fieldsets(type).forEach(function(id){
-      toggleFieldset(id, fieldset, fieldset.selected, type);
+    fieldsets(type).forEach(function(fieldsetId){
+      toggleFieldset(fieldsetId, fieldset, fieldset.selected, type);
     });
   });
 }
@@ -190,18 +189,18 @@ function nodeSelected(item) {
   }
 }
 
-function emptySelect(select){
-  $(select).empty();
-  $(select).append($("<option></option>").val('').text(''));
-  $(select).val('');
+function emptySelect(select_id){
+  $(select_id).empty();
+  $(select_id).append($("<option></option>").val('').text(''));
+  $(select_id).val('');
 }
 
 function initOptions(select_ids){
   console.log('initOptions(' + select_ids[0] + ')');
   select_ids.forEach(emptySelect);
-  select_ids.forEach(function(select){
-    $(select + ' option:selected').prop('selected',false);
-    $(select).val('');
+  select_ids.forEach(function(select_id){
+    $(select_id + ' option:selected').prop('selected',false);
+    $(select_id).val('');
   });
 }
 

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

@@ -24,9 +24,9 @@ function volumesAttributesSelector(profile,index,selector) {
 }
 
 function getIndex(item) {
-  var id = $(item).attr('id');
+  var index_id = $(item).attr('id');
   var pattern = /(host_compute_attributes_volumes_attributes_||compute_attribute_vm_attrs_volumes_attributes_)(\d+)[_](.*)/i;
-  pattern_a = pattern.exec(id);
+  pattern_a = pattern.exec(index_id);
   var index = pattern_a[2];
   return index;
 }
@@ -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.js

@@ -16,24 +16,24 @@
 // along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>.
 
 function getIndex(item) {
-  var id = $(item).attr('id');
+  var index_id = $(item).attr('id');
   var pattern = /(host_compute_attributes_volumes_attributes_||compute_attribute_vm_attrs_volumes_attributes_)(\d+)[_](.*)/i;
-  pattern_a = pattern.exec(id);
+  pattern_a = pattern.exec(index_id);
   var index = pattern_a[2];
   return index;
 }
 
 function volumeId(type,index){
-  let id = '#volume_' + type + '_' + index;
-  return id;
+  var volume_id = '#volume_' + type + '_' + index;
+  return volume_id;
 }
 
-function enableField(id) {
-  $(id).show();
-  $(id).removeAttr('disabled');
+function enableField(item) {
+  $(item).show();
+  $(item).removeAttr('disabled');
 }
 
-function disableField(id) {  
-  $(id).hide();
-  $(id).attr('disabled','disabled');
+function disableField(item) {  
+  $(item).hide();
+  $(item).attr('disabled','disabled');
 }

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

@@ -0,0 +1,80 @@
+# 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 ComputeResourcesVmsController
+    extend ActiveSupport::Concern
+    included do
+      prepend Overrides
+    end
+    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)))
+          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))
+        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)))
+        end
+      end
+
+      def console
+        @console = @compute_resource.console proxmox_vm_id(@compute_resource, @vm)
+        render case @console[:type]
+               when 'spice'
+                 'hosts/console/spice'
+               when 'vnc'
+                 'hosts/console/vnc'
+               when 'vmrc'
+                 'hosts/console/vmrc'
+               else
+                 '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
+      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
+      end
+
+      def run_vm_action(action)
+        if @vm.send(action)
+          @vm.reload
+          success format(_("%<vm>s is now %<vm_state>s"), { :vm => @vm, :vm_state => @vm.state.capitalize })
+        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)))
+      # 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)))
+      end
+    end
+  end
+end