admin/one
1
0 Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2026-11-13 16:23:17 +09:00
Code Issues Packages Projects Releases Wiki Activity

Feature #1611: Add a top level xml element to the default quota info methods

Browse Source
This commit is contained in:
Carlos Martín committed 2012-11-23 18:24:50 +01:00
1 parent a863053794
commit 38f2a8dab4
2 files changed
+38 -11
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/rm/RequestManagerSystem.cc
+35 -8
View File
@@ -61,7 +61,14 @@ void UserQuotaInfo::request_execute(xmlrpc_c::paramList const& paramList,
RequestAttributes& att)
{
string xml;
success_response(Nebula::instance().get_default_user_quota().to_xml(xml), att);
ostringstream oss;
oss << "<DEFAULT_USER_QUOTAS>"
<< Nebula::instance().get_default_user_quota().to_xml(xml)
<< "</DEFAULT_USER_QUOTAS>";
success_response(oss.str(), att);
return;
}
@@ -73,7 +80,14 @@ void GroupQuotaInfo::request_execute(xmlrpc_c::paramList const& paramList,
RequestAttributes& att)
{
string xml;
success_response(Nebula::instance().get_default_group_quota().to_xml(xml), att);
ostringstream oss;
oss << "<DEFAULT_GROUP_QUOTAS>"
<< Nebula::instance().get_default_group_quota().to_xml(xml)
<< "</DEFAULT_GROUP_QUOTAS>";
success_response(oss.str(), att);
return;
}
@@ -87,7 +101,6 @@ void QuotaUpdate::request_execute(xmlrpc_c::paramList const& paramList,
string quota_str = xmlrpc_c::value_string(paramList.getString(1));
string error_str;
Template quota_tmpl;
string xml;
int rc;
@@ -115,7 +128,7 @@ void QuotaUpdate::request_execute(xmlrpc_c::paramList const& paramList,
return;
}
success_response(get_default_quota(xml), att);
success_response(get_default_quota(), att);
return;
}
@@ -131,9 +144,16 @@ int UserQuotaUpdate::set_default_quota(Template *tmpl, string& error)
/* ------------------------------------------------------------------------- */
/* ------------------------------------------------------------------------- */
string& UserQuotaUpdate::get_default_quota(string& xml)
string UserQuotaUpdate::get_default_quota()
{
return Nebula::instance().get_default_user_quota().to_xml(xml);
string xml;
ostringstream oss;
oss << "<DEFAULT_USER_QUOTAS>"
<< Nebula::instance().get_default_user_quota().to_xml(xml)
<< "</DEFAULT_USER_QUOTAS>";
return oss.str();
}
/* ------------------------------------------------------------------------- */
@@ -147,9 +167,16 @@ int GroupQuotaUpdate::set_default_quota(Template *tmpl, string& error)
/* ------------------------------------------------------------------------- */
/* ------------------------------------------------------------------------- */
string& GroupQuotaUpdate::get_default_quota(string& xml)
string GroupQuotaUpdate::get_default_quota()
{
return Nebula::instance().get_default_group_quota().to_xml(xml);
string xml;
ostringstream oss;
oss << "<DEFAULT_GROUP_QUOTAS>"
<< Nebula::instance().get_default_group_quota().to_xml(xml)
<< "</DEFAULT_GROUP_QUOTAS>";
return oss.str();
}
/* ------------------------------------------------------------------------- */