foreman_opennebula 3.2.0 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c48a6d24abe1e59d488b278f70f0d7531f943e75c526c4365c3055aa36977634
-  data.tar.gz: 96d5d5e61d383a2af6e5fa221ac126346e69edf0f714f28aab18427c29c5e61b
+  metadata.gz: ffb18f309d9da945b2ff975b7f90e3457217de8fa3559c8fecc93d9803f1b0dc
+  data.tar.gz: 56ba4265b669eafe7c7ce0606b991aa283c9c0515009d821bf3fdf890d2d70de
 SHA512:
-  metadata.gz: c069c85d6a9fed4f8d9f059845eed3a151eebf0675cae9ec96d8cd28a11aa4874d6f6d83df5f6d29ee45afa17b53734502dc39e0ec21a9985bc9ea95e3cd88bf
-  data.tar.gz: d8bab1c6c864aeffb797c2904b81d033d1baa4e873232eb5c64d09edd7c39c0ce3521a1a52bf196faca6ae95a347cabf6046c97230c783e84029958e71e4bb1a
+  metadata.gz: 044d6b750d7c7715b342ab8266d5577cae10f667145d6a8392ab6cc62698b359bd2f615d8d7017916a17d4d9a718db85679f710fc5528e7fea9ba2979ac3bec0
+  data.tar.gz: eb4219d532c55ddaa6a1b2d24295da9ef1bb290b29cfdf61c071ea2018b05c85f0467911206669d847801c3d60e84a7f3ac9eafd68870d2ad43e163ef15002f0

data/README.md

@@ -7,13 +7,15 @@ This plugin enables managing of OpenNebula as a Compute Resource in Foreman.
 See [How_to_Install_a_Plugin](http://projects.theforeman.org/projects/foreman/wiki/How_to_Install_a_Plugin)
 for how to install Foreman plugins
 
-1. Apply the DB migrations.
+1. Apply the database migrations.
 2. Create a compute resource.
-3. For every Foreman subnet select a corresponding OpenNebula network.
+3. Select an OpenNebula network on the subnet configuration page.
+
+To use the console, install the websockify Python module.
 
 ## Copyright
 
-Copyright (c) 2024 IVI.RU LLC
+Copyright (c) 2025 IVI.RU LLC
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

data/app/models/concerns/foreman_opennebula/key_pair_compute_resource.rb

@@ -37,9 +37,9 @@ module ForemanOpennebula
       logger.info "removing key from compute resource #{name} "\
                   "(#{provider_friendly_name}): #{remote_key_pair}"
       opennebula_user = available_users.detect { |u| u.name == user }
-      template_hash = opennebula_user.to_hash['USER']['TEMPLATE']
-      template_hash.delete('SSH_PUBLIC_KEY')
-      template_str = template_hash.map { |k, v| "#{k}=\"#{v}\"" }.join("\n")
+      opennebula_user.delete_element('TEMPLATE/SSH_PRIVATE_KEY')
+      opennebula_user.delete_element('TEMPLATE/SSH_PUBLIC_KEY')
+      template_str = opennebula_user.template_str
       opennebula_user.update(template_str)
       KeyPair.destroy_by :compute_resource_id => id
     rescue => e
@@ -56,11 +56,13 @@ module ForemanOpennebula
     def setup_key_pair
       key = SSHKey.generate(comment: "foreman-#{id}#{Foreman.uuid}")
       opennebula_user = available_users.detect { |u| u.name == user }
-      template_hash = opennebula_user.to_hash['USER']['TEMPLATE']
-      template_hash['SSH_PUBLIC_KEY'] = key.ssh_public_key
-      template_str = template_hash.map { |k, v| "#{k}=\"#{v}\"" }.join("\n")
+      opennebula_user.add_element('TEMPLATE',
+                                  'SSH_PRIVATE_KEY' => key.private_key,
+                                  'SSH_PUBLIC_KEY' => key.ssh_public_key)
+      template_str = opennebula_user.template_str
       opennebula_user.update(template_str)
-      KeyPair.create! :name => key.comment, :compute_resource_id => id, :secret => key.private_key
+      KeyPair.create! :name => key.comment, :compute_resource_id => id,
+        :secret => key.private_key, :public => key.ssh_public_key
     rescue => e
       Foreman::Logging.exception('Failed to generate key pair', e)
       destroy_key_pair

data/lib/foreman_opennebula/engine.rb

@@ -13,13 +13,15 @@ module ForemanOpennebula
       Foreman::Gettext::Support.add_text_domain locale_domain, locale_dir
     end
 
-    initializer 'foreman_opennebula.register_plugin', :before => :finisher_hook do |_app|
-      Foreman::Plugin.register :foreman_opennebula do
-        requires_foreman '>= 3.7'
-        compute_resource ForemanOpennebula::Opennebula
-        register_global_js_file 'global'
+    initializer 'foreman_opennebula.register_plugin', :before => :finisher_hook do |app|
+      app.reloader.to_prepare do
+        Foreman::Plugin.register :foreman_opennebula do
+          requires_foreman '>= 3.14.0'
+          compute_resource ForemanOpennebula::Opennebula
+          register_global_js_file 'global'
 
-        parameter_filter Subnet, :opennebula_vnet
+          parameter_filter Subnet, :opennebula_vnet
+        end
       end
     end
 

data/lib/foreman_opennebula/version.rb

@@ -1,3 +1,3 @@
 module ForemanOpennebula
-  VERSION = '3.2.0'.freeze
+  VERSION = '4.0.1'.freeze
 end

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_opennebula
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 4.0.1
 platform: ruby
 authors:
 - Vitaly Pyslar
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-09-09 00:00:00.000000000 Z
+date: 2025-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -55,44 +56,50 @@ dependencies:
   name: rubocop-minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.38'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.38'
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.26'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.26'
 - !ruby/object:Gem::Dependency
   name: rubocop-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.33'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.33.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.33'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.33.3
 - !ruby/object:Gem::Dependency
   name: fog-opennebula
   requirement: !ruby/object:Gem::Requirement
@@ -111,16 +118,16 @@ dependencies:
   name: deface
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.9'
 description: Provision and manage OpenNebula VMs from Foreman
 email:
 - vpyslar@ivi.ru
@@ -135,13 +142,9 @@ files:
 - app/assets/javascripts/foreman_opennebula/vmgroup_selected.js
 - app/controllers/foreman_opennebula/hosts_controller.rb
 - app/helpers/concerns/foreman_opennebula/form_helper_extensions.rb
-- app/helpers/concerns/foreman_opennebula/hosts_helper_extensions.rb
 - app/models/concerns/fog_extensions/open_nebula/flavor.rb
 - app/models/concerns/fog_extensions/open_nebula/interface.rb
 - app/models/concerns/fog_extensions/open_nebula/server.rb
-- app/models/concerns/fog_extensions/opennebula/flavor.rb
-- app/models/concerns/fog_extensions/opennebula/interface.rb
-- app/models/concerns/fog_extensions/opennebula/server.rb
 - app/models/concerns/foreman_opennebula/key_pair_compute_resource.rb
 - app/models/foreman_opennebula/opennebula.rb
 - app/overrides/subnets/_fields/opennebula_fields.html.erb.deface
@@ -150,7 +153,6 @@ files:
 - app/views/compute_resources/show/_opennebula.html.erb
 - app/views/compute_resources_vms/form/opennebula/_base.html.erb
 - app/views/compute_resources_vms/form/opennebula/_custom_attribute.html.erb
-- app/views/compute_resources_vms/form/opennebula/_network.html.erb
 - app/views/compute_resources_vms/form/opennebula/_scheduler_hint_data.html.erb
 - app/views/compute_resources_vms/form/opennebula/_vmgroup_role.html.erb
 - app/views/compute_resources_vms/index/_opennebula.html.erb
@@ -180,6 +182,7 @@ licenses:
 - GPL-3.0
 metadata:
   is_foreman_plugin: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -194,7 +197,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.3
+rubygems_version: 3.4.20
+signing_key:
 specification_version: 4
 summary: Foreman OpenNebula plugin
 test_files:

data/app/helpers/concerns/foreman_opennebula/hosts_helper_extensions.rb

@@ -1,20 +0,0 @@
-module ForemanOpennebula
-  module HostsHelperExtensions
-    extend ActiveSupport::Concern
-
-    included do
-      def provider_partial_exist?(compute_resource, partial)
-        return false unless compute_resource
-
-        compute_resource_name = compute_resource.provider.downcase
-
-        return false if controller_name == 'compute_attributes' &&
-          compute_resource_name == 'opennebula' && partial == 'network'
-
-        ActionController::Base.view_paths.any? do |path|
-          File.exist?(File.join(path, 'compute_resources_vms', 'form', compute_resource_name, "_#{partial}.html.erb"))
-        end
-      end
-    end
-  end
-end

data/app/models/concerns/fog_extensions/opennebula/flavor.rb

@@ -1,109 +0,0 @@
-module FogExtensions
-  module OpenNebula
-    module Flavor
-      extend ActiveSupport::Concern
-
-      included do
-        attribute :cpu_model
-        attribute :nic_default
-        attribute :pci
-        attribute :vmgroup
-        attribute :template_id
-
-        def to_s
-          '' + get_cpu \
-            + get_vcpu \
-            + get_memory \
-            + get_disk \
-            + get_nic \
-            + get_os \
-            + get_graphics \
-            + get_pci \
-            + get_raw \
-            + get_sched_requirements \
-            + get_sched_ds_requirements \
-            + get_sched_rank \
-            + get_sched_ds_rank \
-            + get_context \
-            + get_user_variables \
-            + get_cpu_model \
-            + get_nic_default \
-            + get_vmgroup \
-            + get_template_id
-        end
-
-        def get_cpu_model
-          return '' unless attributes[:cpu_model]
-
-          ret = "CPU_MODEL=#{attributes[:cpu_model]}\n"
-          ret.tr!('{', '[')
-          ret.tr!('}', ']')
-          ret.delete!('>')
-          ret
-        end
-
-        def get_nic_default
-          return '' unless attributes[:nic_default]
-
-          ret = "NIC_DEFAULT=#{attributes[:nic_default]}\n"
-          ret.tr!('{', '[')
-          ret.tr!('}', ']')
-          ret.delete!('>')
-          ret
-        end
-
-        def get_vmgroup
-          return '' unless attributes[:vmgroup]
-
-          ret = "VMGROUP=#{attributes[:vmgroup]}\n"
-          ret.tr!('{', '[')
-          ret.tr!('}', ']')
-          ret.delete!('>')
-          ret
-        end
-
-        def get_template_id
-          return '' unless attributes[:template_id]
-
-          ret = "TEMPLATE_ID=#{attributes[:template_id]}\n"
-          ret.tr!('{', '[')
-          ret.tr!('}', ']')
-          ret.delete!('>')
-          ret
-        end
-
-        def get_nic
-          return '' if nic.nil?
-
-          ret = ''
-          if nic.is_a? Array
-            nic.each do |n|
-              next if n.vnet.nil?
-              val = [%(MODEL="#{n.model}"), %(NETWORK_ID="#{n.vnet.id}")]
-              val << %(IP="#{n.ip}") if n.ip.present?
-              ret += %(NIC=[#{val.join(',')}]\n)
-            end
-          end
-          ret
-        end
-
-        def get_pci
-          return '' unless attributes[:pci]
-
-          ret = ''
-          if attributes[:pci].is_a? Array
-            attributes[:pci].each do |pci|
-              ret += "PCI=#{pci}\n"
-            end
-          else
-            ret = "PCI=#{attributes[:pci]}\n"
-          end
-          ret.tr!('{', '[')
-          ret.tr!('}', ']')
-          ret.delete!('>')
-          ret
-        end
-      end
-    end
-  end
-end

data/app/models/concerns/fog_extensions/opennebula/interface.rb

@@ -1,11 +0,0 @@
-module FogExtensions
-  module OpenNebula
-    module Interface
-      extend ActiveSupport::Concern
-
-      included do
-        attribute :ip
-      end
-    end
-  end
-end

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

@@ -1,135 +0,0 @@
-module FogExtensions
-  module OpenNebula
-    module Server
-      extend ActiveSupport::Concern
-      include ActionView::Helpers::NumberHelper
-
-      attr_writer :template_id, :image_id, :disk_size, :vmgroup_id,
-        :vmgroup_role, :scheduler_hint_filter, :scheduler_hint_data
-
-      included do
-        def cpu
-          onevm_object.present? ? onevm_object['TEMPLATE/CPU'] : attributes[:cpu]
-        end
-
-        def vcpu
-          onevm_object.present? ? onevm_object['TEMPLATE/VCPU'] : attributes[:vcpu]
-        end
-
-        def start
-          onevm_object.resume
-        end
-
-        def stop
-          onevm_object.poweroff(true)
-        end
-      end
-
-      def reboot
-        onevm_object.reboot
-        true
-      end
-
-      def reset
-        onevm_object.reboot(true)
-        true
-      end
-
-      def template_id
-        onevm_object.present? ? onevm_object['TEMPLATE/TEMPLATE_ID'] : @template_id
-      end
-
-      def vmgroup_id
-        onevm_object.present? ? onevm_object['TEMPLATE/VMGROUP/VMGROUP_ID'] : @vmgroup_id
-      end
-
-      def vmgroup_role
-        onevm_object.present? ? onevm_object['TEMPLATE/VMGROUP/ROLE'] : @vmgroup_role
-      end
-
-      def sched_requirements
-        return unless onevm_object
-        onevm_object['USER_TEMPLATE/SCHED_REQUIREMENTS']
-      end
-
-      def scheduler_hint_filter
-        if sched_requirements
-          case sched_requirements
-          when /^CLUSTER_ID = \d+$/
-            'Cluster'
-          when /^ID = \d+$/
-            'Host'
-          else
-            'Raw'
-          end
-        else
-          @scheduler_hint_filter
-        end
-      end
-
-      def scheduler_hint_data
-        if sched_requirements
-          scheduler_hint_filter == 'Raw' ? sched_requirements : sched_requirements[/\d+/]
-        else
-          @scheduler_hint_data
-        end
-      end
-
-      def disks
-        return if onevm_object.nil?
-        [onevm_object.to_hash['VM']['TEMPLATE']['DISK']].flatten.compact.map do |disk|
-          OpenStruct.new(disk.transform_keys(&:downcase))
-        end
-      end
-
-      def image_id
-        disks.try(:first).try(:image_id) || @image_id
-      end
-
-      def disk_size
-        disks.try(:first).try(:size) || @disk_size
-      end
-
-      def interfaces
-        [onevm_object.to_hash['VM']['TEMPLATE']['NIC']].flatten.compact.map do |nic|
-          OpenStruct.new(nic.transform_keys(&:downcase))
-        end
-      end
-
-      def select_nic(fog_nics, nic)
-        fog_nics.detect { |fn| fn.network_id == nic.compute_attributes['vnet'] }
-      end
-
-      def host
-        onevm_object['HISTORY_RECORDS/HISTORY[last()]/HOSTNAME']
-      end
-
-      def sched_message
-        onevm_object['USER_TEMPLATE/SCHED_MESSAGE']
-      end
-
-      def display
-        graphics = onevm_object.to_hash['VM']['TEMPLATE']['GRAPHICS']
-        graphics['TYPE'].downcase!
-        graphics.transform_keys(&:downcase).symbolize_keys
-      end
-
-      def poweroff?
-        (status == 8)
-      end
-
-      def to_s
-        name
-      end
-
-      def vm_description
-        _('%{cpu} CPU, %{vcpu} VCPU, %{memory} memory and %{disk} disk') % {
-          :cpu    => cpu,
-          :vcpu   => vcpu,
-          :memory => number_to_human_size(memory.to_i.megabytes),
-          :disk   => number_to_human_size(disk_size.to_i.megabytes)
-        }
-      end
-    end
-  end
-end

data/app/views/compute_resources_vms/form/opennebula/_network.html.erb

@@ -1,2 +0,0 @@
-<%= select_f f, :vnet, compute_resource.available_networks, :id, :name, { :include_blank => true },
-  { :label => _('Network'), :label_size => "col-md-3", :size => "col-md-8" } %>