aboutsummaryrefslogtreecommitdiffstats
path: root/src/test/java
diff options
context:
space:
mode:
authorsebdet <sebastien.determe@intl.att.com>2020-10-09 16:32:12 +0200
committerS�bastien Determe <sebastien.determe@intl.att.com>2020-10-09 18:56:11 +0000
commit88fd35f7b46041f723cff0eaaf4ea4ed46e9530f (patch)
treed2ad8ed68dd0ad8aa40d1dd465bf4fc9fe200890 /src/test/java
parentfd5d1f43556cb7c412f454a742fa87721444425b (diff)
Fix the DCAE query
The DCAE deployment URL can contain URI parameters that crashes the URL used by HTTP4 Camel. Also the parameter connectionTimeToLive is removed as it is transmitted in each call. The SDC client is also updated to 1.4.1 Issue-ID: CLAMP-954 Signed-off-by: sebdet <sebastien.determe@intl.att.com> Change-Id: Ieebdfe009f4339188c75c7a3365546779a087561 Signed-off-by: sebdet <sebastien.determe@intl.att.com>
Diffstat (limited to 'src/test/java')
-rw-r--r--src/test/java/org/onap/clamp/clds/tosca/update/JsonTemplateManagerTest.java24
-rw-r--r--src/test/java/org/onap/clamp/clds/tosca/update/ToscaConverterWithDictionarySupportItCase.java3
2 files changed, 13 insertions, 14 deletions
diff --git a/src/test/java/org/onap/clamp/clds/tosca/update/JsonTemplateManagerTest.java b/src/test/java/org/onap/clamp/clds/tosca/update/JsonTemplateManagerTest.java
index b9fcf51a..50410355 100644
--- a/src/test/java/org/onap/clamp/clds/tosca/update/JsonTemplateManagerTest.java
+++ b/src/test/java/org/onap/clamp/clds/tosca/update/JsonTemplateManagerTest.java
@@ -45,9 +45,9 @@ public class JsonTemplateManagerTest extends TestCase {
JsonTemplateManager jsonTemplateManager =
new JsonTemplateManager(
ResourceFileUtils.getResourceAsString("http-cache/example/policy/api/v1/policytypes/onap"
- + ".policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0&#63;"
- + "connectionTimeToLive=5000/.file"), ResourceFileUtils.getResourceAsString(
- "clds/tosca-converter/default-tosca-types.yaml"),
+ + ".policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0/.file"),
+ ResourceFileUtils.getResourceAsString(
+ "clds/tosca-converter/default-tosca-types.yaml"),
ResourceFileUtils.getResourceAsString("clds/tosca-converter/templates.json"));
String componentName = "onap.policies.monitoring.cdap.tca.hi.lo.app";
jsonTemplateManager.getJsonSchemaForPolicyType(componentName, null, null);
@@ -63,9 +63,9 @@ public class JsonTemplateManagerTest extends TestCase {
JsonTemplateManager jsonTemplateManager =
new JsonTemplateManager(
ResourceFileUtils.getResourceAsString("http-cache/example/policy/api/v1/policytypes/onap"
- + ".policies.controlloop.guard.common.FrequencyLimiter/versions/1.0.0&#63;"
- + "connectionTimeToLive=5000/.file"), ResourceFileUtils.getResourceAsString(
- "clds/tosca-converter/default-tosca-types.yaml"),
+ + ".policies.controlloop.guard.common.FrequencyLimiter/versions/1.0.0/.file"),
+ ResourceFileUtils.getResourceAsString(
+ "clds/tosca-converter/default-tosca-types.yaml"),
ResourceFileUtils.getResourceAsString("clds/tosca-converter/templates.json"));
String componentName = "onap.policies.controlloop.guard.common.FrequencyLimiter";
jsonTemplateManager.getJsonSchemaForPolicyType(componentName, null, null);
@@ -81,9 +81,9 @@ public class JsonTemplateManagerTest extends TestCase {
JsonTemplateManager jsonTemplateManager =
new JsonTemplateManager(
ResourceFileUtils.getResourceAsString("http-cache/example/policy/api/v1/policytypes/onap"
- + ".policies.controlloop.operational.common.Apex/versions/1.0.0&#63;"
- + "connectionTimeToLive=5000/.file"), ResourceFileUtils.getResourceAsString(
- "clds/tosca-converter/default-tosca-types.yaml"),
+ + ".policies.controlloop.operational.common.Apex/versions/1.0.0/.file"),
+ ResourceFileUtils.getResourceAsString(
+ "clds/tosca-converter/default-tosca-types.yaml"),
ResourceFileUtils.getResourceAsString("clds/tosca-converter/templates.json"));
String componentName = "onap.policies.controlloop.operational.common.Apex";
jsonTemplateManager.getJsonSchemaForPolicyType(componentName, null, null);
@@ -99,9 +99,9 @@ public class JsonTemplateManagerTest extends TestCase {
JsonTemplateManager jsonTemplateManager =
new JsonTemplateManager(
ResourceFileUtils.getResourceAsString("http-cache/example/policy/api/v1/policytypes/onap"
- + ".policies.controlloop.operational.common.Drools/versions/1.0.0&#63;"
- + "connectionTimeToLive=5000/.file"), ResourceFileUtils.getResourceAsString(
- "clds/tosca-converter/default-tosca-types.yaml"),
+ + ".policies.controlloop.operational.common.Drools/versions/1.0.0/.file"),
+ ResourceFileUtils.getResourceAsString(
+ "clds/tosca-converter/default-tosca-types.yaml"),
ResourceFileUtils.getResourceAsString("clds/tosca-converter/templates.json"));
String componentName = "onap.policies.controlloop.operational.common.Drools";
jsonTemplateManager.getJsonSchemaForPolicyType(componentName, null, null);
diff --git a/src/test/java/org/onap/clamp/clds/tosca/update/ToscaConverterWithDictionarySupportItCase.java b/src/test/java/org/onap/clamp/clds/tosca/update/ToscaConverterWithDictionarySupportItCase.java
index b5b0247c..1d4ee431 100644
--- a/src/test/java/org/onap/clamp/clds/tosca/update/ToscaConverterWithDictionarySupportItCase.java
+++ b/src/test/java/org/onap/clamp/clds/tosca/update/ToscaConverterWithDictionarySupportItCase.java
@@ -132,8 +132,7 @@ public class ToscaConverterWithDictionarySupportItCase {
JsonTemplateManager jsonTemplateManager =
new JsonTemplateManager(
ResourceFileUtils.getResourceAsString("http-cache/example/policy/api/v1/policytypes/onap"
- + ".policies.controlloop.operational.common.Apex/versions/1.0"
- + ".0&#63;connectionTimeToLive=5000/.file"),
+ + ".policies.controlloop.operational.common.Apex/versions/1.0.0/.file"),
ResourceFileUtils.getResourceAsString("clds/tosca-converter/default-tosca-types.yaml"),
ResourceFileUtils.getResourceAsString("clds/tosca-converter/templates.json"));