From 36b47bdb69f243fe5fe1f9f092d6769ee3fe3011 Mon Sep 17 00:00:00 2001
From: Lakshmi N Sampath <lakshmi.sampath@hp.com>
Date: Fri, 9 May 2014 15:01:39 -0700
Subject: [PATCH] Added support for image snapshots

Change-Id: I860458c8191736b567e8be11f7e3cc18effbde27
---
 graffiti/drivers/glance.py         |  2 +-
 graffiti/drivers/modules/glance.py | 27 +++++++++++++++++----------
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/graffiti/drivers/glance.py b/graffiti/drivers/glance.py
index 23bd690..b042893 100644
--- a/graffiti/drivers/glance.py
+++ b/graffiti/drivers/glance.py
@@ -23,7 +23,7 @@ class GlanceResourceDriver(base.BaseDriver):
 
     def __init__(self):
         self.resource = glance.GlanceResourceDriver()
-        self.resource_types = ["OS::Glance::Image"]
+        self.resource_types = ["OS::Glance::Image", "OS::Glance::Snapshot"]
 
     def get_resource_types(self):
         """Returns the resource types supported by the implementing driver
diff --git a/graffiti/drivers/modules/glance.py b/graffiti/drivers/modules/glance.py
index 8eaf2c3..c183035 100644
--- a/graffiti/drivers/modules/glance.py
+++ b/graffiti/drivers/modules/glance.py
@@ -109,7 +109,7 @@ class GlanceResourceDriver(base.ResourceInterface):
                     image_properties[tag_name] = utils.TAG_IDENTIFIER
 
         image = glance_client.images.get(resource.id)
-        image.update(properties=image_properties, purge_props=False)
+        image.update(properties=image_properties, purge_props=True)
 
     def find_resources(self, resource_query, auth_token,
                        endpoint_id=None, **kwargs):
@@ -121,17 +121,24 @@ class GlanceResourceDriver(base.ResourceInterface):
         :returns list of resources
         """
         resource_list = dict()
-        #TODO(Lakshmi): Filter based on resource type for snapshot etc
         if resource_query:
-            for resource_type in resource_query.resource_types:
-                glance_client = self.__get_glance_client(
-                    endpoint_id,
-                    auth_token
-                )
-                images = glance_client.images.list()
-                for image in list(images):
+            glance_client = self.__get_glance_client(
+                endpoint_id,
+                auth_token
+            )
+            images = glance_client.images.list()
+            for image in list(images):
+                #Filter based on requested resource types
+                glance_image_properties = image.properties
+                image_type = "OS::Glance::Image"
+                if "image_type" in glance_image_properties.keys():
+                    image_type = glance_image_properties['image_type']
+                    if image_type and image_type.lower() == "snapshot":
+                        image_type = "OS::Glance::Snapshot"
+
+                if image_type in resource_query.resource_types:
                     resource = self.transform_image_to_resource(
-                        resource_type,
+                        image_type,
                         image
                     )
                     resource_list[resource.id] = resource