opennebula 5.8.0 → 5.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 569ac708944804df9cca52281833b1a3c382fba0
-  data.tar.gz: 567bc53b12a85dd81f1ef644e54373074cc8fa06
+  metadata.gz: a1806ffa746e5ae8534ea0bc1cd08afb5e0724c3
+  data.tar.gz: a483faf5b0133eec5e50190d642ba42a2a07def8
 SHA512:
-  metadata.gz: ee01e030e359ca720b7069750f9fa6522a89757eadbf5d96d225c30666f14da876f584aadaff373e371e173e61f753f0995fc8a3d6a38c8e775d181f4a8a8155
-  data.tar.gz: c9a50bd7207e7373e2a675471ea905210ded882ecb710a1877eb0656de777c46160c387009b7ef32998e87a58742818a85d13815baba0d1a08705475df7a4db2
+  metadata.gz: 05939c12f4cf7689a9c81bcf1dbc99b805b4509505d25fec3d3193e0aeba98169042d7874b781aa2e02382a14d360ccd6893fcb644b85416ddf9256303e7ad58
+  data.tar.gz: 54d34d8da90fa155e030eab67093da2148a3a18b3d5fcf7e52711fda19b25b465e443ee38fababdb9d459094ba833b37e6ea70bafccfc0db60d4158fa7c5eb75

data/lib/cloud/CloudClient.rb

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

data/lib/opennebula.rb

@@ -71,5 +71,5 @@ require 'opennebula/vntemplate_pool'
 module OpenNebula
 
     # OpenNebula version
-    VERSION = '5.8.0'
+    VERSION = '5.8.1'
 end

data/lib/opennebula/client.rb

@@ -43,7 +43,7 @@ module OpenNebula
                     Ox.sax_parse(self, StringIO.new(str),
                         :symbolize => false,
                         :convert_special => true,
-                        :skip => false)
+                        :skip => :skip_none)
                 end
             end
         end

data/lib/opennebula/marketplaceapp.rb

@@ -17,42 +17,45 @@
 require 'opennebula/pool_element'
 
 module OpenNebula
+
     class MarketPlaceApp < PoolElement
+
         #######################################################################
         # Constants and Class Methods
         #######################################################################
 
         MARKETPLACEAPP_METHODS = {
-            :info       => "marketapp.info",
-            :allocate   => "marketapp.allocate",
-            :delete     => "marketapp.delete",
-            :update     => "marketapp.update",
-            :chown      => "marketapp.chown",
-            :chmod      => "marketapp.chmod",
-            :rename     => "marketapp.rename",
-            :enable     => "marketapp.enable",
-            :lock       => "marketapp.lock",
-            :unlock     => "marketapp.unlock"
+            :info       => 'marketapp.info',
+            :allocate   => 'marketapp.allocate',
+            :delete     => 'marketapp.delete',
+            :update     => 'marketapp.update',
+            :chown      => 'marketapp.chown',
+            :chmod      => 'marketapp.chmod',
+            :rename     => 'marketapp.rename',
+            :enable     => 'marketapp.enable',
+            :lock       => 'marketapp.lock',
+            :unlock     => 'marketapp.unlock'
         }
 
-        MARKETPLACEAPP_STATES=%w{INIT READY LOCKED ERROR DISABLED}
+        MARKETPLACEAPP_STATES = %w{INIT READY LOCKED ERROR DISABLED}
 
         SHORT_MARKETPLACEAPP_STATES={
-            "INIT"      => "ini",
-            "READY"     => "rdy",
-            "LOCKED"    => "lck",
-            "ERROR"     => "err",
-            "DISABLED"  => "dis"
+            'INIT'      => 'ini',
+            'READY'     => 'rdy',
+            'LOCKED'    => 'lck',
+            'ERROR'     => 'err',
+            'DISABLED'  => 'dis'
         }
 
-        MARKETPLACEAPP_TYPES=%w{UNKNOWN IMAGE VMTEMPLATE SERVICE_TEMPLATE}
+        MARKETPLACEAPP_TYPES = %w{UNKNOWN IMAGE VMTEMPLATE SERVICE_TEMPLATE}
 
         SHORT_MARKETPLACEAPP_TYPES = {
-            "UNKNOWN"           => "unk",
-            "IMAGE"             => "img",
-            "VMTEMPLATE"        => "tpl",
-            "SERVICE_TEMPLATE"  => "srv"
+            'UNKNOWN'          => 'unk',
+            'IMAGE'            => 'img',
+            'VMTEMPLATE'       => 'tpl',
+            'SERVICE_TEMPLATE' => 'srv'
         }
+
         # Creates a MarketPlace description with just its identifier
         # this method should be used to create plain MarketPlace objects.
         # +id+ the id of the user
@@ -60,14 +63,14 @@ module OpenNebula
         # Example:
         #  app = MarketPlaceApp.new(MarketPlace.build_xml(3),rpc_client)
         #
-        def MarketPlaceApp.build_xml(pe_id=nil)
+        def MarketPlaceApp.build_xml(pe_id = nil)
             if pe_id
                 app_xml = "<MARKETPLACEAPP><ID>#{pe_id}</ID></MARKETPLACEAPP>"
             else
-                app_xml = "<MARKETPLACEAPP></MARKETPLACEAPP>"
+                app_xml = '<MARKETPLACEAPP></MARKETPLACEAPP>'
             end
 
-            XMLElement.build_xml(app_xml,'MARKETPLACEAPP')
+            XMLElement.build_xml(app_xml, 'MARKETPLACEAPP')
         end
 
         # Class constructor
@@ -80,7 +83,7 @@ module OpenNebula
         #######################################################################
 
         # Retrieves the information of the given marketplace app
-        def info()
+        def info
             super(MARKETPLACEAPP_METHODS[:info], 'MARKETPLACEAPP')
         end
 
@@ -98,7 +101,7 @@ module OpenNebula
         end
 
         # Deletes the marketplace app
-        def delete()
+        def delete
             super(MARKETPLACEAPP_METHODS[:delete])
         end
 
@@ -110,7 +113,7 @@ module OpenNebula
         #
         # @return [nil, OpenNebula::Error] nil in case of success, Error
         #   otherwise
-        def update(new_template, append=false)
+        def update(new_template, append = false)
             super(MARKETPLACEAPP_METHODS[:update], new_template, append ? 1 : 0)
         end
 
@@ -152,7 +155,7 @@ module OpenNebula
         # @return [nil, OpenNebula::Error] nil in case of success, Error
         #   otherwise
         def rename(name)
-            return call(MARKETPLACEAPP_METHODS[:rename], @pe_id, name)
+            call(MARKETPLACEAPP_METHODS[:rename], @pe_id, name)
         end
 
         # Exports this app to a suitable OpenNebula object
@@ -168,79 +171,80 @@ module OpenNebula
         #   { :vm => [ vm ids/OpenNebula::Error ],
         #     :vmtemplate => [ vmtemplates ids/OpenNebula::Error ],
         #     :image => [ vm ids/OpenNebula::Error ] }
-        def export(options={})
-            return Error.new("Missing datastore id") if options[:dsid].nil?
-            return Error.new("Missing name to export app") if options[:name].nil?
-
-            rc  = info
+        def export(options = {})
+            rc = info
             return rc if OpenNebula.is_error?(rc)
-            return Error.new("App is not in READY state") if state_str!="READY"
+            return Error.new('App is not READY') if state_str != 'READY'
 
-            case type_str
-            when "IMAGE"
-                if !self['APPTEMPLATE64'].nil?
-                    tmpl=Base64::decode64(self['APPTEMPLATE64'])
-                else
-                    tmpl=""
-                end
+            if options[:dsid].nil? && type_str != 'VMTEMPLATE'
+                return Error.new('Missing datastore id')
+            end
 
-                name = options[:name] || "marketapp-#{self.id}"
+            return Error.new('Missing name to export app') if options[:name].nil?
 
-                tmpl << "\n"
-                tmpl << "NAME=\"" << name << "\"\n"
-                tmpl << "FROM_APP=\""       << self['ID'] << "\"\n"
+            if !self['APPTEMPLATE64'].nil?
+                tmpl = Base64.decode64(self['APPTEMPLATE64'])
+            else
+                tmpl = ''
+            end
+
+            name = options[:name] || "marketapp-#{id}"
+            options[:vmtemplate_name] = name unless options[:vmtemplate_name]
 
+            tmpl << "\n"
+            tmpl << "NAME=\"" << name << "\"\n"
+            tmpl << "FROM_APP=\"" << self['ID'] << "\"\n"
+
+            case type_str
+            when 'IMAGE'
                 image = Image.new(Image.build_xml, @client)
                 rc    = image.allocate(tmpl, options[:dsid])
 
                 ds = OpenNebula::Datastore.new_with_id(options[:dsid], @client)
-                image.info
-                ds.info
-
-                xpath = 'TEMPLATE/DRIVER'
-                if ds[xpath] == 'vcenter' && self['FORMAT'] != 'iso' && self['FORMAT'] != 'vmdk'
-                    image.replace({'FORMAT' => 'vmdk'})
-                elsif ds[xpath] && ds[xpath] != 'vcenter' && self['FORMAT'] == 'vmdk'
-                    image.replace({'FORMAT' => ds[xpath] })
-                end
 
-                return { :image => [rc] } if OpenNebula.is_error?(rc)
+                rc_image = image.info
+                rc_ds    = ds.info
 
-                image_id = image.id
-                vmtpl_id = -1
+                image_error = OpenNebula.is_error?(rc_image)
+                ds_error    = OpenNebula.is_error?(rc_ds)
 
-                if !self['TEMPLATE/VMTEMPLATE64'].nil?
-                    tmpl=Base64::decode64(self['TEMPLATE/VMTEMPLATE64'])
+                xpath  = 'TEMPLATE/DRIVER'
+                format = self['FORMAT']
+                type   = ds[xpath]
 
-                    tmpl_name = options[:vmtemplate_name] || name
+                if !image_error && !ds_error
+                    if type == 'vcenter' && format != 'iso' && format != 'vmdk'
+                        image.replace('FORMAT' => 'vmdk')
+                    elsif type && type != 'vcenter' && format == 'vmdk'
+                        image.replace('FORMAT' => type)
+                    end
+                end
 
-                    tmpl << "\nNAME=\"#{tmpl_name}\"\n"
-                    tmpl << "DISK=[ IMAGE_ID = #{image.id} ]\n"
+                return { :image => [rc] } if OpenNebula.is_error?(rc)
 
-                    vmtpl = Template.new(Template.build_xml, @client)
-                    rc    = vmtpl.allocate(tmpl)
+                vmtpl_id = create_vmtemplate(options, image.id)
 
-                    if OpenNebula.is_error?(rc)
-                        return { :image => [image_id], :vmtemplate => [rc] }
-                    end
+                return { :image => [image.id], :vmtemplate => [vmtpl_id] }
 
-                    vmtpl_id = vmtpl.id
-                end
+            when 'VMTEMPLATE'
+                # TODO import all the images associated to a VMTEMPLATE app
+                # current version only support no-image based apps (e.g. hybrid)
+                vmtpl_id = create_vmtemplate(options)
 
-                return { :image => [image_id], :vmtemplate => [vmtpl_id] }
+                return { :image => [], :vmtemplate => [vmtpl_id] }
             else
-                return Error.new("App type #{app.type_str} not supported")
+                return Error.new("App type #{type_str} not supported")
             end
         end
 
         # Enables this app
         def enable
-            return call(MARKETPLACEAPP_METHODS[:enable], @pe_id, true)
+            call(MARKETPLACEAPP_METHODS[:enable], @pe_id, true)
         end
 
         # Enables this app
         def disable
-            return call(MARKETPLACEAPP_METHODS[:enable], @pe_id, false)
+            call(MARKETPLACEAPP_METHODS[:enable], @pe_id, false)
         end
 
         # ---------------------------------------------------------------------
@@ -277,14 +281,37 @@ module OpenNebula
             SHORT_MARKETPLACEAPP_STATES[state_str]
         end
 
-        #Locked a MarketplaceApp
+        # Locked a MarketplaceApp
         def lock(level)
-            return call(MARKETPLACEAPP_METHODS[:lock], @pe_id, level)
+            call(MARKETPLACEAPP_METHODS[:lock], @pe_id, level)
         end
 
-        #Unlocked a MarketplaceApp
+        # Unlocked a MarketplaceApp
         def unlock()
-            return call(MARKETPLACEAPP_METHODS[:unlock], @pe_id)
+            call(MARKETPLACEAPP_METHODS[:unlock], @pe_id)
         end
+
+        private
+
+        # Creates a VM template based on the VMTEMPLATE64 attribute
+        # @return [Integer, OpenNebula::Error] template id or error
+        # TODO this method needs to be extended to support [image_ids]
+        def create_vmtemplate(options, image_id = nil)
+            return -1 if self['TEMPLATE/VMTEMPLATE64'].nil?
+
+            tmpl = Base64.decode64(self['TEMPLATE/VMTEMPLATE64'])
+
+            tmpl << "\nNAME=\"#{options[:vmtemplate_name]}\"\n"
+            tmpl << "DISK=[ IMAGE_ID = #{image_id} ]\n" if image_id
+
+            vmtpl = Template.new(Template.build_xml, @client)
+            rc    = vmtpl.allocate(tmpl)
+
+            return rc if OpenNebula.is_error?(rc)
+
+            vmtpl.id
+        end
+
     end
+
 end

data/lib/opennebula/pool.rb

@@ -64,6 +64,10 @@ module OpenNebula
 
         alias_method :info!, :info
 
+        def info_extended(xml_method)
+            return xmlrpc_info(xml_info)
+        end
+
         def info_all(xml_method, *args)
             return xmlrpc_info(xml_method, INFO_ALL, -1, -1, *args)
         end
@@ -232,13 +236,20 @@ module OpenNebula
         #        > 0 => page size    
         # current first element of the page
         # hash:: return page as a hash
-        def get_page(size, current)
+        def get_page(size, current, extended = false)
             rc = nil
 
-            if PAGINATED_POOLS.include?(@pool_name) 
+            if PAGINATED_POOLS.include?(@pool_name)
+                pool_name = @pool_name.delete('_').downcase
+
+                if extended && pool_name == "vmpool"
+                    method = "#{pool_name}.infoextended"
+                else
+                    method = "#{pool_name}.info"
+                end
+
                 size = OpenNebula.pool_page_size if (!size || size == 0)
-                rc   = @client.call("#{@pool_name.delete('_').downcase}.info",
-                            @user_id, current, -size, -1)
+                rc   = @client.call(method, @user_id, current, -size, -1)
 
                 initialize_xml(rc, @pool_name)
             else

data/lib/opennebula/virtual_machine_pool.rb

@@ -26,6 +26,7 @@ module OpenNebula
 
         VM_POOL_METHODS = {
             :info               => "vmpool.info",
+            :info_extended      => "vmpool.infoextended",
             :monitoring         => "vmpool.monitoring",
             :accounting         => "vmpool.accounting",
             :showback           => "vmpool.showback",
@@ -62,57 +63,70 @@ module OpenNebula
         # No arguments, returns the not-in-done VMs for the user
         # [user_id, start_id, end_id]
         # [user_id, start_id, end_id, state]
+        alias_method :info!, :info
+
         def info(*args)
             case args.size
-                when 0
-                    info_filter(VM_POOL_METHODS[:info],
-                                @user_id,
-                                -1,
-                                -1,
-                                INFO_NOT_DONE)
-                when 1
-                    info_filter(VM_POOL_METHODS[:info],
-                                args[0],
-                                -1,
-                                -1,
-                                INFO_NOT_DONE)
-                when 3
-                    info_filter(VM_POOL_METHODS[:info],
-                                args[0],
-                                args[1],
-                                args[2],
-                                INFO_NOT_DONE)
-                when 4
-                    info_filter(VM_POOL_METHODS[:info],
-                                args[0],
-                                args[1],
-                                args[2],
-                                args[3])
+            when 0
+                info_filter(VM_POOL_METHODS[:info],
+                            @user_id,
+                            -1,
+                            -1,
+                            INFO_NOT_DONE)
+            when 1
+                info_filter(VM_POOL_METHODS[:info],
+                            args[0],
+                            -1,
+                            -1,
+                            INFO_NOT_DONE)
+            when 3
+                info_filter(VM_POOL_METHODS[:info],
+                            args[0],
+                            args[1],
+                            args[2],
+                            INFO_NOT_DONE)
+            when 4
+                info_filter(VM_POOL_METHODS[:info],
+                            args[0],
+                            args[1],
+                            args[2],
+                            args[3])
             end
         end
 
-        def info_all()
-            return info_filter(VM_POOL_METHODS[:info],
-                               INFO_ALL,
-                               -1,
-                               -1,
-                               INFO_NOT_DONE)
-        end
+        # Define info methods shortcuts for different filters
+        # info_all() 
+        # info_all!()
+        # info_all_extended 
+        # info_all_extended!()
+        # info_mine() 
+        # info_mine!()
+        # info_mine_extended 
+        # info_mine_extended!()
+        # info_group() 
+        # info_group!()
+        # info_group_extended 
+        # info_group_extended!()
+        # info_primary_group() 
+        # info_primary_group!()
+        # info_primary_group_extended 
+        # info_primary_group_extended!()
+        %w[mine all group primary_group].each do |ifilter|
+            const_name = "OpenNebula::Pool::INFO_#{ifilter.upcase}"
+
+            define_method("info_#{ifilter}") do
+                info_filter(VM_POOL_METHODS[:info],
+                            Object.const_get(const_name), -1, -1,INFO_NOT_DONE)
+            end
 
-        def info_mine()
-            return info_filter(VM_POOL_METHODS[:info],
-                               INFO_MINE,
-                               -1,
-                               -1,
-                               INFO_NOT_DONE)
-        end
+            define_method("info_#{ifilter}_extended") do
+                info_filter(VM_POOL_METHODS[:info_extended],
+                            Object.const_get(const_name), -1, -1,
+                            INFO_NOT_DONE)
+            end
 
-        def info_group()
-            return info_filter(VM_POOL_METHODS[:info],
-                               INFO_GROUP,
-                               -1,
-                               -1,
-                               INFO_NOT_DONE)
+            alias_method "info_#{ifilter}!".to_sym, "info_#{ifilter}".to_sym
+            alias_method "info_#{ifilter}_extended!".to_sym, "info_#{ifilter}_extended".to_sym
         end
 
         def info_search(args = {})
@@ -121,21 +135,24 @@ module OpenNebula
                 :start_id => -1,
                 :end_id   => -1,
                 :state    => INFO_NOT_DONE,
-                :query    => ""
+                :query    => "",
+                :extended => false
             }.merge!(args)
 
-            return info_filter(VM_POOL_METHODS[:info],
-                               default_args[:who],
-                               default_args[:start_id],
-                               default_args[:end_id],
-                               default_args[:state],
-                               default_args[:query])
+            if args[:extended]
+                method = VM_POOL_METHODS[:info_extended]
+            else
+                method = VM_POOL_METHODS[:info]
+            end
+
+            info_filter(method,
+                        default_args[:who],
+                        default_args[:start_id],
+                        default_args[:end_id],
+                        default_args[:state],
+                        default_args[:query])
         end
 
-        alias_method :info!, :info
-        alias_method :info_all!, :info_all
-        alias_method :info_mine!, :info_mine
-        alias_method :info_group!, :info_group
 
         # Retrieves the monitoring data for all the VMs in the pool
         #

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula
 version: !ruby/object:Gem::Version
-  version: 5.8.0
+  version: 5.8.1
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-26 00:00:00.000000000 Z
+date: 2019-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri