openstack/neutron
Code Issues Proposed changes

Merge "Remove redundant implementation of "get_projects" in NetworkRBAC"

Browse Source
This commit is contained in:
Zuul
2020-04-25 19:48:53 +00:00
committed by Gerrit Code Review
parent 09ef333be3 94bb20fb65
commit 111c0b4d91
1 changed files with 0 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
neutron/objects/network.py
View File

@@ -19,7 +19,6 @@ from neutron_lib.objects import common_types
from oslo_utils import versionutils from oslo_utils import versionutils
from oslo_versionedobjects import exception from oslo_versionedobjects import exception
from oslo_versionedobjects import fields as obj_fields from oslo_versionedobjects import fields as obj_fields
import sqlalchemy as sa
from neutron.db.models import dns as dns_models from neutron.db.models import dns as dns_models
from neutron.db.models import external_net as ext_net_model from neutron.db.models import external_net as ext_net_model
@@ -54,22 +53,6 @@ class NetworkRBAC(rbac.RBACBaseObject):
for f in standard_fields: for f in standard_fields:
primitive.pop(f, None) primitive.pop(f, None)
@classmethod
def get_projects(cls, context, object_id=None, action=None,
target_tenant=None):
clauses = []
if object_id:
clauses.append(rbac_db_models.NetworkRBAC.object_id == object_id)
if action:
clauses.append(rbac_db_models.NetworkRBAC.action == action)
if target_tenant:
clauses.append(rbac_db_models.NetworkRBAC.target_tenant ==
target_tenant)
query = context.session.query(rbac_db_models.NetworkRBAC.target_tenant)
if clauses:
query = query.filter(sa.and_(*clauses))
return [data[0] for data in query]
@base.NeutronObjectRegistry.register @base.NeutronObjectRegistry.register
class NetworkDhcpAgentBinding(base.NeutronDbObject): class NetworkDhcpAgentBinding(base.NeutronDbObject):