From 11b23c432b2abc7964939f8360ecb3b0faac71d5 Mon Sep 17 00:00:00 2001 From: Jorge Lobo <47326048+jloboescalona2@users.noreply.github.com> Date: Fri, 10 May 2019 18:52:41 +0200 Subject: [PATCH] B #3308: Extended info conf attribute (#3325) New Sunstone attribute to pull extended pool info from oned Signed-off-by: Jorge Lobo (cherry picked from commit 20fc6d29b0b518f608fd7dc42f36de0d3ef92586) --- src/oca/ruby/opennebula/virtual_machine_pool.rb | 7 +++++++ src/sunstone/models/SunstoneServer.rb | 8 ++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/oca/ruby/opennebula/virtual_machine_pool.rb b/src/oca/ruby/opennebula/virtual_machine_pool.rb index 35617e5a23..9dd9fc75bc 100644 --- a/src/oca/ruby/opennebula/virtual_machine_pool.rb +++ b/src/oca/ruby/opennebula/virtual_machine_pool.rb @@ -50,6 +50,13 @@ module OpenNebula @user_id = user_id end + # Get info extended VM + def get_hash_extended + rc = info_search(:extended => true) + return rc if OpenNebula.is_error?(rc) + to_hash + end + # Default Factory Method for the Pools def factory(element_xml) OpenNebula::VirtualMachine.new(element_xml,@client) diff --git a/src/sunstone/models/SunstoneServer.rb b/src/sunstone/models/SunstoneServer.rb index 1e938f71b4..29d06cce9c 100644 --- a/src/sunstone/models/SunstoneServer.rb +++ b/src/sunstone/models/SunstoneServer.rb @@ -65,8 +65,12 @@ class SunstoneServer < CloudServer error = Error.new("Error: #{kind} resource not supported") return [404, error.to_json] end - - rc = pool.get_hash + + if kind == "vm" && $conf[:get_extended_vm_info] + rc = pool.get_hash_extended + else + rc = pool.get_hash + end if OpenNebula.is_error?(rc) return [500, rc.to_json]