aboutsummaryrefslogtreecommitdiffstats
path: root/src/test
diff options
context:
space:
mode:
Diffstat (limited to 'src/test')
-rw-r--r--src/test/java/org/onap/policy/clamp/flow/FlowLogOperationTest.java10
-rw-r--r--src/test/java/org/onap/policy/clamp/loop/CsarInstallerItCase.java20
-rw-r--r--src/test/java/org/onap/policy/clamp/loop/DcaeComponentTest.java41
-rw-r--r--src/test/java/org/onap/policy/clamp/loop/LoopServiceTestItCase.java4
-rw-r--r--src/test/resources/application.properties24
-rw-r--r--src/test/resources/example/dcae/inventory-response.json78
-rw-r--r--src/test/resources/https/https-test.properties12
-rw-r--r--src/test/resources/robotframework/robotframework-test.properties24
8 files changed, 140 insertions, 73 deletions
diff --git a/src/test/java/org/onap/policy/clamp/flow/FlowLogOperationTest.java b/src/test/java/org/onap/policy/clamp/flow/FlowLogOperationTest.java
index 51c4c078a..622fd5999 100644
--- a/src/test/java/org/onap/policy/clamp/flow/FlowLogOperationTest.java
+++ b/src/test/java/org/onap/policy/clamp/flow/FlowLogOperationTest.java
@@ -1,9 +1,11 @@
/*-
* ============LICENSE_START=======================================================
- * ONAP CLAMP
+ * ONAP POLICY-CLAMP
* ================================================================================
* Copyright (C) 2019 Samsung. All rights reserved.
* ================================================================================
+ * Modifications Copyright (c) 2021 AT&T
+ * ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
@@ -28,7 +30,7 @@ import static org.mockito.Mockito.mock;
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
-import org.apache.camel.impl.DefaultExchange;
+import org.apache.camel.support.DefaultExchange;
import org.junit.Test;
import org.mockito.Mockito;
import org.onap.policy.clamp.clds.util.LoggingUtils;
@@ -43,7 +45,7 @@ public class FlowLogOperationTest {
private FlowLogOperation flowLogOperation = new FlowLogOperation();
@Test
- public void testStratLog() {
+ public void testStartLog() {
// given
LoggingUtils loggingUtils = mock(LoggingUtils.class);
ReflectionTestUtils.setField(flowLogOperation, "util", loggingUtils);
@@ -65,7 +67,7 @@ public class FlowLogOperationTest {
public void testInvokeLog() {
// given
final String mockEntity = "mockEntity";
- final String mockServiceName = "mockSerivceName";
+ final String mockServiceName = "mockServiceName";
MDCAdapter mdcAdapter = MDC.getMDCAdapter();
// when
flowLogOperation.invokeLog(mockEntity, mockServiceName);
diff --git a/src/test/java/org/onap/policy/clamp/loop/CsarInstallerItCase.java b/src/test/java/org/onap/policy/clamp/loop/CsarInstallerItCase.java
index 5b67f1f3a..b0abf832b 100644
--- a/src/test/java/org/onap/policy/clamp/loop/CsarInstallerItCase.java
+++ b/src/test/java/org/onap/policy/clamp/loop/CsarInstallerItCase.java
@@ -1,8 +1,8 @@
/*-
* ============LICENSE_START=======================================================
- * ONAP CLAMP
+ * ONAP POLICY-CLAMP
* ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ * Copyright (C) 2019, 2021 AT&T Intellectual Property. All rights
* reserved.
* ================================================================================
* Modifications copyright (c) 2019 Nokia
@@ -98,9 +98,9 @@ public class CsarInstallerItCase {
@Qualifier("csarInstaller")
private CsarInstaller csarInstaller;
- private BlueprintArtifact buildFakeBuildprintArtifact(String instanceName, String invariantResourceUuid,
- String blueprintFilePath, String artifactName,
- String invariantServiceUuid) throws IOException {
+ private BlueprintArtifact buildFakeBlueprintArtifact(String instanceName, String invariantResourceUuid,
+ String blueprintFilePath, String artifactName,
+ String invariantServiceUuid) throws IOException {
IResourceInstance resource = Mockito.mock(IResourceInstance.class);
Mockito.when(resource.getResourceInstanceName()).thenReturn(instanceName);
Mockito.when(resource.getResourceInvariantUUID()).thenReturn(invariantResourceUuid);
@@ -127,7 +127,7 @@ public class CsarInstallerItCase {
Map<String, BlueprintArtifact> blueprintMap = new HashMap<>();
Mockito.when(csarHandler.getMapOfBlueprints()).thenReturn(blueprintMap);
// Create fake blueprint artifact 1 on resource1
- BlueprintArtifact blueprintArtifact = buildFakeBuildprintArtifact(RESOURCE_INSTANCE_NAME_RESOURCE1,
+ BlueprintArtifact blueprintArtifact = buildFakeBlueprintArtifact(RESOURCE_INSTANCE_NAME_RESOURCE1,
INVARIANT_RESOURCE1_UUID, "example/sdc/blueprint-dcae/tca-bad-policy.yaml", "tca-bad-policy.yaml",
INVARIANT_SERVICE_UUID);
listResources.add(blueprintArtifact.getResourceAttached());
@@ -167,25 +167,25 @@ public class CsarInstallerItCase {
Map<String, BlueprintArtifact> blueprintMap = new HashMap<>();
Mockito.when(csarHandler.getMapOfBlueprints()).thenReturn(blueprintMap);
// Create fake blueprint artifact 1 on resource1
- BlueprintArtifact blueprintArtifact = buildFakeBuildprintArtifact(RESOURCE_INSTANCE_NAME_RESOURCE1,
+ BlueprintArtifact blueprintArtifact = buildFakeBlueprintArtifact(RESOURCE_INSTANCE_NAME_RESOURCE1,
INVARIANT_RESOURCE1_UUID, "example/sdc/blueprint-dcae/tca.yaml", "tca.yaml", INVARIANT_SERVICE_UUID);
listResources.add(blueprintArtifact.getResourceAttached());
blueprintMap.put(blueprintArtifact.getBlueprintArtifactName(), blueprintArtifact);
// Create fake blueprint artifact 2 on resource2
- blueprintArtifact = buildFakeBuildprintArtifact(RESOURCE_INSTANCE_NAME_RESOURCE2, INVARIANT_RESOURCE2_UUID,
+ blueprintArtifact = buildFakeBlueprintArtifact(RESOURCE_INSTANCE_NAME_RESOURCE2, INVARIANT_RESOURCE2_UUID,
"example/sdc/blueprint-dcae/tca_2.yaml", "tca_2.yaml", INVARIANT_SERVICE_UUID);
listResources.add(blueprintArtifact.getResourceAttached());
blueprintMap.put(blueprintArtifact.getBlueprintArtifactName(), blueprintArtifact);
// Create fake blueprint artifact 3 on resource 1 so that it's possible to
// test multiple CL deployment per Service/vnf
- blueprintArtifact = buildFakeBuildprintArtifact(RESOURCE_INSTANCE_NAME_RESOURCE1, INVARIANT_RESOURCE1_UUID,
+ blueprintArtifact = buildFakeBlueprintArtifact(RESOURCE_INSTANCE_NAME_RESOURCE1, INVARIANT_RESOURCE1_UUID,
"example/sdc/blueprint-dcae/tca_3.yaml", "tca_3.yaml", INVARIANT_SERVICE_UUID);
blueprintMap.put(blueprintArtifact.getBlueprintArtifactName(), blueprintArtifact);
// Create fake blueprint artifact 3 on resource 1 so that it's possible to
// test multiple CL deployment per Service/vnf
- blueprintArtifact = buildFakeBuildprintArtifact(RESOURCE_INSTANCE_NAME_RESOURCE1, INVARIANT_RESOURCE1_UUID,
+ blueprintArtifact = buildFakeBlueprintArtifact(RESOURCE_INSTANCE_NAME_RESOURCE1, INVARIANT_RESOURCE1_UUID,
"example/sdc/blueprint-dcae/tca-guilin.yaml", "tca-guilin.yaml", INVARIANT_SERVICE_UUID);
blueprintMap.put(blueprintArtifact.getBlueprintArtifactName(), blueprintArtifact);
diff --git a/src/test/java/org/onap/policy/clamp/loop/DcaeComponentTest.java b/src/test/java/org/onap/policy/clamp/loop/DcaeComponentTest.java
index c94937031..c95725457 100644
--- a/src/test/java/org/onap/policy/clamp/loop/DcaeComponentTest.java
+++ b/src/test/java/org/onap/policy/clamp/loop/DcaeComponentTest.java
@@ -1,8 +1,8 @@
/*-
* ============LICENSE_START=======================================================
- * ONAP CLAMP
+ * ONAP POLICY-CLAMP
* ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ * Copyright (C) 2019, 2021 AT&T Intellectual Property. All rights
* reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -36,6 +36,7 @@ import org.junit.Test;
import org.mockito.Mockito;
import org.onap.policy.clamp.clds.model.dcae.DcaeInventoryResponse;
import org.onap.policy.clamp.clds.model.dcae.DcaeOperationStatusResponse;
+import org.onap.policy.clamp.clds.util.ResourceFileUtils;
import org.onap.policy.clamp.loop.components.external.DcaeComponent;
import org.onap.policy.clamp.loop.components.external.ExternalComponentState;
import org.onap.policy.clamp.loop.template.LoopTemplate;
@@ -52,7 +53,7 @@ public class DcaeComponentTest {
JsonObject.class));
loopTest.setLastComputedState(LoopState.DESIGN);
loopTest.setDcaeDeploymentId("123456789");
- loopTest.setDcaeDeploymentStatusUrl("http4://localhost:8085");
+ loopTest.setDcaeDeploymentStatusUrl("http://localhost:8085");
MicroServicePolicy microServicePolicy = new MicroServicePolicy("configPolicyTest", new PolicyModel("policy1",
"tosca_definitions_version: tosca_simple_yaml_1_0_0", "1.0.0"), true,
@@ -175,36 +176,10 @@ public class DcaeComponentTest {
*/
@Test
public void convertToDcaeInventoryResponseTest() throws IOException, ParseException {
- String dcaeFakeResponse = "{\n" + " \"links\": {\n" + " \"previousLink\": {\n"
- + " \"title\": \"string\",\n" + " \"rel\": \"string\",\n" + " \"uri\": \"string\",\n"
- + " \"uriBuilder\": {},\n" + " \"rels\": [\n" + " \"string\"\n" + " ],\n"
- + " \"params\": {\n" + " \"additionalProp1\": \"string\",\n"
- + " \"additionalProp2\": \"string\",\n" + " \"additionalProp3\": \"string\"\n"
- + " },\n" + " \"type\": \"string\"\n" + " },\n" + " \"nextLink\": {\n"
- + " \"title\": \"string\",\n" + " \"rel\": \"string\",\n" + " \"uri\": \"string\",\n"
- + " \"uriBuilder\": {},\n" + " \"rels\": [\n" + " \"string\"\n" + " ],\n"
- + " \"params\": {\n" + " \"additionalProp1\": \"string\",\n"
- + " \"additionalProp2\": \"string\",\n" + " \"additionalProp3\": \"string\"\n"
- + " },\n" + " \"type\": \"string\"\n" + " }\n" + " },\n" + " \"totalCount\": 0,\n"
- + " \"items\": [\n" + " {\n" + " \"owner\": \"testOwner\",\n"
- + " \"application\": \"testApplication\",\n" + " \"component\": \"testComponent\",\n"
- + " \"typeName\": \"testTypeName\",\n" + " \"typeVersion\": 0,\n"
- + " \"blueprintTemplate\": \"testBlueprintTemplate\",\n" + " \"serviceIds\": [\n"
- + " \"serviceId1\", \"serviceId2\"\n" + " ],\n" + " \"vnfTypes\": [\n"
- + " \"vnfType1\", \"vnfType2\"\n" + " ],\n" + " \"serviceLocations\": [\n"
- + " \"serviceLocation1\", \"serviceLocation2\"\n" + " ],\n"
- + " \"asdcServiceId\": \"testAsdcServiceId\",\n"
- + " \"asdcResourceId\": \"testAsdcResourceId\",\n"
- + " \"asdcServiceURL\": \"testAsdcServiceURL\",\n" + " \"typeId\": \"testTypeId\",\n"
- + " \"selfLink\": {\n" + " \"title\": \"selfLinkTitle\",\n"
- + " \"rel\": \"selfLinkRel\",\n" + " \"uri\": \"selfLinkUri\",\n"
- + " \"uriBuilder\": {},\n" + " \"rels\": [\n" + " \"string\"\n" + " ],\n"
- + " \"params\": {\n" + " \"additionalProp1\": \"string\",\n"
- + " \"additionalProp2\": \"string\",\n" + " \"additionalProp3\": \"string\"\n"
- + " },\n" + " \"type\": \"string\"\n" + " },\n"
- + " \"created\": \"2020-01-22T09:38:15.436Z\",\n"
- + " \"deactivated\": \"2020-01-22T09:38:15.437Z\"\n" + " }\n" + " ]\n" + "}";
- List<DcaeInventoryResponse> responseObject = DcaeComponent.convertToDcaeInventoryResponse(dcaeFakeResponse);
+
+ List<DcaeInventoryResponse> responseObject = DcaeComponent
+ .convertToDcaeInventoryResponse(
+ ResourceFileUtils.getResourceAsString("example/dcae/inventory-response.json"));
assertThat(responseObject.get(0).getAsdcResourceId()).isEqualTo("testAsdcResourceId");
assertThat(responseObject.get(0).getAsdcServiceId()).isEqualTo("testAsdcServiceId");
assertThat(responseObject.get(0).getTypeName()).isEqualTo("testTypeName");
diff --git a/src/test/java/org/onap/policy/clamp/loop/LoopServiceTestItCase.java b/src/test/java/org/onap/policy/clamp/loop/LoopServiceTestItCase.java
index 010c4978a..74092727c 100644
--- a/src/test/java/org/onap/policy/clamp/loop/LoopServiceTestItCase.java
+++ b/src/test/java/org/onap/policy/clamp/loop/LoopServiceTestItCase.java
@@ -355,10 +355,10 @@ public class LoopServiceTestItCase {
saveTestLoopToDb();
Loop loop = loopService.getLoop(EXAMPLE_LOOP_NAME);
loopService.updateDcaeDeploymentFields(loop, "CLAMP_c5ce429a-f570-48c5-a7ea-53bed8f86f85",
- "https4://deployment-handler.onap:8443");
+ "https://deployment-handler.onap:8443");
loop = loopService.getLoop(EXAMPLE_LOOP_NAME);
assertThat(loop.getDcaeDeploymentId()).isEqualTo("CLAMP_c5ce429a-f570-48c5-a7ea-53bed8f86f85");
- assertThat(loop.getDcaeDeploymentStatusUrl()).isEqualTo("https4://deployment-handler.onap:8443");
+ assertThat(loop.getDcaeDeploymentStatusUrl()).isEqualTo("https://deployment-handler.onap:8443");
}
@Test
diff --git a/src/test/resources/application.properties b/src/test/resources/application.properties
index 2a4caee98..d67fe74a3 100644
--- a/src/test/resources/application.properties
+++ b/src/test/resources/application.properties
@@ -1,6 +1,6 @@
###
# ============LICENSE_START=======================================================
-# ONAP CLAMP
+# ONAP POLICY-CLAMP
# ================================================================================
# Copyright (C) 2017-2018, 2021 AT&T Intellectual Property. All rights
# reserved.
@@ -79,10 +79,11 @@ camel.defaultthreadpool.maxpoolsize=20
camel.defaultthreadpool.maxqueuesize=1000
camel.defaultthreadpool.keepaliveTime=60
camel.defaultthreadpool.rejectpolicy=CallerRuns
-#camel.springboot.xmlRoutes = false
-camel.springboot.xmlRoutes=classpath:/clds/camel/routes/*.xml
-camel.springboot.xmlRests=classpath:/clds/camel/rest/*.xml
-#camel.springboot.typeConversion = false
+camel.springboot.xml-routes=classpath:/clds/camel/routes/*.xml
+camel.springboot.xml-rests=classpath:/clds/camel/rest/*.xml
+camel.springboot.backlog-tracing=true
+camel.springboot.tracing=true
+camel.springboot.message-history=true
#clds datasource connection details
spring.datasource.driverClassName=org.mariadb.jdbc.Driver
@@ -128,12 +129,15 @@ clamp.config.files.cldsUsers=classpath:/clds/clds-users.json
clamp.config.files.globalProperties=classpath:/clds/templates/globalProperties.json
clamp.config.files.sdcController=classpath:/clds/sdc-controllers-config.json
+clamp.config.httpclient.socketTimeout=20000
+clamp.config.httpclient.connectTimeout=10000
+
#
# Configuration Settings for Policy Engine Components
-clamp.config.policy.api.url=http4://localhost:${docker.http-cache.port.host}
+clamp.config.policy.api.url=http://localhost:${docker.http-cache.port.host}
clamp.config.policy.api.userName=healthcheck
clamp.config.policy.api.password=zb!XztG34
-clamp.config.policy.pap.url=http4://localhost:${docker.http-cache.port.host}
+clamp.config.policy.pap.url=http://localhost:${docker.http-cache.port.host}
clamp.config.policy.pap.userName=healthcheck
clamp.config.policy.pap.password=zb!XztG34
@@ -142,12 +146,12 @@ clamp.config.policy.pap.password=zb!XztG34
clamp.config.sdc.csarFolder = ${project.build.directory}/sdc-tests
#DCAE Inventory Url Properties
-clamp.config.dcae.inventory.url=http4://localhost:${docker.http-cache.port.host}
+clamp.config.dcae.inventory.url=http://localhost:${docker.http-cache.port.host}
clamp.config.dcae.intentory.retry.interval=100
clamp.config.dcae.intentory.retry.limit=1
#DCAE Deployment Url Properties
-clamp.config.dcae.deployment.url=http4://localhost:${docker.http-cache.port.host}
+clamp.config.dcae.deployment.url=http://localhost:${docker.http-cache.port.host}
clamp.config.dcae.deployment.userName=test
clamp.config.dcae.deployment.password=test
@@ -164,7 +168,7 @@ clamp.config.security.permission.instance=dev
clamp.config.security.authentication.class=org.onap.aaf.cadi.principal.X509Principal, org.onap.aaf.cadi.principal.CachedBasicPrincipal
# Configuration settings for CDS
-clamp.config.cds.url=http4://localhost:${docker.http-cache.port.host}
+clamp.config.cds.url=http://localhost:${docker.http-cache.port.host}
clamp.config.cds.userName=ccsdkapps
clamp.config.cds.password=ccsdkapps
diff --git a/src/test/resources/example/dcae/inventory-response.json b/src/test/resources/example/dcae/inventory-response.json
new file mode 100644
index 000000000..1ebf068b8
--- /dev/null
+++ b/src/test/resources/example/dcae/inventory-response.json
@@ -0,0 +1,78 @@
+{
+ "links": {
+ "previousLink": {
+ "title": "string",
+ "rel": "string",
+ "uri": "string",
+ "uriBuilder": {},
+ "rels": [
+ "string"
+ ],
+ "params": {
+ "additionalProp1": "string",
+ "additionalProp2": "string",
+ "additionalProp3": "string"
+ },
+ "type": "string"
+ },
+ "nextLink": {
+ "title": "string",
+ "rel": "string",
+ "uri": "string",
+ "uriBuilder": {},
+ "rels": [
+ "string"
+ ],
+ "params": {
+ "additionalProp1": "string",
+ "additionalProp2": "string",
+ "additionalProp3": "string"
+ },
+ "type": "string"
+ }
+ },
+ "totalCount": 0,
+ "items": [
+ {
+ "owner": "testOwner",
+ "application": "testApplication",
+ "component": "testComponent",
+ "typeName": "testTypeName",
+ "typeVersion": 0,
+ "blueprintTemplate": "testBlueprintTemplate",
+ "serviceIds": [
+ "serviceId1",
+ "serviceId2"
+ ],
+ "vnfTypes": [
+ "vnfType1",
+ "vnfType2"
+ ],
+ "serviceLocations": [
+ "serviceLocation1",
+ "serviceLocation2"
+ ],
+ "asdcServiceId": "testAsdcServiceId",
+ "asdcResourceId": "testAsdcResourceId",
+ "asdcServiceURL": "testAsdcServiceURL",
+ "typeId": "testTypeId",
+ "selfLink": {
+ "title": "selfLinkTitle",
+ "rel": "selfLinkRel",
+ "uri": "selfLinkUri",
+ "uriBuilder": {},
+ "rels": [
+ "string"
+ ],
+ "params": {
+ "additionalProp1": "string",
+ "additionalProp2": "string",
+ "additionalProp3": "string"
+ },
+ "type": "string"
+ },
+ "created": "2020-01-22T09:38:15.436Z",
+ "deactivated": "2020-01-22T09:38:15.437Z"
+ }
+ ]
+} \ No newline at end of file
diff --git a/src/test/resources/https/https-test.properties b/src/test/resources/https/https-test.properties
index b52b16db4..14079a78e 100644
--- a/src/test/resources/https/https-test.properties
+++ b/src/test/resources/https/https-test.properties
@@ -96,10 +96,11 @@ camel.defaultthreadpool.maxpoolsize=20
camel.defaultthreadpool.maxqueuesize=1000
camel.defaultthreadpool.keepaliveTime=60
camel.defaultthreadpool.rejectpolicy=CallerRuns
-#camel.springboot.xmlRoutes = false
-camel.springboot.xmlRoutes=classpath:/clds/camel/routes/*.xml
-camel.springboot.xmlRests=classpath:/clds/camel/rest/*.xml
-#camel.springboot.typeConversion = false
+camel.springboot.xml-routes=classpath:/clds/camel/routes/*.xml
+camel.springboot.xml-rests=classpath:/clds/camel/rest/*.xml
+camel.springboot.backlog-tracing=true
+camel.springboot.tracing=true
+camel.springboot.message-history=true
#For EELF logback file
#com.att.eelf.logging.path=
@@ -107,6 +108,9 @@ com.att.eelf.logging.file=logback-default.xml
#The log folder that will be used in logback.xml file
clamp.config.log.path=log
+clamp.config.httpclient.socketTimeout=20000
+clamp.config.httpclient.connectTimeout=10000
+
#Define user permission related parameters, the permission type can be changed but MUST be redefined in clds-users.properties in that case !
clamp.config.security.permission.type.cl=org.onap.clamp.clds.cl
clamp.config.security.permission.type.cl.manage=org.onap.clamp.clds.cl.manage
diff --git a/src/test/resources/robotframework/robotframework-test.properties b/src/test/resources/robotframework/robotframework-test.properties
index 1e173f961..a12f052ad 100644
--- a/src/test/resources/robotframework/robotframework-test.properties
+++ b/src/test/resources/robotframework/robotframework-test.properties
@@ -1,6 +1,6 @@
###
# ============LICENSE_START=======================================================
-# ONAP CLAMP
+# ONAP POLICY-CLAMP
# ================================================================================
# Copyright (C) 2017-2018, 2021 AT&T Intellectual Property. All rights
# reserved.
@@ -79,10 +79,11 @@ camel.defaultthreadpool.maxpoolsize=20
camel.defaultthreadpool.maxqueuesize=1000
camel.defaultthreadpool.keepaliveTime=60
camel.defaultthreadpool.rejectpolicy=CallerRuns
-#camel.springboot.xmlRoutes = false
-camel.springboot.xmlRoutes=classpath:/clds/camel/routes/*.xml
-camel.springboot.xmlRests=classpath:/clds/camel/rest/*.xml
-#camel.springboot.typeConversion = false
+camel.springboot.xml-routes=classpath:/clds/camel/routes/*.xml
+camel.springboot.xml-rests=classpath:/clds/camel/rest/*.xml
+camel.springboot.backlog-tracing=true
+camel.springboot.tracing=true
+camel.springboot.message-history=true
#clds datasource connection details
spring.datasource.driverClassName=org.mariadb.jdbc.Driver
@@ -128,12 +129,15 @@ clamp.config.files.cldsUsers=classpath:/clds/clds-users.json
clamp.config.files.globalProperties=classpath:/clds/templates/globalProperties.json
clamp.config.files.sdcController=classpath:/clds/sdc-controllers-config.json
+clamp.config.httpclient.socketTimeout=20000
+clamp.config.httpclient.connectTimeout=10000
+
#
# Configuration Settings for Policy Engine Components
-clamp.config.policy.api.url=http4://localhost:${docker.http-cache.port.host}
+clamp.config.policy.api.url=http://localhost:${docker.http-cache.port.host}
clamp.config.policy.api.userName=healthcheck
clamp.config.policy.api.password=zb!XztG34
-clamp.config.policy.pap.url=http4://localhost:${docker.http-cache.port.host}
+clamp.config.policy.pap.url=http://localhost:${docker.http-cache.port.host}
clamp.config.policy.pap.userName=healthcheck
clamp.config.policy.pap.password=zb!XztG34
@@ -142,12 +146,12 @@ clamp.config.policy.pap.password=zb!XztG34
clamp.config.sdc.csarFolder = ${project.build.directory}/sdc-tests
#DCAE Inventory Url Properties
-clamp.config.dcae.inventory.url=http4://localhost:${docker.http-cache.port.host}
+clamp.config.dcae.inventory.url=http://localhost:${docker.http-cache.port.host}
clamp.config.dcae.intentory.retry.interval=100
clamp.config.dcae.intentory.retry.limit=1
#DCAE Deployment Url Properties
-clamp.config.dcae.deployment.url=http4://localhost:${docker.http-cache.port.host}
+clamp.config.dcae.deployment.url=http://localhost:${docker.http-cache.port.host}
clamp.config.dcae.deployment.userName=test
clamp.config.dcae.deployment.password=test
@@ -164,7 +168,7 @@ clamp.config.security.permission.instance=dev
clamp.config.security.authentication.class=org.onap.aaf.cadi.principal.X509Principal, org.onap.aaf.cadi.principal.CachedBasicPrincipal
# Configuration settings for CDS
-clamp.config.cds.url=http4://localhost:${docker.http-cache.port.host}
+clamp.config.cds.url=http://localhost:${docker.http-cache.port.host}
clamp.config.cds.userName=ccsdkapps
clamp.config.cds.password=ccsdkapps