2 files changed, 60 insertions, 9 deletions
diff --git a/runtime/src/test/resources/http-cache/example/node_template.json b/runtime/src/test/resources/http-cache/example/node_template.json
new file mode 100644
index 000000000..fdbfe8563
--- /dev/null
+++ b/runtime/src/test/resources/http-cache/example/node_template.json
@@ -0,0 +1,44 @@
+{
+  "org.onap.domain.pmsh.PMSHControlLoopDefinition": {
+    "name": "org.onap.domain.pmsh.PMSHControlLoopDefinition",
+    "version": "1.2.3",
+    "derived_from": null,
+    "metadata": {},
+    "description": "Control loop for Performance Management Subscription Handling",
+    "type": "org.onap.policy.clamp.controlloop.ControlLoop",
+    "type_version": "1.0.0",
+    "properties": {
+      "elements": [
+        {
+          "name": "org.onap.domain.pmsh.PMSH_DCAEMicroservice",
+          "version": "1.2.3"
+        },
+        {
+          "name": "org.onap.domain.pmsh.PMSH_MonitoringPolicyControlLoopElement",
+          "version": "1.2.3"
+        },
+        {
+          "name": "org.onap.domain.pmsh.PMSH_OperationalPolicyControlLoopElement",
+          "version": "1.2.3"
+        }
+      ],
+      "provider": "Ericsson"
+    },
+    "requirements": null,
+    "capabilities": null,
+    "identifier": {
+      "name": "org.onap.domain.pmsh.PMSHControlLoopDefinition",
+      "version": "1.2.3"
+    },
+    "type_identifier": {
+      "name": "org.onap.policy.clamp.controlloop.ControlLoop",
+      "version": "1.0.0"
+    },
+    "key": {
+      "name": "org.onap.domain.pmsh.PMSHControlLoopDefinition",
+      "version": "1.2.3"
+    },
+    "defined_name": "org.onap.domain.pmsh.PMSHControlLoopDefinition",
+    "defined_version": "1.2.3"
+  }
+}
diff --git a/runtime/src/test/resources/http-cache/third_party_proxy.py b/runtime/src/test/resources/http-cache/third_party_proxy.py
index 2a28c65d3..013388197 100644
--- a/runtime/src/test/resources/http-cache/third_party_proxy.py
+++ b/runtime/src/test/resources/http-cache/third_party_proxy.py
@@ -294,16 +294,24 @@ class Proxy(SimpleHTTPServer.SimpleHTTPRequestHandler):
              self._create_cache(jsonGenerated, cached_file_folder, cached_file_header, cached_file_content)
          return True
      elif (self.path.startswith("/onap/controlloop/v2/commission/elements")) and http_type == "GET":
-         print "self.path start with /commission/elements Control Loop Elements, generating response json..."
-         #jsondata = json.loads(self.data_string)
-         jsonGenerated = "[{\"name\": ,\"org.onap.domain.pmsh.PMSH_DCAEMicroservice\": [{ \"version\": \"1.2.3\", \"derived_from\": null }]}]"
-         self._create_cache(jsonGenerated, cached_file_folder, cached_file_header, cached_file_content)
+         if not _file_available:
+             print "self.path start with /commission/elements Control Loop Elements, generating response json..."
+             jsonGenerated = "[{\"name\": ,\"org.onap.domain.pmsh.PMSH_DCAEMicroservice\": [{ \"version\": \"1.2.3\", \"derived_from\": null }]}]"
+             self._create_cache(jsonGenerated, cached_file_folder, cached_file_header, cached_file_content)
          return True
      elif (self.path.startswith("/onap/controlloop/v2/commission")) and http_type == "GET":
-         print "self.path start with /commission control loop definition, generating response json..."
-         #jsondata = json.loads(self.data_string)
-         jsonGenerated = "[{\"name\": ,\"org.onap.domain.pmsh.PMSHControlLoopDefinition\": [{ \"version\": \"1.2.3\", \"derived_from\": null }]}]"
-         self._create_cache(jsonGenerated, cached_file_folder, cached_file_header, cached_file_content)
+         if not _file_available:
+             print "self.path start with /commission control loop definition, generating response json..."
+             #jsondata = json.loads(self.data_string)
+             jsonGenerated = "[{\"name\": ,\"org.onap.domain.pmsh.PMSHControlLoopDefinition\": [{ \"version\": \"1.2.3\", \"derived_from\": null }]}]"
+             self._create_cache(jsonGenerated, cached_file_folder, cached_file_header, cached_file_content)
+         return True
+     elif (self.path.startswith("/onap/controlloop/v2/commission/getCommonOrInstanceProperties")) and http_type == "GET":
+         if not _file_available:
+             print "self.path start with /commission getting common properties, generating response json..."
+             with open("example/node_template.json", "r") as f:
+                 jsonGenerated = f.read()
+             self._create_cache(jsonGenerated, cached_file_folder, cached_file_header, cached_file_content)
          return True
      elif (self.path.startswith("/onap/controlloop/v2/commission")) and http_type == "POST":
          print "self.path start with POST /onap/controlloop/v2/commission, copying body to response ..."
@@ -318,7 +326,6 @@ class Proxy(SimpleHTTPServer.SimpleHTTPRequestHandler):
          print "self.path start with /commission Decommissioning, generating response json..."
          jsonGenerated = "{\"errorDetails\": null,\"affectedControlLoopDefinitions\": [{ \"name\": \"ToscaServiceTemplateSimple\", \"version\": \"1.0.0\" }]}"
          self._create_cache(jsonGenerated, cached_file_folder, cached_file_header, cached_file_content)
-
          return True
      else:
         return False