From 9a35070ad2488361d987ba50e300b5d6c9b3ad15 Mon Sep 17 00:00:00 2001 From: SamKirsch10 Date: Mon, 20 Jul 2015 11:59:24 -0600 Subject: [PATCH] transform bug fixes in mysql clause and in get single transform --- .../repositories/mysql/transforms_repository.py | 2 +- monasca_events_api/v2/transforms.py | 15 +-------------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/monasca_events_api/common/repositories/mysql/transforms_repository.py b/monasca_events_api/common/repositories/mysql/transforms_repository.py index e5fa655..42f15f3 100644 --- a/monasca_events_api/common/repositories/mysql/transforms_repository.py +++ b/monasca_events_api/common/repositories/mysql/transforms_repository.py @@ -79,7 +79,7 @@ class TransformsRepository(mysql_repository.MySQLRepository, def list_transform(self, tenant_id, transform_id): base_query = """select * from event_transform where deleted_at IS NULL""" tenant_id_clause = " and tenant_id = \"{}\"".format(tenant_id) - transform_id_clause = " and transform_id = \"{}\"".format(transform_id) + transform_id_clause = " and id = \"{}\"".format(transform_id) query = (base_query+ tenant_id_clause+ diff --git a/monasca_events_api/v2/transforms.py b/monasca_events_api/v2/transforms.py index 89cbba3..cfd87a9 100644 --- a/monasca_events_api/v2/transforms.py +++ b/monasca_events_api/v2/transforms.py @@ -174,26 +174,13 @@ class Transforms(transforms_api_v2.TransformsV2API): raise falcon.HTTPInternalServerError('Service unavailable', ex.message) - def _list_transform(self, tenant_id, transform_id, uri): - try: - transform = self._transforms_repo.list_transform(tenant_id, - transform_id)[0] - return transform - except repository_exceptions.RepositoryException as ex: - LOG.error(ex) - raise falcon.HTTPInternalServerError('Service unavailable', - ex.message) - def _list_transform(self, tenant_id, transform_id, uri): try: transform = self._transforms_repo.list_transform(tenant_id, transform_id)[0] transform['specification'] = yaml.safe_dump( transform['specification']) - transform_list = list() - transform_list.append(transform) - transform_list = helpers.paginate(transform, uri) - return json.dumps(transform_list, cls=MyEncoder) + return transform except repository_exceptions.RepositoryException as ex: LOG.error(ex) raise falcon.HTTPInternalServerError('Service unavailable',