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

Feature #2565: New special cluster ID, 10, adds ACL rule *

Browse Source 
This allows the admin to assign all resources from a zone
to a group
This commit is contained in:
Carlos Martín 2013-12-20 17:21:47 +01:00
parent b3e070be08
commit 402eee32ef
3 changed files with 44 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/ClusterPool.h
View File

@ -44,6 +44,12 @@ public:
*/
static const int NONE_CLUSTER_ID;
/**
* Special ID to refer to all OpenNebula resources, from any cluster
* or in cluster none (* in ACL rules).
*/
static const int ALL_RESOURCES;
/* ---------------------------------------------------------------------- */
/* Methods for DB management */
/* ---------------------------------------------------------------------- */

1
src/cluster/ClusterPool.cc
View File

@ -28,6 +28,7 @@
const string ClusterPool::NONE_CLUSTER_NAME = "";
const int ClusterPool::NONE_CLUSTER_ID = -1;
const int ClusterPool::ALL_RESOURCES = 10;
/* -------------------------------------------------------------------------- */
/* -------------------------------------------------------------------------- */

53
src/rm/RequestManagerGroup.cc
View File

@ -115,15 +115,18 @@ void GroupEditProvider::request_execute(
return;
}
rc = get_info(clpool, cluster_id, PoolObjectSQL::CLUSTER,
att, cluster_perms, cluster_name);
// TODO: If cluster does not exist, it may be that the cluster was deleted
// and we should allow to delete the resource provider.
if ( rc == -1 )
if (cluster_id != ClusterPool::ALL_RESOURCES)
{
return;
rc = get_info(clpool, cluster_id, PoolObjectSQL::CLUSTER,
att, cluster_perms, cluster_name);
// TODO: If cluster does not exist, it may be that the cluster was deleted
// and we should allow to delete the resource provider.
if ( rc == -1 )
{
return;
}
}
if ( att.uid != 0 )
@ -194,13 +197,23 @@ int GroupAddProvider::edit_acl_rules(
{
int rc = 0;
long long mask_prefix;
if (cluster_id == ClusterPool::ALL_RESOURCES)
{
mask_prefix = AclRule::ALL_ID;
}
else
{
mask_prefix = AclRule::CLUSTER_ID | cluster_id;
}
// @<gid> HOST/%<cid> MANAGE
rc += aclm->add_rule(
AclRule::GROUP_ID |
group_id,
AclRule::CLUSTER_ID |
cluster_id |
mask_prefix |
PoolObjectSQL::HOST,
AuthRequest::MANAGE,
@ -212,8 +225,7 @@ int GroupAddProvider::edit_acl_rules(
AclRule::GROUP_ID |
group_id,
AclRule::CLUSTER_ID |
cluster_id |
mask_prefix |
PoolObjectSQL::DATASTORE |
PoolObjectSQL::NET,
@ -246,13 +258,23 @@ int GroupDelProvider::edit_acl_rules(
{
int rc = 0;
long long mask_prefix;
if (cluster_id == ClusterPool::ALL_RESOURCES)
{
mask_prefix = AclRule::ALL_ID;
}
else
{
mask_prefix = AclRule::CLUSTER_ID | cluster_id;
}
// @<gid> HOST/%<cid> MANAGE
rc += aclm->del_rule(
AclRule::GROUP_ID |
group_id,
AclRule::CLUSTER_ID |
cluster_id |
mask_prefix |
PoolObjectSQL::HOST,
AuthRequest::MANAGE,
@ -264,8 +286,7 @@ int GroupDelProvider::edit_acl_rules(
AclRule::GROUP_ID |
group_id,
AclRule::CLUSTER_ID |
cluster_id |
mask_prefix |
PoolObjectSQL::DATASTORE |
PoolObjectSQL::NET,