From 19d9de001af2700e35f77daf3d089f64062693ca Mon Sep 17 00:00:00 2001 From: Jorge Lobo Date: Fri, 10 May 2019 15:10:22 +0200 Subject: [PATCH] B #3308: VM custom attributes for some hypervisors are not in the body Signed-off-by: Jorge Lobo --- src/oca/ruby/opennebula/pool.rb | 3 +-- src/sunstone/models/SunstoneServer.rb | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/oca/ruby/opennebula/pool.rb b/src/oca/ruby/opennebula/pool.rb index d2e668c3dfd..6e4f5d0a721 100644 --- a/src/oca/ruby/opennebula/pool.rb +++ b/src/oca/ruby/opennebula/pool.rb @@ -186,7 +186,7 @@ def get_hash(size=nil, extended=nil) allow_paginated = PAGINATED_POOLS.include?(@pool_name) if OpenNebula.pool_page_size && allow_paginated && - ( ( size && size >= 2 ) || !size ) + ( ( size && size >= 2 ) || !size ) && !extended size = OpenNebula.pool_page_size if !size hash = info_paginated(size) @@ -197,7 +197,6 @@ def get_hash(size=nil, extended=nil) else if extended rc = info_search(:extended => true) - File.open('/tmp/test', 'w') { |file| file.write(rc) } else rc = info end diff --git a/src/sunstone/models/SunstoneServer.rb b/src/sunstone/models/SunstoneServer.rb index 94b7392cb0d..88f2cb7c0a7 100644 --- a/src/sunstone/models/SunstoneServer.rb +++ b/src/sunstone/models/SunstoneServer.rb @@ -67,8 +67,7 @@ def get_pool(kind,user_flag, client=nil) end if kind == "vm" - rc = pool.get_hash(nil,true); - File.open("/tmp/test", 'w') { |file| file.write(rc) } + rc = pool.get_hash(nil,$conf[:get_extended_vm_info]; else rc = pool.get_hash end