foreman_fog_proxmox 0.10.1 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f6ccfa5c56960acddaacf20dd5d89665ab7dfcc5479204fd9abd8e0a2af791e
-  data.tar.gz: d5c61cfdaa156b8d6f323d98913a6ae76c57ed16a47613dd53319f12a5e09163
+  metadata.gz: 24ea33cf00db1fc077b47811dba321202308f03801612dab34a93613fa31d34a
+  data.tar.gz: f579acd4f75749a0676afdbb8f106ede3dcbedaca41e63297c7f36a222e31ccc
 SHA512:
-  metadata.gz: 0a051879d69327057c56c26a1c0301e0790079cf313ef78252067efc729959db7def39d44d051c9a0f7c4c32a0ccbac5cba979cb4029fabbd5d04b7e4d214c61
-  data.tar.gz: c188de68693be5e1f8547cbf24e5c5f2d54ea88c221c5d25620d018aa3d1dd1ca9dff0581800debde179e0f3891951f54fd3a070467f4137be40af35d6396135
+  metadata.gz: b7252797a07aff96816601a9ce46adb13e242098e4a9731ccf29f515537d6c41d7f70f0c93fb0463eb54d8d0d5beb22f9acd4e4eca8817513d742097ffbcf7bf
+  data.tar.gz: 9f03bf388ae9af712be16fa65424cb8c789abd8d4c6282d59215fa4248d94f96effeb0e84c3051da793e867ff42831df2d566dd3e5d5725e82bb7c741fadaca9

data/README.md

@@ -1,8 +1,9 @@
 ![ForemanFogProxmox](.github/images/foremanproxmox.png)
 
-[![Build Status](https://travis-ci.com/theforeman/foreman_fog_proxmox.svg?branch=master)](https://travis-ci.com/theforeman/foreman_fog_proxmox)
+![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)
+[![Gem Version](https://badge.fury.io/rb/foreman_fog_proxmox.svg)](https://badge.fury.io/rb/foreman_fog_proxmox)
 
 # ForemanFogProxmox
 
@@ -29,6 +30,8 @@ You can support the plugin development via the following methods:
 |<0.9 |<6.0|=0.9|>=1.22|>=2.3|
 |>=0.9 |>=5.4|>=0.9.1|>=1.22|>=2.3|
 |>=0.10 |>=5.4|>=0.9.4|>=1.22|>=2.5|
+|>=0.11 |>=5.4|>=0.10|>=1.22|>=2.5|
+|>=0.12 |>=6.1|>=0.11|>=2.0|>=2.5|
 
 ## Installation
 
@@ -128,8 +131,8 @@ git clone https://github.com/theforeman/foreman -b develop
 * Add this line:
 
 ```ruby
-gem 'foreman_fog_proxmox', :path => '/your_path_to/foreman_fog_proxmox'
-gem 'fog-proxmox', :path => '/your_path_to/fog-proxmox' # optional if you need to modify fog-proxmox code too
+gem 'foreman_fog_proxmox', :path => '../../theforeman/foreman_fog_proxmox'
+gem 'fog-proxmox', :path => '../../fog/fog-proxmox' # optional if you need to modify fog-proxmox code too
 gem 'ruby-debug-ide' # dev
 gem 'debase' # dev
 gem 'simplecov' # test
@@ -138,7 +141,10 @@ gem 'simplecov' # test
 * In foreman directory, install dependencies:
 
 ```shell
-bundle install --without libvirt postgresql mysql2
+gem install bundler
+# prerequisites postgresql-client library on OS
+bundle config set without 'libvirt ovirt mysql2'
+bundle install
 ```
 
 ```shell
@@ -151,14 +157,37 @@ npm install
 cp config/settings.yaml.test config/settings.yaml
 ```
 
-* Install foreman database (sqlite is default in rails development):
+add these lines to config/settings.yml:
+
+```yaml
+    :webpack_dev_server: true
+```
+
+* SQLite is no more default rails dev or test database, instead add:
+
+```shell
+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 config/database.yml:
+
+```yaml
+    username: foreman
+    password: foreman
+```
+
+```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
 bundle exec bin/rake db:migrate
-bundle exec bin/rake db:seed
+bundle exec bin/rake db:seed assets:precompile locale:pack webpack:compile
 ```
 
 * You can reset admin password if needed:
@@ -169,6 +198,13 @@ bundle exec bin/rake permissions:reset
 
 * You should write tests and you can execute those specific to this plugin:
 
+first, create database `foreman-test` with psql commands:
+
+```shell
+docker exec -it foreman-db psql -U foreman
+foreman=# create database "foreman-test";
+```
+
 all:
 
 ```shell
@@ -180,7 +216,7 @@ or just one:
 
 ```shell
 export DISABLE_SPRING=true
-bundle exec bin/rake test TEST=test/functional/compute_resources_controller_test.rb
+bundle exec bin/rake test TEST=test/functional/compute_resources_controller_test.rb DATABASE_URL=nulldb://nohost
 ```
 
 * Check code syntax with rubocop and foreman rules:
@@ -207,16 +243,28 @@ bundle exec bin/rake plugin:assets:precompile[foreman_fog_proxmox]
 bundle exec bin/rake plugin:gettext[foreman_fog_proxmox]
 ```
 
-* In foreman directory, run rails server:
+* In foreman directory, run in a new terminal the webpack-dev-server:
 
 ```shell
-bundle exec bin/rails server
+./node_modules/.bin/webpack-dev-server --config config/webpack.config.js
 ```
 
-* In foreman directory, run in a new terminal the webpack-dev-server:
+* Or without webpack-dev-server, add this line in config/settings.yml:
+
+```yml
+:webpack_dev_server: false
+```
+
+then compile webpack assets:
 
 ```shell
-./node_modules/.bin/webpack-dev-server --config config/webpack.config.js
+bundle exec bin/rake webpack:compile
+```
+
+* In foreman directory, run rails server:
+
+```shell
+bundle exec bin/rails server
 ```
 
 * Or you can launch all together:
@@ -231,8 +279,9 @@ See details in [foreman plugin development](https://projects.theforeman.org/proj
 
 If you like it and still want to improve it, [sponsor me](https://github.com/sponsors/tristanrobert)!
 
-You can reach the [contributors](.github/CONTRIBUTORS.md).
-Bug reports and pull requests are welcome on GitHub at [ForemanFogProxmox](https://github.com/theforeman/foreman_fog_proxmox).
+* You can reach the [contributors](.github/CONTRIBUTORS.md).
+* [Translate it in your favorite language](https://www.transifex.com/foreman/foreman/foreman_fog_proxmox/)
+* Bug reports and pull requests are welcome on GitHub at [ForemanFogProxmox](https://github.com/theforeman/foreman_fog_proxmox).
 
 Please read more information about [how to contribute](.github/CONTRIBUTING.md).
 

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

@@ -103,14 +103,14 @@ function nodeSelected(item) {
   if (type == undefined) type = $("#compute_attribute_vm_attrs_type").val();
   switch (type) {
     case 'qemu':
-      updateOptions('isostorages', 'compute_attributes_config_attributes', 'cdrom_storage', 'compute_attributes_config_attributes', 'cdrom_iso', 'storage', node_id);
-      updateOptions('storages', 'compute_attributes_volumes_attributes', 'storage', undefined, undefined, 'storage', node_id);
-      updateOptions('bridges', 'interfaces_attributes', 'compute_attributes_bridge', undefined, undefined, 'iface', node_id);
+      updateOptions('isostorages', 'compute_attributes_config_attributes', 'cdrom_storage', 'compute_attributes_config_attributes', 'cdrom_iso', 'storage', node_id, undefined);
+      updateOptions('storages', 'compute_attributes_volumes_attributes', 'storage', undefined, undefined, 'storage', node_id, undefined);
+      updateOptions('bridges', 'interfaces_attributes', 'compute_attributes_bridge', undefined, undefined, 'iface', node_id, undefined);
       break;
     case 'lxc':
-      updateOptions('ostemplates', 'compute_attributes_ostemplate', 'storage', 'compute_attributes_ostemplate', 'file', 'storage', node_id);
-      updateOptions('storages', 'compute_attributes_volumes_attributes', 'storage', undefined, undefined, 'storage', node_id);
-      updateOptions('bridges', 'interfaces_attributes', 'compute_attributes_bridge', undefined, undefined, 'iface', node_id);
+      updateOptions('ostemplates', 'compute_attributes_ostemplate', 'storage', 'compute_attributes_ostemplate', 'file', 'storage', node_id, undefined);
+      updateOptions('storages', 'compute_attributes_volumes_attributes', 'storage', undefined, undefined, 'storage', node_id, undefined);
+      updateOptions('bridges', 'interfaces_attributes', 'compute_attributes_bridge', undefined, undefined, 'iface', node_id, undefined);
       break;
     default:
       console.log("unkown type=" + type);
@@ -149,7 +149,7 @@ function selectIds(start_options_id, end_options_id){
   return [select_host_id, select_profile_id];
 }
 
-function updateOptions(options_path, start_options_id, end_options_id, start_second_options_id, end_second_options_id, option_id, node_id, second_id = undefined) {
+function updateOptions(options_path, start_options_id, end_options_id, start_second_options_id, end_second_options_id, option_id, node_id, second_id) {
   
   var select_ids = selectIds(start_options_id, end_options_id);
   var select_second_ids;

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

@@ -122,26 +122,4 @@ function computeControllerMaxDevice(controller) {
     default:
       return 1;
   }
-}
-
-function balloonSelected(item) {
-  var ballooned = $(item).is(':checked');
-  var memory_f = $("input[name$='[config_attributes][memory]']:hidden");
-  var min_memory_f = $("input[id$='config_attributes_min_memory']");
-  var min_memory_hidden_f = $("input[name$='[config_attributes][min_memory]']:hidden");
-  var shares_f = $("input[id$='config_attributes_shares']");
-  var shares_hidden_f = $("input[name$='[config_attributes][shares]']:hidden");
-  if (ballooned) {
-    min_memory_f.removeAttr('disabled');
-    shares_f.removeAttr('disabled');
-    var max = memory_f.val();
-    console.log("max=" + max);
-    min_memory_f.attr('data-soft-max', max);
-  } else {
-    min_memory_f.attr('disabled', 'disabled');
-    min_memory_hidden_f.attr('value', '');
-    shares_f.attr('disabled', 'disabled');
-    shares_hidden_f.attr('value', '');
-  }
-  tfm.numFields.initAll();
 }

data/app/helpers/proxmox_compute_selectors_helper.rb

@@ -47,6 +47,15 @@ module ProxmoxComputeSelectorsHelper
      ForemanFogProxmox::OptionsSelect.new(name: 'VirtIO Block', id: 'virtio', range: 15)]
   end
 
+  def proxmox_scsi_controllers_map
+    [OpenStruct.new(id: 'lsi', name: 'LSI 53C895A (Default)'),
+     OpenStruct.new(id: 'lsi53c810', name: 'LSI 53C810'),
+     OpenStruct.new(id: 'virtio-scsi-pci', name: 'VirtIO SCSI'),
+     OpenStruct.new(id: 'virtio-scsi-single', name: 'VirtIO SCSI Single'),
+     OpenStruct.new(id: 'megasas', name: 'MegaRAID SAS 8708EM2'),
+     OpenStruct.new(id: 'pvscsi', name: 'VMware PVSCSI')]
+  end
+
   def proxmox_operating_systems_map
     [OpenStruct.new(id: 'other', name: 'Unspecified OS'),
      OpenStruct.new(id: 'wxp', name: 'Microsoft Windows XP'),
@@ -167,4 +176,9 @@ module ProxmoxComputeSelectorsHelper
      OpenStruct.new(id: 'rtl8139', name: 'Realtek RTL8139'),
      OpenStruct.new(id: 'vmxnet3', name: 'VMware vmxnet3')]
   end
+
+  def proxmox_bios_map
+    [OpenStruct.new(id: 'seabios', name: '(Default) Seabios'),
+     OpenStruct.new(id: 'ovmf', name: 'OVMF (UEFI)')]
+  end
 end

data/app/helpers/proxmox_server_helper.rb

@@ -38,7 +38,7 @@ module ProxmoxServerHelper
     volumes = parse_server_volumes(vols)
     cpu_a = ['cpu_type', 'spectre', 'pcid']
     cpu = parse_server_cpu(config.select { |key, _value| cpu_a.include? key })
-    memory_a = ['memory', 'min_memory', 'balloon', 'shares']
+    memory_a = ['memory', 'balloon', 'shares']
     memory = parse_server_memory(config.select { |key, _value| memory_a.include? key })
     interfaces_attributes = args['interfaces_attributes']
     interfaces_to_add, interfaces_to_delete = parse_server_interfaces(interfaces_attributes)
@@ -64,11 +64,7 @@ module ProxmoxServerHelper
   def parse_server_memory(args)
     memory = {}
     memory.store(:memory, args['memory'].to_i) if args['memory']
-    ballooned = args['balloon'].to_i == 1
-    if ballooned
-      memory.store(:shares, args['shares'].to_i) if args['shares']
-      memory.store(:min_memory, args['min_memory'].to_i) if args['min_memory']
-    end
+    memory.store(:shares, args['shares'].to_i) if args['shares']
     memory.store(:balloon, args['balloon'].to_i) if args['balloon']
     logger.debug("parse_server_memory(): #{memory}")
     memory

data/app/helpers/proxmox_vm_helper.rb

@@ -59,7 +59,7 @@ module ProxmoxVmHelper
 
   def convert_memory_sizes(args)
     convert_memory_size(args['config_attributes'], 'memory')
-    convert_memory_size(args['config_attributes'], 'min_memory')
+    convert_memory_size(args['config_attributes'], 'balloon')
     convert_memory_size(args['config_attributes'], 'shares')
     convert_memory_size(args['config_attributes'], 'swap')
   end
@@ -70,7 +70,7 @@ module ProxmoxVmHelper
 
   def convert_sizes(args)
     convert_memory_size(args['config_attributes'], 'memory')
-    convert_memory_size(args['config_attributes'], 'min_memory')
+    convert_memory_size(args['config_attributes'], 'balloon')
     convert_memory_size(args['config_attributes'], 'shares')
     convert_memory_size(args['config_attributes'], 'swap')
     args['volumes_attributes'].each_value { |value| value['size'] = (value['size'].to_i / GIGA).to_s unless ForemanFogProxmox::Value.empty?(value['size']) }
@@ -85,12 +85,4 @@ module ProxmoxVmHelper
     memory = (config_hash[key].to_i / MEGA).to_s == '0' ? config_hash[key] : (config_hash[key].to_i / MEGA).to_s
     config_hash.store(key, memory)
   end
-
-  def vm_type(host)
-    host.compute_object.type
-  end
-
-  def node_id(host)
-    host.compute_object.node_id
-  end
 end

data/app/models/concerns/fog_extensions/proxmox/server.rb

@@ -77,6 +77,7 @@ module FogExtensions
       end
 
       delegate :vga, to: :config
+      delegate :pool, to: :config
 
       def interfaces_attributes=(attrs); end
 

data/app/models/foreman_fog_proxmox/proxmox_compute_attributes.rb

@@ -38,12 +38,25 @@ module ForemanFogProxmox
       [:disks, :interfaces, :vmid, :node_id, :node, :type].include?(key) || !vm.config.respond_to?(key)
     end
 
+    def interface_compute_attributes(interface_attributes)
+      vm_attrs = {}
+      vm_attrs.store(:mac, interface_attributes[:macaddr])
+      vm_attrs.store(:id, interface_attributes[:id])
+      vm_attrs.store(:identifier, interface_attributes[:id])
+      vm_attrs.store(:ip, interface_attributes[:ip])
+      vm_attrs.store(:ip6, interface_attributes[:ip6])
+      vm_attrs[:compute_attributes] = interface_attributes.reject { |k, _v| [:macaddr, :id].include?(k) }
+      vm_attrs
+    end
+
     def vm_compute_attributes(vm)
       vm_attrs = {}
       if vm.respond_to?(:config)
         vm_attrs = vm_attrs.merge(vmid: vm.identity, node_id: vm.node_id, type: vm.type)
         vm_attrs[:volumes_attributes] = Hash[vm.config.disks.each_with_index.map { |disk, idx| [idx.to_s, disk.attributes] }] if vm.config.respond_to?(:disks)
-        vm_attrs[:interfaces_attributes] = Hash[vm.config.interfaces.each_with_index.map { |interface, idx| [idx.to_s, interface.attributes] }] if vm.config.respond_to?(:interfaces)
+        if vm.config.respond_to?(:interfaces)
+          vm_attrs[:interfaces_attributes] = Hash[vm.config.interfaces.each_with_index.map { |interface, idx| [idx.to_s, interface_compute_attributes(interface.attributes)] }]
+        end
         vm_attrs[:config_attributes] = vm.config.attributes.reject do |key, value|
           not_config_key?(vm, key) || ForemanFogProxmox::Value.empty?(value.to_s) || Fog::Proxmox::DiskHelper.disk?(key.to_s) || Fog::Proxmox::NicHelper.nic?(key.to_s)
         end

data/app/models/foreman_fog_proxmox/proxmox_connection.rb

@@ -22,7 +22,7 @@ require 'fog/proxmox'
 module ForemanFogProxmox
   module ProxmoxConnection
     def connection_options
-      opts = http_proxy ? { proxy: http_proxy.full_url } : { disable_proxy: 1 }
+      opts = super
       opts.store(:ssl_verify_peer, ssl_verify_peer)
       opts.store(:ssl_cert_store, certs_to_store) if Foreman::Cast.to_bool(ssl_verify_peer)
       opts

data/app/models/foreman_fog_proxmox/proxmox_operating_systems.rb

@@ -39,7 +39,7 @@ module ForemanFogProxmox
     end
 
     def os_linux_types_mapping(host)
-      ['Debian', 'Redhat', 'Suse', 'Altlinux', 'Archlinux', 'CoreOs', 'Gentoo'].include?(host.operatingsystem.type) ? available_linux_operating_systems : []
+      ['Debian', 'Redhat', 'Suse', 'Altlinux', 'Archlinux', 'Coreos', 'Gentoo'].include?(host.operatingsystem.type) ? available_linux_operating_systems : []
     end
 
     def os_windows_types_mapping(host)

data/app/models/foreman_fog_proxmox/proxmox_pools.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+# Copyright 2019 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 ProxmoxPools
+    def pools
+      pools = identity_client.pools.all
+      pools.sort_by(&:poolid)
+    end
+
+    def pool_owner(vm)
+      logger.debug(format(_('pool_owner(%<vmid>s)'), vmid: vm&.vmid))
+      pools_owners = pools.select { |pool| pool.has_server?(vm&.vmid) }
+      pool = pools_owners.first
+      logger.debug(format(_('found vm: %<vmid>s member of pool: %<poolid>s'), vmid: vm&.vmid, poolid: pool&.poolid))
+      vm&.config&.pool = pool&.poolid
+    end
+
+    def add_vm_to_pool(poolid, vmid)
+      logger.debug(format(_('add_vm_to_pool(%<poolid>s, %<vmid>s)'), poolid: poolid, vmid: vmid))
+      pool = identity_client.pools.get poolid
+      pool&.add_server vmid
+    end
+
+    def remove_vm_from_pool(poolid, vmid)
+      logger.debug(format(_('remove_vm_from_pool(%<poolid>s, %<vmid>s)'), poolid: poolid, vmid: vmid))
+      pool = identity_client.pools.get poolid
+      pool&.remove_server vmid
+    end
+
+    def update_pool(vm, poolid)
+      pool_owner(vm)
+      vm_pool = vm.config.pool || ''
+      return if vm_pool.eql?(poolid)
+
+      remove_vm_from_pool(vm_pool, vm.vmid)
+      add_vm_to_pool(poolid, vm.vmid)
+    end
+  end
+end

data/app/models/foreman_fog_proxmox/proxmox_vm_commands.rb

@@ -20,6 +20,7 @@
 module ForemanFogProxmox
   module ProxmoxVmCommands
     include ProxmoxVolumes
+    include ProxmoxPools
 
     def start_on_boot(vm, args)
       startonboot = args[:start_after_create].blank? ? false : Foreman::Cast.to_bool(args[:start_after_create])
@@ -31,6 +32,7 @@ module ForemanFogProxmox
       vmid = args[:vmid].to_i
       type = args[:type]
       node = client.nodes.get(args[:node_id])
+      vmid = node.servers.next_id.to_i if vmid < 1
       raise ::Foreman::Exception, format(N_('invalid vmid=%<vmid>s'), vmid: vmid) unless node.servers.id_valid?(vmid)
 
       image_id = args[:image_id]
@@ -100,11 +102,13 @@ module ForemanFogProxmox
         volumes_attributes&.each_value { |volume_attributes| save_volume(vm, volume_attributes) }
         parsed_attr = vm.container? ? parse_container_vm(new_attributes.merge(type: vm.type)) : parse_server_vm(new_attributes.merge(type: vm.type))
         logger.debug("parsed_attr=#{parsed_attr}")
-        config_attributes = parsed_attr.reject { |key, _value| [:vmid, :templated, :ostemplate, :ostemplate_file, :ostemplate_storage, :volumes_attributes].include? key.to_sym }
+        config_attributes = parsed_attr.reject { |key, _value| [:vmid, :templated, :ostemplate, :ostemplate_file, :ostemplate_storage, :volumes_attributes, :pool].include? key.to_sym }
         config_attributes = config_attributes.reject { |_key, value| ForemanFogProxmox::Value.empty?(value) }
         cdrom_attributes = parsed_attr.select { |_key, value| Fog::Proxmox::DiskHelper.cdrom?(value.to_s) }
         config_attributes = config_attributes.reject { |key, _value| Fog::Proxmox::DiskHelper.disk?(key) }
         vm.update(config_attributes.merge(cdrom_attributes))
+        poolid = new_attributes['pool'] if new_attributes.key?('pool')
+        update_pool(vm, poolid) if poolid
       end
       find_vm_by_uuid(uuid)
     end

data/app/models/foreman_fog_proxmox/proxmox_vm_new.rb

@@ -39,9 +39,9 @@ module ForemanFogProxmox
       type ||= 'qemu'
       case type
       when 'lxc'
-        return new_volume_server(attr)
+        new_volume_server(attr)
       when 'qemu'
-        return new_volume_container(attr)
+        new_volume_container(attr)
       end
     end
 
@@ -74,9 +74,9 @@ module ForemanFogProxmox
       type ||= 'qemu'
       case type
       when 'lxc'
-        return new_container_interface(attr)
+        new_container_interface(attr)
       when 'qemu'
-        return new_server_interface(attr)
+        new_server_interface(attr)
       end
     end