From 4c6978aedcfcf112ab977602e6649bf33264df74 Mon Sep 17 00:00:00 2001
From: Martin Korbel <mkorbel@redhat.com>
Date: Thu, 8 Feb 2018 14:17:55 +0100
Subject: [PATCH] Fix image list

---
 .travis.yml         |  5 +++--
 vminute/__init__.py |  2 +-
 vminute/vminute.py  | 13 +++++++++++--
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ee5e7a3..f2f563b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,10 +15,11 @@ deploy:
 - provider: pypi
   skip_cleanup: true
   distributions: "sdist"
-  user: rdrazny
+  user: BlackSmith
   password:
-    secure: "YoUVrooz8gKCc+gmrbckyCrJVpcryYkRvnLTCK9tjGjdIGNrC7DtJcNkgtweD5HuZ4VGD9K9RJN9koMukV6LAIMNwQvscZQyUz79LSivCFHL3766Pp/P7TX7JeNybHvDcdZKw1vyI/5nzYeY2y9KOvyuIsAi3sTTQukyGMLA6yXYDaMWhPzPVyM/llFZkFdCyKpu3syLj+vfRgOYk+jlUXamsOh+jMy/L21tf3LGWNX0Fon/taUPAF7r294MuK3+MGIrzxjrV+H3L8DcKsOulDBRgijZpUylDAJyqKFYGHJBACldgqJinL7OUxMpqKCwTDmStYCwil2VSxY3ot1xE+lDmTVbfPG3G/zo4owjn3hVJ4xMva2iNb5RU+SDC/pJdg2r7VfdfcU1Zpo1g12s1J+UyCJLIXHy7fEikSO8eMX1F+EqIeabbWqJfqb5KQZ4xLo+EtMM0NWpsAuYozrdyiP9X+niRv/QhYGkaDBvvMQPIosR+utKHYDDZ8dWgYsOgxqOquyO4bSGfLhNtuGZQ4h3FhkhjwjLXAjHxLSfdUzpJ4+Zkf1PqKIWA2WUeKHUxG7UZM4gnu3qoBU1ihDJitLxv3UpRO+e1CAWD33Br2Y/cdcvZnkD9E7QhqiVR/STVzhLdPM/NiZMv4J+ucqn7OyWo/cvYUrDbmR/FDaEZZg="
+    secure: ES8mpWwlZ8QchOgSwJhjdOrSY0BcG5hWWJ+1us7jy5jxuCbZazHP6AvUkTAamaZGrcIUdlJ/eDK3XjRfGNwhHkUyZEbBZshXBvpFmFgCK5yu7f+JV3c1oHBMBgF+FR5j5zOsu/yCGrQ5hEBZ1G1l6Mcp665qc5WZxJGIzzGkQ/0erfOdIhcR6n8wMIUDes7z9rKvEJNGkKSM7P8e3JPmzf8JHFMScYsj5TixkM4XAxp7vSefobUtzhVv/i6eBAPCRW996kIWu/kLHxQgQp4z3YIlnrDPWM8DY13TnNJD6BIF3bPb0I3wp/wP8yKB3tjvD9fn0JOGFC6gUv8yU2SK0oHs4TwRMdRuSc5/c1jxzyyYFNMNsS8xFh6tC8GmLGNKPHvyuZ10hAX0nWvpJmxCVV/JPYNCsAqgHympGRVY6MXuUvUlNeIwLXJuNiqEhuJXKkkWbYQ0lNJed5x7tgDfUrCjk5P7UTfiaJKcNW40Ow5hz7wDkD/cwlYOhHXAK8ebdrQv872f+G4Tn4/Gbv2yQR+jxQYtAiYPDnnW/2EZLQnttzivi7SJaQbr8pDGueBvBroxq4DRJFGH8zb8zfOuIvmV8CZf7UqsuDtlYyUW9kB4nEppGnhcRSK3Hs5m620j0tR//V0+Tw4lHOGeD+FlgK04T6horuhPQUihWJpZG5A=
   on:
     tags: true
+    all_branches: true
 #    condition: $TRAVIS_PYTHON_VERSION = 3.6
 #    branch: master    
diff --git a/vminute/__init__.py b/vminute/__init__.py
index 434e872..da5a555 100644
--- a/vminute/__init__.py
+++ b/vminute/__init__.py
@@ -2,7 +2,7 @@
 
 from .vminute import main
 import sys
-__version__ = "0.2.26"
+__version__ = "0.2.27"
 
 
 def main_main():
diff --git a/vminute/vminute.py b/vminute/vminute.py
index 6156052..deb0bf4 100755
--- a/vminute/vminute.py
+++ b/vminute/vminute.py
@@ -427,16 +427,24 @@ def help(self):
 
 
 class ImagesClass(BaseClass):
-    __filter = r"^(5minute-|%s-)" % USER
+    __filter = None
+    __default_filter = r"^(5minute-|%s-)" % USER
 
     @catch_exception("Problem getting the list of images.")
     def __images(self):
+        # This is time optimalization, it is 5-times faster.
+        ff = {}
+        if self.__filter == self.__default_filter:
+            # Call simple method for create session object
+            self.nova.api_version.is_null()
+            ff = {'filters': {'owner': os.environ.get('OS_TENANT_ID')}}
+
         # Somewhere between novaclient version 6 and
         # version 9, images was deprecated and replaced
         # with glance.  If glance exists, use it.
         # Otherwise fall back to the legacy images.
         try:
-            images = self.nova.glance.list()
+            images = self.glance.images.list(**ff)
         except AttributeError:
             images = self.nova.images.list()
         x = PrettyTable(["Name", "ID", "Status"])
@@ -449,6 +457,7 @@ def __images(self):
         print((x.get_string(sortby="Name")))
 
     def cmd(self, argv):
+        self.__filter = self.__default_filter
         if len(argv) > 0:
             if argv[0] in ('help', '--help', '-h'):
                 self.help()