opennebula 5.6.2 → 5.7.80.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f3d50ea49086d91f902b480814640319a02e0ec
-  data.tar.gz: ef9b86e98abbb21d21954a48e2e0e5835d1c944d
+  metadata.gz: deb89f9163327f290a995f3318e5c9d4ef11e035
+  data.tar.gz: 50bcd5012425d6880b15d9f07411b7fbef65d64d
 SHA512:
-  metadata.gz: 3aa8288851cfbdf6912c9ab09090c0da15e0b77c6144a6d1f90ef66bd7d3987b9660dbda180f852b94503f4bcb9a35b1e42c2fd0068c28405643f9fe8a9e818b
-  data.tar.gz: 89003ca9786c0e50df46f7905b8b2e1eb6da7042cbfeebbb4ed9b97036bad71cd9bdabbcd413ad9dbeb8432176a30e89a2e79de5853c4cddc05177ef801ef8f4
+  metadata.gz: 13e09da10e18bf2ee093b5e35c51862d9bafdb329538aac0a25a386be02f9f8c03d1f6b26c26b5fc90221c481e50c62442040d661afc9cebddcd071ab24cad1e
+  data.tar.gz: 596263c07baa18b494b71cedfd10a42bcf7fbf78c869f4eff0d2eec998633b4b44ac6c6336ed17a1d068abf7e6ce7c1348b56d3e3c3d2c6f13f29f2f1b5628ee

data/lib/cloud/CloudClient.rb

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

data/lib/opennebula.rb

@@ -65,9 +65,11 @@ require 'opennebula/marketplaceapp'
 require 'opennebula/marketplaceapp_pool'
 require 'opennebula/vm_group'
 require 'opennebula/vm_group_pool'
+require 'opennebula/vntemplate'
+require 'opennebula/vntemplate_pool'
 
 module OpenNebula
 
     # OpenNebula version
-    VERSION = '5.6.2'
+    VERSION = '5.7.80'
 end

data/lib/opennebula/acl.rb

@@ -72,7 +72,8 @@ module OpenNebula
             "VROUTER"       =>  0x4000000000000,
             "MARKETPLACE"   =>  0x8000000000000,
             "MARKETPLACEAPP"=> 0x10000000000000,
-            "VMGROUP"       => 0x20000000000000
+            "VMGROUP"       => 0x20000000000000,
+            "VNTEMPLATE"    => 0x40000000000000
         }
 
         RIGHTS =

data/lib/opennebula/host.rb

@@ -237,9 +237,10 @@ module OpenNebula
             vcenter_wild_vm = wild.key? "VCENTER_TEMPLATE"
             if vcenter_wild_vm
                 require 'vcenter_driver'
-                host_id = self["ID"]
-                vm_ref  = wild["DEPLOY_ID"]
-                return VCenterDriver::Importer.import_wild(host_id, vm_ref, vm, template)
+                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']})
             else
                 rc = vm.allocate(template)
 

data/lib/opennebula/ldap_auth.rb

@@ -184,13 +184,17 @@ class OpenNebula::LdapAuth
         end
     end
 
+    def in_hash_ignore_case?(hash, key)
+        return hash.keys.find {|k| key.downcase == k.downcase}
+    end
+
     def get_groups
         groups = []
 
         if @options[:rfc2307bis]
             [@user['memberOf']].flatten.each do |group|
-                if @mapping[group]
-                    groups << @mapping[group]
+                if (g = in_hash_ignore_case?(@mapping, group))
+                    groups << @mapping[g]
                 end
             end
         else
@@ -200,9 +204,10 @@ class OpenNebula::LdapAuth
                 :attributes => [ "dn" ],
                 :filter     => filter
             ) do |entry|
-                if @mapping[entry.dn]
-                    groups << @mapping[entry.dn]
+                if (g = in_hash_ignore_case?(@mapping, entry.dn))
+                    groups << @mapping[g]
                 end
+
             end
         end
 

data/lib/opennebula/virtual_machine.rb

@@ -46,6 +46,7 @@ module OpenNebula
             :disksnapshotcreate => "vm.disksnapshotcreate",
             :disksnapshotrevert => "vm.disksnapshotrevert",
             :disksnapshotdelete => "vm.disksnapshotdelete",
+            :disksnapshotrename => "vm.disksnapshotrename",
             :diskresize     => "vm.diskresize",
             :updateconf     => "vm.updateconf",
             :lock     => "vm.lock",
@@ -211,7 +212,9 @@ module OpenNebula
             disk-snapshot-create disk-snapshot-delete terminate terminate-hard
             disk-resize deploy chown chmod updateconf rename resize update
             snapshot-resize snapshot-delete snapshot-revert disk-saveas
-            disk-snapshot-revert recover retry monitor}
+            disk-snapshot-revert recover retry monitor disk-snapshot-rename
+            alias-attach alias-detach poweroff-migrate poweroff-hard-migrate
+            }
 
         EXTERNAL_IP_ATTRS = [
             'GUEST_IP',
@@ -341,9 +344,10 @@ module OpenNebula
         #
         # @return [nil, OpenNebula::Error] nil in case of success, Error
         #   otherwise
-        def deploy(host_id, enforce=false, ds_id=-1)
+        def deploy(host_id, enforce=false, ds_id=-1, extra_template="")
             enforce ||= false
             ds_id ||= -1
+            extra_template ||= ""
 
             self.info
 
@@ -351,7 +355,8 @@ module OpenNebula
                         @pe_id,
                         host_id.to_i,
                         enforce,
-                        ds_id.to_i)
+                        ds_id.to_i,
+                        extra_template)
         end
 
         # Shutdowns an already deployed VM
@@ -463,12 +468,16 @@ module OpenNebula
         #   overcommited. Defaults to false
         # @param ds_id [Integer] The System Datastore where to migrate the VM.
         #   To use the current one, set it to -1
+        # @param mtype [Integer] How to perform the cold migration: 
+        #     - 0: save - restore,
+        #     - 1: power off - boot
+        #     - 2: power off hard - boot
         #
         # @return [nil, OpenNebula::Error] nil in case of success, Error
         #   otherwise
-        def migrate(host_id, live=false, enforce=false, ds_id=-1)
+        def migrate(host_id, live=false, enforce=false, ds_id=-1, mtype=0)
             call(VM_METHODS[:migrate], @pe_id, host_id.to_i, live==true,
-                enforce, ds_id.to_i)
+                enforce, ds_id.to_i, mtype)
         end
 
         # @deprecated use {#migrate} instead
@@ -649,6 +658,18 @@ module OpenNebula
           return call(VM_METHODS[:disksnapshotdelete], @pe_id, disk_id, snap_id)
         end
 
+        # Renames a disk snapshot
+        #
+        # @param disk_id  [Integer] Id of the disk
+        # @param snap_id  [Integer] Id of the snapshot
+        # @param new_name [String]  New name for the snapshot
+        #
+        # @return [nil, OpenNebula::Error] nil in case of success, Error
+        #   otherwise
+        def disk_snapshot_rename(disk_id, snap_id, new_name)
+            return call(VM_METHODS[:disksnapshotrename], @pe_id, disk_id, snap_id, new_name)
+        end
+
         # Changes the size of a disk
         #
         # @param disk_id [Integer] Id of the disk
@@ -662,7 +683,7 @@ module OpenNebula
         # Recovers an ACTIVE VM
         #
         # @param result [Integer] Recover with failure (0), success (1),
-        # retry (2), delete (3), delete-recreate (4)
+        # retry (2), delete (3), delete-recreate (4), delete-db (5)
         # @param result [info] Additional information needed to recover the VM
         # @return [nil, OpenNebula::Error] nil in case of success, Error
         #   otherwise
@@ -840,17 +861,25 @@ module OpenNebula
                     image_id = disk["IMAGE_ID"]
 
                     if !image_id.nil? && !image_id.empty?
-                        rc = disk_saveas(disk_id.to_i,"#{name}-disk-#{disk_id}","",-1)
+                        if disk['TYPE'] == 'CDROM'
+                            replace << "DISK = [ IMAGE_ID = #{image_id}"
+                            if disk["OPENNEBULA_MANAGED"]
+                                replace << ", OPENNEBULA_MANAGED=#{disk["OPENNEBULA_MANAGED"]}"
+                            end
+                            replace << " ]\n"
+                        else
+                            rc = disk_saveas(disk_id.to_i,"#{name}-disk-#{disk_id}","",-1)
 
-                        raise if OpenNebula.is_error?(rc)
+                            raise if OpenNebula.is_error?(rc)
 
-                        if persistent == true
-                            OpenNebula::Image.new_with_id(rc.to_i, @client).persistent()
-                        end
+                            if persistent == true
+                                OpenNebula::Image.new_with_id(rc.to_i, @client).persistent()
+                            end
 
-                        img_ids << rc.to_i
+                            img_ids << rc.to_i
 
-                        replace << "DISK = [ IMAGE_ID = #{rc} ]\n"
+                            replace << "DISK = [ IMAGE_ID = #{rc} ]\n"
+                        end
                     else
                         # Volatile disks cannot be saved, so the definition is copied
                         replace << self.template_like_str(
@@ -859,12 +888,13 @@ module OpenNebula
                 end
 
                 self.each('TEMPLATE/NIC') do |nic|
-
                     nic_id = nic["NIC_ID"]
+
                     if nic_id.nil? || nic_id.empty?
                         rc = Error.new('The NIC_ID is missing from the VM template')
                         raise
                     end
+
                     REMOVE_VNET_ATTRS.each do |attr|
                         nic.delete_element(attr)
                     end

data/lib/opennebula/vntemplate.rb

@@ -0,0 +1,260 @@
+# -------------------------------------------------------------------------- #
+# Copyright 2002-2018, 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 'opennebula/pool_element'
+
+module OpenNebula
+    class VNTemplate < PoolElement
+        #######################################################################
+        # Constants and Class Methods
+        #######################################################################
+
+
+        TEMPLATE_METHODS = {
+            :allocate    => "vntemplate.allocate",
+            :instantiate => "vntemplate.instantiate",
+            :info        => "vntemplate.info",
+            :update      => "vntemplate.update",
+            :delete      => "vntemplate.delete",
+            :chown       => "vntemplate.chown",
+            :chmod       => "vntemplate.chmod",
+            :clone       => "vntemplate.clone",
+            :rename      => "vntemplate.rename",
+            :lock        => "vntemplate.lock",
+            :unlock      => "vntemplate.unlock"
+        }
+
+        # Creates a VNTemplate description with just its identifier
+        # this method should be used to create plain VNTemplate objects.
+        # +id+ the id of the user
+        #
+        # Example:
+        #   vntemplate = VNTemplate.new(VNTemplate.build_xml(3),rpc_client)
+        #
+        def VNTemplate.build_xml(pe_id=nil)
+            if pe_id
+                obj_xml = "<VNTEMPLATE><ID>#{pe_id}</ID></VNTEMPLATE>"
+            else
+                obj_xml = "<VNTEMPLATE></VNTEMPLATE>"
+            end
+
+            XMLElement.build_xml(obj_xml,'VNTEMPLATE')
+        end
+
+        # Class constructor
+        def initialize(xml, client)
+            super(xml,client)
+
+            @client = client
+        end
+
+        #######################################################################
+        # XML-RPC Methods for the Template Object
+        #######################################################################
+
+        # Retrieves the information of the given VNTemplate.
+        # include extended information, such as the SIZE for each DISK
+        def info()
+            return Error.new('ID not defined') if !@pe_id
+
+            rc = @client.call(TEMPLATE_METHODS[:info], @pe_id, false)
+
+            if !OpenNebula.is_error?(rc)
+                initialize_xml(rc, 'VNTEMPLATE')
+                rc   = nil
+
+                @pe_id = self['ID'].to_i if self['ID']
+                @name  = self['NAME'] if self['NAME']
+            end
+
+            return rc
+        end
+
+        alias_method :info!, :info
+
+        # Allocates a new VNTemplate in OpenNebula
+        #
+        # @param description [String] The contents of the VNTemplate.
+        #
+        # @return [nil, OpenNebula::Error] nil in case of success, Error
+        #   otherwise
+        def allocate(description)
+            super(TEMPLATE_METHODS[:allocate], description)
+        end
+
+        # Deletes the Template
+        # 
+        # @return [nil, OpenNebula::Error] nil in case of success, Error
+        #   otherwise
+        def delete()
+            return call(TEMPLATE_METHODS[:delete], @pe_id, false)
+        end
+
+        # Creates a VNet instance from a VNTemplate
+        #
+        # @param name [String] Name for the VNet instance. If it is an empty
+        #   string OpenNebula will set a default name
+        # @param template [String] User provided VNTemplate to merge with the
+        #   one being instantiated
+        #
+        # @return [Integer, OpenNebula::Error] The new VNet id, Error
+        #   otherwise
+        def instantiate(name="", template="")
+            return Error.new('ID not defined') if !@pe_id
+
+            name ||= ""
+            template ||= ""
+
+            rc = @client.call(TEMPLATE_METHODS[:instantiate], @pe_id,
+                name, template)
+
+            return rc
+        end
+
+        # Replaces the vntemplate contents
+        #
+        # @param new_template [String] New vntemplate contents
+        # @param append [true, false] True to append new attributes instead of
+        #   replace the whole template
+        #
+        # @return [nil, OpenNebula::Error] nil in case of success, Error
+        #   otherwise
+        def update(new_template, append=false)
+            super(TEMPLATE_METHODS[:update], new_template, append ? 1 : 0)
+        end
+
+        # Publishes the Template, to be used by other users
+        def publish
+            set_publish(true)
+        end
+
+        # Unplubishes the Image
+        def unpublish
+            set_publish(false)
+        end
+
+        # Changes the owner/group
+        # uid:: _Integer_ the new owner id. Set to -1 to leave the current one
+        # gid:: _Integer_ the new group id. Set to -1 to leave the current one
+        # [return] nil in case of success or an Error object
+        def chown(uid, gid)
+            super(TEMPLATE_METHODS[:chown], uid, gid)
+        end
+
+        # Changes the VNTemplate permissions.
+        #
+        # @param octet [String] Permissions octed , e.g. 640
+        # @param recursive [true,false] optional, chmods the vntemplate plus
+        # any image defined in DISK.
+        #
+        # @return [nil, OpenNebula::Error] nil in case of success, Error
+        #   otherwise
+        def chmod_octet(octet, recursive=false)
+            owner_u = octet[0..0].to_i & 4 != 0 ? 1 : 0
+            owner_m = octet[0..0].to_i & 2 != 0 ? 1 : 0
+            owner_a = octet[0..0].to_i & 1 != 0 ? 1 : 0
+            group_u = octet[1..1].to_i & 4 != 0 ? 1 : 0
+            group_m = octet[1..1].to_i & 2 != 0 ? 1 : 0
+            group_a = octet[1..1].to_i & 1 != 0 ? 1 : 0
+            other_u = octet[2..2].to_i & 4 != 0 ? 1 : 0
+            other_m = octet[2..2].to_i & 2 != 0 ? 1 : 0
+            other_a = octet[2..2].to_i & 1 != 0 ? 1 : 0
+
+            chmod(owner_u, owner_m, owner_a, group_u, group_m, group_a, other_u,
+                other_m, other_a, recursive)
+        end
+
+        # Changes the VNTemplate permissions.
+        # Each [Integer] argument must be 1 to allow, 0 deny, -1 do not change
+        #
+        # @param recursive [true,false] optional, chmods the vntemplate plus
+        # any image defined in DISK.
+        #
+        # @return [nil, OpenNebula::Error] nil in case of success, Error
+        #   otherwise
+        def chmod(owner_u, owner_m, owner_a, group_u, group_m, group_a, other_u,
+                other_m, other_a, recursive=false)
+            return call(TEMPLATE_METHODS[:chmod], @pe_id, owner_u, owner_m, owner_a, group_u,
+                group_m, group_a, other_u, other_m, other_a, recursive)
+        end
+
+        # Clones this VNTemplate into a new one
+        #
+        # @param [String] name for the new VNTemplate.
+        # any image defined in DISK. The new IMAGE_ID is set into each DISK.
+        #
+        # @return [Integer, OpenNebula::Error] The new Template ID in case
+        #   of success, Error otherwise
+        def clone(name)
+            return Error.new('ID not defined') if !@pe_id
+
+            rc = @client.call(TEMPLATE_METHODS[:clone], @pe_id, name, false)
+
+            return rc
+        end
+
+        # Renames this VNTemplate
+        #
+        # @param name [String] New name for the VNTemplate.
+        #
+        # @return [nil, OpenNebula::Error] nil in case of success, Error
+        #   otherwise
+        def rename(name)
+            return call(TEMPLATE_METHODS[:rename], @pe_id, name)
+        end
+
+        #######################################################################
+        # Helpers to get VNTemplate information
+        #######################################################################
+
+        # Returns the group identifier
+        # [return] _Integer_ the element's group ID
+        def gid
+            self['GID'].to_i
+        end
+
+        def owner_id
+            self['UID'].to_i
+        end
+
+        # Lock a VNTemplate
+        def lock(level)
+            return call(TEMPLATE_METHODS[:lock], @pe_id, level)
+        end
+
+        # Unlock a VNTemplate
+        def unlock()
+            return call(TEMPLATE_METHODS[:unlock], @pe_id)
+        end
+
+        def public?
+            if self['PERMISSIONS/GROUP_U'] == "1" || self['PERMISSIONS/OTHER_U'] == "1"
+                true
+            else
+                false
+            end
+        end
+
+    private
+
+        def set_publish(published)
+            group_u = published ? 1 : 0
+
+            chmod(-1, -1, -1, group_u, -1, -1, -1, -1, -1)
+        end
+    end
+end

data/lib/opennebula/vntemplate_pool.rb

@@ -0,0 +1,79 @@
+# -------------------------------------------------------------------------- #
+# Copyright 2002-2018, 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 'opennebula/pool'
+
+module OpenNebula
+    class VNTemplatePool < Pool
+        #######################################################################
+        # Constants and Class attribute accessors
+        #######################################################################
+
+
+        TEMPLATE_POOL_METHODS = {
+            :info => "vntemplatepool.info"
+        }
+
+        #######################################################################
+        # Class constructor & Pool Methods
+        #######################################################################
+
+        # +client+ a Client object that represents an XML-RPC connection
+        # +user_id+ used to refer to a Pool with Templates from that user
+        def initialize(client, user_id=-1)
+            super('VNTEMPLATE_POOL','VNTEMPLATE',client)
+
+            @user_id  = user_id
+        end
+
+        # Factory method to create Template objects
+        def factory(element_xml)
+            OpenNebula::VNTemplate.new(element_xml,@client)
+        end
+
+        #######################################################################
+        # XML-RPC Methods for the Template Object
+        #######################################################################
+
+        # Retrieves all or part of the Templates in the pool.
+        def info(*args)
+            case args.size
+                when 0
+                    info_filter(TEMPLATE_POOL_METHODS[:info],@user_id,-1,-1)
+                when 3
+                    info_filter(TEMPLATE_POOL_METHODS[:info],args[0],args[1],args[2])
+            end
+        end
+
+        def info_all()
+            return super(TEMPLATE_POOL_METHODS[:info])
+        end
+
+        def info_mine()
+            return super(TEMPLATE_POOL_METHODS[:info])
+        end
+
+        def info_group()
+            return super(TEMPLATE_POOL_METHODS[:info])
+        end
+
+        alias_method :info!, :info
+        alias_method :info_all!, :info_all
+        alias_method :info_mine!, :info_mine
+        alias_method :info_group!, :info_group
+    end
+end

data/lib/vcenter_driver.rb

@@ -38,11 +38,29 @@ $LOAD_PATH << LIB_LOCATION + '/ruby/vendors/rbvmomi/lib'
 $LOAD_PATH << LIB_LOCATION + '/ruby'
 $LOAD_PATH << LIB_LOCATION + '/ruby/vcenter_driver'
 
+class VCenterConf < Hash
+    DEFAULT_CONFIGURATION = {
+        delete_images:           false,
+        vm_poweron_wait_default: 300,
+        debug_information:       false
+    }
+
+    def initialize
+        self.replace(DEFAULT_CONFIGURATION)
+        begin
+            self.merge!(YAML.load_file("#{VAR_LOCATION}/remotes/etc/vmm/vcenter/vcenterrc"))
+        rescue
+        end
+    end
+end
+
 require 'rbvmomi'
 require 'yaml'
 require 'opennebula'
 require 'base64'
 require 'openssl'
+require 'digest'
+require 'resolv'
 
 # ---------------------------------------------------------------------------- #
 # vCenter Library                                                              #
@@ -55,12 +73,17 @@ require 'vi_helper'
 require 'datacenter'
 require 'host'
 require 'datastore'
+require 'vm_template'
 require 'virtual_machine'
 require 'network'
 require 'file_helper'
-require 'importer'
 
 CHECK_REFS = true
+
+module VCenterDriver
+    CONFIG = VCenterConf.new
+end
+
 # ---------------------------------------------------------------------------- #
 # Helper functions                                                             #
 # ---------------------------------------------------------------------------- #

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula
 version: !ruby/object:Gem::Version
-  version: 5.6.2
+  version: 5.7.80.pre
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-10 00:00:00.000000000 Z
+date: 2019-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -108,6 +108,8 @@ files:
 - lib/opennebula/virtual_router_pool.rb
 - lib/opennebula/vm_group.rb
 - lib/opennebula/vm_group_pool.rb
+- lib/opennebula/vntemplate.rb
+- lib/opennebula/vntemplate_pool.rb
 - lib/opennebula/xml_element.rb
 - lib/opennebula/xml_pool.rb
 - lib/opennebula/xml_utils.rb
@@ -137,9 +139,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: []
 rubyforge_project: 
 rubygems_version: 2.0.14.1