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

B #2402: Changed restricted_attribute fuction to return a boolean

Browse Source
This commit is contained in:
juanmont 2018-09-11 11:47:39 +02:00 committed by Ruben S. Montero
parent 58af3b5ec9
commit a28b6b449b
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/template/Template.cc
View File

@ -696,15 +696,16 @@ void Template::parse_restricted(const vector<const SingleAttribute *>& ras,
/* -------------------------------------------------------------------------- */
/* -------------------------------------------------------------------------- */
static void restricted_values(const string& vname, const set<string>& vsubs,
static bool restricted_values(const string& vname, const set<string>& vsubs,
const Template* tmpl, vector<string>& rstrings)
{
string value;
bool exists;
vector<const VectorAttribute *>::const_iterator va_it;
vector<const VectorAttribute *> va;
tmpl->get(vname, va);
exists = tmpl->get(vname, va);
for ( va_it = va.begin(); va_it != va.end() ; ++va_it )
{
@ -718,6 +719,8 @@ static void restricted_values(const string& vname, const set<string>& vsubs,
}
sort(rstrings.begin(), rstrings.end());
return exists;
}
bool Template::check_restricted(string& ra, const Template* base,
@ -730,11 +733,12 @@ bool Template::check_restricted(string& ra, const Template* base,
if (!(rit->second).empty())
{
vector<string> rvalues, rvalues_base;
bool has_restricted;
restricted_values(rit->first, rit->second, this, rvalues);
has_restricted = restricted_values(rit->first, rit->second, this, rvalues);
restricted_values(rit->first, rit->second, base, rvalues_base);
if ( rvalues != rvalues_base && !rvalues.empty())
if ( rvalues != rvalues_base && has_restricted)
{
ra = rit->first;
return true;