Fix the CDS calls

Fix the CDS calls for generic tosca policies, the new tosca parser must be interrupted so that clamp can do json schema enrichment

Issue-ID: CLAMP-786
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
Change-Id: Ib7e85a6cc3849f614a3025779d29e8024f7a2ef2

2 files changed, 10 insertions, 10 deletions

diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Apex/versions/1.0.0?connectionTimeToLive=5000/.file b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Apex/versions/1.0.0?connectionTimeToLive=5000/.file
index 7d694eb8..ae0dfbfc 100644
--- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Apex/versions/1.0.0?connectionTimeToLive=5000/.file
+++ b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Apex/versions/1.0.0?connectionTimeToLive=5000/.file
@@ -72,7 +72,7 @@ data_types:
                     entity that generated the ONSET event will be the target.
                 required: false
                 metadata:
-                    clamp_possible_values: test
+                    clamp_possible_values: ClampExecution:CSAR_RESOURCES
                 entry_schema:
                     type: string
 
@@ -85,23 +85,23 @@ data_types:
                 description: The actor performing the operation.
                 required: true
                 metadata:
-                    clamp_possible_values: test
+                    clamp_possible_values: Dictionary:DefaultActor
             operation:
                 type: string
                 description: The operation the actor is performing.
                 required: true
                 metadata:
-                    clamp_possible_values: test
+                    clamp_possible_values: ClampExecution:CDS/operation
             target:
                 type: onap.datatype.controlloop.Target
                 description: The resource the operation should be performed on.
                 required: true
-                metadata:
-                    clamp_possible_values: test
             payload:
                 type: map
                 description: Name/value pairs of payload information passed by Policy to the actor
                 required: false
+                metadata:
+                    clamp_possible_values: ClampExecution:CDS/payload
                 entry_schema:
                     type: string
 
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Drools/versions/1.0.0?connectionTimeToLive=5000/.file b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Drools/versions/1.0.0?connectionTimeToLive=5000/.file
index 24000993..1f8723c3 100644
--- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Drools/versions/1.0.0?connectionTimeToLive=5000/.file
+++ b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Drools/versions/1.0.0?connectionTimeToLive=5000/.file
@@ -60,7 +60,7 @@ data_types:
                     entity that generated the ONSET event will be the target.
                 required: false
                 metadata:
-                    clamp_possible_values: test
+                    clamp_possible_values: ClampExecution:CSAR_RESOURCES
                 entry_schema:
                     type: string
 
@@ -73,23 +73,23 @@ data_types:
                 description: The actor performing the operation.
                 required: true
                 metadata:
-                    clamp_possible_values: test
+                    clamp_possible_values: Dictionary:DefaultActor
             operation:
                 type: string
                 description: The operation the actor is performing.
                 required: true
                 metadata:
-                    clamp_possible_values: test
+                    clamp_possible_values: ClampExecution:CDS/operation
             target:
                 type: onap.datatype.controlloop.Target
                 description: The resource the operation should be performed on.
                 required: true
-                metadata:
-                    clamp_possible_values: test
             payload:
                 type: map
                 description: Name/value pairs of payload information passed by Policy to the actor
                 required: false
+                metadata:
+                    clamp_possible_values: ClampExecution:CDS/payload
                 entry_schema:
                     type: string