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

B #2284: Added test to check quota assignment

Browse Source
This commit is contained in:
juanmont 2018-07-20 11:23:30 +02:00 committed by Ruben S. Montero
parent 6de65d6667
commit 547ef24f59
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/um/Quota.cc
View File

@ -372,10 +372,13 @@ int Quota::update_limits(
{
limit = va->vector_value_str(metrics[i], limit_f);
if (( limit_f == -1 && limit == "" ) // NaN
||
if (limit == "")
{
limit_f = DEFAULT;
}
// Negative. Default & unlimited allowed
( !is_default && limit_f < 0 && limit_f != UNLIMITED && limit_f != DEFAULT )
if (( !is_default && limit_f < 0 && limit_f != UNLIMITED && limit_f != DEFAULT )
||
// Negative. Unlimited allowed
( is_default && limit_f < 0 && limit_f != UNLIMITED )
@ -408,10 +411,13 @@ VectorAttribute * Quota::new_quota(VectorAttribute * va)
limit = va->vector_value_str(metrics[i], limit_f);
if (( limit_f == -1 && limit == "" ) // NaN
||
if (limit == "")
{
limit_f = DEFAULT;
limit = DEFAULT_STR;
}
// Negative. Default & unlimited allowed
( !is_default && limit_f < 0 && limit_f != UNLIMITED && limit_f != DEFAULT )
if (( !is_default && limit_f < 0 && limit_f != UNLIMITED && limit_f != DEFAULT )
||
// Negative. Unlimited allowed
( is_default && limit_f < 0 && limit_f != UNLIMITED )