opennebula 5.3.80.beta1 → 5.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 793beff44dc5a782c2aafcfc3049362b981f972b
-  data.tar.gz: ed04d3cf4814a0715471a99342cf04811ad86520
+  metadata.gz: ca8e48dff96a619344f9f0ecc9898d159e755bee
+  data.tar.gz: 4991ad72e4dc6de08a4df646804e6ba07d8cecc5
 SHA512:
-  metadata.gz: c892fa6c7a0f2012185c432eae4b7954ed3500f35962e4b5d453279db3c702f716d27fed588ae653cf383d7d8eede5dd4ecb55534bbc62d1c46033b75b452161
-  data.tar.gz: e751d6869d55f43512f28746bf0f4d98b8e0cdb67576263b5577a676013823286e020a05bd45109937198f4209f5fe6240812d9790009f52bd291c4b6a22e56e
+  metadata.gz: 3a8202519ce9a8183a0dbfcc50a70513c26fff537c3962e2a6c81d24415a88f898fe8c1d3a8c8e89229556ff50eb400496e942b97d08b69d37a2cab9ae2786b5
+  data.tar.gz: eae3a740d5e3f1b43a92a05640d8985be8279d03e7a943f6631b0858adbcadd136efa23f4dfce170fa457ff7b59437cd334a67c31269609fc8fe84b3e7c67136

data/lib/cloud/CloudClient.rb

@@ -50,7 +50,7 @@ end
 module CloudClient
 
     # OpenNebula version
-    VERSION = '5.3.80'
+    VERSION = '5.4.0'
 
     # #########################################################################
     # Default location for the authentication file

data/lib/opennebula.rb

@@ -27,6 +27,7 @@ require 'pp'
 require 'opennebula/xml_utils'
 require 'opennebula/client'
 require 'opennebula/error'
+require 'opennebula/utils'
 require 'opennebula/virtual_machine'
 require 'opennebula/virtual_machine_pool'
 require 'opennebula/virtual_network'
@@ -68,5 +69,5 @@ require 'opennebula/vm_group_pool'
 module OpenNebula
 
     # OpenNebula version
-    VERSION = '5.3.80'
+    VERSION = '5.4.0'
 end

data/lib/opennebula/client.rb

@@ -39,9 +39,11 @@ module OpenNebula
                 alias :start_element :startElement
 
                 def parse(str)
+
                     Ox.sax_parse(self, StringIO.new(str),
                         :symbolize => false,
-                        :convert_special => true)
+                        :convert_special => true,
+                        :skip => false)
                 end
             end
         end
@@ -83,6 +85,8 @@ module OpenNebula
     # 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
 
@@ -127,7 +131,7 @@ module OpenNebula
             elsif File.file?("/var/lib/one/.one/one_auth")
                 @one_auth = File.read("/var/lib/one/.one/one_auth")
             else
-                raise "ONE_AUTH file not present"
+                raise NO_ONE_AUTH_ERROR
             end
 
             @one_auth = @one_auth.rstrip

data/lib/opennebula/host.rb

@@ -230,7 +230,7 @@ module OpenNebula
             if vcenter_wild_vm
                 require 'vcenter_driver'
                 host_id = self["ID"]
-                vm_ref    = wild["DEPLOY_ID"]
+                vm_ref  = wild["DEPLOY_ID"]
                 return VCenterDriver::Importer.import_wild(host_id, vm_ref, vm, template)
             else
                 rc = vm.allocate(template)

data/lib/opennebula/ldap_auth.rb

@@ -48,7 +48,8 @@ class OpenNebula::LdapAuth
             :mapping_filename   => 'server1.yaml',
             :mapping_key        => 'GROUP_DN',
             :mapping_default    => 1,
-            :attributes         => [ "memberOf" ]
+            :attributes         => [ "memberOf" ],
+            :rfc2307bis         => true
         }.merge(options)
 
         ops={}
@@ -61,6 +62,10 @@ class OpenNebula::LdapAuth
             }
         end
 
+        if !@options[:rfc2307bis]
+            @options[:attributes] << @options[:user_field]
+        end
+
         ops[:host]=@options[:host] if @options[:host]
         ops[:port]=@options[:port].to_i if @options[:port]
         ops[:encryption]=@options[:encryption] if @options[:encryption]
@@ -181,9 +186,22 @@ class OpenNebula::LdapAuth
     def get_groups
         groups = []
 
-        [@user['memberOf']].flatten.each do |group|
-            if @mapping[group]
-                groups << @mapping[group]
+        if @options[:rfc2307bis]
+            [@user['memberOf']].flatten.each do |group|
+                if @mapping[group]
+                    groups << @mapping[group]
+                end
+            end
+        else
+            filter = "(#{@options[:group_field]}=#{@user[@options[:user_field]].first})"
+            @ldap.search(
+                :base       => @options[:base],
+                :attributes => "dn",
+                :filter     => filter
+            ) do |entry|
+                if @mapping[entry.dn]
+                    groups << @mapping[entry.dn]
+                end
             end
         end
 

data/lib/opennebula/system.rb

@@ -30,7 +30,8 @@ module OpenNebula
             :groupquotaupdate   => "groupquota.update",
             :version            => "system.version",
             :config             => "system.config",
-            :sql                => "system.sql"
+            :sql                => "system.sql",
+            :sqlquery           => "system.sqlquery"
         }
 
         #######################################################################
@@ -57,6 +58,22 @@ module OpenNebula
             return @client.call(SYSTEM_METHODS[:sql], sql, federate)
         end
 
+        # Executes a SQL query command on OpenNebula DB
+        #   @param [String] Sql string
+        #   @return [String, OpenNebula::Error] Sql execution result in XML 
+        #   format in case of success, Error otherwise
+        #   <QUERY>
+        #     the query sent to oned
+        #   </QUERY>
+        #   <RESULT>
+        #     <ROW>
+        #       <column_name>column_value</column_name>
+        #       ...
+        #     </ROW>
+        #   </RESULT>
+        def sql_query_command(sql)
+            return @client.call(SYSTEM_METHODS[:sqlquery], sql)
+        end
         #
         # Gets the oned version
         #

data/lib/opennebula/utils.rb

@@ -0,0 +1,50 @@
+# -------------------------------------------------------------------------- #
+# Copyright 2002-2017, 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.                                             #
+#--------------------------------------------------------------------------- #
+
+module OpenNebula
+    # we use this file to extend opennebula oca functionalities
+    # It contains generic methods that can be used in oca context
+    # to help other components
+
+    # receive a object key => value format
+    # returns hashed values
+    def self.encrypt(opts, token)
+        res = {}
+        opts.each do |key, value|
+            cipher = OpenSSL::Cipher::AES.new(256,:CBC)
+            cipher.encrypt.key = token[0..31]
+            encrypted = cipher.update(value) + cipher.final
+            res[key] = Base64::encode64(encrypted).gsub("\n", "")
+        end
+        return res
+    end
+
+    # receive hashed values (res) with a token
+    # returns original values
+    def self.decrypt(res, token)
+        opts = {}
+
+        res.each do |key, encrypted_value|
+            decipher = OpenSSL::Cipher::AES.new(256,:CBC)
+            decipher.decrypt
+            decipher.key = token[0..31]
+            plain = decipher.update(Base64::decode64(encrypted_value)) + decipher.final
+            opts[key] = plain
+        end
+        return opts
+    end
+
+end

data/lib/opennebula/virtual_machine.rb

@@ -14,7 +14,6 @@
 # limitations under the License.                                             #
 #--------------------------------------------------------------------------- #
 
-
 require 'opennebula/pool_element'
 
 module OpenNebula
@@ -343,16 +342,6 @@ module OpenNebula
 
             self.info
 
-            # Add dsid as VM template parameter for vcenter
-            if ds_id!=-1 &&
-               !self["/VM/USER_TEMPLATE/PUBLIC_CLOUD/TYPE"].nil? &&
-               self["/VM/USER_TEMPLATE/PUBLIC_CLOUD/TYPE"].downcase == "vcenter"
-                ds = OpenNebula::Datastore.new_with_id(ds_id, @client)
-                rc = ds.info
-                return rc if OpenNebula.is_error?(rc)
-               self.update("VCENTER_DS_REF=#{ds['/DATASTORE/VCENTER_DS_REF']}", true)
-            end
-
             return call(VM_METHODS[:deploy],
                         @pe_id,
                         host_id.to_i,
@@ -755,10 +744,9 @@ module OpenNebula
         # @return [Integer, OpenNebula::Error] the new Template ID in case of
         #   success, error otherwise
         REMOVE_VNET_ATTRS = %w{AR_ID BRIDGE CLUSTER_ID IP MAC TARGET NIC_ID NETWORK_ID VN_MAD SECURITY_GROUPS}
-        def save_as_template(name, persistent=nil)
+        def save_as_template(name,description, persistent=nil)
             img_ids = []
             new_tid = nil
-
             begin
                 rc = info()
                 raise if OpenNebula.is_error?(rc)
@@ -783,7 +771,9 @@ module OpenNebula
 
                 # Replace the original template's capacity with the actual VM values
                 replace = ""
-
+                if !description.nil?
+                    replace << "DESCRIPTION = #{description}\n"
+                end
                 cpu = self['TEMPLATE/CPU']
                 if !cpu.nil? && !cpu.empty?
                     replace << "CPU = #{cpu}\n"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula
 version: !ruby/object:Gem::Version
-  version: 5.3.80.beta1
+  version: 5.4.0
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-05 00:00:00.000000000 Z
+date: 2017-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -104,6 +104,7 @@ files:
 - lib/opennebula/template_pool.rb
 - lib/opennebula/user.rb
 - lib/opennebula/user_pool.rb
+- lib/opennebula/utils.rb
 - lib/opennebula/vdc.rb
 - lib/opennebula/vdc_pool.rb
 - lib/opennebula/virtual_machine.rb
@@ -136,9 +137,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.11