Browse Source

Merge "Allow admin update cluster/template in any project"

changes/56/627756/3
Zuul 2 years ago
committed by Gerrit Code Review
parent
commit
309c60e527
6 changed files with 61 additions and 3 deletions
  1. +6
    -1
      magnum/api/controllers/v1/cluster.py
  2. +6
    -2
      magnum/api/controllers/v1/cluster_template.py
  3. +11
    -0
      magnum/common/policies/cluster.py
  4. +11
    -0
      magnum/common/policies/cluster_template.py
  5. +13
    -0
      magnum/tests/unit/api/controllers/v1/test_cluster.py
  6. +14
    -0
      magnum/tests/unit/api/controllers/v1/test_cluster_template.py

+ 6
- 1
magnum/api/controllers/v1/cluster.py View File

@ -416,7 +416,7 @@ class ClustersController(base.Controller):
# parameter, currently the design is allowing admin user to list
# all clusters from all projects. But the all_tenants is one of
# the condition to do project filter in DB API. And it's also used
# by periodic tasks. So the could be removed in the future and
# by periodic tasks. So this could be removed in the future and
# a new parameter 'project_id' would be added so that admin user
# can list clusters for a particular project.
context.all_tenants = True
@ -549,6 +549,11 @@ class ClustersController(base.Controller):
def _patch(self, cluster_ident, patch):
context = pecan.request.context
if context.is_admin:
policy.enforce(context, "cluster:update_all_projects",
action="cluster:update_all_projects")
context.all_tenants = True
cluster = api_utils.get_resource('Cluster', cluster_ident)
policy.enforce(context, 'cluster:update', cluster.as_dict(),
action='cluster:update')


+ 6
- 2
magnum/api/controllers/v1/cluster_template.py View File

@ -275,7 +275,7 @@ class ClusterTemplatesController(base.Controller):
# parameter, currently the design is allowing admin user to list
# all clusters from all projects. But the all_tenants is one of
# the condition to do project filter in DB API. And it's also used
# by periodic tasks. So the could be removed in the future and
# by periodic tasks. So this could be removed in the future and
# a new parameter 'project_id' would be added so that admin user
# can list clusters for a particular project.
context.all_tenants = True
@ -356,7 +356,7 @@ class ClusterTemplatesController(base.Controller):
# parameter, currently the design is allowing admin user to list
# all clusters from all projects. But the all_tenants is one of
# the condition to do project filter in DB API. And it's also used
# by periodic tasks. So the could be removed in the future and
# by periodic tasks. So this could be removed in the future and
# a new parameter 'project_id' would be added so that admin user
# can list clusters for a particular project.
context.all_tenants = True
@ -428,6 +428,10 @@ class ClusterTemplatesController(base.Controller):
ClusterTemplate.
"""
context = pecan.request.context
if context.is_admin:
policy.enforce(context, 'clustertemplate:update_all_projects',
action='clustertemplate:update_all_projects')
context.all_tenants = True
cluster_template = api_utils.get_resource('ClusterTemplate',
cluster_template_ident)
policy.enforce(context, 'clustertemplate:update',


+ 11
- 0
magnum/common/policies/cluster.py View File

@ -129,6 +129,17 @@ rules = [
}
]
),
policy.DocumentedRuleDefault(
name=CLUSTER % 'update_all_projects',
check_str=base.RULE_ADMIN_API,
description='Update an existing cluster.',
operations=[
{
'path': '/v1/clusters/{cluster_ident}',
'method': 'PATCH'
}
]
),
policy.DocumentedRuleDefault(
name=CLUSTER % 'resize',
check_str=base.RULE_DENY_CLUSTER_USER,


+ 11
- 0
magnum/common/policies/cluster_template.py View File

@ -130,6 +130,17 @@ rules = [
}
]
),
policy.DocumentedRuleDefault(
name=CLUSTER_TEMPLATE % 'update_all_projects',
check_str=base.RULE_ADMIN_API,
description='Update an existing cluster template.',
operations=[
{
'path': '/v1/clustertemplate/{clustertemplate_ident}',
'method': 'PATCH'
}
]
),
policy.DocumentedRuleDefault(
name=CLUSTER_TEMPLATE % 'publish',
check_str=base.RULE_ADMIN_API,


+ 13
- 0
magnum/tests/unit/api/controllers/v1/test_cluster.py View File

@ -504,6 +504,19 @@ class TestPatch(api_base.FunctionalTest):
self.assertEqual(400, response.status_code)
self.assertTrue(response.json['errors'])
@mock.patch("magnum.common.policy.enforce")
@mock.patch("magnum.common.context.make_context")
def test_update_cluster_as_admin(self, mock_context, mock_policy):
temp_uuid = uuidutils.generate_uuid()
obj_utils.create_test_cluster(self.context, uuid=temp_uuid)
self.context.is_admin = True
response = self.patch_json('/clusters/%s' % temp_uuid,
[{'path': '/node_count',
'value': 4,
'op': 'replace'}])
self.assertEqual('application/json', response.content_type)
self.assertEqual(202, response.status_code)
class TestPost(api_base.FunctionalTest):
def setUp(self):


+ 14
- 0
magnum/tests/unit/api/controllers/v1/test_cluster_template.py View File

@ -597,6 +597,20 @@ class TestPatch(api_base.FunctionalTest):
self.assertEqual('application/json', response.content_type)
self.assertTrue(response.json['errors'])
@mock.patch("magnum.common.policy.enforce")
@mock.patch("magnum.common.context.make_context")
def test_update_cluster_template_as_admin(self, mock_context, mock_policy):
temp_uuid = uuidutils.generate_uuid()
obj_utils.create_test_cluster_template(self.context, uuid=temp_uuid,
project_id=temp_uuid)
self.context.is_admin = True
response = self.patch_json('/clustertemplates/%s' % temp_uuid,
[{'path': '/name',
'value': 'cluster_model_example_B',
'op': 'replace'}],
expect_errors=True)
self.assertEqual(200, response.status_int)
class TestPost(api_base.FunctionalTest):


Loading…
Cancel
Save