From f2924bedfe0b318087df3d444f083d06d23bdb87 Mon Sep 17 00:00:00 2001 From: Kevin Zhao Date: Fri, 13 Jan 2017 15:40:32 +0800 Subject: [PATCH] Remove get_container_id functions Remove get_container_id function since it hasn't been used anymore. Related-bug: #1655835 Change-Id: I2bd3e83f44db2a45ba55004ba0ac6800e6ca742c Signed-off-by: Kevin Zhao --- zun/db/api.py | 11 ----------- zun/db/sqlalchemy/api.py | 9 --------- zun/tests/unit/db/test_container.py | 13 ++----------- 3 files changed, 2 insertions(+), 31 deletions(-) diff --git a/zun/db/api.py b/zun/db/api.py index 666be1205..5f4828ee0 100644 --- a/zun/db/api.py +++ b/zun/db/api.py @@ -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. diff --git a/zun/db/sqlalchemy/api.py b/zun/db/sqlalchemy/api.py index eab7e5688..7e9b73275 100644 --- a/zun/db/sqlalchemy/api.py +++ b/zun/db/sqlalchemy/api.py @@ -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) diff --git a/zun/tests/unit/db/test_container.py b/zun/tests/unit/db/test_container.py index 919e50053..9cac66c60 100644 --- a/zun/tests/unit/db/test_container.py +++ b/zun/tests/unit/db/test_container.py @@ -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)