Rework the SDC cache

Rework the SDC cache used during the integration tests as it was not
working on windows

Issue-ID: CLAMP-85
Change-Id: I56f19e7dc5e817a21714c4a19609c1de8e76e8dc
Signed-off-by: Determe, Sebastien (sd378r) <sd378r@intl.att.com>

7 files changed, 4 insertions, 1 deletions

diff --git a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources?resourceType=CVFC/.file b/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources?resourceType=CVFC/.file
index 7115df3f..7115df3f 100644
--- a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources?resourceType=CVFC/.file
+++ b/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources?resourceType=CVFC/.file
diff --git a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources?resourceType=CVFC/.header b/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources?resourceType=CVFC/.header
index e7f1e849..e7f1e849 100644
--- a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources?resourceType=CVFC/.header
+++ b/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources?resourceType=CVFC/.header
diff --git a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources?resourceType=VF/.file b/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources?resourceType=VF/.file
index 253046a9..253046a9 100644
--- a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources?resourceType=VF/.file
+++ b/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources?resourceType=VF/.file
diff --git a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources?resourceType=VF/.header b/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources?resourceType=VF/.header
index ff1f54a0..ff1f54a0 100644
--- a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources?resourceType=VF/.header
+++ b/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources?resourceType=VF/.header
diff --git a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources?resourceType=VFC/.file b/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources?resourceType=VFC/.file
index a99aa44d..a99aa44d 100644
--- a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources?resourceType=VFC/.file
+++ b/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources?resourceType=VFC/.file
diff --git a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources?resourceType=VFC/.header b/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources?resourceType=VFC/.header
index 6a280d97..6a280d97 100644
--- a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources?resourceType=VFC/.header
+++ b/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources?resourceType=VFC/.header
diff --git a/src/test/resources/http-cache/sdc_proxy.py b/src/test/resources/http-cache/sdc_proxy.py
index 301e7af9..45dac413 100644..100755
--- a/src/test/resources/http-cache/sdc_proxy.py
+++ b/src/test/resources/http-cache/sdc_proxy.py
@@ -91,6 +91,9 @@ class Proxy(SimpleHTTPServer.SimpleHTTPRequestHandler):
         self.check_credentials()
 
         cached_file = '%s/%s' % (CACHE_ROOT, self.path,)
+        print("Cached file name before escaping : %s" % cached_file)
+        cached_file = cached_file.replace('<','&#60;').replace('>','&#62;').replace('?','&#63;').replace('*','&#42;').replace('\\','&#42;').replace(':','&#58;').replace('|','&#124;')
+        print("Cached file name after escaping (used for cache storage) : %s" % cached_file)
         cached_file_content = "%s/.file" % (cached_file,)
         cached_file_header = "%s/.header" % (cached_file,)
 
@@ -100,7 +103,7 @@ class Proxy(SimpleHTTPServer.SimpleHTTPRequestHandler):
             return "404 Not found"
 
         if not _file_available:
-            print("Request for not cached file : %s" % (cached_file,))
+            print("SDC Request for data currently not present in cache: %s" % (cached_file,))
             url = '%s%s' % (SDC_HOST, self.path)
             response = requests.get(url, auth=SDC_AUTH, headers=SDC_HEADERS, stream=True)