opennebula 7.0.2 → 7.1.80.pre

data/lib/opennebula/virtual_machine.rb

@@ -64,7 +64,10 @@ module OpenNebula
             :backupcancel   => 'vm.backupcancel',
             :attachpci      => 'vm.attachpci',
             :detachpci      => 'vm.detachpci',
-            :restore        => 'vm.restore'
+            :restore        => 'vm.restore',
+            :exec           => 'vm.exec',
+            :retryexec      => 'vm.retryexec',
+            :cancelexec     => 'vm.cancelexec'
         }
 
         VM_STATE=['INIT', 'PENDING', 'HOLD', 'ACTIVE', 'STOPPED', 'SUSPENDED', 'DONE', 'FAILED',
@@ -294,7 +297,10 @@ module OpenNebula
           'sg-detach',
           'pci-attach',
           'pci-detach',
-          'restore'
+          'restore',
+          'exec',
+          'exec-retry',
+          'exec-cancel'
         ]
 
         # VirtualMachineDriver constants
@@ -894,6 +900,32 @@ module OpenNebula
             @client.call(VM_METHODS[:restore], @pe_id, img_id, inc_id, disk_id)
         end
 
+        # Execute a command in the VM
+        #
+        # @param cmd [String] Command to be executed
+        # @param cmd_stdin [String] Stdin data for the command
+        # @return [nil, OpenNebula::Error] nil in case of sucess, Error
+        #  otherwise.
+        def exec(cmd, cmd_stdin)
+            @client.call(VM_METHODS[:exec], @pe_id, cmd, cmd_stdin)
+        end
+
+        # Retry the last command executed in the VM
+        #
+        # @return [nil, OpenNebula::Error] nil in case of sucess, Error
+        #  otherwise.
+        def exec_retry
+            @client.call(VM_METHODS[:retryexec], @pe_id)
+        end
+
+        # Cancel the command being executed in the VM
+        #
+        # @return [nil, OpenNebula::Error] nil in case of sucess, Error
+        #  otherwise.
+        def exec_cancel
+            @client.call(VM_METHODS[:cancelexec], @pe_id)
+        end
+
         ########################################################################
         # Helpers to get VirtualMachine information
         ########################################################################

data/lib/opennebula/virtual_machine_ext.rb

@@ -60,6 +60,8 @@ module OpenNebula::VirtualMachineExt
                                   'OPENNEBULA_MANAGED', 'PERSISTENT_SNAPSHOTS']
 
             def save_as_template(name, desc, opts = {})
+                require 'opennebula/template'
+
                 opts = {
                     :persistent => false,
                     :poweroff   => false,

data/lib/opennebula/virtual_network_pool.rb

@@ -42,6 +42,8 @@ module OpenNebula
 
         # Default Factory Method for the Pools
         def factory(element_xml)
+            require 'opennebula/virtual_network'
+
             OpenNebula::VirtualNetwork.new(element_xml,@client)
         end
 

data/lib/opennebula/wait_ext.rb

@@ -17,6 +17,7 @@
 require 'opennebula/host'
 require 'opennebula/image'
 require 'opennebula/virtual_machine'
+require 'opennebula/virtual_network'
 
 module OpenNebula
 

data/lib/opennebula/xml_element.rb

@@ -14,6 +14,7 @@
 # limitations under the License.                                             #
 #--------------------------------------------------------------------------- #
 
+require 'rexml/document'
 
 module OpenNebula
     # The XMLElement class provides an abstraction of the underlying

data/lib/opennebula/xml_utils.rb

@@ -46,7 +46,7 @@ module OpenNebula
     module ParsePoolBase
         attr_accessor :pool
 
-        def initialize (pool_name, elem_name)
+        def initialize(pool_name, elem_name)
             clear
 
             @pool_name = pool_name
@@ -91,7 +91,7 @@ module OpenNebula
                 @current   = 0
                 @levels[0] = Hash.new
             else
-                @current = @current -1
+                @current = @current - 1
             end
         end
     end

data/lib/opennebula/zone.rb

@@ -84,10 +84,11 @@ module OpenNebula
             return rc if OpenNebula.is_error?(rc)
 
             @xml.xpath("SERVER_POOL/SERVER").each do |server|
-                endpoint = server.xpath("ENDPOINT")
-                endpoint = endpoint.text if endpoint
+                endpoint = server.xpath("ENDPOINT_GRPC")&.text
+                endpoint = server.xpath("ENDPOINT")&.text if endpoint.nil? || endpoint.empty?
 
-                next if endpoint.nil?
+                #puts "endpoint:#{endpoint}:#{server.xpath("ENDPOINT_GRPC").text}:#{server.xpath("ENDPOINT").text}"
+                next if endpoint.nil? || endpoint.empty?
 
                 client = OpenNebula::Client.new(nil, endpoint, {:timeout => 5})
 

data/lib/opennebula.rb

@@ -14,18 +14,12 @@
 # limitations under the License.                                             #
 #--------------------------------------------------------------------------- #
 
-
-begin # require 'rubygems'
-    require 'rubygems'
-rescue Exception
-end
-
 require 'digest/sha1'
 require 'rexml/document'
 require 'pp'
 
 require 'opennebula/xml_utils'
-require 'opennebula/client'
+require 'opennebula/lib/client'
 require 'opennebula/error'
 require 'opennebula/utils'
 require 'opennebula/virtual_machine'
@@ -75,9 +69,4 @@ require 'opennebula/hook_log'
 require 'opennebula/flow'
 require 'opennebula/backupjob'
 require 'opennebula/backupjob_pool'
-
-module OpenNebula
-
-    # OpenNebula version
-    VERSION = '7.0.2'
-end
+require 'opennebula/version'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula
 version: !ruby/object:Gem::Version
-  version: 7.0.2
+  version: 7.1.80.pre
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-12-09 00:00:00.000000000 Z
+date: 2026-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -113,7 +113,6 @@ files:
 - lib/opennebula/acl_pool.rb
 - lib/opennebula/backupjob.rb
 - lib/opennebula/backupjob_pool.rb
-- lib/opennebula/client.rb
 - lib/opennebula/cluster.rb
 - lib/opennebula/cluster_pool.rb
 - lib/opennebula/datastore.rb
@@ -132,6 +131,51 @@ files:
 - lib/opennebula/flow/validator.rb
 - lib/opennebula/group.rb
 - lib/opennebula/group_pool.rb
+- lib/opennebula/grpc/acl_pb.rb
+- lib/opennebula/grpc/acl_services_pb.rb
+- lib/opennebula/grpc/backupjob_pb.rb
+- lib/opennebula/grpc/backupjob_services_pb.rb
+- lib/opennebula/grpc/cluster_pb.rb
+- lib/opennebula/grpc/cluster_services_pb.rb
+- lib/opennebula/grpc/datastore_pb.rb
+- lib/opennebula/grpc/datastore_services_pb.rb
+- lib/opennebula/grpc/document_pb.rb
+- lib/opennebula/grpc/document_services_pb.rb
+- lib/opennebula/grpc/group_pb.rb
+- lib/opennebula/grpc/group_services_pb.rb
+- lib/opennebula/grpc/hook_pb.rb
+- lib/opennebula/grpc/hook_services_pb.rb
+- lib/opennebula/grpc/host_pb.rb
+- lib/opennebula/grpc/host_services_pb.rb
+- lib/opennebula/grpc/image_pb.rb
+- lib/opennebula/grpc/image_services_pb.rb
+- lib/opennebula/grpc/marketplace_pb.rb
+- lib/opennebula/grpc/marketplace_services_pb.rb
+- lib/opennebula/grpc/marketplaceapp_pb.rb
+- lib/opennebula/grpc/marketplaceapp_services_pb.rb
+- lib/opennebula/grpc/secgroup_pb.rb
+- lib/opennebula/grpc/secgroup_services_pb.rb
+- lib/opennebula/grpc/shared_pb.rb
+- lib/opennebula/grpc/system_pb.rb
+- lib/opennebula/grpc/system_services_pb.rb
+- lib/opennebula/grpc/template_pb.rb
+- lib/opennebula/grpc/template_services_pb.rb
+- lib/opennebula/grpc/user_pb.rb
+- lib/opennebula/grpc/user_services_pb.rb
+- lib/opennebula/grpc/vdc_pb.rb
+- lib/opennebula/grpc/vdc_services_pb.rb
+- lib/opennebula/grpc/vm_pb.rb
+- lib/opennebula/grpc/vm_services_pb.rb
+- lib/opennebula/grpc/vmgroup_pb.rb
+- lib/opennebula/grpc/vmgroup_services_pb.rb
+- lib/opennebula/grpc/vn_pb.rb
+- lib/opennebula/grpc/vn_services_pb.rb
+- lib/opennebula/grpc/vntemplate_pb.rb
+- lib/opennebula/grpc/vntemplate_services_pb.rb
+- lib/opennebula/grpc/vrouter_pb.rb
+- lib/opennebula/grpc/vrouter_services_pb.rb
+- lib/opennebula/grpc/zone_pb.rb
+- lib/opennebula/grpc/zone_services_pb.rb
 - lib/opennebula/hook.rb
 - lib/opennebula/hook_log.rb
 - lib/opennebula/hook_pool.rb
@@ -148,6 +192,7 @@ files:
 - lib/opennebula/marketplaceapp_ext.rb
 - lib/opennebula/marketplaceapp_pool.rb
 - lib/opennebula/oneflow_client.rb
+- lib/opennebula/oneform_client.rb
 - lib/opennebula/pool.rb
 - lib/opennebula/pool_element.rb
 - lib/opennebula/saml_auth.rb
@@ -165,6 +210,7 @@ files:
 - lib/opennebula/utils.rb
 - lib/opennebula/vdc.rb
 - lib/opennebula/vdc_pool.rb
+- lib/opennebula/version.rb
 - lib/opennebula/virtual_machine.rb
 - lib/opennebula/virtual_machine_ext.rb
 - lib/opennebula/virtual_machine_pool.rb
@@ -198,9 +244,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.3.5
 signing_key: 

data/lib/opennebula/client.rb

@@ -1,228 +0,0 @@
-# -------------------------------------------------------------------------- #
-# Copyright 2002-2025, OpenNebula Project, OpenNebula Systems                #
-#                                                                            #
-# Licensed under the Apache License, Version 2.0 (the "License"); you may    #
-# not use this file except in compliance with the License. You may obtain    #
-# a copy of the License at                                                   #
-#                                                                            #
-# http://www.apache.org/licenses/LICENSE-2.0                                 #
-#                                                                            #
-# Unless required by applicable law or agreed to in writing, software        #
-# distributed under the License is distributed on an "AS IS" BASIS,          #
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
-# See the License for the specific language governing permissions and        #
-# limitations under the License.                                             #
-#--------------------------------------------------------------------------- #
-
-require 'xmlrpc/client'
-require 'bigdecimal'
-require 'stringio'
-require 'openssl'
-
-
-module OpenNebula
-    def self.pool_page_size
-        @@pool_page_size
-    end
-
-    if OpenNebula::OX
-        class OxStreamParser < XMLRPC::XMLParser::AbstractStreamParser
-            def initialize
-                @parser_class = OxParser
-            end
-
-            class OxParser < Ox::Sax
-                include XMLRPC::XMLParser::StreamParserMixin
-
-                alias :text :character
-                alias :end_element :endElement
-                alias :start_element :startElement
-
-                def parse(str)
-
-                    Ox.sax_parse(self, StringIO.new(str),
-                        :symbolize => false,
-                        :convert_special => true,
-                        :skip => :skip_none)
-                end
-            end
-        end
-    elsif OpenNebula::NOKOGIRI
-        class NokogiriStreamParser < XMLRPC::XMLParser::AbstractStreamParser
-            def initialize
-                @parser_class = NokogiriParser
-            end
-
-            class NokogiriParser < Nokogiri::XML::SAX::Document
-                include XMLRPC::XMLParser::StreamParserMixin
-
-                alias :cdata_block :character
-                alias :characters :character
-                alias :end_element :endElement
-                alias :start_element :startElement
-
-                def parse(str)
-                    parser = Nokogiri::XML::SAX::Parser.new(self)
-                    parser.parse(str)
-                end
-            end
-        end
-    end
-
-    DEFAULT_POOL_PAGE_SIZE = 200
-
-    if size=ENV['ONE_POOL_PAGE_SIZE']
-        if size.strip.match(/^\d+$/) && size.to_i >= 2
-            @@pool_page_size = size.to_i
-        else
-            @@pool_page_size = nil
-        end
-    else
-        @@pool_page_size = DEFAULT_POOL_PAGE_SIZE
-    end
-
-
-    # The client class, represents the connection with the core and handles the
-    # xml-rpc calls.
-    class Client
-        NO_ONE_AUTH_ERROR = "ONE_AUTH file not present"
-
-        attr_accessor :one_auth
-        attr_reader   :one_endpoint, :one_zmq
-
-        begin
-            require 'xmlparser'
-            XMLPARSER=true
-        rescue LoadError
-            XMLPARSER=false
-        end
-
-        # Creates a new client object that will be used to call OpenNebula
-        # functions.
-        #
-        # @param [String, nil] secret user credentials ("user:password") or
-        #   nil to get the credentials from user auth file
-        # @param [String, nil] endpoint OpenNebula server endpoint
-        #   (http://host:2633/RPC2) or nil to get it form the environment
-        #   variable ONE_XMLRPC or use the default endpoint
-        # @param [Hash] options
-        # @option params [Integer] :timeout connection timeout in seconds,
-        #   defaults to 30
-        # @option params [String] :http_proxy HTTP proxy string used for
-        #  connecting to the endpoint; defaults to no proxy
-        # @option params [Boolean] :sync Use only one http connection for
-        #  all calls. It should not be used for multithreaded programs.
-        #  It's the only mode that can be used with :cert_dir and
-        #  :disable_ssl_verify
-        # @option params [String] :cert_dir Extra directory where to import
-        #  trusted issuer certificates. Use with :sync = true
-        # @option params [String] :disable_ssl_verify Disable SSL certificate
-        #  verification. Use only for testing and with :sync = true
-        #
-        # @return [OpenNebula::Client]
-        def initialize(secret=nil, endpoint=nil, options={})
-            if secret
-                @one_auth = secret
-            elsif ENV["ONE_AUTH"] and !ENV["ONE_AUTH"].empty? and
-                    File.file?(ENV["ONE_AUTH"])
-                @one_auth = File.read(ENV["ONE_AUTH"])
-            elsif ENV["HOME"] and File.file?(ENV["HOME"]+"/.one/one_auth")
-                @one_auth = File.read(ENV["HOME"]+"/.one/one_auth")
-            elsif File.file?("/var/lib/one/.one/one_auth")
-                @one_auth = File.read("/var/lib/one/.one/one_auth")
-            else
-                raise NO_ONE_AUTH_ERROR
-            end
-
-            @one_auth = @one_auth.rstrip
-
-            if endpoint
-                @one_endpoint = endpoint
-            elsif ENV["ONE_XMLRPC"]
-                @one_endpoint = ENV["ONE_XMLRPC"]
-            elsif ENV['HOME'] and File.exist?(ENV['HOME']+"/.one/one_endpoint")
-                @one_endpoint = File.read(ENV['HOME']+"/.one/one_endpoint")
-            elsif File.exist?("/var/lib/one/.one/one_endpoint")
-                @one_endpoint = File.read("/var/lib/one/.one/one_endpoint")
-            else
-                @one_endpoint = "http://localhost:2633/RPC2"
-            end
-
-            @one_endpoint= @one_endpoint.rstrip
-
-            @async = !options[:sync]
-
-            if options[:subscriber_endpoint]
-                @one_zmq = options[:subscriber_endpoint]
-            elsif ENV["ONE_ZMQ"]
-                @one_zmq = ENV["ONE_ZMQ"]
-            else
-                @one_zmq = 'tcp://localhost:2101'
-            end
-
-            timeout=nil
-            if options[:timeout]
-                timeout = options[:timeout]
-            elsif ENV['ONE_XMLRPC_TIMEOUT']
-                timeout = ENV['ONE_XMLRPC_TIMEOUT'].to_i
-            end
-
-            http_proxy=nil
-            http_proxy=options[:http_proxy] if options[:http_proxy]
-
-            @server = XMLRPC::Client.new2(@one_endpoint, http_proxy, timeout)
-            @server.http_header_extra = {'accept-encoding' => 'identity'}
-
-            http = @server.instance_variable_get("@http")
-
-            if options[:cert_dir] || ENV['ONE_CERT_DIR']
-                raise "SSL options don't work in async mode" if @async
-
-                cert_dir = options[:cert_dir] || ENV['ONE_CERT_DIR']
-                cert_files = Dir["#{cert_dir}/*"]
-
-                cert_store = OpenSSL::X509::Store.new
-                cert_store.set_default_paths
-                cert_files.each {|cert| cert_store.add_file(cert) }
-
-                http.cert_store = cert_store
-            end
-
-            if options[:disable_ssl_verify] || ENV['ONE_DISABLE_SSL_VERIFY']
-                raise "SSL options don't work in async mode" if @async
-
-                http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-            end
-
-            if defined?(OxStreamParser)
-                @server.set_parser(OxStreamParser.new)
-            elsif OpenNebula::NOKOGIRI
-                @server.set_parser(NokogiriStreamParser.new)
-            elsif XMLPARSER
-                @server.set_parser(XMLRPC::XMLParser::XMLStreamParser.new)
-            end
-        end
-
-        def call(action, *args)
-            begin
-                if @async
-                    response = @server.call_async("one."+action, @one_auth, *args)
-                else
-                    response = @server.call("one."+action, @one_auth, *args)
-                end
-
-                if response[0] == false
-                    Error.new(response[1], response[2])
-                else
-                    response[1] #response[1..-1]
-                end
-            rescue Exception => e
-                Error.new(e.message, Error::EXML_RPC_CALL)
-            end
-        end
-
-        def get_version()
-            call("system.version")
-        end
-    end
-end