shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2024-12-23 17:33:56 +03:00
Code Releases Wiki Activity

Merge branch 'master' of git.opennebula.org:one

Browse Source
This commit is contained in:
Ruben S. Montero 2014-03-04 12:02:47 +01:00
commit 253d75ef0b
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cli/one_helper/onezone_helper.rb
View File

@ -43,11 +43,11 @@ class OneZoneHelper < OpenNebulaHelper::OneHelper
d["NAME"]
end
column :ENDPOINT, "Endpoint of the Zone", :left, :size=>50 do |d|
column :ENDPOINT, "Endpoint of the Zone", :left, :size=>45 do |d|
d["TEMPLATE"]['ENDPOINT']
end
default :ID, :NAME, :ENDPOINT
default :CURRENT, :ID, :NAME, :ENDPOINT
end
table

18
src/group/Group.cc
View File

@ -371,6 +371,11 @@ int Group::add_resource_provider(int zone_id, int cluster_id, string& error_msg)
error_msg);
if (rc < 0)
{
NebulaLog::log("GROUP",Log::ERROR,error_msg);
}
// @<gid> DATASTORE+NET/%<cid> USE #<zone>
rc += aclm->add_rule(
AclRule::GROUP_ID |
@ -387,9 +392,9 @@ int Group::add_resource_provider(int zone_id, int cluster_id, string& error_msg)
error_msg);
if (rc != 0)
if (rc < 0)
{
return -1;
NebulaLog::log("GROUP",Log::ERROR,error_msg);
}
return 0;
@ -436,6 +441,11 @@ int Group::del_resource_provider(int zone_id, int cluster_id, string& error_msg)
error_msg);
if (rc < 0)
{
NebulaLog::log("GROUP",Log::ERROR,error_msg);
}
// @<gid> DATASTORE+NET/%<cid> USE #<zid>
rc += aclm->del_rule(
AclRule::GROUP_ID |
@ -452,9 +462,9 @@ int Group::del_resource_provider(int zone_id, int cluster_id, string& error_msg)
error_msg);
if (rc != 0)
if (rc < 0)
{
return -1;
NebulaLog::log("GROUP",Log::ERROR,error_msg);
}
return 0;