openstack
/
nova
Code Issues Proposed changes

Merge "Remove unused db.security_group_rule_get_by_security_group_grantee()"

This commit is contained in:
Jenkins 2015-08-25 10:51:05 +00:00 committed by Gerrit Code Review
parent c49093866e 861309b44b
commit fba42b465f
3 changed files with 0 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nova/db/api.py
View File

@ -1302,13 +1302,6 @@ def security_group_rule_get_by_security_group(context, security_group_id,
context, security_group_id, columns_to_join=columns_to_join)
def security_group_rule_get_by_security_group_grantee(context,
security_group_id):
"""Get all rules that grant access to the given security group."""
return IMPL.security_group_rule_get_by_security_group_grantee(context,
security_group_id)
def security_group_rule_destroy(context, security_group_rule_id):
"""Deletes a security group rule."""
return IMPL.security_group_rule_destroy(context, security_group_rule_id)

9
nova/db/sqlalchemy/api.py
View File

@ -4282,15 +4282,6 @@ def security_group_rule_get_by_security_group(context, security_group_id,
return query.all()
@require_context
def security_group_rule_get_by_security_group_grantee(context,
security_group_id):
return (_security_group_rule_get_query(context).
filter_by(group_id=security_group_id).
all())
@require_context
def security_group_rule_create(context, values):
return _security_group_rule_create(context, values)

9
nova/tests/unit/db/test_db_api.py
View File

@ -1619,15 +1619,6 @@ class SecurityGroupRuleTestCase(test.TestCase, ModelsObjectComparatorMixin):
def test_security_group_rule_get_by_security_group_no_joins(self):
self._test_security_group_rule_get_by_security_group(columns=[])
def test_security_group_rule_get_by_security_group_grantee(self):
security_group = self._create_security_group({})
security_group_rule = self._create_security_group_rule(
{'grantee_group': security_group})
rules = db.security_group_rule_get_by_security_group_grantee(self.ctxt,
security_group['id'])
self.assertEqual(len(rules), 1)
self.assertEqual(rules[0]['id'], security_group_rule['id'])
def test_security_group_rule_destroy(self):
self._create_security_group({'name': 'fake1'})
self._create_security_group({'name': 'fake2'})