Bypass cache for LCM of cloud region

Cache only the resource uri without query string.
Bypass the cache for LCM of a cloud region,which enhance the resilience
in case mismatch between AAI and cache

Change-Id: I57fd7981753d5959757401cea69f6fabd1874e25
Issue-ID: MULTICLOUD-968
Signed-off-by: Bin Yang <bin.yang@windriver.com>

1 files changed, 13 insertions, 6 deletions

diff --git a/share/common/utils/aai_cache.py b/share/common/utils/aai_cache.py
index 62545df6..c2e8e034 100644
--- a/share/common/utils/aai_cache.py
+++ b/share/common/utils/aai_cache.py
@@ -17,11 +17,14 @@ logger = logging.getLogger(__name__)
 
 # note: memcached key length should be < 250, the value < 1MB
 
+
 def flush_cache_by_url(resource_url):
     try:
-        cache.delete("AAI_" + resource_url)
+        # this is to invalidate similar cache data blindly
+        resource_wo_query = resource_url.split("?", 1)[0]
+        cache.delete("AAI_" + resource_wo_query)
     except:
-        pass # silently drop any exception
+        pass  # silently drop any exception
 
 
 def get_cache_by_url(resource_url):
@@ -43,14 +46,18 @@ def set_cache_by_url(resource_url, resource_in_json):
         if filter_cache_by_url(resource_url):
             # cache the resource for 24 hours
             # logger.debug("Cache the resource: "+ resource_url)
-            cache.set("AAI_" + resource_url, json.dumps(resource_in_json), 3600 * 24)
+            cache.set("AAI_" + resource_url,
+                      json.dumps(resource_in_json), 3600 * 24)
     except Exception as e:
         logger.error("get_cache_by_url exception: %s" % str(e))
-        pass
+
 
 def filter_cache_by_url(resource_url):
+    # cannot cache url with query string, e.g. depth=all
+    if resource_url.find(r"?") >= 0:
+        return False
     # hardcoded filter: cloud region only
-    if resource_url.find(r"cloud-infrastructure/cloud-regions/cloud-region") > 0:
+    if resource_url.find(r"cloud-infrastructure/cloud-regions/cloud-region") >= 0:
         return True
     else:
-        return False
\ No newline at end of file
+        return False