openstack/zun
Code Issues Proposed changes

Merge "Remove get_container_id functions"

Browse Source
This commit is contained in:
Jenkins 2017-01-13 16:02:29 +00:00 committed by Gerrit Code Review
commit ad5e6c9810
3 changed files with 2 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
zun/db/api.py
View File

@ -84,17 +84,6 @@ def create_container(context, values):
return dbdriver.create_container(context, values)
def get_container_by_id(context, container_id):
"""Return a container.
:param context: The security context
:param container_uuid: The uuid of a container.
:returns: A container.
"""
dbdriver = get_instance()
return dbdriver.get_container_by_id(context, container_id)
def get_container_by_uuid(context, container_uuid):
"""Return a container.

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

@ -174,15 +174,6 @@ class Connection(object):
value=values['uuid'])
return container
def get_container_by_id(self, context, container_id):
query = model_query(models.Container)
query = self._add_tenant_filters(context, query)
query = query.filter_by(id=container_id)
try:
return query.one()
except NoResultFound:
raise exception.ContainerNotFound(container=container_id)
def get_container_by_uuid(self, context, container_uuid):
query = model_query(models.Container)
query = self._add_tenant_filters(context, query)

13
zun/tests/unit/db/test_container.py
View File

@ -50,12 +50,6 @@ class DbContainerTestCase(base.DbTestCase):
utils.create_test_container(context=self.context,
uuid='123')
def test_get_container_by_id(self):
container = utils.create_test_container(context=self.context)
res = dbapi.get_container_by_id(self.context, container.id)
self.assertEqual(container.id, res.id)
self.assertEqual(container.uuid, res.uuid)
def test_create_container_already_exists_in_project_name_space(self):
CONF.set_override("unique_container_name_scope", "project",
group="compute",
@ -117,9 +111,6 @@ class DbContainerTestCase(base.DbTestCase):
self.assertEqual(container.uuid, res.uuid)
def test_get_container_that_does_not_exist(self):
self.assertRaises(exception.ContainerNotFound,
dbapi.get_container_by_id,
self.context, 99)
self.assertRaises(exception.ContainerNotFound,
dbapi.get_container_by_uuid,
self.context,
@ -185,8 +176,8 @@ class DbContainerTestCase(base.DbTestCase):
container = utils.create_test_container(context=self.context)
dbapi.destroy_container(self.context, container.id)
self.assertRaises(exception.ContainerNotFound,
dbapi.get_container_by_id,
self.context, container.id)
dbapi.get_container_by_uuid,
self.context, container.uuid)
def test_destroy_container_by_uuid(self):
container = utils.create_test_container(context=self.context)