B #3308: VM custom attributes for some hypervisors are not in the body

Signed-off-by: Jorge Lobo <jlobo@opennebula.systems>
OpenNebula · May 10, 2019 · 19d9de0 · 19d9de0 · GitCop · May 10, 2019
1 parent 87ffb06
commit 19d9de0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git 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
@@ -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