foreman_opennebula 2.3.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20707d6bbb40864fa2888689e0da98ed358ae564a69993c92573184e8c118ee8
-  data.tar.gz: 2906546d3690e96fb8f16cfa78d6cd2b2fc3028040768f59c5c02f111afc8c76
+  metadata.gz: dda5882a295555eb9c4e145959787fee3af1c522681ac2ca1d7d85ae35ac4d14
+  data.tar.gz: 7f9a76c97effc394aed06300c501ddeaf09d7a706fab6f2e28d4a228cc9147b2
 SHA512:
-  metadata.gz: 73357e8428988e16540a71085caf9c1d96ecbe117fb592dae130e598b7e2bce1b03eea83250f841b07ee16f28dbd4e1fe417dc0dd78f0026222608711a266547
-  data.tar.gz: 13e5f25bbf9380e8e00e1ad4b665a51e860457c00d5de388a711b49ca317b3726b73c45b8b030b77fd022bf38808c0bd69ba08985a01c50985efaf2b7bf7b7e2
+  metadata.gz: 1f2011131086920a71f02a797d545e9d097cb3c05a042106015dd2bdc25b9bc5d4eb7a0300095bfbacf4cea459608e3126eec1dfdf21cc28d7dc908cc78ff582
+  data.tar.gz: 7916313a9f48a3c22753030a29e0a0eeb9047a8d124dd3d211a0ed2285cd2b5e01e49c5254bb2cf547883687e0df313eb310f31e69bba22f1b125c803df76189

data/README.md

@@ -7,6 +7,10 @@ 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.
+2. Create a compute resource.
+3. For every Foreman subnet select a corresponding OpenNebula network.
+
 ## Copyright
 
 Copyright (c) 2024 IVI.RU LLC

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

@@ -0,0 +1,111 @@
+module FogExtensions
+  module OpenNebula
+    module Flavor
+      extend ActiveSupport::Concern
+
+      included do
+        attribute :cpu_model
+        attribute :nic_default
+        attribute :pci
+        attribute :vmgroup
+        attribute :template_id
+
+        # rubocop:disable Style/StringConcatenation
+        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
+        # rubocop:enable Style/StringConcatenation
+
+        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/open_nebula/interface.rb

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

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

@@ -0,0 +1,135 @@
+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/models/foreman_opennebula/opennebula.rb

@@ -207,8 +207,19 @@ module ForemanOpennebula
       associate_by('mac', vm.interfaces.map(&:mac))
     end
 
+    def host_interfaces_attrs(host)
+      setup_nics_attrs(host)
+      super
+    end
+
     private
 
+    def setup_nics_attrs(host)
+      host.interfaces.each do |nic|
+        nic.compute_attributes['vnet'] = nic.subnet&.opennebula_vnet.to_s
+      end
+    end
+
     def client
       @client ||= Fog::Compute.new(
         provider: 'OpenNebula',

data/app/overrides/subnets/_fields/opennebula_fields.html.erb.deface

@@ -0,0 +1,4 @@
+<!-- insert_after ':root:last-child' -->
+
+<%= select_f f, :opennebula_vnet, ForemanOpennebula::Opennebula.first.available_networks, :id, :name, { include_blank: true },
+:label => _("OpenNebula Virtual Network"), :help_inline => _("Reference at OpenNebula Virtual Network object") %>

data/db/migrate/20241120000000_add_opennebula_vnet_to_subnets.foreman_opennebula.rb

@@ -0,0 +1,5 @@
+class AddOpennebulaVnetToSubnets < ActiveRecord::Migration[6.1]
+  def change
+    add_column :subnets, :opennebula_vnet, :integer, null: true
+  end
+end

data/lib/foreman_opennebula/engine.rb

@@ -18,6 +18,14 @@ module ForemanOpennebula
         requires_foreman '>= 3.7'
         compute_resource ForemanOpennebula::Opennebula
         register_global_js_file 'global'
+
+        parameter_filter Subnet, :opennebula_vnet
+      end
+    end
+
+    initializer 'foreman_opennebula.load_app_instance_data' do |app|
+      ForemanOpennebula::Engine.paths['db/migrate'].existent.each do |path|
+        app.config.paths['db/migrate'] << path
       end
     end
 
@@ -25,16 +33,14 @@ module ForemanOpennebula
       require 'fog/opennebula/models/compute/server'
       require 'fog/opennebula/models/compute/flavor'
       require 'fog/opennebula/models/compute/interface'
-      require File.expand_path('../../app/models/concerns/fog_extensions/opennebula/server', __dir__)
-      require File.expand_path('../../app/models/concerns/fog_extensions/opennebula/flavor', __dir__)
-      require File.expand_path('../../app/models/concerns/fog_extensions/opennebula/interface', __dir__)
-      require File.expand_path('../../app/helpers/concerns/foreman_opennebula/hosts_helper_extensions', __dir__)
+      require File.expand_path('../../app/models/concerns/fog_extensions/open_nebula/server', __dir__)
+      require File.expand_path('../../app/models/concerns/fog_extensions/open_nebula/flavor', __dir__)
+      require File.expand_path('../../app/models/concerns/fog_extensions/open_nebula/interface', __dir__)
       require File.expand_path('../../app/helpers/concerns/foreman_opennebula/form_helper_extensions', __dir__)
 
       ::Fog::Compute::OpenNebula::Server.include(FogExtensions::OpenNebula::Server)
       ::Fog::Compute::OpenNebula::Flavor.include(FogExtensions::OpenNebula::Flavor)
       ::Fog::Compute::OpenNebula::Interface.include(FogExtensions::OpenNebula::Interface)
-      ::HostsHelper.include(ForemanOpennebula::HostsHelperExtensions)
       # ::FormHelper.include(ForemanOpennebula::FormHelperExtensions)
       ::ActionView::Base.include(ForemanOpennebula::FormHelperExtensions)
     rescue => e

data/lib/foreman_opennebula/version.rb

@@ -1,3 +1,3 @@
 module ForemanOpennebula
-  VERSION = '2.3.0'.freeze
+  VERSION = '3.0.0'.freeze
 end

data/lib/foreman_opennebula.rb

@@ -1,4 +1,5 @@
 require 'foreman_opennebula/engine'
+require 'deface'
 
 module ForemanOpennebula
 end

data/package.json

@@ -12,7 +12,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/pyslarvt/foreman-opennebula.git"
+    "url": "https://github.com/theforeman/foreman_opennebula.git"
   },
   "author": {
     "name": "Vitaly Pyslar",

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: foreman_opennebula
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Vitaly Pyslar
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-08-12 00:00:00.000000000 Z
+date: 2025-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -52,6 +51,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.36'
+- !ruby/object:Gem::Dependency
+  name: rubocop-minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fog-opennebula
   requirement: !ruby/object:Gem::Requirement
@@ -66,9 +107,23 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.0'
+- !ruby/object:Gem::Dependency
+  name: deface
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Provision and manage OpenNebula VMs from Foreman
 email:
-- ops@ivi.ru
+- vpyslar@ivi.ru
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -81,11 +136,15 @@ files:
 - 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
 - app/views/api/v2/compute_resources/opennebula.json.rabl
 - app/views/compute_resources/form/_opennebula.html.erb
 - app/views/compute_resources/show/_opennebula.html.erb
@@ -97,6 +156,7 @@ files:
 - app/views/compute_resources_vms/show/_opennebula.html.erb
 - app/views/images/form/_opennebula.html.erb
 - config/routes.rb
+- db/migrate/20241120000000_add_opennebula_vnet_to_subnets.foreman_opennebula.rb
 - lib/foreman_opennebula.rb
 - lib/foreman_opennebula/engine.rb
 - lib/foreman_opennebula/version.rb
@@ -119,7 +179,6 @@ licenses:
 - GPL-3.0
 metadata:
   is_foreman_plugin: 'true'
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -134,12 +193,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.3
-signing_key: 
+rubygems_version: 3.6.3
 specification_version: 4
 summary: Foreman OpenNebula plugin
 test_files:
+- test/factories/foreman_opennebula_factories.rb
 - test/test_plugin_helper.rb
 - test/unit/foreman_opennebula_test.rb
-- test/factories/foreman_opennebula_factories.rb