opennebula 5.10.5 → 5.12.1

data/lib/opennebula/pool.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2020, 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    #
@@ -91,9 +91,6 @@ module OpenNebula
         # Retrieves the monitoring data for all the Objects in the pool
         #
         # @param [String] xml_method xml-rcp method
-        # @param [String] root_elem Root for each individual PoolElement
-        # @param [String] timestamp_elem Name of the XML element with the last
-        #   monitorization timestamp
         # @param [Array<String>] xpath_expressions Elements to retrieve.
         # @param args arguemnts for the xml_method call
         #
@@ -101,8 +98,7 @@ module OpenNebula
         #   OpenNebula::Error] The first level hash uses the Object ID as keys,
         #   and as value a Hash with the requested xpath expressions,
         #   and an Array of 'timestamp, value'.
-        def monitoring(xml_method, root_elem, timestamp_elem, xpath_expressions,
-            *args)
+        def monitoring(xml_method, xpaths, *args)
 
             rc = @client.call(xml_method, *args)
 
@@ -116,7 +112,7 @@ module OpenNebula
             hash = {}
 
             # Get all existing Object IDs
-            ids = xmldoc.retrieve_elements("#{root_elem}/ID")
+            ids = xmldoc.retrieve_elements('/MONITORING_DATA/MONITORING/ID')
 
             if ids.nil?
                 return hash
@@ -125,9 +121,7 @@ module OpenNebula
             end
 
             ids.each { |id|
-                hash[id] = OpenNebula.process_monitoring(
-                    xmldoc, root_elem, timestamp_elem, id, xpath_expressions)
-
+                hash[id] = OpenNebula.process_monitoring(xmldoc, id, xpaths)
             }
 
             return hash

data/lib/opennebula/pool_element.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2020, 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    #
@@ -183,15 +183,12 @@ module OpenNebula
         # Retrieves this Element's monitoring data from OpenNebula
         #
         # @param [String] xml_method the name of the XML-RPC method
-        # @param [String] root_elem Root for each individual PoolElement
-        # @param [String] timestamp_elem Name of the XML element with the last
-        #   monitorization timestamp
-        # @param xpath_expressions [Array<String>] Xpath expressions for the
-        #   elements to retrieve.
+        # @param xpaths [Array<String>] Xpath expressions for the elements to
+        # retrieve.
         #
         # @return [Hash<String, Array<Array<int>>, OpenNebula::Error] Hash with
         #   the requested xpath expressions, and an Array of [timestamp, value].
-        def monitoring(xml_method, root_elem, timestamp_elem, xpath_expressions)
+        def monitoring(xml_method, xpaths)
             return Error.new('ID not defined') if !@pe_id
 
             rc = @client.call(xml_method, @pe_id)
@@ -204,8 +201,7 @@ module OpenNebula
             xmldoc.initialize_xml(rc, 'MONITORING_DATA')
 
 
-            return OpenNebula.process_monitoring(
-                xmldoc, root_elem, timestamp_elem, @pe_id, xpath_expressions)
+            return OpenNebula.process_monitoring(xmldoc, @pe_id, xpaths)
         end
 
     public
@@ -261,21 +257,20 @@ module OpenNebula
     # Processes the monitoring data in XML returned by OpenNebula
     #
     # @param [XMLElement] xmldoc monitoring data returned by OpenNebula
-    # @param [String] root_elem Root for each individual PoolElement
-    # @param [String] timestamp_elem Name of the XML element with the last
     #   monitorization timestamp
     # @param [Integer] oid Id of the object to process
     # @param [Array<String>] xpath_expressions Elements to retrieve.
     #
     # @return [Hash<String, Array<Array<int>>, OpenNebula::Error] Hash with
     #   the requested xpath expressions, and an Array of [timestamp, value].
-    def self.process_monitoring(xmldoc, root_elem, timestamp_elem, oid, xpath_expressions)
+    def self.process_monitoring(xmldoc, oid, xpath_expressions)
         hash = {}
         timestamps = xmldoc.retrieve_elements(
-            "#{root_elem}[ID=#{oid}]/#{timestamp_elem}")
+            "/MONITORING_DATA/MONITORING[ID=#{oid}]/TIMESTAMP")
 
         xpath_expressions.each { |xpath|
-            xpath_values = xmldoc.retrieve_elements("#{root_elem}[ID=#{oid}]/#{xpath}")
+            xpath_values = xmldoc.retrieve_elements(
+                "/MONITORING_DATA/MONITORING[ID=#{oid}]/#{xpath}")
 
             if ( xpath_values.nil? )
                 hash[xpath] = []
@@ -287,27 +282,4 @@ module OpenNebula
         return hash
     end
 
-    # Alternative method with better performance for huge number of timestamps.
-    # For reasonable amounts of data, the current method is quicker
-=begin
-    def self.process_monitoring(xmldoc, root_elem, timestamp_elem, oid, xpath_expressions)
-        hash = {}
-
-        xpath_expressions.each { |xpath|
-            hash[xpath] = []
-        }
-
-        xmldoc.each("#{root_elem}[ID=#{oid}]") do |elem|
-            timestamp = elem[timestamp_elem]
-
-            xpath_expressions.each { |xpath|
-                xpath_value = elem[xpath]
-
-                hash[xpath] << [timestamp, xpath_value] if !xpath_value.nil?
-            }
-        end
-
-        return hash
-    end
-=end
 end

data/lib/opennebula/security_group.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2020, 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    #

data/lib/opennebula/security_group_pool.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2020, 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    #

data/lib/opennebula/server_cipher_auth.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2020, 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    #

data/lib/opennebula/server_x509_auth.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2020, 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    #

data/lib/opennebula/ssh_auth.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2020, 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    #

data/lib/opennebula/system.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2020, 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    #
@@ -60,7 +60,7 @@ module OpenNebula
 
         # Executes a SQL query command on OpenNebula DB
         #   @param [String] Sql string
-        #   @return [String, OpenNebula::Error] Sql execution result in XML 
+        #   @return [String, OpenNebula::Error] Sql execution result in XML
         #   format in case of success, Error otherwise
         #   <QUERY>
         #     the query sent to oned
@@ -110,7 +110,7 @@ module OpenNebula
             end
 
             config = XMLElement.new
-            config.initialize_xml(rc, 'TEMPLATE')
+            config.initialize_xml(rc, 'OPENNEBULA_CONFIGURATION')
 
             return config
         end

data/lib/opennebula/template.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2020, 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    #

data/lib/opennebula/template_pool.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2020, 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    #

data/lib/opennebula/user.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2020, 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    #

data/lib/opennebula/user_pool.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2020, 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    #

data/lib/opennebula/utils.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2020, 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    #

data/lib/opennebula/vdc.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2020, 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    #

data/lib/opennebula/vdc_pool.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2020, 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    #

data/lib/opennebula/virtual_machine.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2020, 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    #
@@ -122,6 +122,7 @@ module OpenNebula
             DISK_RESIZE
             DISK_RESIZE_POWEROFF
             DISK_RESIZE_UNDEPLOYED
+            HOTPLUG_NIC_POWEROFF
         }
 
         SHORT_VM_STATES={
@@ -202,7 +203,8 @@ module OpenNebula
             "PROLOG_MIGRATE_UNKNOWN_FAILURE" => "fail",
             "DISK_RESIZE"            => "drsz",
             "DISK_RESIZE_POWEROFF"   => "drsz",
-            "DISK_RESIZE_UNDEPLOYED" => "drsz"
+            "DISK_RESIZE_UNDEPLOYED" => "drsz",
+            "HOTPLUG_NIC_POWEROFF"   => "hotp"
         }
 
         HISTORY_ACTION=%w{none migrate live-migrate shutdown shutdown-hard
@@ -560,18 +562,17 @@ module OpenNebula
         #   the requested xpath expressions, and an Array of 'timestamp, value'.
         #
         # @example
-        #   vm.monitoring( ['MONITORING/CPU', 'MONITORING/NETTX'] )
+        #   vm.monitoring( ['CPU', 'NETTX'] )
         #
         #   {
-        #    "MONITORING/CPU"=>[["1435085098", "47"], ["1435085253", "5"],
+        #    "CPU"=>[["1435085098", "47"], ["1435085253", "5"],
         #      ["1435085410", "48"], ["1435085566", "3"], ["1435088136", "2"]],
-        #    "MONITORING/NETTX"=>[["1435085098", "0"], ["1435085253", "50"],
+        #    "NETTX"=>[["1435085098", "0"], ["1435085253", "50"],
         #      ["1435085410", "50"], ["1435085566", "50"], ["1435085723", "50"]]
         #   }
         #
         def monitoring(xpath_expressions)
-            return super(VM_METHODS[:monitoring], 'VM',
-                'LAST_POLL', xpath_expressions)
+            return super(VM_METHODS[:monitoring], xpath_expressions)
         end
 
         # Retrieves this VM's monitoring data from OpenNebula, in XML

data/lib/opennebula/virtual_machine_pool.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2020, 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    #
@@ -191,19 +191,21 @@ module OpenNebula
         #     }
         #   }
         #
-        def monitoring(xpath_expressions, filter_flag=INFO_ALL)
-            return super(VM_POOL_METHODS[:monitoring],
-                'VM', 'LAST_POLL', xpath_expressions, filter_flag)
+        def monitoring(xpaths, filter_flag=INFO_ALL)
+            return super(VM_POOL_METHODS[:monitoring], xpaths, filter_flag)
         end
 
         # Retrieves the monitoring data for all the VMs in the pool, in XML
         #
         # @param [Integer] filter_flag Optional filter flag to retrieve all or
         #   part of the Pool. Possible values: INFO_ALL, INFO_GROUP, INFO_MINE.
-        #
+        # @param [Integer] num Optional Retrieve monitor records in the last num
+        #   seconds. 0 just the last record, -1 or nil all records
         # @return [String] VM monitoring data, in XML
-        def monitoring_xml(filter_flag=INFO_ALL)
-            return @client.call(VM_POOL_METHODS[:monitoring], filter_flag)
+        def monitoring_xml(filter_flag=INFO_ALL, num=nil)
+            return @client.call(VM_POOL_METHODS[:monitoring], filter_flag) if num.nil?
+
+            @client.call(VM_POOL_METHODS[:monitoring], filter_flag, num.to_i)
         end
 
         # Processes all the history records, and stores the monthly cost for

data/lib/opennebula/virtual_network.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2020, 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    #
@@ -145,10 +145,10 @@ module OpenNebula
         end
 
         # Removes an Address Range from the VirtualNetwork
-        def rm_ar(ar_id)
+        def rm_ar(ar_id, force = false)
             return Error.new('ID not defined') if !@pe_id
 
-            rc = @client.call(VN_METHODS[:rm_ar], @pe_id, ar_id.to_i)
+            rc = @client.call(VN_METHODS[:rm_ar], @pe_id, ar_id.to_i, force)
             rc = nil if !OpenNebula.is_error?(rc)
 
             return rc
@@ -252,6 +252,12 @@ module OpenNebula
             return @client.call(VN_METHODS[:reserve], @pe_id, rtmpl)
         end
 
+        def reserve_with_extra(extra)
+            return Error.new('ID not defined') unless @pe_id
+
+            @client.call(VN_METHODS[:reserve], @pe_id, extra)
+        end
+
         # Removes an Address Range from the VirtualNetwork
         def free(ar_id)
             return Error.new('ID not defined') if !@pe_id

data/lib/opennebula/virtual_network_pool.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2020, 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    #

data/lib/opennebula/virtual_router.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2020, 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    #

data/lib/opennebula/virtual_router_pool.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2020, 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    #

data/lib/opennebula/vm_group.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2020, 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    #

data/lib/opennebula/vm_group_pool.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2020, 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    #

data/lib/opennebula/vntemplate.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2020, 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    #

data/lib/opennebula/vntemplate_pool.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2020, 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    #

data/lib/opennebula/x509_auth.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2020, 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    #

data/lib/opennebula/xml_element.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2020, 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    #

data/lib/opennebula/xml_pool.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2020, 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    #