From 744eee2a8483831d84801e073a4985271db2f3dd Mon Sep 17 00:00:00 2001 From: Serg Melikyan Date: Sun, 1 Jun 2014 17:28:38 +0400 Subject: [PATCH] Fix issue with package loader Pagination for Catalog API was introduced in change If71da70fa835a1ee7a271ebf7238c0a4c64d4123 but package loader was not updated to handle changed result type for call to GET /catalog/packages Change-Id: If79efe560801bb33a36e2b0032a71cdbe191fb03 Closes-bug: #1325365 --- murano/engine/package_loader.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/murano/engine/package_loader.py b/murano/engine/package_loader.py index 27c4c84d8..52ea059de 100644 --- a/murano/engine/package_loader.py +++ b/murano/engine/package_loader.py @@ -130,13 +130,14 @@ class ApiPackageLoader(PackageLoader): def _get_definition(self, filter_opts): try: packages = self._client.packages.filter(**filter_opts) - if not packages: + try: + return packages.next() + except StopIteration: LOG.debug('There are no packages matching filter ' '{0}'.format(filter_opts)) # TODO(smelikyan): This exception should be replaced with one # defined in python-muranoclient raise LookupError() - return packages[0] except muranoclient_exc.HTTPException: LOG.debug('Failed to get package definition from repository') raise LookupError()