shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-22 18:50:08 +03:00
Code Releases Wiki Activity

feature #696: Fixes minor bugs

Browse Source
This commit is contained in:
Ruben S. Montero 2011-06-24 18:43:20 +02:00
parent 953c02c792
commit 7e7c2451ec
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/oca/ruby/OpenNebula/Pool.rb
View File

@ -22,11 +22,6 @@ module OpenNebula
include Enumerable
protected
# Constants for info queries (include/RequestManagerPoolInfoFilter.h)
INFO_GROUP = -1
INFO_ALL = -2
INFO_MINE = -3
#pool:: _String_ XML name of the root element
#element:: _String_ XML name of the Pool elements
#client:: _Client_ represents a XML-RPC connection
@ -93,6 +88,10 @@ module OpenNebula
end
public
# Constants for info queries (include/RequestManagerPoolInfoFilter.h)
INFO_GROUP = -1
INFO_ALL = -2
INFO_MINE = -3
# Iterates over every PoolElement in the Pool and calls the block with a
# a PoolElement obtained calling the factory method

10
src/rm/RequestManagerPoolInfoFilter.cc
View File

@ -68,7 +68,12 @@ void RequestManagerPoolInfoFilter::request_execute(xmlrpc_c::paramList const& pa
if ( start_id != -1 )
{
where_string << "AND ( oid >= " << start_id;
if (filter_flag != ALL)
{
where_string << " AND ";
}
where_string << "( oid >= " << start_id;
if ( end_id != -1 )
{
@ -84,7 +89,8 @@ void RequestManagerPoolInfoFilter::request_execute(xmlrpc_c::paramList const& pa
{
return;
}
auth_object = AuthRequest::VM;
// Call the template pool dump
rc = pool->dump(oss,where_string.str());