opennebula 5.10.3 → 5.11.90.pre

data/lib/opennebula/document_pool_json.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/error.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/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    #
@@ -330,6 +330,8 @@ module OpenNebula
         end
 
         def create_default_acls(resources=nil)
+            return if resources && resources.strip.empty?
+
             resources = GROUP_DEFAULT_ACLS if !resources
 
             acls = Array.new

data/lib/opennebula/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/hook.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/hook_log.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/hook_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/host.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    #
@@ -184,8 +184,7 @@ module OpenNebula
         #        ["1337266088", "800"]]
         #   }
         def monitoring(xpath_expressions)
-            return super(HOST_METHODS[:monitoring], 'HOST',
-                'LAST_MON_TIME', xpath_expressions)
+            return super(HOST_METHODS[:monitoring], xpath_expressions)
         end
 
         # Retrieves this Host's monitoring data from OpenNebula, in XML
@@ -240,7 +239,8 @@ module OpenNebula
                 vi_client = VCenterDriver::VIClient.new_from_host(self["ID"])
                 importer  = VCenterDriver::VmmImporter.new(@client, vi_client)
 
-                return importer.import({wild: wild, template: template, one_item: vm, host: self['ID']})
+                return importer.import({wild: wild, template: template,
+                                        one_item: vm, host: self['ID']})
             else
                 rc = vm.allocate(template)
 

data/lib/opennebula/host_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    #
@@ -94,15 +94,21 @@ module OpenNebula
         #      "HOST_SHARE/FREE_CPU"=>[["1337609673", "800"]],
         #      "HOST_SHARE/RUNNING_VMS"=>[["1337609673", "3"]]}}
         def monitoring(xpath_expressions)
-            return super(HOST_POOL_METHODS[:monitoring],
-                'HOST', 'LAST_MON_TIME', xpath_expressions)
+            return super(HOST_POOL_METHODS[:monitoring], xpath_expressions)
         end
 
         # Retrieves the monitoring data for all the Hosts in the pool, in XML
         #
+        # @param [Integer] num Optional number of monitoring records to be
+        #   retrieved. If nill all records are retrieved
+        #
         # @return [String] VM monitoring data, in XML
-        def monitoring_xml()
-            return @client.call(HOST_POOL_METHODS[:monitoring])
+        def monitoring_xml(num = nil)
+            return @client.call(HOST_POOL_METHODS[:monitoring]) if num.nil?
+
+            @client.call(HOST_POOL_METHODS[:monitoring], num.to_i)
         end
+
     end
+
 end

data/lib/opennebula/image.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/image_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/ldap_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      #
@@ -50,7 +50,8 @@ class OpenNebula::LdapAuth
             :mapping_key        => 'GROUP_DN',
             :mapping_default    => 1,
             :attributes         => [ "memberOf" ],
-            :rfc2307bis         => true
+            :rfc2307bis         => true,
+            :group_admin_group_dn => nil
         }.merge(options)
 
         ops={}
@@ -63,9 +64,8 @@ class OpenNebula::LdapAuth
             }
         end
 
-        if !@options[:rfc2307bis]
-            @options[:attributes] << @options[:user_field]
-        end
+        # always fetch user_filed to compare whitespace diff
+        @options[:attributes] << @options[:user_field]
 
         # fetch the user group field only if we need that
         if @options[:group] or !@options[:rfc2307bis]
@@ -142,15 +142,20 @@ class OpenNebula::LdapAuth
 
         if result && result.first
             @user = result.first
-            [@user.dn, @user[@options[:user_group_field]]]
+
+            [@user.dn,
+             @user[@options[:user_field]].first,
+             @user[@options[:user_group_field]]]
         else
             result=@ldap.search(:base => name)
 
             if result && result.first
                 @user = result.first
-                [name, @user[@options[:user_group_field]]]
+                [name,
+                 @user[@options[:user_field]].first,
+                 @user[@options[:user_group_field]]]
             else
-                [nil, nil]
+                [nil, nil, nil]
             end
         end
     end
@@ -190,26 +195,26 @@ class OpenNebula::LdapAuth
     end
 
     def get_groups
-        groups = []
-
         if @options[:rfc2307bis]
-            [@user['memberOf']].flatten.each do |group|
-                if (g = in_hash_ignore_case?(@mapping, group))
-                    groups << @mapping[g]
-                end
-            end
+            ldap_groups = [@user['memberOf']].flatten
         else
             group_base = @options[:group_base] ? @options[:group_base] : @options[:base]
             filter = Net::LDAP::Filter.equals(@options[:group_field], @user[@options[:user_group_field]].first)
-            @ldap.search(
+            ldap_groups = @ldap.search(
                 :base       => group_base,
                 :attributes => [ "dn" ],
                 :filter     => filter
-            ) do |entry|
-                if (g = in_hash_ignore_case?(@mapping, entry.dn))
+            ).map! { |entry| entry.dn }
+        end
+
+        groups = []
+        ldap_groups.each do |group|
+            if (g = in_hash_ignore_case?(@mapping, group))
+                if ldap_groups.include? @options[:group_admin_group_dn]
+                    groups << "*#{@mapping[g]}"
+                else
                     groups << @mapping[g]
                 end
-
             end
         end
 

data/lib/opennebula/ldap_auth_spec.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/marketplace.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/marketplace_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/marketplaceapp.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    #
@@ -192,8 +192,9 @@ module OpenNebula
             options[:vmtemplate_name] = name unless options[:vmtemplate_name]
 
             tmpl << "\n"
-            tmpl << "NAME=\"" << name << "\"\n"
-            tmpl << "FROM_APP=\"" << self['ID'] << "\"\n"
+            tmpl << 'NAME="' << name << "\"\n"
+            tmpl << 'FROM_APP="' << self['ID'] << "\"\n"
+            tmpl << 'URL_ARGS="' << options[:url_args] << "\"\n" if options[:url_args]
 
             case type_str
             when 'IMAGE'

data/lib/opennebula/marketplaceapp_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/oneflow_client.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    #
@@ -36,7 +36,12 @@ module Role
         'reboot-hard',
         'poweroff',
         'poweroff-hard',
-        'snapshot-create'
+        'snapshot-create',
+        'snapshot-revert',
+        'snapshot-delete',
+        'disk-snapshot-create',
+        'disk-snapshot-revert',
+        'disk-snapshot-delete'
     ]
 
     STATE = {
@@ -285,7 +290,7 @@ module Service
         exit_code = 0
 
         ids.each do |id|
-            response = block.call(id)
+            response = block.call(id) if block_given?
 
             if CloudClient::is_error?(response)
                 puts response.to_s
@@ -296,6 +301,22 @@ module Service
         exit_code
     end
 
+    # Perform an action on a resource
+    # @param [Integer] id resource id
+    # @param [Block] block action to be performed
+    # @return [Integer] exit_code
+    def self.perform_action(id, &block)
+        exit_code = 0
+        response  = block.call(id) if block_given?
+
+        if CloudClient::is_error?(response)
+            puts response.to_s
+            exit_code = response.code.to_i
+        end
+
+        exit_code
+    end
+
     class Client
         def initialize(opts={})
             @username = opts[:username] || ENV['ONEFLOW_USER']

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