aboutsummaryrefslogtreecommitdiffstats
path: root/csit
diff options
context:
space:
mode:
authorliamfallon <liam.fallon@est.tech>2022-09-08 15:54:08 +0100
committerliamfallon <liam.fallon@est.tech>2022-09-09 13:26:34 +0100
commit479d2c204f1869490b3d0f11aaa2cb84a6671b09 (patch)
tree75e33aee45ac5b6fd28e511d623c3fb5d500579e /csit
parentb21a268b301bc9ac3a9c23eff468f476aebcb44d (diff)
Convert CSIT tests to use HTTP rather than HTTPS
This commit converts the CSITs from HTTPS to HTTP. It also does some refactoring and didying up on the CSIT environment. Issue-ID: POLICY-4338 Change-Id: I31ac4aa83d476dd677f611a0a0f368dbec4ac21f Signed-off-by: liamfallon <liam.fallon@est.tech>
Diffstat (limited to 'csit')
-rwxr-xr-xcsit/apex-pdp/plans/teardown.sh5
-rw-r--r--csit/apex-pdp/tests/apex-pdp-test.robot4
-rw-r--r--csit/apex-pdp/tests/data/onap.policies.apex.pnf.Test.json8
-rw-r--r--csit/apex-pdp/tests/data/onap.policies.apex.pnf.metadataSet.Test.json8
-rw-r--r--csit/apex-pdp/tests/data/onap.policies.apex.vnf.Test.json6
-rwxr-xr-xcsit/api/plans/teardown.sh3
-rwxr-xr-xcsit/clamp/plans/setup.sh4
-rw-r--r--csit/clamp/tests/policy-clamp-test.robot28
-rw-r--r--csit/common-library.robot20
-rw-r--r--csit/compose-grafana.yml33
-rw-r--r--csit/config/apex-pdp/OnapPfConfig.json6
-rw-r--r--csit/config/apex-pdp/groups.json28
-rw-r--r--csit/config/apex-pdp/logback.xml122
-rw-r--r--csit/config/api/groups.json137
-rw-r--r--csit/config/api/logback.xml207
-rw-r--r--csit/config/cakey.pem30
-rw-r--r--csit/config/careq.pem16
-rw-r--r--csit/config/caroot.cer19
-rw-r--r--csit/config/caserial.txt1
-rw-r--r--csit/config/clamp/AcRuntimeParameters.yaml7
-rw-r--r--csit/config/clamp/ClampBackend.properties (renamed from csit/config/clamp/application-smoke.properties)40
-rw-r--r--csit/config/clamp/HttpParticipantParameters.yaml8
-rw-r--r--csit/config/clamp/KubernetesParticipantParameters.yaml8
-rw-r--r--csit/config/clamp/PolicyParticipantParameters.yaml12
-rw-r--r--csit/config/clamp/groups.json137
-rw-r--r--csit/config/clamp/logback-backend.xml219
-rw-r--r--csit/config/clamp/logback.xml206
-rw-r--r--csit/config/distribution/defaultConfig.json6
-rw-r--r--csit/config/distribution/groups.json137
-rw-r--r--csit/config/distribution/logback.xml136
-rw-r--r--csit/config/dns_ssl.txt21
-rw-r--r--csit/config/drools-applications/custom/engine-system.properties (renamed from csit/config/drools-apps/custom/engine-system.properties)0
-rw-r--r--csit/config/drools-applications/custom/feature-lifecycle.properties (renamed from csit/config/drools-apps/custom/feature-lifecycle.properties)4
-rwxr-xr-xcsit/config/drools-applications/custom/features.pre.sh (renamed from csit/config/drools-apps/custom/features.pre.sh)0
-rw-r--r--csit/config/drools-applications/custom/standalone-settings.xml (renamed from csit/config/drools-apps/custom/standalone-settings.xml)0
-rw-r--r--csit/config/drools-applications/env/base.conf (renamed from csit/config/drools-apps/env/base.conf)11
-rw-r--r--csit/config/drools-applications/env/feature-healthcheck.conf (renamed from csit/config/drools-apps/env/feature-healthcheck.conf)0
-rw-r--r--csit/config/drools-applications/env/feature-pooling-dmaap.conf (renamed from csit/config/drools-apps/env/feature-pooling-dmaap.conf)0
-rw-r--r--csit/config/drools-applications/groups.json137
-rw-r--r--csit/config/drools-pdp/custom/engine-system.properties (renamed from csit/config/drools/custom/engine-system.properties)0
-rwxr-xr-xcsit/config/drools-pdp/custom/noop.pre.sh (renamed from csit/config/drools/custom/noop.pre.sh)0
-rw-r--r--csit/config/drools-pdp/env/base.conf (renamed from csit/config/drools/env/base.conf)4
-rw-r--r--csit/config/drools-pdp/groups.json137
-rw-r--r--csit/config/ks.cer29
-rw-r--r--csit/config/ks.csr18
-rw-r--r--csit/config/ks.jksbin5001 -> 0 bytes
-rw-r--r--csit/config/pap/groups.json111
-rw-r--r--csit/config/pap/logback.xml120
-rw-r--r--csit/config/pap/papParameters.yaml12
-rw-r--r--csit/config/policy-gui/application.yaml (renamed from csit/config/clamp/gui/application.yaml)14
-rw-r--r--csit/config/policy-gui/groups.json137
-rw-r--r--csit/config/policy-gui/logback.xml119
-rw-r--r--csit/config/policy-truststorebin125108 -> 0 bytes
-rw-r--r--csit/config/sim-all/logback.xml42
-rw-r--r--csit/config/sim-all/simParameters.json18
-rw-r--r--csit/config/xacml-pdp/defaultConfig.json8
-rw-r--r--csit/config/xacml-pdp/groups.json101
-rw-r--r--csit/config/xacml-pdp/logback.xml116
-rwxr-xr-xcsit/db-migrator/plans/teardown.sh2
-rwxr-xr-xcsit/distribution/plans/teardown.sh5
-rw-r--r--csit/docker-compose-all.yml207
-rw-r--r--csit/docker-compose-gui-smoke.yml361
-rwxr-xr-xcsit/drools-applications/plans/teardown.sh6
-rw-r--r--csit/drools-applications/tests/drools-applications-test.robot8
-rwxr-xr-xcsit/drools-pdp/plans/teardown.sh5
-rw-r--r--csit/drools-pdp/tests/drools-pdp-test.robot8
-rwxr-xr-xcsit/gen_keystore.sh54
-rwxr-xr-xcsit/gen_truststore.sh49
-rwxr-xr-xcsit/include-raw-integration-install-robotframework.sh2
-rwxr-xr-xcsit/make_topic.sh3
-rw-r--r--csit/metrics/prometheus.yml13
-rwxr-xr-xcsit/onset.sh3
-rwxr-xr-xcsit/pap/plans/setup.sh12
-rwxr-xr-xcsit/pap/plans/teardown.sh4
-rw-r--r--csit/pap/tests/pap-test.robot4
-rwxr-xr-xcsit/prepare-config-files.py59
-rw-r--r--csit/pylibs.txt1
-rwxr-xr-xcsit/run-project-csit.sh66
-rwxr-xr-xcsit/start-all.sh (renamed from csit/start-gui-smoke-components.sh)10
-rwxr-xr-xcsit/start-grafana.sh10
-rwxr-xr-xcsit/stop-all.sh (renamed from csit/stop-gui-smoke.sh)2
-rwxr-xr-xcsit/wait_for_port.sh6
-rwxr-xr-xcsit/wait_topic.sh3
-rwxr-xr-xcsit/xacml-pdp/plans/setup.sh2
-rwxr-xr-xcsit/xacml-pdp/plans/teardown.sh5
85 files changed, 2603 insertions, 1067 deletions
diff --git a/csit/apex-pdp/plans/teardown.sh b/csit/apex-pdp/plans/teardown.sh
index a44e3aab..9bfdfe88 100755
--- a/csit/apex-pdp/plans/teardown.sh
+++ b/csit/apex-pdp/plans/teardown.sh
@@ -20,9 +20,4 @@
# SPDX-License-Identifier: Apache-2.0
# ============LICENSE_END=========================================================
-docker logs policy-api
-docker logs simulator
-docker logs policy-pap
-docker logs apex-pdp
-
docker-compose -f ${SCRIPTS}/docker-compose-all.yml down -v
diff --git a/csit/apex-pdp/tests/apex-pdp-test.robot b/csit/apex-pdp/tests/apex-pdp-test.robot
index b0e4c727..77393270 100644
--- a/csit/apex-pdp/tests/apex-pdp-test.robot
+++ b/csit/apex-pdp/tests/apex-pdp-test.robot
@@ -100,7 +100,7 @@ RunEventOnApexEngine
TriggerAndVerifyTestPnfPolicy
[Documentation] Send TestPnf policy trigger event to DMaaP and read notifications to verify policy execution
- Create Session apexSession https://${DMAAP_IP}:3905 max_retries=1
+ Create Session apexSession http://${DMAAP_IP}:3904 max_retries=1
${data}= Get Binary File ${CURDIR}/data/VesEventForPnfPolicy.json
&{headers}= Create Dictionary Content-Type=application/json Accept=application/json
${resp}= POST On Session apexSession /events/unauthenticated.DCAE_CL_OUTPUT data=${data} headers=${headers}
@@ -111,7 +111,7 @@ TriggerAndVerifyTestPnfPolicy
TriggerAndVerifyTestVnfPolicy
[Documentation] Send TestVnf policy trigger event to DMaaP and read notifications to verify policy execution
- Create Session apexSession https://${DMAAP_IP}:3905 max_retries=1
+ Create Session apexSession http://${DMAAP_IP}:3904 max_retries=1
${data}= Get Binary File ${CURDIR}/data/VesEventForVnfPolicy.json
&{headers}= Create Dictionary Content-Type=application/json Accept=application/json
${resp}= POST On Session apexSession /events/unauthenticated.DCAE_POLICY_EXAMPLE_OUTPUT data=${data} headers=${headers}
diff --git a/csit/apex-pdp/tests/data/onap.policies.apex.pnf.Test.json b/csit/apex-pdp/tests/data/onap.policies.apex.pnf.Test.json
index 5d9cbf9a..05522936 100644
--- a/csit/apex-pdp/tests/data/onap.policies.apex.pnf.Test.json
+++ b/csit/apex-pdp/tests/data/onap.policies.apex.pnf.Test.json
@@ -32,7 +32,7 @@
"taskParameters": [
{
"key": "logUrl",
- "value": "https://message-router:3905/events/APEX-CL-MGT"
+ "value": "http://message-router:3904/events/APEX-CL-MGT"
}
]
},
@@ -2778,7 +2778,7 @@
"carrierTechnology": "RESTCLIENT",
"parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restclient.RestClientCarrierTechnologyParameters",
"parameters": {
- "url": "https://message-router:3905/events/unauthenticated.DCAE_CL_OUTPUT/cl/apex?timeout=30000"
+ "url": "http://message-router:3904/events/unauthenticated.DCAE_CL_OUTPUT/cl/apex?timeout=30000"
}
},
"eventProtocolParameters": {
@@ -2791,7 +2791,7 @@
"carrierTechnology": "RESTREQUESTOR",
"parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restrequestor.RestRequestorCarrierTechnologyParameters",
"parameters": {
- "url": "https://aai-sim:6666/aai/v16/network/pnfs/pnf/{pnfName}",
+ "url": "http://aai-sim:6666/aai/v16/network/pnfs/pnf/{pnfName}",
"httpMethod": "GET",
"httpCodeFilter": "[2-5][0-1][0-9]",
"httpHeaders": [
@@ -2879,7 +2879,7 @@
"carrierTechnology": "RESTCLIENT",
"parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restclient.RestClientCarrierTechnologyParameters",
"parameters": {
- "url": "https://message-router:3905/events/APEX-CL-MGT"
+ "url": "http://message-router:3904/events/APEX-CL-MGT"
}
},
"eventProtocolParameters": {
diff --git a/csit/apex-pdp/tests/data/onap.policies.apex.pnf.metadataSet.Test.json b/csit/apex-pdp/tests/data/onap.policies.apex.pnf.metadataSet.Test.json
index 767adf13..20338fff 100644
--- a/csit/apex-pdp/tests/data/onap.policies.apex.pnf.metadataSet.Test.json
+++ b/csit/apex-pdp/tests/data/onap.policies.apex.pnf.metadataSet.Test.json
@@ -36,7 +36,7 @@
"taskParameters": [
{
"key": "logUrl",
- "value": "https://message-router:3905/events/APEX-CL-MGT2"
+ "value": "http://message-router:3904/events/APEX-CL-MGT2"
}
]
}
@@ -47,7 +47,7 @@
"carrierTechnology": "RESTCLIENT",
"parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restclient.RestClientCarrierTechnologyParameters",
"parameters": {
- "url": "https://message-router:3905/events/unauthenticated.DCAE_CL_OUTPUT/cl/apex?timeout=30000"
+ "url": "http://message-router:3904/events/unauthenticated.DCAE_CL_OUTPUT/cl/apex?timeout=30000"
}
},
"eventProtocolParameters": {
@@ -60,7 +60,7 @@
"carrierTechnology": "RESTREQUESTOR",
"parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restrequestor.RestRequestorCarrierTechnologyParameters",
"parameters": {
- "url": "https://aai-sim:6666/aai/v16/network/pnfs/pnf/{pnfName}",
+ "url": "http://aai-sim:6666/aai/v16/network/pnfs/pnf/{pnfName}",
"httpMethod": "GET",
"httpCodeFilter": "[2-5][0-1][0-9]",
"httpHeaders": [
@@ -148,7 +148,7 @@
"carrierTechnology": "RESTCLIENT",
"parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restclient.RestClientCarrierTechnologyParameters",
"parameters": {
- "url": "https://message-router:3905/events/APEX-CL-MGT2"
+ "url": "http://message-router:3904/events/APEX-CL-MGT2"
}
},
"eventProtocolParameters": {
diff --git a/csit/apex-pdp/tests/data/onap.policies.apex.vnf.Test.json b/csit/apex-pdp/tests/data/onap.policies.apex.vnf.Test.json
index d000de7c..7886f84b 100644
--- a/csit/apex-pdp/tests/data/onap.policies.apex.vnf.Test.json
+++ b/csit/apex-pdp/tests/data/onap.policies.apex.vnf.Test.json
@@ -32,7 +32,7 @@
"taskParameters": [
{
"key": "logUrl",
- "value": "https://message-router:3905/events/APEX-CL-MGT"
+ "value": "http://message-router:3904/events/APEX-CL-MGT"
}
]
},
@@ -3060,7 +3060,7 @@
"carrierTechnology": "RESTCLIENT",
"parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restclient.RestClientCarrierTechnologyParameters",
"parameters": {
- "url": "https://message-router:3905/events/unauthenticated.DCAE_POLICY_EXAMPLE_OUTPUT/ApexExampleCG1/1?timeout=30000"
+ "url": "http://message-router:3904/events/unauthenticated.DCAE_POLICY_EXAMPLE_OUTPUT/ApexExampleCG1/1?timeout=30000"
}
},
"eventProtocolParameters": {
@@ -3073,7 +3073,7 @@
"carrierTechnology": "RESTREQUESTOR",
"parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restrequestor.RestRequestorCarrierTechnologyParameters",
"parameters": {
- "url": "https://aai-sim:6666/aai/v16/network/generic-vnfs/generic-vnf?vnf-name={vnf-name}",
+ "url": "http://aai-sim:6666/aai/v16/network/generic-vnfs/generic-vnf?vnf-name={vnf-name}",
"httpMethod": "GET",
"httpCodeFilter": "[245][0-9][0-9]",
"httpHeaders": [
diff --git a/csit/api/plans/teardown.sh b/csit/api/plans/teardown.sh
index 71daccc6..6f77caa4 100755
--- a/csit/api/plans/teardown.sh
+++ b/csit/api/plans/teardown.sh
@@ -18,7 +18,4 @@
# SPDX-License-Identifier: Apache-2.0
# ============LICENSE_END=========================================================
-docker logs policy-api
-docker logs simulator
-
docker-compose -f ${SCRIPTS}/docker-compose-all.yml down -v
diff --git a/csit/clamp/plans/setup.sh b/csit/clamp/plans/setup.sh
index c7bbabe0..6b11f9e0 100755
--- a/csit/clamp/plans/setup.sh
+++ b/csit/clamp/plans/setup.sh
@@ -44,6 +44,8 @@ echo POLICY RUNTIME ACM IP IS "${POLICY_RUNTIME_ACM_IP}"
"${SCRIPTS}"/wait_for_port.sh "${POLICY_RUNTIME_ACM_IP}" 6969
# Bringup ACM participant containers
+docker-compose -f "${SCRIPTS}"/docker-compose-all.yml up -d policy-clamp-ac-k8s-ppnt
+docker-compose -f "${SCRIPTS}"/docker-compose-all.yml up -d policy-clamp-ac-http-ppnt
docker-compose -f "${SCRIPTS}"/docker-compose-all.yml up -d policy-clamp-ac-pf-ppnt
sleep 10
@@ -60,7 +62,7 @@ echo K8S PARTICIPANT IP IS "${K8S_PARTICIPANT_IP}"
echo HTTP PARTICIPANT IP IS "${HTTP_PARTICIPANT_IP}"
# wait for the app to start up
-"${SCRIPTS}"/wait_for_port.sh "${POLICY_API_IP}" 6969
+"${SCRIPTS}"/wait_for_port.sh "${POLICY_PARTICIPANT_IP}" 6969
ROBOT_VARIABLES=""
ROBOT_VARIABLES="${ROBOT_VARIABLES} -v POLICY_RUNTIME_ACM_IP:${POLICY_RUNTIME_ACM_IP}"
diff --git a/csit/clamp/tests/policy-clamp-test.robot b/csit/clamp/tests/policy-clamp-test.robot
index fe241333..f819d2d2 100644
--- a/csit/clamp/tests/policy-clamp-test.robot
+++ b/csit/clamp/tests/policy-clamp-test.robot
@@ -9,9 +9,9 @@ Library json
CommissionAutomationCompositionV1
[Documentation] Commission automation composition.
${auth}= Create List runtimeUser zb!XztG34
- Log Creating session https://${POLICY_RUNTIME_ACM_IP}:6969
+ Log Creating session http://${POLICY_RUNTIME_ACM_IP}:6969
${postyaml}= Get file ${CURDIR}/data/PMSHMultipleACTosca.yaml
- ${session}= Create Session policy https://${POLICY_RUNTIME_ACM_IP}:6969 auth=${auth}
+ ${session}= Create Session policy http://${POLICY_RUNTIME_ACM_IP}:6969 auth=${auth}
${headers}= Create Dictionary Accept=application/yaml Content-Type=application/yaml
${resp}= POST On Session policy /onap/policy/clamp/acm/v2/commission data=${postyaml} headers=${headers}
Log Received response from runtime acm ${resp.text}
@@ -20,9 +20,9 @@ CommissionAutomationCompositionV1
InstantiateAutomationCompositionV1
[Documentation] Instantiate automation composition.
${auth}= Create List runtimeUser zb!XztG34
- Log Creating session https://${POLICY_RUNTIME_ACM_IP}:6969
+ Log Creating session http://${POLICY_RUNTIME_ACM_IP}:6969
${postjson}= Get file ${CURDIR}/data/InstantiateAC.json
- ${session}= Create Session policy https://${POLICY_RUNTIME_ACM_IP}:6969 auth=${auth}
+ ${session}= Create Session policy http://${POLICY_RUNTIME_ACM_IP}:6969 auth=${auth}
${headers}= Create Dictionary Accept=application/json Content-Type=application/json
${resp}= POST On Session policy /onap/policy/clamp/acm/v2/instantiation data=${postjson} headers=${headers}
Log Received response from runtime acm ${resp.text}
@@ -31,9 +31,9 @@ InstantiateAutomationCompositionV1
PassivateAutomationComposition
[Documentation] Passivate automation composition.
${auth}= Create List runtimeUser zb!XztG34
- Log Creating session https://${POLICY_RUNTIME_ACM_IP}:6969
+ Log Creating session http://${POLICY_RUNTIME_ACM_IP}:6969
${postjson}= Get file ${CURDIR}/data/PassivateAC.json
- ${session}= Create Session policy https://${POLICY_RUNTIME_ACM_IP}:6969 auth=${auth}
+ ${session}= Create Session policy http://${POLICY_RUNTIME_ACM_IP}:6969 auth=${auth}
${headers}= Create Dictionary Accept=application/json Content-Type=application/json
${resp}= PUT On Session policy /onap/policy/clamp/acm/v2/instantiation/command data=${postjson} headers=${headers}
Log Received response from runtime acm ${resp.text}
@@ -42,8 +42,8 @@ PassivateAutomationComposition
QueryPolicies
[Documentation] Runs Policy Participant Query New Policies
${auth}= Create List policyadmin zb!XztG34
- Log Creating session https://${POLICY_API_IP}:6969
- ${session}= Create Session policy https://${POLICY_API_IP}:6969 auth=${auth}
+ Log Creating session http://${POLICY_API_IP}:6969
+ ${session}= Create Session policy http://${POLICY_API_IP}:6969 auth=${auth}
${headers}= Create Dictionary Accept=application/json Content-Type=application/json
${resp}= GET On Session policy /policy/api/v1/policies headers=${headers}
Log Received response from policy-api {resp.text}
@@ -52,8 +52,8 @@ QueryPolicies
QueryPolicyTypes
[Documentation] Runs Policy Participant Query New Policy Types
${auth}= Create List policyadmin zb!XztG34
- Log Creating session https://${POLICY_API_IP}:6969
- ${session}= Create Session policy https://${POLICY_API_IP}:6969 auth=${auth}
+ Log Creating session http://${POLICY_API_IP}:6969
+ ${session}= Create Session policy http://${POLICY_API_IP}:6969 auth=${auth}
${headers}= Create Dictionary Accept=application/json Content-Type=application/json
${resp}= GET On Session policy /policy/api/v1/policytypes headers=${headers}
Log Received response from policy-api ${resp.text}
@@ -62,9 +62,9 @@ QueryPolicyTypes
StateChangeRunningAutomationComposition
[Documentation] AutomationComposition State Change to RUNNING.
${auth}= Create List runtimeUser zb!XztG34
- Log Creating session https://${POLICY_RUNTIME_ACM_IP}:6969
+ Log Creating session http://${POLICY_RUNTIME_ACM_IP}:6969
${postjson}= Get file ${CURDIR}/data/StateChangeRunningAC.json
- ${session}= Create Session policy https://${POLICY_RUNTIME_ACM_IP}:6969 auth=${auth}
+ ${session}= Create Session policy http://${POLICY_RUNTIME_ACM_IP}:6969 auth=${auth}
${headers}= Create Dictionary Accept=application/json Content-Type=application/json
${resp}= PUT On Session policy /onap/policy/clamp/acm/v2/instantiation/command data=${postjson} headers=${headers} expected_status=406
Log Received response from runtime acm ${resp.text}
@@ -72,8 +72,8 @@ StateChangeRunningAutomationComposition
QueryInstantiatedACs
[Documentation] Get Instantiated AutomationCompositions
${auth}= Create List runtimeUser zb!XztG34
- Log Creating session https://${POLICY_RUNTIME_ACM_IP}:6969
- ${session}= Create Session policy https://${POLICY_RUNTIME_ACM_IP}:6969 auth=${auth}
+ Log Creating session http://${POLICY_RUNTIME_ACM_IP}:6969
+ ${session}= Create Session policy http://${POLICY_RUNTIME_ACM_IP}:6969 auth=${auth}
${headers}= Create Dictionary Accept=application/json Content-Type=application/json
${resp}= GET On Session policy /onap/policy/clamp/acm/v2/instantiation headers=${headers}
Log Received response from runtime acm ${resp.text}
diff --git a/csit/common-library.robot b/csit/common-library.robot
index aa737a02..b90f854c 100644
--- a/csit/common-library.robot
+++ b/csit/common-library.robot
@@ -16,8 +16,8 @@ HealthCheckAuth
PerformPostRequest
[Arguments] ${hostname} ${url} ${expectedstatus} ${postjson} ${params} ${auth}
- Log Creating session https://${hostname}:6969
- ${session}= Create Session policy https://${hostname}:6969 auth=${auth}
+ Log Creating session http://${hostname}:6969
+ ${session}= Create Session policy http://${hostname}:6969 auth=${auth}
${headers}= Create Dictionary Accept=application/json Content-Type=application/json
${resp}= POST On Session policy ${url} data=${postjson} params=${params} headers=${headers} expected_status=${expectedstatus}
Log Received response from policy ${resp.text}
@@ -25,8 +25,8 @@ PerformPostRequest
PerformPutRequest
[Arguments] ${hostname} ${url} ${expectedstatus} ${params} ${auth}
- Log Creating session https://${hostname}:6969
- ${session}= Create Session policy https://${hostname}:6969 auth=${auth}
+ Log Creating session http://${hostname}:6969
+ ${session}= Create Session policy http://${hostname}:6969 auth=${auth}
${headers}= Create Dictionary Accept=application/json Content-Type=application/json
${resp}= PUT On Session policy ${url} params=${params} headers=${headers} expected_status=${expectedstatus}
Log Received response from policy ${resp.text}
@@ -34,8 +34,8 @@ PerformPutRequest
PerformGetRequest
[Arguments] ${hostname} ${url} ${expectedstatus} ${params} ${auth}
- Log Creating session https://${hostname}:6969
- ${session}= Create Session policy https://${hostname}:6969 auth=${auth}
+ Log Creating session http://${hostname}:6969
+ ${session}= Create Session policy http://${hostname}:6969 auth=${auth}
${headers}= Create Dictionary Accept=application/json Content-Type=application/json
${resp}= GET On Session policy ${url} params=${params} headers=${headers} expected_status=${expectedstatus}
Log Received response from policy ${resp.text}
@@ -43,8 +43,8 @@ PerformGetRequest
PerformDeleteRequest
[Arguments] ${hostname} ${url} ${expectedstatus} ${auth}
- Log Creating session https://${hostname}:6969
- ${session}= Create Session policy https://${hostname}:6969 auth=${auth}
+ Log Creating session http://${hostname}:6969
+ ${session}= Create Session policy http://${hostname}:6969 auth=${auth}
${headers}= Create Dictionary Accept=application/json Content-Type=application/json
${resp}= DELETE On Session policy ${url} headers=${headers} expected_status=${expectedstatus}
Log Received response from policy ${resp.text}
@@ -114,8 +114,8 @@ QueryPolicyStatus
GetMetrics
[Arguments] ${hostname} ${auth}
- Log Creating session https://${hostname}:6969
- ${session}= Create Session policy https://${hostname}:6969 auth=${auth}
+ Log Creating session http://${hostname}:6969
+ ${session}= Create Session policy http://${hostname}:6969 auth=${auth}
${resp}= GET On Session policy /metrics expected_status=200
Log Received response from policy ${resp.text}
[return] ${resp}
diff --git a/csit/compose-grafana.yml b/csit/compose-grafana.yml
index 75b39fbb..f9908533 100644
--- a/csit/compose-grafana.yml
+++ b/csit/compose-grafana.yml
@@ -165,7 +165,6 @@ services:
- 9696
volumes:
- ./config/drools-apps/custom:/tmp/policy-install/config:ro
- - ./config/drools-apps/custom/feature-lifecycle.properties:/opt/app/policy/features/lifecycle/config/feature-lifecycle.properties:ro
- ./wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro
env_file:
- config/drools-apps/env/base.conf
@@ -224,6 +223,23 @@ services:
'pap', '6969',
'apex-pdp', '6969'
]
+ policy-clamp-runtime-acm:
+ image: nexus3.onap.org:10001/onap/policy-clamp-runtime-acm:${POLICY_CLAMP_VERSION}
+ container_name: policy-clamp-runtime-acm
+ depends_on:
+ - mariadb
+ - simulator
+ hostname: policy-clamp-runtime-acm
+ expose:
+ - 6969
+ volumes:
+ - ./wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro
+ - ./config/clamp/AcRuntimeParameters.yaml:/opt/app/policy/clamp/etc/AcRuntimeParameters.yaml:ro
+ entrypoint: /opt/app/policy/bin/wait_for_port.sh
+ command: [
+ '-c', './acm-runtime.sh',
+ 'message-router', '3904'
+ ]
prometheus:
image: prom/prometheus:v2.32.1
container_name: prometheus
@@ -244,3 +260,18 @@ services:
- ./metrics/dashboard.yaml:/etc/grafana/provisioning/dashboards/dashboard.yaml
- ./metrics/datasource.yaml:/etc/grafana/provisioning/datasources/datasource.yaml
- ./metrics/dashboards:/var/lib/grafana/dashboards
+ node-exporter:
+ image: prom/node-exporter:latest
+ container_name: node-exporter
+ restart: unless-stopped
+ volumes:
+ - /proc:/host/proc:ro
+ - /sys:/host/sys:ro
+ - /:/rootfs:ro
+ command:
+ - '--path.procfs=/host/proc'
+ - '--path.rootfs=/rootfs'
+ - '--path.sysfs=/host/sys'
+ - '--collector.filesystem.mount-points-exclude=^/(sys|proc|dev|host|etc)($$|/)'
+ expose:
+ - 9100
diff --git a/csit/config/apex-pdp/OnapPfConfig.json b/csit/config/apex-pdp/OnapPfConfig.json
index 74085a19..5760259b 100644
--- a/csit/config/apex-pdp/OnapPfConfig.json
+++ b/csit/config/apex-pdp/OnapPfConfig.json
@@ -5,7 +5,7 @@
"port": 6969,
"userName": "healthcheck",
"password": "zb!XztG34",
- "https": {{HTTPS_ENABLED}},
+ "https": false,
"prometheus": true
},
"pdpStatusParameters":{
@@ -29,13 +29,13 @@
"topic" : "POLICY-PDP-PAP",
"servers" : [ "message-router" ],
"topicCommInfrastructure" : "dmaap",
- "useHttps" : {{HTTPS_ENABLED}}
+ "useHttps" : false
}],
"topicSinks" : [{
"topic" : "POLICY-PDP-PAP",
"servers" : [ "message-router" ],
"topicCommInfrastructure" : "dmaap",
- "useHttps" : {{HTTPS_ENABLED}}
+ "useHttps" : false
}]
}
}
diff --git a/csit/config/apex-pdp/groups.json b/csit/config/apex-pdp/groups.json
new file mode 100644
index 00000000..bd5c2868
--- /dev/null
+++ b/csit/config/apex-pdp/groups.json
@@ -0,0 +1,28 @@
+{
+ "groups": [
+ {
+ "name": "defaultGroup",
+ "version": "1.0.0",
+ "description": "The default group that registers all supported policy types and pdps.",
+ "pdpGroupState": "ACTIVE",
+ "pdpSubgroups": [
+ {
+ "pdpType": "apex",
+ "supportedPolicyTypes": [
+ {
+ "name": "onap.policies.controlloop.operational.common.Apex",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.native.Apex",
+ "version": "1.0.0"
+ }
+ ],
+ "currentInstanceCount": 0,
+ "desiredInstanceCount": 1,
+ "policies": []
+ }
+ ]
+ }
+ ]
+}
diff --git a/csit/config/apex-pdp/logback.xml b/csit/config/apex-pdp/logback.xml
new file mode 100644
index 00000000..eb5613c0
--- /dev/null
+++ b/csit/config/apex-pdp/logback.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ============LICENSE_START=======================================================
+ Copyright (C) 2016-2018 Ericsson. All rights reserved.
+ Modifications Copyright (C) 2019 Nordix Foundation.
+ Modifications Copyright (C) 2021 Bell Canada. All rights reserved.
+ ================================================================================
+ 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
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ SPDX-License-Identifier: Apache-2.0
+ ============LICENSE_END=========================================================
+-->
+
+<configuration scan="true" scanPeriod="30 seconds" debug="false">
+
+ <property name="logDir" value="${POLICY_LOGS}" />
+
+ <property name="errorLog" value="error" />
+ <property name="debugLog" value="debug" />
+ <property name="networkLog" value="network" />
+
+ <property name="debugPattern"
+ value="[%d{yyyy-MM-dd'T'HH:mm:ss.SSS+00:00, UTC}|%level|%logger{0}|%thread] %msg%n" />
+ <property name="errorPattern" value="${debugPattern}" />
+ <property name="networkPattern" value="[%d{yyyy-MM-dd'T'HH:mm:ss.SSS+00:00, UTC}|%t]%m%n" />
+
+ <appender name="ErrorOut" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <file>${logDir}/${errorLog}.log</file>
+ <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+ <fileNamePattern>${logDir}/${errorLog}.%d{yyyy-MM-dd}.%i.log.zip
+ </fileNamePattern>
+ <maxFileSize>50MB</maxFileSize>
+ <maxHistory>30</maxHistory>
+ <totalSizeCap>10GB</totalSizeCap>
+ </rollingPolicy>
+ <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+ <level>WARN</level>
+ </filter>
+ <encoder>
+ <pattern>${errorPattern}</pattern>
+ </encoder>
+ </appender>
+
+ <appender name="AsyncErrorOut" class="ch.qos.logback.classic.AsyncAppender">
+ <appender-ref ref="ErrorOut" />
+ </appender>
+
+ <appender name="DebugOut" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <file>${logDir}/${debugLog}.log</file>
+ <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+ <fileNamePattern>${logDir}/${debugLog}.%d{yyyy-MM-dd}.%i.log.zip
+ </fileNamePattern>
+ <maxFileSize>50MB</maxFileSize>
+ <maxHistory>30</maxHistory>
+ <totalSizeCap>10GB</totalSizeCap>
+ </rollingPolicy>
+ <encoder>
+ <pattern>${debugPattern}</pattern>
+ </encoder>
+ </appender>
+
+ <appender name="AsyncDebugOut" class="ch.qos.logback.classic.AsyncAppender">
+ <appender-ref ref="DebugOut" />
+ </appender>
+
+ <appender name="NetworkOut" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <file>${logDir}/${networkLog}.log</file>
+ <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+ <fileNamePattern>${logDir}/${networkLog}.%d{yyyy-MM-dd}.%i.log.zip
+ </fileNamePattern>
+ <maxFileSize>50MB</maxFileSize>
+ <maxHistory>30</maxHistory>
+ <totalSizeCap>10GB</totalSizeCap>
+ </rollingPolicy>
+ <encoder>
+ <pattern>${networkPattern}</pattern>
+ </encoder>
+ </appender>
+
+ <appender name="AsyncNetworkOut" class="ch.qos.logback.classic.AsyncAppender">
+ <appender-ref ref="NetworkOut" />
+ </appender>
+
+ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <Pattern>[%d{yyyy-MM-dd'T'HH:mm:ss.SSS+00:00, UTC}|%level|%logger{0}|%thread] %msg%n</Pattern>
+ </encoder>
+ </appender>
+
+ <appender name="AsyncStdOut" class="ch.qos.logback.classic.AsyncAppender">
+ <appender-ref ref="STDOUT" />
+ </appender>
+
+ <logger name="network" level="INFO" additivity="false">
+ <appender-ref ref="AsyncNetworkOut" />
+ <appender-ref ref="AsyncStdOut" />
+ </logger>
+
+ <logger name="org.eclipse.jetty.server.RequestLog" level="info" additivity="false">
+ <appender-ref ref="AsyncNetworkOut" />
+ <appender-ref ref="AsyncStdOut" />
+ </logger>
+
+ <logger name="org.eclipse.jetty" level="ERROR" />
+
+ <root level="INFO">
+ <appender-ref ref="AsyncDebugOut" />
+ <appender-ref ref="AsyncErrorOut" />
+ <appender-ref ref="AsyncStdOut" />
+ </root>
+
+</configuration>
diff --git a/csit/config/api/groups.json b/csit/config/api/groups.json
new file mode 100644
index 00000000..6ee30e1c
--- /dev/null
+++ b/csit/config/api/groups.json
@@ -0,0 +1,137 @@
+{
+ "groups": [
+ {
+ "name": "defaultGroup",
+ "version": "1.0.0",
+ "description": "The default group that registers all supported policy types and pdps.",
+ "pdpGroupState": "ACTIVE",
+ "pdpSubgroups": [
+ {
+ "pdpType": "xacml",
+ "supportedPolicyTypes": [
+ {
+ "name": "onap.policies.controlloop.guard.common.FrequencyLimiter",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.controlloop.guard.common.MinMax",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.controlloop.guard.common.Blacklist",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.controlloop.guard.common.Filter",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.controlloop.guard.coordination.FirstBlocksSecond",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.monitoring.*",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.*",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.AffinityPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.DistancePolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.HpaPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.OptimizationPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.PciPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.service.QueryPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.service.SubscriberPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.Vim_fit",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.VnfPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.native.Xacml",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.Naming",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.match.*",
+ "version": "1.0.0"
+ }
+ ],
+ "currentInstanceCount": 0,
+ "desiredInstanceCount": 1,
+ "policies": [
+ {
+ "name": "SDNC_Policy.ONAP_NF_NAMING_TIMESTAMP",
+ "version": "1.0.0"
+ }
+ ]
+ },
+ {
+ "pdpType": "drools",
+ "supportedPolicyTypes": [
+ {
+ "name": "onap.policies.controlloop.operational.common.Drools",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.native.drools.Controller",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.native.drools.Artifact",
+ "version": "1.0.0"
+ }
+ ],
+ "currentInstanceCount": 0,
+ "desiredInstanceCount": 1,
+ "policies": []
+ },
+ {
+ "pdpType": "apex",
+ "supportedPolicyTypes": [
+ {
+ "name": "onap.policies.controlloop.operational.common.Apex",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.native.Apex",
+ "version": "1.0.0"
+ }
+ ],
+ "currentInstanceCount": 0,
+ "desiredInstanceCount": 1,
+ "policies": []
+ }
+ ]
+ }
+ ]
+}
diff --git a/csit/config/api/logback.xml b/csit/config/api/logback.xml
new file mode 100644
index 00000000..83a70993
--- /dev/null
+++ b/csit/config/api/logback.xml
@@ -0,0 +1,207 @@
+<!--
+ ============LICENSE_START=======================================================
+ policy-api
+ ================================================================================
+ Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
+ ================================================================================
+ 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
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ ============LICENSE_END=========================================================
+ -->
+
+<configuration scan="true" scanPeriod="30 seconds" debug="false">
+
+ <property name="logDir" value="${POLICY_LOGS}" />
+
+ <property name="errorLog" value="error" />
+ <property name="debugLog" value="debug" />
+ <property name="networkLog" value="network" />
+
+ <property name="metricLog" value="metric" />
+ <property name="transactionLog" value="audit" />
+
+ <property name="debugPattern"
+ value="[%d{yyyy-MM-dd'T'HH:mm:ss.SSS+00:00, UTC}|%level|%logger{0}|%thread] %msg%n" />
+ <property name="errorPattern" value="${debugPattern}" />
+ <property name="networkPattern"
+ value="[%d{yyyy-MM-dd'T'HH:mm:ss.SSS+00:00, UTC}|%t]%m%n" />
+
+ <property
+ name="mpPreamble"
+ value="%X{RequestID}|%X{InvocationID}|%X{ServiceName}|%X{PartnerName}" />
+
+ <property
+ name="mpTime"
+ value="%X{BeginTimestamp}|%X{EndTimestamp}|%X{ElapsedTime}" />
+
+ <property
+ name="mpLine1"
+ value="%X{ServiceInstanceID}|%X{VirtualServerName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDescription}" />
+
+ <property
+ name="mpLine2"
+ value="%X{InstanceUUID}|%X{Severity}|%X{TargetEntity}|%X{TargetServiceName}|%X{Server}|%X{ServerIPAddress}" />
+
+ <property
+ name="mpLine3"
+ value="%X{ServerFQDN}|%X{ClientIPAddress}|%X{ProcessKey}|%X{RemoteHost}|%X{AlertSeverity}" />
+
+ <property
+ name="mpLine4"
+ value="%X{TargetVirtualEntity}|%level|%thread| %msg%n" />
+
+
+ <property name="metricPattern"
+ value="{$mpPreamble}|{$mpTime}|{$mpLine1}|{$mpLine2}|{$mpLine3}|$mpLine4" />
+
+ <property name="transactionPattern" value="${metricPattern}" />
+
+ <appender name="ErrorOut"
+ class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <file>${logDir}/${errorLog}.log</file>
+ <rollingPolicy
+ class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+ <fileNamePattern>${logDir}/${errorLog}.%d{yyyy-MM-dd}.%i.log.zip
+ </fileNamePattern>
+ <maxFileSize>50MB</maxFileSize>
+ <maxHistory>30</maxHistory>
+ <totalSizeCap>10GB</totalSizeCap>
+ </rollingPolicy>
+ <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+ <level>WARN</level>
+ </filter>
+ <encoder>
+ <pattern>${errorPattern}</pattern>
+ </encoder>
+ </appender>
+
+ <appender name="AsyncErrorOut"
+ class="ch.qos.logback.classic.AsyncAppender">
+ <appender-ref ref="ErrorOut" />
+ </appender>
+
+ <appender name="DebugOut"
+ class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <file>${logDir}/${debugLog}.log</file>
+ <rollingPolicy
+ class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+ <fileNamePattern>${logDir}/${debugLog}.%d{yyyy-MM-dd}.%i.log.zip
+ </fileNamePattern>
+ <maxFileSize>50MB</maxFileSize>
+ <maxHistory>30</maxHistory>
+ <totalSizeCap>10GB</totalSizeCap>
+ </rollingPolicy>
+ <encoder>
+ <pattern>${debugPattern}</pattern>
+ </encoder>
+ </appender>
+
+ <appender name="AsyncDebugOut"
+ class="ch.qos.logback.classic.AsyncAppender">
+ <appender-ref ref="DebugOut" />
+ </appender>
+
+ <appender name="NetworkOut"
+ class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <file>${logDir}/${networkLog}.log</file>
+ <rollingPolicy
+ class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+ <fileNamePattern>${logDir}/${networkLog}.%d{yyyy-MM-dd}.%i.log.zip
+ </fileNamePattern>
+ <maxFileSize>50MB</maxFileSize>
+ <maxHistory>30</maxHistory>
+ <totalSizeCap>10GB</totalSizeCap>
+ </rollingPolicy>
+ <encoder>
+ <pattern>${networkPattern}</pattern>
+ </encoder>
+ </appender>
+
+ <appender name="AsyncNetworkOut"
+ class="ch.qos.logback.classic.AsyncAppender">
+ <appender-ref ref="NetworkOut" />
+ </appender>
+
+ <appender name="MetricOut"
+ class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <file>${logDir}/${metricLog}.log</file>
+ <rollingPolicy
+ class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+ <fileNamePattern>${logDir}/${metricLog}.%d{yyyy-MM-dd}.%i.log.zip
+ </fileNamePattern>
+ <maxFileSize>50MB</maxFileSize>
+ <maxHistory>30</maxHistory>
+ <totalSizeCap>10GB</totalSizeCap>
+ </rollingPolicy>
+ <encoder>
+ <pattern>${metricPattern}</pattern>
+ </encoder>
+ </appender>
+
+ <appender name="AsyncMetricOut"
+ class="ch.qos.logback.classic.AsyncAppender">
+ <appender-ref ref="MetricOut" />
+ </appender>
+
+ <appender name="TransactionOut"
+ class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <file>${logDir}/${transactionLog}.log</file>
+ <rollingPolicy
+ class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+ <fileNamePattern>${logDir}/${transactionLog}.%d{yyyy-MM-dd}.%i.log.zip
+ </fileNamePattern>
+ <maxFileSize>50MB</maxFileSize>
+ <maxHistory>30</maxHistory>
+ <totalSizeCap>10GB</totalSizeCap>
+ </rollingPolicy>
+ <encoder>
+ <pattern>${transactionPattern}</pattern>
+ </encoder>
+ </appender>
+
+ <appender name="AsyncTransactionOut"
+ class="ch.qos.logback.classic.AsyncAppender">
+ <appender-ref ref="TransactionOut" />
+ </appender>
+
+ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <Pattern>[%d{yyyy-MM-dd'T'HH:mm:ss.SSS+00:00, UTC}|%level|%logger{0}|%thread] %msg%n</Pattern>
+ </encoder>
+ </appender>
+
+ <appender name="AsyncStdOut" class="ch.qos.logback.classic.AsyncAppender">
+ <appender-ref ref="STDOUT" />
+ </appender>
+
+
+ <logger name="network" level="INFO" additivity="false">
+ <appender-ref ref="AsyncNetworkOut" />
+ </logger>
+
+ <logger name="org.eclipse.jetty.server.RequestLog" level="info"
+ additivity="false">
+ <appender-ref ref="AsyncNetworkOut" />
+ <appender-ref ref="AsyncStdOut" />
+ </logger>
+
+ <logger name="org.eclipse.jetty" level="ERROR" />
+
+ <root level="INFO">
+ <appender-ref ref="AsyncDebugOut" />
+ <appender-ref ref="AsyncErrorOut" />
+ <appender-ref ref="AsyncMetricOut" />
+ <appender-ref ref="AsyncTransactionOut" />
+ <appender-ref ref="AsyncStdOut" />
+ </root>
+
+</configuration>
diff --git a/csit/config/cakey.pem b/csit/config/cakey.pem
deleted file mode 100644
index 461c1523..00000000
--- a/csit/config/cakey.pem
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIrbGtIemEC2oCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECNUTed7WnOACBIIEyOcQO0PmJ/Qj
-0NSwyyRpztMUtwuBanXC43vHgPfkYXiQRSl7vFrKZ6c3rYc8+ZFIK4U6XzK9peuc
-Tqkt408CBlpOcHqYEtgIQ+U2Fm2ytbIa8BVYbKN3w2+GRN1bbfNwn2+k23r7lceb
-4M4OOM6aaEcTITXa63xE0LdpDX2URh4Jaty/6kVhu4ZHWarHZ4hoeZKbdS4WEz66
-j0Rajmpwddo59EK5S3sseYqkqKJzfBnDijTbk45xTzOxS14JqEmGBJtWCGehl2ax
-9zJE+27E8BUB9yEE7nrUXiEyMW3LHePb2sjcdXhRlS1dczyR/y17m/d2auJ26uiw
-IUMcuW0KJ6y9uqH9t8RyhjXabRktKbl3bGvcItd+pHBFlXw+aFVXA9xraXjIj1+B
-aKsIL7KKmsK8hjhjaPw7KKTScj5ttHSI9rrUsu3o/N2HdPGhPp/BY1ycW7+Aen7/
-0lRBoxvzNjj0IlVEBUGWha+ZscD0CpP9Xn9WpzMlBEDvZ6RS8ddn1uQlG9fbOZ9p
-phEewKlPUbXShluGivmAVuOvcIVXTi+V8lExIYdWo49H8U0zd8XYScxlAQYIkO8+
-O1roHsmUDI8QSaILW3bMnEr7oznyGe3qXA1rs+z0ZZWrlGunIeG71H7jrf2z2IOt
-RB2P/fYova0XoT/rZ88tn61zeJOBLvJqy2Z4Fqa3dnpEkGsKot6QAvaTkrGegN1+
-fEZQ+EdUAzqgMoBeNuadJ6Q42tsnpLzcAukcqz3x5zJuirQKgX9ALxVuh7xMHSVj
-W4D9RIpPxOK5ZUZ/COro+Fd9SXqZAevrsXb0q3KHIglZ3RhVxVFuWq8Y/6Tk1Zc9
-mZCKIrwQPzs3llvckebFf16+Vanxtwmb8xkWtYO7LzK28vVkZJ7HtKzX1zcy+OmX
-F/gZ+tzJk/vZg8OtW3Z+ypjRlh5ch+M7b2l448UFdMKrdqk4FpSsgZtlDAsi/1bK
-9HBNiskke7j1yj963A7rP0X/b2dRa7W/KrfMprtGp0wWUj1jm/SP5IaX+hfQYG9Z
-0vnU68A8p9Kphd1J2BDm3lrUhiZSwZKrZYNXelLifcNhjMn0ChhcShf4AVOb3gVH
-cSKtABk0B2bSWU6mgVHhmBQbc4grQdGG1ilyx4U0QnUJA2HLbiWvqe4NOWQjReTs
-6RptSeidlCu47f99U73f/f+X7WhOSEaCkzDhrWZzvOo3lwli9h18m2S+yDasMwVe
-Q0Ymv1+DiyXELS+jKbTiIMzuYGK4TYOE9OcQDNE0ob/C4oJioEGcdi9s2akYMXTt
-FFWn52elJnd+5Q38ElO3jpK3L1cOr4KA9tahl1uM1C8blM696fBbeS2A5HHh8PbO
-tl0GXXLgSM5fzGhKlZCbRnVIsusONC0O3cw72RKC1OszaNIYctIoYy3OcSeG85wy
-0BjiWo72Nvc1yKdwO4mRm1IYm95N61uv2bLMaRXtjQSlHqrY/S5UdTO/1SnMOYRZ
-KChzLf8rRN0c6lb+3bov167Uveu6tAGgXE8W53w9fA7ZwcmdDchnPJsN4YkM2bGh
-qoHiVDXvb4OS3H4HMoJBv/yUOb/icr5Z+kALpnH2FGUx/N36NcYH/cDesFNj7X9T
-FIhIqnbHcdIEGmjnmXCwmA==
------END ENCRYPTED PRIVATE KEY-----
diff --git a/csit/config/careq.pem b/csit/config/careq.pem
deleted file mode 100644
index b56ade1e..00000000
--- a/csit/config/careq.pem
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN CERTIFICATE REQUEST-----
-MIICjDCCAXQCAQAwRzELMAkGA1UEBhMCVVMxEzARBgNVBAgMCk5ldyBKZXJzZXkx
-DTALBgNVBAsMBE9OQVAxFDASBgNVBAMMC3BvbGljeS5vbmFwMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0qNgvDgs8fDWKUqQ0/ZLE3X8Ugg1EMnH0KVb
-qBAQlQjcP/G02ucBbp5KATXMI7RJQTtjajeQlLAHs2G8rZDRoWwg/61aEI6SGHzZ
-gb0k/ROQ1sIrtSfbHVSrZIyQaIF8XZrAh5RdA2oCLwJbc80aCDY06Sc4OsuljylN
-wqZHlBY/KBytkVGbeRY79dx7844SN7Wcr8qRAfLo1Gc3ZgSSwpMUHFueWr84Fh1O
-4xc9TXiz52QACWjHbqrI66IJLRZrvqMJz+hVOIQeT1c0ixTfb7q4kH5yDSmqZuNF
-PevnzL3Z0EoH/d3cJ5JmIjzKL5O+FMY43fPisziJoQmj36GaFQIDAQABoAAwDQYJ
-KoZIhvcNAQELBQADggEBAFdqXYjXK+88XvJyspAD5YX9XKBAiOH+eyacdMUKqkDJ
-coYw4xBX0LlzupZamg5Qwk/Ad/SMlqXL29hI322HN7Frx3dwlNzuighIMZ62sN/s
-FFf+rrAxqMBb1b++9thfOgrZdIQI5WodU0EELy+sFpRAbkieyEQ7a1SVie1+7Afu
-KhGfEGTvgln81eMr+QB0gRkTlorC7AkeWJzIgWMh4kTcujTWsVc/FLb1jSe7Hc7R
-diOdNes3EZLjfdpORhuL3BOb+HzTwVUyw2BHD3bD0u+XFOfDLIUlfdOSesuf6bi6
-JKHSeUV0xww0R0WfsgYxN/6HSFQ8hWFGa3PjY5D1UNE=
------END CERTIFICATE REQUEST-----
diff --git a/csit/config/caroot.cer b/csit/config/caroot.cer
deleted file mode 100644
index cd12c65c..00000000
--- a/csit/config/caroot.cer
+++ /dev/null
@@ -1,19 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDFTCCAf0CFCAWwWW10ZqYy46ID/aAsN1zxnkgMA0GCSqGSIb3DQEBCwUAMEcx
-CzAJBgNVBAYTAlVTMRMwEQYDVQQIDApOZXcgSmVyc2V5MQ0wCwYDVQQLDARPTkFQ
-MRQwEgYDVQQDDAtwb2xpY3kub25hcDAeFw0yMjA5MDUxMzI1MDlaFw0zMjA5MDIx
-MzI1MDlaMEcxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApOZXcgSmVyc2V5MQ0wCwYD
-VQQLDARPTkFQMRQwEgYDVQQDDAtwb2xpY3kub25hcDCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBANKjYLw4LPHw1ilKkNP2SxN1/FIINRDJx9ClW6gQEJUI
-3D/xtNrnAW6eSgE1zCO0SUE7Y2o3kJSwB7NhvK2Q0aFsIP+tWhCOkhh82YG9JP0T
-kNbCK7Un2x1Uq2SMkGiBfF2awIeUXQNqAi8CW3PNGgg2NOknODrLpY8pTcKmR5QW
-PygcrZFRm3kWO/Xce/OOEje1nK/KkQHy6NRnN2YEksKTFBxbnlq/OBYdTuMXPU14
-s+dkAAlox26qyOuiCS0Wa76jCc/oVTiEHk9XNIsU32+6uJB+cg0pqmbjRT3r58y9
-2dBKB/3d3CeSZiI8yi+TvhTGON3z4rM4iaEJo9+hmhUCAwEAATANBgkqhkiG9w0B
-AQsFAAOCAQEAumReAeDIj8a/bba3Lyhe55NSrMiVzZD9GRxJSUkmbi0RD6QRJpHG
-HXu9e8v3luP7Y8INz6c/ztCCNWCIggR53qYRdGAssId/mLpkx02WOvQGdWiPIoZQ
-VmUC4BORkfuHk/LceKPwIf+RM52NzlRPhPawZhDITVoVx5EASeV5ZrVUMoxDgix6
-Wk56MYUSjAjMQq3NFPzLbQEMA73gSCifo29NSPqEtTzNKI4UHTgOaXnv59YKP3t7
-IgbCtAxiN4qqUgemTXeBvfpLLpuq0wrltxu2joqprikvJujqxvxzOXlH4cMik47v
-aRqp806pFMBIf7P8S3b4MzLrZi8U5/CqVA==
------END CERTIFICATE-----
diff --git a/csit/config/caserial.txt b/csit/config/caserial.txt
deleted file mode 100644
index 3bdca32d..00000000
--- a/csit/config/caserial.txt
+++ /dev/null
@@ -1 +0,0 @@
-1245
diff --git a/csit/config/clamp/AcRuntimeParameters.yaml b/csit/config/clamp/AcRuntimeParameters.yaml
index 40031828..ef686cf7 100644
--- a/csit/config/clamp/AcRuntimeParameters.yaml
+++ b/csit/config/clamp/AcRuntimeParameters.yaml
@@ -32,6 +32,8 @@ security:
server:
port: 6969
+ ssl:
+ enabled: false
servlet:
context-path: /onap/policy/clamp/acm
error:
@@ -52,17 +54,18 @@ runtime:
- ${topicServer:message-router}
topicCommInfrastructure: dmaap
fetchTimeout: 15000
- useHttps: true
+ useHttps: false
topicSinks:
-
topic: POLICY-ACRUNTIME-PARTICIPANT
servers:
- ${topicServer:message-router}
topicCommInfrastructure: dmaap
- useHttps: true
+ useHttps: false
management:
endpoints:
web:
+ base-path: /
exposure:
include: health, metrics, prometheus
diff --git a/csit/config/clamp/application-smoke.properties b/csit/config/clamp/ClampBackend.properties
index 40578077..b9776d04 100644
--- a/csit/config/clamp/application-smoke.properties
+++ b/csit/config/clamp/ClampBackend.properties
@@ -44,11 +44,11 @@
### HTTPS Example:
### --------------
### server.port=8443
-server.ssl.key-store=file:/opt/policy/clamp/policy-keystore
-server.ssl.key-store-password=enc:qWxBtY7w9h5Hl72vQKgI5G1qqyRIuBarQqMkVDHqZmd
-server.ssl.key-password=enc:qWxBtY7w9h5Hl72vQKgI5G1qqyRIuBarQqMkVDHqZmd
-server.ssl.key-store-type=jks
-server.port=8443
+#server.ssl.key-store=file:/opt/policy/clamp/policy-keystore
+#server.ssl.key-store-password=enc:qWxBtY7w9h5Hl72vQKgI5G1qqyRIuBarQqMkVDHqZmd
+#server.ssl.key-password=enc:qWxBtY7w9h5Hl72vQKgI5G1qqyRIuBarQqMkVDHqZmd
+#server.ssl.key-store-type=jks
+server.port=8445
## Config part for Server certificates
# Can be a classpath parameter instead of file:/
#server.ssl.key-store=classpath:/clds/aaf/org.onap.clamp.p12
@@ -56,22 +56,22 @@ server.port=8443
#server.ssl.key-password=enc:YZs7M6IftyPjHniTa6J7G2416hssb8qI-Av8D1b8pPS
## Config part for Client certificates
-server.ssl.client-auth=want
+#server.ssl.client-auth=want
#server.ssl.trust-store=classpath:/clds/aaf/truststoreONAPall.jks
#server.ssl.trust-store-password=enc:iDnPBBLq_EMidXlMa1FEuBR8TZzYxrCg66vq_XfLHdJ
-server.ssl.trust-store=file:/opt/policy/clamp/policy-truststore
-server.ssl.trust-store-password=enc:qWxBtY7w9h5Hl72vQKgI5G1qqyRIuBarQqMkVDHqZmd
+#server.ssl.trust-store=file:/opt/policy/clamp/policy-truststore
+#server.ssl.trust-store-password=enc:qWxBtY7w9h5Hl72vQKgI5G1qqyRIuBarQqMkVDHqZmd
# The key file used to decode the key store and trust store password
# If not defined, the key store and trust store password will not be decrypted
#clamp.config.keyFile=classpath:/clds/aaf/org.onap.clamp.keyfile
-clamp.config.keyFile=file:/opt/policy/clamp/clamp-be-keyfile
+#clamp.config.keyFile=file:/opt/policy/clamp/clamp-be-keyfile
-#server.http-to-https-redirection.port=8080
+server.http-to-https-redirection.port=8080
server.servlet.context-path=/
#Modified engine-rest applicationpath
-spring.profiles.active=clamp-default,clamp-default-user,clamp-sdc-controller,clamp-ssl-config,clamp-policy-controller,default-dictionary-elements
+spring.profiles.active=clamp-default,clamp-default-user,clamp-policy-controller,default-dictionary-elements
spring.http.converters.preferred-json-mapper=gson
#The max number of active threads in this pool
@@ -134,10 +134,10 @@ async.max.pool.size=20
async.queue.capacity=500
#For logback file
-#clamp.config.logback.path=
-clamp.config.logback.filename=logback-default.xml
+clamp.config.logback.path=/opt/policy/clamp/config
+clamp.config.logback.filename=logback.xml
#The log folder that will be used in logback.xml file
-clamp.config.log.path=/var/log/onap/clamp
+clamp.config.log.path=/var/log/onap/policy/clamp
clamp.config.files.systemProperties=classpath:/system.properties
clamp.config.files.cldsUsers=classpath:/clds/clds-users.json
clamp.config.files.globalProperties=classpath:/clds/templates/globalProperties.json
@@ -148,10 +148,10 @@ clamp.config.httpclient.connectTimeout=10000
#
# Configuration Settings for Policy Engine Components
-clamp.config.policy.api.url={{PROTOCOL}}${POLICY_API_HOST}:6969
+clamp.config.policy.api.url=http://${POLICY_API_HOST}:6969
clamp.config.policy.api.userName=policyadmin
clamp.config.policy.api.password=zb!XztG34
-clamp.config.policy.pap.url={{PROTOCOL}}${POLICY_PAP_HOST}:6969
+clamp.config.policy.pap.url=http://${POLICY_PAP_HOST}:6969
clamp.config.policy.pap.userName=policyadmin
clamp.config.policy.pap.password=zb!XztG34
@@ -160,12 +160,12 @@ clamp.config.policy.pap.password=zb!XztG34
clamp.config.sdc.csarFolder = /tmp/sdc-controllers
#DCAE Inventory Url Properties
-clamp.config.dcae.inventory.url={{PROTOCOL}}localhost:8085
+clamp.config.dcae.inventory.url=http://localhost:8085
clamp.config.dcae.intentory.retry.interval=10000
clamp.config.dcae.intentory.retry.limit=5
#DCAE Deployment Url Properties
-clamp.config.dcae.deployment.url={{PROTOCOL}}localhost:8085
+clamp.config.dcae.deployment.url=http://localhost:8085
clamp.config.dcae.deployment.userName=test
clamp.config.dcae.deployment.password=test
@@ -187,11 +187,11 @@ clamp.config.tosca.converter.default.datatypes=classpath:/clds/tosca-converter/d
clamp.config.tosca.converter.dictionary.support.enabled=true
# Configuration settings for CDS
-clamp.config.cds.url={{PROTOCOL}}cds-blueprints-processor-http:8080
+clamp.config.cds.url=http://cds-blueprints-processor-http:8080
clamp.config.cds.userName=ccsdkapps
clamp.config.cds.password=ccsdkapps
# Configuration settings for ControlLoop Runtime Rest API
-clamp.config.acm.runtime.url={{PROTOCOL}}${RUNTIME_HOST}:6969
+clamp.config.acm.runtime.url=http://${RUNTIME_HOST}:6969
clamp.config.acm.runtime.userName=runtimeUser
clamp.config.acm.runtime.password=zb!XztG34
diff --git a/csit/config/clamp/HttpParticipantParameters.yaml b/csit/config/clamp/HttpParticipantParameters.yaml
index 529b095a..15768882 100644
--- a/csit/config/clamp/HttpParticipantParameters.yaml
+++ b/csit/config/clamp/HttpParticipantParameters.yaml
@@ -22,19 +22,21 @@ participant:
- ${topicServer:message-router}
topicCommInfrastructure: dmaap
fetchTimeout: 15000
- useHttps: true
+ useHttps: false
topicSinks:
- topic: POLICY-ACRUNTIME-PARTICIPANT
servers:
- ${topicServer:message-router}
topicCommInfrastructure: dmaap
- useHttps: true
+ useHttps: false
management:
endpoints:
web:
exposure:
include: health, metrics, prometheus
server:
- port: 8084
+ port: 6969
+ ssl:
+ enabled: false
servlet:
context-path: /onap/policy/clamp/acm/httpparticipant
diff --git a/csit/config/clamp/KubernetesParticipantParameters.yaml b/csit/config/clamp/KubernetesParticipantParameters.yaml
index c6acf405..c13f8151 100644
--- a/csit/config/clamp/KubernetesParticipantParameters.yaml
+++ b/csit/config/clamp/KubernetesParticipantParameters.yaml
@@ -26,14 +26,14 @@ participant:
- ${topicServer:message-router}
topicCommInfrastructure: dmaap
fetchTimeout: 15000
- useHttps: true
+ useHttps: false
topicSinks:
-
topic: POLICY-ACRUNTIME-PARTICIPANT
servers:
- ${topicServer:message-router}
topicCommInfrastructure: dmaap
- useHttps: true
+ useHttps: false
management:
endpoints:
@@ -41,7 +41,9 @@ management:
exposure:
include: health, metrics, prometheus
server:
- port: 8083
+ port: 6969
+ ssl:
+ enabled: false
servlet:
context-path: /onap/policy/clamp/acm/k8sparticipant
diff --git a/csit/config/clamp/PolicyParticipantParameters.yaml b/csit/config/clamp/PolicyParticipantParameters.yaml
index 1cb4e6dc..acaaebbe 100644
--- a/csit/config/clamp/PolicyParticipantParameters.yaml
+++ b/csit/config/clamp/PolicyParticipantParameters.yaml
@@ -13,7 +13,7 @@ participant:
port: 6969
userName: policyadmin
password: zb!XztG34
- useHttps: true
+ useHttps: false
allowSelfSignedCerts: true
policyPapParameters:
clientName: pap
@@ -21,7 +21,7 @@ participant:
port: 6969
userName: policyadmin
password: zb!XztG34
- useHttps: true
+ useHttps: false
allowSelfSignedCerts: true
intermediaryParameters:
reportingTimeIntervalMs: 120000
@@ -40,20 +40,22 @@ participant:
- ${topicServer:message-router}
topicCommInfrastructure: dmaap
fetchTimeout: 15000
- useHttps: true
+ useHttps: false
topicSinks:
-
topic: POLICY-ACRUNTIME-PARTICIPANT
servers:
- ${topicServer:message-router}
topicCommInfrastructure: dmaap
- useHttps: true
+ useHttps: false
management:
endpoints:
web:
exposure:
include: health, metrics, prometheus
server:
- port: 8085
+ port: 6969
+ ssl:
+ enabled: false
servlet:
context-path: /onap/policy/clamp/acm/policyparticipant
diff --git a/csit/config/clamp/groups.json b/csit/config/clamp/groups.json
new file mode 100644
index 00000000..6ee30e1c
--- /dev/null
+++ b/csit/config/clamp/groups.json
@@ -0,0 +1,137 @@
+{
+ "groups": [
+ {
+ "name": "defaultGroup",
+ "version": "1.0.0",
+ "description": "The default group that registers all supported policy types and pdps.",
+ "pdpGroupState": "ACTIVE",
+ "pdpSubgroups": [
+ {
+ "pdpType": "xacml",
+ "supportedPolicyTypes": [
+ {
+ "name": "onap.policies.controlloop.guard.common.FrequencyLimiter",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.controlloop.guard.common.MinMax",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.controlloop.guard.common.Blacklist",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.controlloop.guard.common.Filter",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.controlloop.guard.coordination.FirstBlocksSecond",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.monitoring.*",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.*",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.AffinityPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.DistancePolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.HpaPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.OptimizationPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.PciPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.service.QueryPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.service.SubscriberPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.Vim_fit",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.VnfPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.native.Xacml",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.Naming",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.match.*",
+ "version": "1.0.0"
+ }
+ ],
+ "currentInstanceCount": 0,
+ "desiredInstanceCount": 1,
+ "policies": [
+ {
+ "name": "SDNC_Policy.ONAP_NF_NAMING_TIMESTAMP",
+ "version": "1.0.0"
+ }
+ ]
+ },
+ {
+ "pdpType": "drools",
+ "supportedPolicyTypes": [
+ {
+ "name": "onap.policies.controlloop.operational.common.Drools",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.native.drools.Controller",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.native.drools.Artifact",
+ "version": "1.0.0"
+ }
+ ],
+ "currentInstanceCount": 0,
+ "desiredInstanceCount": 1,
+ "policies": []
+ },
+ {
+ "pdpType": "apex",
+ "supportedPolicyTypes": [
+ {
+ "name": "onap.policies.controlloop.operational.common.Apex",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.native.Apex",
+ "version": "1.0.0"
+ }
+ ],
+ "currentInstanceCount": 0,
+ "desiredInstanceCount": 1,
+ "policies": []
+ }
+ ]
+ }
+ ]
+}
diff --git a/csit/config/clamp/logback-backend.xml b/csit/config/clamp/logback-backend.xml
new file mode 100644
index 00000000..cfa280c4
--- /dev/null
+++ b/csit/config/clamp/logback-backend.xml
@@ -0,0 +1,219 @@
+<included>
+ <jmxConfigurator />
+ <!-- Example evaluator filter applied against console appender -->
+ <property name="p_tim" value="%d{&quot;yyyy-MM-dd'T'HH:mm:ss.SSSXXX&quot;, UTC}" />
+ <property name="p_lvl" value="%level" />
+ <property name="p_log" value="%logger" />
+ <property name="p_mdc" value="%replace(%replace(%mdc){'\t','\\\\t'}){'\n', '\\\\n'}" />
+ <property name="p_msg" value="%replace(%replace(%msg){'\t', '\\\\t'}){'\n','\\\\n'}" />
+ <property name="p_exc" value="%replace(%replace(%rootException){'\t', '\\\\t'}){'\n','\\\\n'}" />
+ <property name="p_mak" value="%replace(%replace(%marker){'\t', '\\\\t'}){'\n','\\\\n'}" />
+ <property name="p_thr" value="%thread" />
+ <property name="defaultPattern"
+ value="%nopexception${p_tim}\t${p_thr}\t${p_lvl}\t${p_log}\t${p_mdc}\t${p_msg}\t${p_exc}\t${p_mak}\t%n" />
+ <property name="debugPattern" value="%nopexception${p_tim}|${p_lvl}|${p_mdc}|${p_exc}|%msg%n" />
+
+ <property name="errorPattern"
+ value="%X{EntryTimestamp}|%X{RequestID}|%thread|%X{ServiceName}|%X{PartnerName}|%X{TargetEntity}|%X{TargetServiceName}||||%msg%n" />
+
+ <property name="auditPattern"
+ value="%X{EntryTimestamp}|%date{yyyy-MM-dd'T'HH:mm:ss.SSSXXX,UTC}|%X{RequestID}|%X{ServiceInstanceId}|%thread|%X{VirtualServerName}|%X{ServiceName}|%X{PartnerName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDesc}|%X{InstanceUUID}|%.-5level|%X{Severity}|%X{ServerIPAddress}|%X{ElapsedTime}|%X{ServerFQDN}|%X{RemoteHost}||||%marker|%mdc|||%msg%n" />
+
+ <property name="metricPattern"
+ value="%X{InvokeTimestamp}|%date{yyyy-MM-dd'T'HH:mm:ss.SSSXXX,UTC}|%X{RequestID}|%X{ServiceInstanceId}|%thread||%X{ServiceName}|%X{PartnerName}|%X{TargetEntity}|%X{TargetServiceName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDesc}|%X{InstanceUUID}|%.-5level|%X{Severity}|%X{ServerIPAddress}|%X{ElapsedTime}|%X{ServerFQDN}|%X{RemoteHost}||||%X{TargetVirtualEntity}|%marker|%mdc|||%msg%n" />
+
+
+ <!-- Example evaluator filter applied against console appender -->
+ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+ <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+ <level>INFO</level>
+ </filter>
+ <encoder>
+ <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{1024} - %msg%n
+ </pattern>
+ </encoder>
+ </appender>
+
+ <appender name="ERROR" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <filter class="ch.qos.logback.classic.filter.LevelFilter">
+ <level>ERROR</level>
+ <onMatch>ACCEPT</onMatch>
+ <onMismatch>DENY</onMismatch>
+ </filter>
+ <file>${logDirectory}/error.log</file>
+ <append>true</append>
+ <encoder>
+ <pattern>${errorPattern}</pattern>
+ </encoder>
+ <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+ <fileNamePattern>${logDirectory}/error.%d{yyyy-MM-dd}.%i.log.zip
+ </fileNamePattern>
+ <maxFileSize>50MB</maxFileSize>
+ <maxHistory>20</maxHistory>
+ <totalSizeCap>1GB</totalSizeCap>
+ </rollingPolicy>
+ </appender>
+ <appender name="asyncError" class="ch.qos.logback.classic.AsyncAppender">
+ <queueSize>256</queueSize>
+ <appender-ref ref="ERROR" />
+ </appender>
+
+ <appender name="DEBUG" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <file>${logDirectory}/debug.log</file>
+ <append>true</append>
+ <encoder>
+ <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{1024} - %msg%n
+ </pattern>
+ </encoder>
+ <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+ <fileNamePattern>${logDirectory}/debug.%d{yyyy-MM-dd}.%i.log.zip
+ </fileNamePattern>
+ <maxFileSize>50MB</maxFileSize>
+ <maxHistory>20</maxHistory>
+ <totalSizeCap>1GB</totalSizeCap>
+ </rollingPolicy>
+ </appender>
+ <appender name="asyncDebug" class="ch.qos.logback.classic.AsyncAppender">
+ <queueSize>256</queueSize>
+ <appender-ref ref="DEBUG" />
+ </appender>
+
+ <appender name="AUDIT" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <filter class="org.onap.policy.common.utils.logging.LoggerMarkerFilter$AuditLoggerMarkerFilter" />
+ <file>${logDirectory}/audit.log</file>
+ <encoder>
+ <pattern>${auditPattern}</pattern>
+ </encoder>
+ <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+ <FileNamePattern>${logDirectory}/audit.%d{yyyy-MM-dd}.%i.log.zip
+ </FileNamePattern>
+ <maxFileSize>50MB</maxFileSize>
+ <maxHistory>20</maxHistory>
+ <totalSizeCap>1GB</totalSizeCap>
+ </rollingPolicy>
+ </appender>
+ <appender name="asyncAudit" class="ch.qos.logback.classic.AsyncAppender">
+ <queueSize>256</queueSize>
+ <appender-ref ref="AUDIT" />
+ </appender>
+
+ <appender name="METRIC" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <filter class="org.onap.policy.common.utils.logging.LoggerMarkerFilter$MetricLoggerMarkerFilter" />
+ <file>${logDirectory}/metric.log</file>
+ <encoder>
+ <pattern>${metricPattern}</pattern>
+ </encoder>
+ <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+ <FileNamePattern>${logDirectory}/metric.%d{yyyy-MM-dd}.%i.log.zip
+ </FileNamePattern>
+ <maxFileSize>50MB</maxFileSize>
+ <maxHistory>20</maxHistory>
+ <totalSizeCap>1GB</totalSizeCap>
+ </rollingPolicy>
+ </appender>
+ <appender name="asyncMetric" class="ch.qos.logback.classic.AsyncAppender">
+ <queueSize>256</queueSize>
+ <appender-ref ref="METRIC" />
+ </appender>
+
+ <!-- SECURITY related loggers -->
+ <appender name="SECURITY" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <filter class="org.onap.policy.common.utils.logging.LoggerMarkerFilter$SecurityLoggerMarkerFilter" />
+ <file>${logDirectory}/security.log</file>
+ <encoder>
+ <pattern>%X{EntryTimestamp}|%date{yyyy-MM-dd'T'HH:mm:ss.SSSXXX,UTC}|%X{RequestID}|%X{ServiceInstanceId}|%.20thread|%X{VirtualServerName}|%X{ServiceName}|%X{PartnerName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDescription}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ElapsedTime}|%X{ServerFQDN}|%X{RemoteHost}|%X{ClassName}|%X{Unused}|%X{ProcessKey}|%X{CustomField1}|%X{CustomField2}|%X{CustomField3}|%X{CustomField4}|%msg%n
+ </pattern>
+ </encoder>
+ <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+ <FileNamePattern>${logDirectory}/security.%d{yyyy-MM-dd}.%i.log.zip
+ </FileNamePattern>
+ <maxFileSize>50MB</maxFileSize>
+ <maxHistory>20</maxHistory>
+ <totalSizeCap>1GB</totalSizeCap>
+ </rollingPolicy>
+ </appender>
+ <appender name="asyncSecurity" class="ch.qos.logback.classic.AsyncAppender">
+ <queueSize>256</queueSize>
+ <appender-ref ref="SECURITY" />
+ </appender>
+
+ <!-- logback jms appenders & loggers definition starts here -->
+ <appender name="auditLogs" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+ </filter>
+ <file>${logDirectory}/Audits.log</file>
+ <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+ <fileNamePattern>${logDirectory}/Audits-%d{yyyy-MM-dd}.%i.log.zip
+ </fileNamePattern>
+ <maxFileSize>50MB</maxFileSize>
+ <maxHistory>20</maxHistory>
+ <totalSizeCap>1GB</totalSizeCap>
+ </rollingPolicy>
+ <encoder>
+ <pattern>"%d [%thread] %-5level %logger{1024} - %msg%n"</pattern>
+ </encoder>
+ </appender>
+
+ <appender name="perfLogs" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+ </filter>
+ <file>${logDirectory}/Perform.log</file>
+ <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+ <fileNamePattern>${logDirectory}/Perform--%d{yyyy-MM-dd}.%i.log.zip
+ </fileNamePattern>
+ <maxFileSize>50MB</maxFileSize>
+ <maxHistory>20</maxHistory>
+ <totalSizeCap>1GB</totalSizeCap>
+ </rollingPolicy>
+ <encoder>
+ <pattern>"%d [%thread] %-5level %logger{1024} - %msg%n"</pattern>
+ </encoder>
+ </appender>
+
+ <logger name="org.onap.aaf" level="DEBUG">
+ <appender-ref ref="DEBUG" />
+ </logger>
+ <logger name="org.hibernate" level="INFO">
+ <appender-ref ref="DEBUG" />
+ </logger>
+ <logger name="org.apache.camel.Tracing" level="INFO">
+ <appender-ref ref="DEBUG" />
+ </logger>
+
+ <logger name="org.apache" level="INFO">
+ <appender-ref ref="DEBUG" />
+ </logger>
+ <!-- Spring related loggers -->
+ <logger name="org.springframework" level="INFO">
+ <appender-ref ref="DEBUG" />
+ </logger>
+
+ <!-- CLAMP related loggers -->
+ <logger name="org.onap.policy.clamp" level="DEBUG">
+ <appender-ref ref="ERROR" />
+ <appender-ref ref="DEBUG" />
+ </logger>
+
+ <!-- logback internals logging -->
+ <logger name="ch.qos.logback.classic" level="INFO" />
+ <logger name="ch.qos.logback.core" level="INFO" />
+ <logger name="AuditRecord" level="INFO" additivity="false">
+ <appender-ref ref="auditLogs" />
+ </logger>
+ <logger name="AuditRecord_DirectCall" level="INFO" additivity="false">
+ <appender-ref ref="auditLogs" />
+ </logger>
+ <logger name="PerfTrackerRecord" level="INFO" additivity="false">
+ <appender-ref ref="perfLogs" />
+ </logger>
+ <!-- logback jms appenders & loggers definition ends here -->
+
+ <root level="DEBUG">
+ <appender-ref ref="asyncDebug" />
+ <appender-ref ref="asyncError" />
+ <appender-ref ref="asyncAudit" />
+ <appender-ref ref="asyncMetric" />
+ <appender-ref ref="asyncSecurity" />
+ <appender-ref ref="STDOUT" />
+ </root>
+</included>
diff --git a/csit/config/clamp/logback.xml b/csit/config/clamp/logback.xml
new file mode 100644
index 00000000..c316e179
--- /dev/null
+++ b/csit/config/clamp/logback.xml
@@ -0,0 +1,206 @@
+<!--
+ ============LICENSE_START=======================================================
+ policy-clamp
+ ================================================================================
+ Copyright (C) 2021 Nordix Foundation.
+ ================================================================================
+ 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
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ ============LICENSE_END=========================================================
+ -->
+
+<configuration scan="true" scanPeriod="30 seconds" debug="false">
+
+ <property name="logDir" value="${POLICY_LOGS}" />
+
+ <property name="errorLog" value="error" />
+ <property name="debugLog" value="debug" />
+ <property name="networkLog" value="network" />
+
+ <property name="metricLog" value="metric" />
+ <property name="transactionLog" value="audit" />
+
+ <property name="debugPattern"
+ value="[%d{yyyy-MM-dd'T'HH:mm:ss.SSS+00:00, UTC}|%level|%logger{0}|%thread] %msg%n" />
+ <property name="errorPattern" value="${debugPattern}" />
+ <property name="networkPattern"
+ value="[%d{yyyy-MM-dd'T'HH:mm:ss.SSS+00:00, UTC}|%t]%m%n" />
+
+ <property
+ name="mpPreamble"
+ value="%X{RequestID}|%X{InvocationID}|%X{ServiceName}|%X{PartnerName}" />
+
+ <property
+ name="mpTime"
+ value="%X{BeginTimestamp}|%X{EndTimestamp}|%X{ElapsedTime}" />
+
+ <property
+ name="mpLine1"
+ value="%X{ServiceInstanceID}|%X{VirtualServerName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDescription}" />
+
+ <property
+ name="mpLine2"
+ value="%X{InstanceUUID}|%X{Severity}|%X{TargetEntity}|%X{TargetServiceName}|%X{Server}|%X{ServerIPAddress}" />
+
+ <property
+ name="mpLine3"
+ value="%X{ServerFQDN}|%X{ClientIPAddress}|%X{ProcessKey}|%X{RemoteHost}|%X{AlertSeverity}" />
+
+ <property
+ name="mpLine4"
+ value="%X{TargetVirtualEntity}|%level|%thread| %msg%n" />
+
+
+ <property name="metricPattern"
+ value="{$mpPreamble}|{$mpTime}|{$mpLine1}|{$mpLine2}|{$mpLine3}|$mpLine4" />
+
+ <property name="transactionPattern" value="${metricPattern}" />
+
+ <appender name="ErrorOut"
+ class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <file>${logDir}/${errorLog}.log</file>
+ <rollingPolicy
+ class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+ <fileNamePattern>${logDir}/${errorLog}.%d{yyyy-MM-dd}.%i.log.zip
+ </fileNamePattern>
+ <maxFileSize>50MB</maxFileSize>
+ <maxHistory>30</maxHistory>
+ <totalSizeCap>10GB</totalSizeCap>
+ </rollingPolicy>
+ <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+ <level>WARN</level>
+ </filter>
+ <encoder>
+ <pattern>${errorPattern}</pattern>
+ </encoder>
+ </appender>
+
+ <appender name="AsyncErrorOut"
+ class="ch.qos.logback.classic.AsyncAppender">
+ <appender-ref ref="ErrorOut" />
+ </appender>
+
+ <appender name="DebugOut"
+ class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <file>${logDir}/${debugLog}.log</file>
+ <rollingPolicy
+ class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+ <fileNamePattern>${logDir}/${debugLog}.%d{yyyy-MM-dd}.%i.log.zip
+ </fileNamePattern>
+ <maxFileSize>50MB</maxFileSize>
+ <maxHistory>30</maxHistory>
+ <totalSizeCap>10GB</totalSizeCap>
+ </rollingPolicy>
+ <encoder>
+ <pattern>${debugPattern}</pattern>
+ </encoder>
+ </appender>
+
+ <appender name="AsyncDebugOut"
+ class="ch.qos.logback.classic.AsyncAppender">
+ <appender-ref ref="DebugOut" />
+ </appender>
+
+ <appender name="NetworkOut"
+ class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <file>${logDir}/${networkLog}.log</file>
+ <rollingPolicy
+ class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+ <fileNamePattern>${logDir}/${networkLog}.%d{yyyy-MM-dd}.%i.log.zip
+ </fileNamePattern>
+ <maxFileSize>50MB</maxFileSize>
+ <maxHistory>30</maxHistory>
+ <totalSizeCap>10GB</totalSizeCap>
+ </rollingPolicy>
+ <encoder>
+ <pattern>${networkPattern}</pattern>
+ </encoder>
+ </appender>
+
+ <appender name="AsyncNetworkOut"
+ class="ch.qos.logback.classic.AsyncAppender">
+ <appender-ref ref="NetworkOut" />
+ </appender>
+
+ <appender name="MetricOut"
+ class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <file>${logDir}/${metricLog}.log</file>
+ <rollingPolicy
+ class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+ <fileNamePattern>${logDir}/${metricLog}.%d{yyyy-MM-dd}.%i.log.zip
+ </fileNamePattern>
+ <maxFileSize>50MB</maxFileSize>
+ <maxHistory>30</maxHistory>
+ <totalSizeCap>10GB</totalSizeCap>
+ </rollingPolicy>
+ <encoder>
+ <pattern>${metricPattern}</pattern>
+ </encoder>
+ </appender>
+
+ <appender name="AsyncMetricOut"
+ class="ch.qos.logback.classic.AsyncAppender">
+ <appender-ref ref="MetricOut" />
+ </appender>
+
+ <appender name="TransactionOut"
+ class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <file>${logDir}/${transactionLog}.log</file>
+ <rollingPolicy
+ class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+ <fileNamePattern>${logDir}/${transactionLog}.%d{yyyy-MM-dd}.%i.log.zip
+ </fileNamePattern>
+ <maxFileSize>50MB</maxFileSize>
+ <maxHistory>30</maxHistory>
+ <totalSizeCap>10GB</totalSizeCap>
+ </rollingPolicy>
+ <encoder>
+ <pattern>${transactionPattern}</pattern>
+ </encoder>
+ </appender>
+
+ <appender name="AsyncTransactionOut"
+ class="ch.qos.logback.classic.AsyncAppender">
+ <appender-ref ref="TransactionOut" />
+ </appender>
+
+ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <Pattern>[%d{yyyy-MM-dd'T'HH:mm:ss.SSS+00:00, UTC}|%level|%logger{0}|%thread] %msg%n</Pattern>
+ </encoder>
+ </appender>
+
+ <appender name="AsyncStdOut" class="ch.qos.logback.classic.AsyncAppender">
+ <appender-ref ref="STDOUT" />
+ </appender>
+
+ <logger name="network" level="INFO" additivity="false">
+ <appender-ref ref="AsyncNetworkOut" />
+ <appender-ref ref="AsyncStdOut" />
+ </logger>
+
+ <logger name="org.eclipse.jetty.server.RequestLog" level="info" additivity="false">
+ <appender-ref ref="AsyncNetworkOut" />
+ <appender-ref ref="AsyncStdOut" />
+ </logger>
+
+ <logger name="org.eclipse.jetty" level="ERROR" />
+
+ <root level="INFO">
+ <appender-ref ref="AsyncDebugOut" />
+ <appender-ref ref="AsyncErrorOut" />
+ <appender-ref ref="AsyncMetricOut" />
+ <appender-ref ref="AsyncTransactionOut" />
+ <appender-ref ref="AsyncStdOut" />
+ </root>
+
+</configuration>
diff --git a/csit/config/distribution/defaultConfig.json b/csit/config/distribution/defaultConfig.json
index 50cb822e..7f09c6b4 100644
--- a/csit/config/distribution/defaultConfig.json
+++ b/csit/config/distribution/defaultConfig.json
@@ -5,7 +5,7 @@
"port":6969,
"userName":"healthcheck",
"password":"zb!XztG34",
- "https": {{HTTPS_ENABLED}},
+ "https": false,
"prometheus": true
},
"receptionHandlerParameters":{
@@ -59,7 +59,7 @@
"port": 6969,
"userName": "policyadmin",
"password": "zb!XztG34",
- "useHttps": {{HTTPS_ENABLED}}
+ "useHttps": false
},
"papParameters": {
"clientName": "policy-pap",
@@ -67,7 +67,7 @@
"port": 6969,
"userName": "policyadmin",
"password": "zb!XztG34",
- "useHttps": {{HTTPS_ENABLED}}
+ "useHttps": false
},
"deployPolicies": true
}
diff --git a/csit/config/distribution/groups.json b/csit/config/distribution/groups.json
new file mode 100644
index 00000000..6ee30e1c
--- /dev/null
+++ b/csit/config/distribution/groups.json
@@ -0,0 +1,137 @@
+{
+ "groups": [
+ {
+ "name": "defaultGroup",
+ "version": "1.0.0",
+ "description": "The default group that registers all supported policy types and pdps.",
+ "pdpGroupState": "ACTIVE",
+ "pdpSubgroups": [
+ {
+ "pdpType": "xacml",
+ "supportedPolicyTypes": [
+ {
+ "name": "onap.policies.controlloop.guard.common.FrequencyLimiter",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.controlloop.guard.common.MinMax",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.controlloop.guard.common.Blacklist",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.controlloop.guard.common.Filter",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.controlloop.guard.coordination.FirstBlocksSecond",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.monitoring.*",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.*",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.AffinityPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.DistancePolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.HpaPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.OptimizationPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.PciPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.service.QueryPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.service.SubscriberPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.Vim_fit",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.VnfPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.native.Xacml",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.Naming",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.match.*",
+ "version": "1.0.0"
+ }
+ ],
+ "currentInstanceCount": 0,
+ "desiredInstanceCount": 1,
+ "policies": [
+ {
+ "name": "SDNC_Policy.ONAP_NF_NAMING_TIMESTAMP",
+ "version": "1.0.0"
+ }
+ ]
+ },
+ {
+ "pdpType": "drools",
+ "supportedPolicyTypes": [
+ {
+ "name": "onap.policies.controlloop.operational.common.Drools",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.native.drools.Controller",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.native.drools.Artifact",
+ "version": "1.0.0"
+ }
+ ],
+ "currentInstanceCount": 0,
+ "desiredInstanceCount": 1,
+ "policies": []
+ },
+ {
+ "pdpType": "apex",
+ "supportedPolicyTypes": [
+ {
+ "name": "onap.policies.controlloop.operational.common.Apex",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.native.Apex",
+ "version": "1.0.0"
+ }
+ ],
+ "currentInstanceCount": 0,
+ "desiredInstanceCount": 1,
+ "policies": []
+ }
+ ]
+ }
+ ]
+}
diff --git a/csit/config/distribution/logback.xml b/csit/config/distribution/logback.xml
new file mode 100644
index 00000000..fdd850f9
--- /dev/null
+++ b/csit/config/distribution/logback.xml
@@ -0,0 +1,136 @@
+<!--
+ ============LICENSE_START=======================================================
+ Copyright (C) 2018 Ericsson. All rights reserved.
+ ================================================================================
+ 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
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ SPDX-License-Identifier: Apache-2.0
+ ============LICENSE_END=========================================================
+-->
+
+<configuration scan="true" scanPeriod="30 seconds" debug="false">
+
+ <property name="logDir" value="${POLICY_LOGS}" />
+
+ <property name="errorLog" value="error" />
+ <property name="debugLog" value="debug" />
+ <property name="networkLog" value="network" />
+
+ <property name="metricLog" value="metric" />
+ <property name="transactionLog" value="audit" />
+
+ <property name="debugPattern"
+ value="[%d{yyyy-MM-dd'T'HH:mm:ss.SSS+00:00, UTC}|%level|%logger{0}|%thread] %msg%n" />
+ <property name="errorPattern" value="${debugPattern}" />
+ <property name="networkPattern"
+ value="[%d{yyyy-MM-dd'T'HH:mm:ss.SSS+00:00, UTC}|%t]%m%n" />
+
+ <property name="metricPattern"
+ value="%X{RequestID}|%X{InvocationID}|%X{ServiceName}|%X{PartnerName}|%X{BeginTimestamp}|%X{EndTimestamp}|%X{ElapsedTime}|%X{ServiceInstanceID}|%X{VirtualServerName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDescription}|%X{InstanceUUID}|%X{Severity}|%X{TargetEntity}|%X{TargetServiceName}|%X{Server}|%X{ServerIPAddress}|%X{ServerFQDN}|%X{ClientIPAddress}|%X{ProcessKey}|%X{RemoteHost}|%X{AlertSeverity}|%X{TargetVirtualEntity}|%level|%thread| %msg%n" />
+ <property name="transactionPattern" value="${metricPattern}" />
+
+ <appender name="ErrorOut"
+ class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <file>${logDir}/${errorLog}.log</file>
+ <rollingPolicy
+ class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+ <fileNamePattern>${logDir}/${errorLog}.%d{yyyy-MM-dd}.%i.log.zip
+ </fileNamePattern>
+ <maxFileSize>50MB</maxFileSize>
+ <maxHistory>30</maxHistory>
+ <totalSizeCap>10GB</totalSizeCap>
+ </rollingPolicy>
+ <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+ <level>WARN</level>
+ </filter>
+ <encoder>
+ <pattern>${errorPattern}</pattern>
+ </encoder>
+ </appender>
+
+ <appender name="AsyncErrorOut"
+ class="ch.qos.logback.classic.AsyncAppender">
+ <appender-ref ref="ErrorOut" />
+ </appender>
+
+ <appender name="DebugOut"
+ class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <file>${logDir}/${debugLog}.log</file>
+ <rollingPolicy
+ class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+ <fileNamePattern>${logDir}/${debugLog}.%d{yyyy-MM-dd}.%i.log.zip
+ </fileNamePattern>
+ <maxFileSize>50MB</maxFileSize>
+ <maxHistory>30</maxHistory>
+ <totalSizeCap>10GB</totalSizeCap>
+ </rollingPolicy>
+ <encoder>
+ <pattern>${debugPattern}</pattern>
+ </encoder>
+ </appender>
+
+ <appender name="AsyncDebugOut"
+ class="ch.qos.logback.classic.AsyncAppender">
+ <appender-ref ref="DebugOut" />
+ </appender>
+
+ <appender name="NetworkOut"
+ class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <file>${logDir}/${networkLog}.log</file>
+ <rollingPolicy
+ class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+ <fileNamePattern>${logDir}/${networkLog}.%d{yyyy-MM-dd}.%i.log.zip
+ </fileNamePattern>
+ <maxFileSize>50MB</maxFileSize>
+ <maxHistory>30</maxHistory>
+ <totalSizeCap>10GB</totalSizeCap>
+ </rollingPolicy>
+ <encoder>
+ <pattern>${networkPattern}</pattern>
+ </encoder>
+ </appender>
+
+ <appender name="AsyncNetworkOut"
+ class="ch.qos.logback.classic.AsyncAppender">
+ <appender-ref ref="NetworkOut" />
+ </appender>
+
+ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <Pattern>[%d{yyyy-MM-dd'T'HH:mm:ss.SSS+00:00, UTC}|%level|%logger{0}|%thread] %msg%n</Pattern>
+ </encoder>
+ </appender>
+
+ <appender name="AsyncStdOut" class="ch.qos.logback.classic.AsyncAppender">
+ <appender-ref ref="STDOUT" />
+ </appender>
+
+ <logger name="network" level="INFO" additivity="false">
+ <appender-ref ref="AsyncNetworkOut" />
+ <appender-ref ref="AsyncStdOut" />
+ </logger>
+
+ <logger name="org.eclipse.jetty.server.RequestLog" level="info" additivity="false">
+ <appender-ref ref="AsyncNetworkOut" />
+ <appender-ref ref="AsyncStdOut" />
+ </logger>
+
+ <logger name="org.eclipse.jetty" level="ERROR" />
+
+ <root level="INFO">
+ <appender-ref ref="AsyncDebugOut" />
+ <appender-ref ref="AsyncErrorOut" />
+ <appender-ref ref="AsyncStdOut" />
+ </root>
+
+</configuration>
diff --git a/csit/config/dns_ssl.txt b/csit/config/dns_ssl.txt
deleted file mode 100644
index 9833ed23..00000000
--- a/csit/config/dns_ssl.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-subjectAltName = \
- DNS:policy, \
- DNS:drools, \
- DNS:drools.onap, \
- DNS:policy-apex-pdp, \
- DNS:policy-apex-pdp.onap, \
- DNS:policy-api, \
- DNS:policy-api.onap, \
- DNS:policy-distribution, \
- DNS:policy-distribution.onap, \
- DNS:policy-pap, \
- DNS:policy-pap.onap, \
- DNS:policy-xacml-pdp, \
- DNS:policy-xacml-pdp.onap, \
- DNS:simulator, \
- DNS:aai-sim, \
- DNS:grpc-sim, \
- DNS:sdnc-sim, \
- DNS:so-sim, \
- DNS:vfc-sim, \
- DNS:message-router
diff --git a/csit/config/drools-apps/custom/engine-system.properties b/csit/config/drools-applications/custom/engine-system.properties
index 19e03b51..19e03b51 100644
--- a/csit/config/drools-apps/custom/engine-system.properties
+++ b/csit/config/drools-applications/custom/engine-system.properties
diff --git a/csit/config/drools-apps/custom/feature-lifecycle.properties b/csit/config/drools-applications/custom/feature-lifecycle.properties
index dcbf290e..3e862970 100644
--- a/csit/config/drools-apps/custom/feature-lifecycle.properties
+++ b/csit/config/drools-applications/custom/feature-lifecycle.properties
@@ -29,10 +29,10 @@ dmaap.source.topics.POLICY-PDP-PAP.servers=${envd:DMAAP_SERVERS}
dmaap.source.topics.POLICY-PDP-PAP.effectiveTopic=${envd:POLICY_PDP_PAP_TOPIC}
dmaap.source.topics.POLICY-PDP-PAP.apiKey=${envd:POLICY_PDP_PAP_API_KEY}
dmaap.source.topics.POLICY-PDP-PAP.apiSecret=${envd:POLICY_PDP_PAP_API_SECRET}
-dmaap.source.topics.POLICY-PDP-PAP.https=${envd:DMAAP_HTTPS:true}
+dmaap.source.topics.POLICY-PDP-PAP.https=${envd:DMAAP_HTTPS:false}
dmaap.sink.topics.POLICY-PDP-PAP.servers=${envd:DMAAP_SERVERS}
dmaap.sink.topics.POLICY-PDP-PAP.effectiveTopic=${envd:POLICY_PDP_PAP_TOPIC}
dmaap.sink.topics.POLICY-PDP-PAP.apiKey=${envd:POLICY_PDP_PAP_API_KEY}
dmaap.sink.topics.POLICY-PDP-PAP.apiSecret=${envd:POLICY_PDP_PAP_API_SECRET}
-dmaap.sink.topics.POLICY-PDP-PAP.https=${envd:DMAAP_HTTPS:true}
+dmaap.sink.topics.POLICY-PDP-PAP.https=${envd:DMAAP_HTTPS:false}
diff --git a/csit/config/drools-apps/custom/features.pre.sh b/csit/config/drools-applications/custom/features.pre.sh
index fd7b5b91..fd7b5b91 100755
--- a/csit/config/drools-apps/custom/features.pre.sh
+++ b/csit/config/drools-applications/custom/features.pre.sh
diff --git a/csit/config/drools-apps/custom/standalone-settings.xml b/csit/config/drools-applications/custom/standalone-settings.xml
index ebd6dd2a..ebd6dd2a 100644
--- a/csit/config/drools-apps/custom/standalone-settings.xml
+++ b/csit/config/drools-applications/custom/standalone-settings.xml
diff --git a/csit/config/drools-apps/env/base.conf b/csit/config/drools-applications/env/base.conf
index 7b65681d..c3cf80f7 100644
--- a/csit/config/drools-apps/env/base.conf
+++ b/csit/config/drools-applications/env/base.conf
@@ -50,6 +50,8 @@ SQL_HOST=mariadb
SQL_USER=policy_user
SQL_PASSWORD=policy_user
SQL_PORT=3306
+JDBC_URL=jdbc:mariadb://mariadb:3306/
+JDBC_OPTS=
# AAF
@@ -59,7 +61,7 @@ AAF_HOST=aaf.api.simpledemo.onap.org
# HTTP Servers
-HTTP_SERVER_HTTPS={{HTTPS_ENABLED}}
+HTTP_SERVER_HTTPS=false
PROMETHEUS=true
# LIVENESS Checks
@@ -95,7 +97,7 @@ PDP_PORT=6969
PDP_CONTEXT_URI=policy/pdpx/v1/
PDP_USERNAME=healthcheck
PDP_PASSWORD=zb!XztG34
-
+PDP_HTTPS=false
# DCAE DMaaP
@@ -106,7 +108,7 @@ DCAE_CONSUMER_GROUP=dcae.policy.shared
# Open DMaaP
DMAAP_SERVERS=message-router
-DMAAP_HTTPS={{HTTPS_ENABLED}}
+DMAAP_HTTPS=false
# AAI
@@ -115,13 +117,14 @@ AAI_PORT=6666
AAI_CONTEXT_URI=
AAI_USERNAME=policy@policy.onap.org
AAI_PASSWORD=demo123456!
+AAI_HTTPS=false
# MSO
SO_HOST=so-sim
SO_PORT=6669
SO_CONTEXT_URI=
-SO_URL=https://message-router:6669/
+SO_URL=http://message-router:6669/
SO_USERNAME=InfraPortalClient
SO_PASSWORD=password1$
diff --git a/csit/config/drools-apps/env/feature-healthcheck.conf b/csit/config/drools-applications/env/feature-healthcheck.conf
index 1c710547..1c710547 100644
--- a/csit/config/drools-apps/env/feature-healthcheck.conf
+++ b/csit/config/drools-applications/env/feature-healthcheck.conf
diff --git a/csit/config/drools-apps/env/feature-pooling-dmaap.conf b/csit/config/drools-applications/env/feature-pooling-dmaap.conf
index 3808e3d9..3808e3d9 100644
--- a/csit/config/drools-apps/env/feature-pooling-dmaap.conf
+++ b/csit/config/drools-applications/env/feature-pooling-dmaap.conf
diff --git a/csit/config/drools-applications/groups.json b/csit/config/drools-applications/groups.json
new file mode 100644
index 00000000..6ee30e1c
--- /dev/null
+++ b/csit/config/drools-applications/groups.json
@@ -0,0 +1,137 @@
+{
+ "groups": [
+ {
+ "name": "defaultGroup",
+ "version": "1.0.0",
+ "description": "The default group that registers all supported policy types and pdps.",
+ "pdpGroupState": "ACTIVE",
+ "pdpSubgroups": [
+ {
+ "pdpType": "xacml",
+ "supportedPolicyTypes": [
+ {
+ "name": "onap.policies.controlloop.guard.common.FrequencyLimiter",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.controlloop.guard.common.MinMax",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.controlloop.guard.common.Blacklist",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.controlloop.guard.common.Filter",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.controlloop.guard.coordination.FirstBlocksSecond",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.monitoring.*",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.*",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.AffinityPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.DistancePolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.HpaPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.OptimizationPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.PciPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.service.QueryPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.service.SubscriberPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.Vim_fit",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.VnfPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.native.Xacml",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.Naming",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.match.*",
+ "version": "1.0.0"
+ }
+ ],
+ "currentInstanceCount": 0,
+ "desiredInstanceCount": 1,
+ "policies": [
+ {
+ "name": "SDNC_Policy.ONAP_NF_NAMING_TIMESTAMP",
+ "version": "1.0.0"
+ }
+ ]
+ },
+ {
+ "pdpType": "drools",
+ "supportedPolicyTypes": [
+ {
+ "name": "onap.policies.controlloop.operational.common.Drools",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.native.drools.Controller",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.native.drools.Artifact",
+ "version": "1.0.0"
+ }
+ ],
+ "currentInstanceCount": 0,
+ "desiredInstanceCount": 1,
+ "policies": []
+ },
+ {
+ "pdpType": "apex",
+ "supportedPolicyTypes": [
+ {
+ "name": "onap.policies.controlloop.operational.common.Apex",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.native.Apex",
+ "version": "1.0.0"
+ }
+ ],
+ "currentInstanceCount": 0,
+ "desiredInstanceCount": 1,
+ "policies": []
+ }
+ ]
+ }
+ ]
+}
diff --git a/csit/config/drools/custom/engine-system.properties b/csit/config/drools-pdp/custom/engine-system.properties
index 19e03b51..19e03b51 100644
--- a/csit/config/drools/custom/engine-system.properties
+++ b/csit/config/drools-pdp/custom/engine-system.properties
diff --git a/csit/config/drools/custom/noop.pre.sh b/csit/config/drools-pdp/custom/noop.pre.sh
index 63bdc4cf..63bdc4cf 100755
--- a/csit/config/drools/custom/noop.pre.sh
+++ b/csit/config/drools-pdp/custom/noop.pre.sh
diff --git a/csit/config/drools/env/base.conf b/csit/config/drools-pdp/env/base.conf
index fd4d66fc..4bd7632b 100644
--- a/csit/config/drools/env/base.conf
+++ b/csit/config/drools-pdp/env/base.conf
@@ -59,7 +59,7 @@ AAF_HOST=aaf.api.simpledemo.onap.org
# HTTP Servers
-HTTP_SERVER_HTTPS={{HTTPS_ENABLED}}
+HTTP_SERVER_HTTPS=false
PROMETHEUS=true
# PDP-D DMaaP configuration channel
@@ -104,7 +104,7 @@ DCAE_CONSUMER_GROUP=dcae.policy.shared
# Open DMaaP
DMAAP_SERVERS=mr.api.simpledemo.onap.org
-DMAAP_HTTPS={{HTTPS_ENABLED}}
+DMAAP_HTTPS=false
# AAI
diff --git a/csit/config/drools-pdp/groups.json b/csit/config/drools-pdp/groups.json
new file mode 100644
index 00000000..6ee30e1c
--- /dev/null
+++ b/csit/config/drools-pdp/groups.json
@@ -0,0 +1,137 @@
+{
+ "groups": [
+ {
+ "name": "defaultGroup",
+ "version": "1.0.0",
+ "description": "The default group that registers all supported policy types and pdps.",
+ "pdpGroupState": "ACTIVE",
+ "pdpSubgroups": [
+ {
+ "pdpType": "xacml",
+ "supportedPolicyTypes": [
+ {
+ "name": "onap.policies.controlloop.guard.common.FrequencyLimiter",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.controlloop.guard.common.MinMax",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.controlloop.guard.common.Blacklist",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.controlloop.guard.common.Filter",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.controlloop.guard.coordination.FirstBlocksSecond",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.monitoring.*",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.*",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.AffinityPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.DistancePolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.HpaPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.OptimizationPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.PciPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.service.QueryPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.service.SubscriberPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.Vim_fit",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.VnfPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.native.Xacml",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.Naming",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.match.*",
+ "version": "1.0.0"
+ }
+ ],
+ "currentInstanceCount": 0,
+ "desiredInstanceCount": 1,
+ "policies": [
+ {
+ "name": "SDNC_Policy.ONAP_NF_NAMING_TIMESTAMP",
+ "version": "1.0.0"
+ }
+ ]
+ },
+ {
+ "pdpType": "drools",
+ "supportedPolicyTypes": [
+ {
+ "name": "onap.policies.controlloop.operational.common.Drools",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.native.drools.Controller",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.native.drools.Artifact",
+ "version": "1.0.0"
+ }
+ ],
+ "currentInstanceCount": 0,
+ "desiredInstanceCount": 1,
+ "policies": []
+ },
+ {
+ "pdpType": "apex",
+ "supportedPolicyTypes": [
+ {
+ "name": "onap.policies.controlloop.operational.common.Apex",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.native.Apex",
+ "version": "1.0.0"
+ }
+ ],
+ "currentInstanceCount": 0,
+ "desiredInstanceCount": 1,
+ "policies": []
+ }
+ ]
+ }
+ ]
+}
diff --git a/csit/config/ks.cer b/csit/config/ks.cer
deleted file mode 100644
index 2946a080..00000000
--- a/csit/config/ks.cer
+++ /dev/null
@@ -1,29 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIE+jCCA+KgAwIBAgIUDSbE1jAMdFITeC8csFyyBEhTc6YwDQYJKoZIhvcNAQEL
-BQAwRzELMAkGA1UEBhMCVVMxEzARBgNVBAgMCk5ldyBKZXJzZXkxDTALBgNVBAsM
-BE9OQVAxFDASBgNVBAMMC3BvbGljeS5vbmFwMB4XDTIyMDkwNTEzMjUyMVoXDTIy
-MTAwNTEzMjUyMVowYjEPMA0GA1UEAxMGcG9saWN5MSMwIQYDVQQLDBpwb2xpY3lA
-cG9saWN5Lm9uYXAub3JnOkRFVjEOMAwGA1UECxMFT1NBQUYxDTALBgNVBAoTBE9O
-QVAxCzAJBgNVBAYTAlVTMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-kBWA9VTEHET8X9uDs35VVTfpHtHXxxHPWwm04uCROHus6AADNN0KVchZCFMm2Cem
-f4kEoaGxLWNsW57YnSybyB5L254/YvNa9utFLkaMnVzNZkoFFE24j4T2KgT2Vbt4
-YLMJYFzdu6/9pGhlkBw30UfZKo8li0BPyxReshk8hWFV+6Tcbr94qPM90j4b1Hz6
-pkJ1BwPOqCyrRLjuk6tQc2TYRN3PBFjknC/C9yeJc7fiBgoe8Hbx8AWEpMK/pFIB
-2JkMojuopjLffic8cN834+mExECWqtyaHNxnv8BaLvpCOgxXo3EMS9fHPM/N9XGz
-XIlw7W70d/FWE8pwCw+DXwIDAQABo4IBwTCCAb0wggEsBgNVHREEggEjMIIBH4IG
-cG9saWN5ggZkcm9vbHOCC2Ryb29scy5vbmFwgg9wb2xpY3ktYXBleC1wZHCCFHBv
-bGljeS1hcGV4LXBkcC5vbmFwggpwb2xpY3ktYXBpgg9wb2xpY3ktYXBpLm9uYXCC
-E3BvbGljeS1kaXN0cmlidXRpb26CGHBvbGljeS1kaXN0cmlidXRpb24ub25hcIIK
-cG9saWN5LXBhcIIPcG9saWN5LXBhcC5vbmFwghBwb2xpY3kteGFjbWwtcGRwghVw
-b2xpY3kteGFjbWwtcGRwLm9uYXCCCXNpbXVsYXRvcoIHYWFpLXNpbYIIZ3JwYy1z
-aW2CCHNkbmMtc2ltggZzby1zaW2CB3ZmYy1zaW2CDm1lc3NhZ2Utcm91dGVyMB0G
-A1UdDgQWBBRWeSCDe3OXHeKiptkS05EYEt2lLjBsBgNVHSMEZTBjoUukSTBHMQsw
-CQYDVQQGEwJVUzETMBEGA1UECAwKTmV3IEplcnNleTENMAsGA1UECwwET05BUDEU
-MBIGA1UEAwwLcG9saWN5Lm9uYXCCFCAWwWW10ZqYy46ID/aAsN1zxnkgMA0GCSqG
-SIb3DQEBCwUAA4IBAQDQf71j4ZMONLxNLZs/GBPBKVSw29MMoLXrsMkUVmne+g2M
-cnCEV0W4I/kSGwlxLGx3bxquUmRevKl2zB5pvzub+kwOotYqG+qWcS9mH4E2GGOP
-TsCldopk2mPLuEdTve583RtsUeRM4DJ4X3kiFZmyD+Pu/f8yhTqjZS79kPxbPcHX
-O9riD4Qh/x69UdcR5KK2Lsy63fAtTVY9F5bKx1PmRm5vnQbExYp+ncD+C+8mvPEU
-ofJIbGmEGrf/YHDsCrn0yq37G3ujJxT114Z7YIai+LTFlMqSL8wR8gDhSEGB4anz
-cWNLMN4/l73ySRMXSC7Kj2h2J5DS0z46ujJCkCPN
------END CERTIFICATE-----
diff --git a/csit/config/ks.csr b/csit/config/ks.csr
deleted file mode 100644
index 9777b85b..00000000
--- a/csit/config/ks.csr
+++ /dev/null
@@ -1,18 +0,0 @@
------BEGIN NEW CERTIFICATE REQUEST-----
-MIIC1zCCAb8CAQAwYjEPMA0GA1UEAxMGcG9saWN5MSMwIQYDVQQLDBpwb2xpY3lA
-cG9saWN5Lm9uYXAub3JnOkRFVjEOMAwGA1UECxMFT1NBQUYxDTALBgNVBAoTBE9O
-QVAxCzAJBgNVBAYTAlVTMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-kBWA9VTEHET8X9uDs35VVTfpHtHXxxHPWwm04uCROHus6AADNN0KVchZCFMm2Cem
-f4kEoaGxLWNsW57YnSybyB5L254/YvNa9utFLkaMnVzNZkoFFE24j4T2KgT2Vbt4
-YLMJYFzdu6/9pGhlkBw30UfZKo8li0BPyxReshk8hWFV+6Tcbr94qPM90j4b1Hz6
-pkJ1BwPOqCyrRLjuk6tQc2TYRN3PBFjknC/C9yeJc7fiBgoe8Hbx8AWEpMK/pFIB
-2JkMojuopjLffic8cN834+mExECWqtyaHNxnv8BaLvpCOgxXo3EMS9fHPM/N9XGz
-XIlw7W70d/FWE8pwCw+DXwIDAQABoDAwLgYJKoZIhvcNAQkOMSEwHzAdBgNVHQ4E
-FgQUVnkgg3tzlx3ioqbZEtORGBLdpS4wDQYJKoZIhvcNAQELBQADggEBAE6C4xqR
-1Ju3IaVGGoUW6zVtKwPPwXbbU4opQfpFMnDw6HGs1HFF6bRmB5bCN9uS32CSRq42
-X6uYFh24prpU2D3e1xQCtSZfBq55AYlgVrfuLwDXgpLNTQbQGnpeyobThS5qgeld
-umpWTCOU4dRIjjpXJb3e3CW2PN3wzNwavjgx1kHWHH+D5OGD4BZeZT8PHShT0qo6
-G6LNcedvEgJVHDFxnWJ7CK0qVAHHldVZ6PKvb9T79g2tRbIw29yfLv4nUUQtpRzU
-Ru0LTNStOxvbbg5Lrlx9gltdiHUMihnSj430yhG+7W6D16pP1YhAMCLBbdp9BKzn
-jOCKf0x5qlcc/Bk=
------END NEW CERTIFICATE REQUEST-----
diff --git a/csit/config/ks.jks b/csit/config/ks.jks
deleted file mode 100644
index c45251b8..00000000
--- a/csit/config/ks.jks
+++ /dev/null
Binary files differ
diff --git a/csit/config/pap/groups.json b/csit/config/pap/groups.json
index cf52fd89..bd5c2868 100644
--- a/csit/config/pap/groups.json
+++ b/csit/config/pap/groups.json
@@ -7,115 +7,6 @@
"pdpGroupState": "ACTIVE",
"pdpSubgroups": [
{
- "pdpType": "xacml",
- "supportedPolicyTypes": [
- {
- "name": "onap.policies.controlloop.guard.common.FrequencyLimiter",
- "version": "1.0.0"
- },
- {
- "name": "onap.policies.controlloop.guard.common.MinMax",
- "version": "1.0.0"
- },
- {
- "name": "onap.policies.controlloop.guard.common.Blacklist",
- "version": "1.0.0"
- },
- {
- "name": "onap.policies.controlloop.guard.common.Filter",
- "version": "1.0.0"
- },
- {
- "name": "onap.policies.controlloop.guard.coordination.FirstBlocksSecond",
- "version": "1.0.0"
- },
- {
- "name": "onap.policies.monitoring.*",
- "version": "1.0.0"
- },
- {
- "name": "onap.policies.optimization.*",
- "version": "1.0.0"
- },
- {
- "name": "onap.policies.optimization.resource.AffinityPolicy",
- "version": "1.0.0"
- },
- {
- "name": "onap.policies.optimization.resource.DistancePolicy",
- "version": "1.0.0"
- },
- {
- "name": "onap.policies.optimization.resource.HpaPolicy",
- "version": "1.0.0"
- },
- {
- "name": "onap.policies.optimization.resource.OptimizationPolicy",
- "version": "1.0.0"
- },
- {
- "name": "onap.policies.optimization.resource.PciPolicy",
- "version": "1.0.0"
- },
- {
- "name": "onap.policies.optimization.service.QueryPolicy",
- "version": "1.0.0"
- },
- {
- "name": "onap.policies.optimization.service.SubscriberPolicy",
- "version": "1.0.0"
- },
- {
- "name": "onap.policies.optimization.resource.Vim_fit",
- "version": "1.0.0"
- },
- {
- "name": "onap.policies.optimization.resource.VnfPolicy",
- "version": "1.0.0"
- },
- {
- "name": "onap.policies.native.Xacml",
- "version": "1.0.0"
- },
- {
- "name": "onap.policies.Naming",
- "version": "1.0.0"
- },
- {
- "name": "onap.policies.match.*",
- "version": "1.0.0"
- }
- ],
- "currentInstanceCount": 1,
- "desiredInstanceCount": 1,
- "policies": [
- {
- "name": "SDNC_Policy.ONAP_NF_NAMING_TIMESTAMP",
- "version": "1.0.0"
- }
- ]
- },
- {
- "pdpType": "drools",
- "supportedPolicyTypes": [
- {
- "name": "onap.policies.controlloop.operational.common.Drools",
- "version": "1.0.0"
- },
- {
- "name": "onap.policies.native.drools.Controller",
- "version": "1.0.0"
- },
- {
- "name": "onap.policies.native.drools.Artifact",
- "version": "1.0.0"
- }
- ],
- "currentInstanceCount": 1,
- "desiredInstanceCount": 1,
- "policies": []
- },
- {
"pdpType": "apex",
"supportedPolicyTypes": [
{
@@ -127,7 +18,7 @@
"version": "1.0.0"
}
],
- "currentInstanceCount": 1,
+ "currentInstanceCount": 0,
"desiredInstanceCount": 1,
"policies": []
}
diff --git a/csit/config/pap/logback.xml b/csit/config/pap/logback.xml
new file mode 100644
index 00000000..a88f60a7
--- /dev/null
+++ b/csit/config/pap/logback.xml
@@ -0,0 +1,120 @@
+<!--
+ ============LICENSE_START=======================================================
+ Copyright (C) 2019 Nordix Foundation.
+ Modifications Copyright (C) 2019 AT&T Intellectual Property.
+ ================================================================================
+ 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
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ SPDX-License-Identifier: Apache-2.0
+ ============LICENSE_END=========================================================
+-->
+
+<configuration scan="true" scanPeriod="30 seconds" debug="false">
+
+ <property name="logDir" value="${POLICY_LOGS}" />
+
+ <property name="errorLog" value="error" />
+ <property name="debugLog" value="debug" />
+ <property name="networkLog" value="network" />
+
+ <property name="debugPattern"
+ value="[%d{yyyy-MM-dd'T'HH:mm:ss.SSS+00:00, UTC}|%level|%logger{0}|%thread] %msg%n" />
+ <property name="errorPattern" value="${debugPattern}" />
+ <property name="networkPattern" value="[%d{yyyy-MM-dd'T'HH:mm:ss.SSS+00:00, UTC}|%t]%m%n" />
+
+ <appender name="ErrorOut" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <file>${logDir}/${errorLog}.log</file>
+ <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+ <fileNamePattern>${logDir}/${errorLog}.%d{yyyy-MM-dd}.%i.log.zip
+ </fileNamePattern>
+ <maxFileSize>50MB</maxFileSize>
+ <maxHistory>30</maxHistory>
+ <totalSizeCap>10GB</totalSizeCap>
+ </rollingPolicy>
+ <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+ <level>WARN</level>
+ </filter>
+ <encoder>
+ <pattern>${errorPattern}</pattern>
+ </encoder>
+ </appender>
+
+ <appender name="AsyncErrorOut" class="ch.qos.logback.classic.AsyncAppender">
+ <appender-ref ref="ErrorOut" />
+ </appender>
+
+ <appender name="DebugOut" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <file>${logDir}/${debugLog}.log</file>
+ <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+ <fileNamePattern>${logDir}/${debugLog}.%d{yyyy-MM-dd}.%i.log.zip
+ </fileNamePattern>
+ <maxFileSize>50MB</maxFileSize>
+ <maxHistory>30</maxHistory>
+ <totalSizeCap>10GB</totalSizeCap>
+ </rollingPolicy>
+ <encoder>
+ <pattern>${debugPattern}</pattern>
+ </encoder>
+ </appender>
+
+ <appender name="AsyncDebugOut" class="ch.qos.logback.classic.AsyncAppender">
+ <appender-ref ref="DebugOut" />
+ </appender>
+
+ <appender name="NetworkOut" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <file>${logDir}/${networkLog}.log</file>
+ <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+ <fileNamePattern>${logDir}/${networkLog}.%d{yyyy-MM-dd}.%i.log.zip
+ </fileNamePattern>
+ <maxFileSize>50MB</maxFileSize>
+ <maxHistory>30</maxHistory>
+ <totalSizeCap>10GB</totalSizeCap>
+ </rollingPolicy>
+ <encoder>
+ <pattern>${networkPattern}</pattern>
+ </encoder>
+ </appender>
+
+ <appender name="AsyncNetworkOut" class="ch.qos.logback.classic.AsyncAppender">
+ <appender-ref ref="NetworkOut" />
+ </appender>
+
+ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <Pattern>[%d{yyyy-MM-dd'T'HH:mm:ss.SSS+00:00, UTC}|%level|%logger{0}|%thread] %msg%n</Pattern>
+ </encoder>
+ </appender>
+
+ <appender name="AsyncStdOut" class="ch.qos.logback.classic.AsyncAppender">
+ <appender-ref ref="STDOUT" />
+ </appender>
+
+ <logger name="network" level="INFO" additivity="false">
+ <appender-ref ref="AsyncNetworkOut" />
+ <appender-ref ref="AsyncStdOut" />
+ </logger>
+
+ <logger name="org.eclipse.jetty.server.RequestLog" level="info" additivity="false">
+ <appender-ref ref="AsyncNetworkOut" />
+ <appender-ref ref="AsyncStdOut" />
+ </logger>
+
+ <logger name="org.eclipse.jetty" level="ERROR" />
+
+ <root level="INFO">
+ <appender-ref ref="AsyncDebugOut" />
+ <appender-ref ref="AsyncErrorOut" />
+ <appender-ref ref="AsyncStdOut" />
+ </root>
+
+</configuration>
diff --git a/csit/config/pap/papParameters.yaml b/csit/config/pap/papParameters.yaml
index 9a57ebb6..bb050205 100644
--- a/csit/config/pap/papParameters.yaml
+++ b/csit/config/pap/papParameters.yaml
@@ -24,7 +24,7 @@ spring:
server:
port: 6969
ssl:
- enabled: {{HTTPS_ENABLED}}
+ enabled: false
pap:
name: PapGroup
@@ -44,7 +44,7 @@ pap:
servers:
- message-router
topicCommInfrastructure: dmaap
- useHttps: {{HTTPS_ENABLED}}
+ useHttps: false
fetchTimeout: 15000
- topic: POLICY-HEARTBEAT
effectiveTopic: POLICY-PDP-PAP
@@ -52,26 +52,26 @@ pap:
servers:
- message-router
topicCommInfrastructure: dmaap
- useHttps: {{HTTPS_ENABLED}}
+ useHttps: false
fetchTimeout: 15000
topicSinks:
- topic: POLICY-PDP-PAP
servers:
- message-router
topicCommInfrastructure: dmaap
- useHttps: {{HTTPS_ENABLED}}
+ useHttps: false
- topic: POLICY-NOTIFICATION
servers:
- message-router
topicCommInfrastructure: dmaap
- useHttps: {{HTTPS_ENABLED}}
+ useHttps: false
healthCheckRestClientParameters:
- clientName: api
hostname: policy-api
port: 6969
userName: policyadmin
password: zb!XztG34
- useHttps: {{HTTPS_ENABLED}}
+ useHttps: false
basePath: policy/api/v1/healthcheck
management:
diff --git a/csit/config/clamp/gui/application.yaml b/csit/config/policy-gui/application.yaml
index a0a6c224..30de64bf 100644
--- a/csit/config/clamp/gui/application.yaml
+++ b/csit/config/policy-gui/application.yaml
@@ -16,19 +16,13 @@
# ============LICENSE_END=====================================================
#
server:
- port: 2443
+ port: 2445
ssl:
- enabled: {{HTTPS_ENABLED}}
- enabled-protocols: TLSv1.2
- client-auth: want
- key-store: file:${KEYSTORE}
- key-store-password: ${KEYSTORE_PASSWD}
- trust-store: file:${TRUSTSTORE}
- trust-store-password: ${TRUSTSTORE_PASSWD}
+ enabled: false
clamp:
- url: https://policy-clamp-be:8443
- disable-ssl-validation: false
+ url: http://policy-clamp-be:8445
+ disable-ssl-validation: true
disable-ssl-hostname-check: true
apex-editor:
diff --git a/csit/config/policy-gui/groups.json b/csit/config/policy-gui/groups.json
new file mode 100644
index 00000000..6ee30e1c
--- /dev/null
+++ b/csit/config/policy-gui/groups.json
@@ -0,0 +1,137 @@
+{
+ "groups": [
+ {
+ "name": "defaultGroup",
+ "version": "1.0.0",
+ "description": "The default group that registers all supported policy types and pdps.",
+ "pdpGroupState": "ACTIVE",
+ "pdpSubgroups": [
+ {
+ "pdpType": "xacml",
+ "supportedPolicyTypes": [
+ {
+ "name": "onap.policies.controlloop.guard.common.FrequencyLimiter",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.controlloop.guard.common.MinMax",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.controlloop.guard.common.Blacklist",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.controlloop.guard.common.Filter",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.controlloop.guard.coordination.FirstBlocksSecond",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.monitoring.*",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.*",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.AffinityPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.DistancePolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.HpaPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.OptimizationPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.PciPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.service.QueryPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.service.SubscriberPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.Vim_fit",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.VnfPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.native.Xacml",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.Naming",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.match.*",
+ "version": "1.0.0"
+ }
+ ],
+ "currentInstanceCount": 0,
+ "desiredInstanceCount": 1,
+ "policies": [
+ {
+ "name": "SDNC_Policy.ONAP_NF_NAMING_TIMESTAMP",
+ "version": "1.0.0"
+ }
+ ]
+ },
+ {
+ "pdpType": "drools",
+ "supportedPolicyTypes": [
+ {
+ "name": "onap.policies.controlloop.operational.common.Drools",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.native.drools.Controller",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.native.drools.Artifact",
+ "version": "1.0.0"
+ }
+ ],
+ "currentInstanceCount": 0,
+ "desiredInstanceCount": 1,
+ "policies": []
+ },
+ {
+ "pdpType": "apex",
+ "supportedPolicyTypes": [
+ {
+ "name": "onap.policies.controlloop.operational.common.Apex",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.native.Apex",
+ "version": "1.0.0"
+ }
+ ],
+ "currentInstanceCount": 0,
+ "desiredInstanceCount": 1,
+ "policies": []
+ }
+ ]
+ }
+ ]
+}
diff --git a/csit/config/policy-gui/logback.xml b/csit/config/policy-gui/logback.xml
new file mode 100644
index 00000000..04bc5671
--- /dev/null
+++ b/csit/config/policy-gui/logback.xml
@@ -0,0 +1,119 @@
+<!--
+ ============LICENSE_START=======================================================
+ policy-gui
+ ================================================================================
+ Copyright (C) 2021-2022 Nordix Foundation.
+ ================================================================================
+ 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
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ ============LICENSE_END=========================================================
+ -->
+
+<configuration scan="true" scanPeriod="30 seconds" debug="false">
+
+ <property name="logDir" value="${POLICY_LOGS}" />
+
+ <property name="errorLog" value="error" />
+ <property name="debugLog" value="debug" />
+ <property name="networkLog" value="network" />
+
+ <property name="debugPattern"
+ value="[%d{yyyy-MM-dd'T'HH:mm:ss.SSS+00:00, UTC}|%level|%logger{0}|%thread] %msg%n" />
+ <property name="errorPattern" value="${debugPattern}" />
+ <property name="networkPattern" value="[%d{yyyy-MM-dd'T'HH:mm:ss.SSS+00:00, UTC}|%t]%m%n" />
+
+ <appender name="ErrorOut" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <file>${logDir}/${errorLog}.log</file>
+ <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+ <fileNamePattern>${logDir}/${errorLog}.%d{yyyy-MM-dd}.%i.log.zip
+ </fileNamePattern>
+ <maxFileSize>50MB</maxFileSize>
+ <maxHistory>30</maxHistory>
+ <totalSizeCap>10GB</totalSizeCap>
+ </rollingPolicy>
+ <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+ <level>WARN</level>
+ </filter>
+ <encoder>
+ <pattern>${errorPattern}</pattern>
+ </encoder>
+ </appender>
+
+ <appender name="AsyncErrorOut" class="ch.qos.logback.classic.AsyncAppender">
+ <appender-ref ref="ErrorOut" />
+ </appender>
+
+ <appender name="DebugOut" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <file>${logDir}/${debugLog}.log</file>
+ <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+ <fileNamePattern>${logDir}/${debugLog}.%d{yyyy-MM-dd}.%i.log.zip
+ </fileNamePattern>
+ <maxFileSize>50MB</maxFileSize>
+ <maxHistory>30</maxHistory>
+ <totalSizeCap>10GB</totalSizeCap>
+ </rollingPolicy>
+ <encoder>
+ <pattern>${debugPattern}</pattern>
+ </encoder>
+ </appender>
+
+ <appender name="AsyncDebugOut" class="ch.qos.logback.classic.AsyncAppender">
+ <appender-ref ref="DebugOut" />
+ </appender>
+
+ <appender name="NetworkOut" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <file>${logDir}/${networkLog}.log</file>
+ <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+ <fileNamePattern>${logDir}/${networkLog}.%d{yyyy-MM-dd}.%i.log.zip
+ </fileNamePattern>
+ <maxFileSize>50MB</maxFileSize>
+ <maxHistory>30</maxHistory>
+ <totalSizeCap>10GB</totalSizeCap>
+ </rollingPolicy>
+ <encoder>
+ <pattern>${networkPattern}</pattern>
+ </encoder>
+ </appender>
+
+ <appender name="AsyncNetworkOut" class="ch.qos.logback.classic.AsyncAppender">
+ <appender-ref ref="NetworkOut" />
+ </appender>
+
+ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <Pattern>[%d{yyyy-MM-dd'T'HH:mm:ss.SSS+00:00, UTC}|%level|%logger{0}|%thread] %msg%n</Pattern>
+ </encoder>
+ </appender>
+
+ <appender name="AsyncStdOut" class="ch.qos.logback.classic.AsyncAppender">
+ <appender-ref ref="STDOUT" />
+ </appender>
+
+ <logger name="network" level="INFO" additivity="false">
+ <appender-ref ref="AsyncNetworkOut" />
+ <appender-ref ref="AsyncStdOut" />
+ </logger>
+
+ <logger name="org.eclipse.jetty.server.RequestLog" level="info" additivity="false">
+ <appender-ref ref="AsyncNetworkOut" />
+ <appender-ref ref="AsyncStdOut" />
+ </logger>
+
+ <logger name="org.eclipse.jetty" level="ERROR" />
+
+ <root level="INFO">
+ <appender-ref ref="AsyncDebugOut" />
+ <appender-ref ref="AsyncErrorOut" />
+ <appender-ref ref="AsyncStdOut" />
+ </root>
+
+</configuration> \ No newline at end of file
diff --git a/csit/config/policy-truststore b/csit/config/policy-truststore
deleted file mode 100644
index 78998aff..00000000
--- a/csit/config/policy-truststore
+++ /dev/null
Binary files differ
diff --git a/csit/config/sim-all/logback.xml b/csit/config/sim-all/logback.xml
new file mode 100644
index 00000000..131b0fe3
--- /dev/null
+++ b/csit/config/sim-all/logback.xml
@@ -0,0 +1,42 @@
+<!--
+ ============LICENSE_START=======================================================
+ Copyright (C) 2020 AT&T Intellectual Property.
+ ================================================================================
+ 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
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ SPDX-License-Identifier: Apache-2.0
+ ============LICENSE_END=========================================================
+-->
+
+<configuration scan="true" scanPeriod="30 seconds" debug="false">
+
+ <!--
+ This is only used for testing and only a snapshot docker image is generated,
+ thus it is not necessary for the messages to following the ONAP standard.
+ Therefore, keeping it short so it's easier to wade through the output.
+
+ Also sending all output to stdout instead of to a log file; it can be viewed
+ via "docker logs" or captured by kubernetes.
+ -->
+
+ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <Pattern>%d %level %msg%n</Pattern>
+ </encoder>
+ </appender>
+
+ <root level="INFO">
+ <appender-ref ref="STDOUT" />
+ </root>
+
+</configuration>
diff --git a/csit/config/sim-all/simParameters.json b/csit/config/sim-all/simParameters.json
index 3d348125..41fc9057 100644
--- a/csit/config/sim-all/simParameters.json
+++ b/csit/config/sim-all/simParameters.json
@@ -8,15 +8,15 @@
"name": "DMaaP simulator",
"providerClass": "org.onap.policy.models.sim.dmaap.rest.DmaapSimRestControllerV1",
"host": "0.0.0.0",
- "port": {{MESSAGE_ROUTER_PORT}},
- "https": {{HTTPS_ENABLED}}
+ "port": 3904,
+ "https": false
},
{
"name": "A&AI simulator",
"providerClass": "org.onap.policy.simulators.AaiSimulatorJaxRs",
"host": "0.0.0.0",
"port": 6666,
- "https": {{HTTPS_ENABLED}},
+ "https": false,
"userName": "policy@policy.onap.org",
"password": "demo123456!",
"resourceLocation": "/opt/app/policy/simulators/etc/mounted/aairesponse/"
@@ -26,7 +26,7 @@
"providerClass": "org.onap.policy.simulators.SdncSimulatorJaxRs",
"host": "0.0.0.0",
"port": 6668,
- "https": {{HTTPS_ENABLED}}
+ "https": false
},
{
"name": "SO simulator",
@@ -42,7 +42,7 @@
"providerClass": "org.onap.policy.simulators.VfcSimulatorJaxRs",
"host": "0.0.0.0",
"port": 6670,
- "https": {{HTTPS_ENABLED}}
+ "https": false
}
],
"topicSinks": [
@@ -50,7 +50,7 @@
"topic": "APPC-CL",
"servers": ["${HOST_NAME}"],
"topicCommInfrastructure": "DMAAP",
- "useHttps": {{HTTPS_ENABLED}},
+ "useHttps": false,
"apiKey": "some-key",
"apiSecret": "some-secret"
},
@@ -58,7 +58,7 @@
"topic": "APPC-LCM-WRITE",
"servers": ["${HOST_NAME}"],
"topicCommInfrastructure": "DMAAP",
- "useHttps": {{HTTPS_ENABLED}},
+ "useHttps": false,
"apiKey": "some-key",
"apiSecret": "some-secret"
}
@@ -68,7 +68,7 @@
"topic": "APPC-CL",
"servers": ["${HOST_NAME}"],
"topicCommInfrastructure": "DMAAP",
- "useHttps": {{HTTPS_ENABLED}},
+ "useHttps": false,
"apiKey": "some-key",
"apiSecret": "some-secret"
},
@@ -76,7 +76,7 @@
"topic": "APPC-LCM-READ",
"servers": ["${HOST_NAME}"],
"topicCommInfrastructure": "DMAAP",
- "useHttps": {{HTTPS_ENABLED}},
+ "useHttps": false,
"apiKey": "some-key",
"apiSecret": "some-secret"
}
diff --git a/csit/config/xacml-pdp/defaultConfig.json b/csit/config/xacml-pdp/defaultConfig.json
index 6ee07698..a4bcc5ed 100644
--- a/csit/config/xacml-pdp/defaultConfig.json
+++ b/csit/config/xacml-pdp/defaultConfig.json
@@ -7,7 +7,7 @@
"port": 6969,
"userName": "healthcheck",
"password": "zb!XztG34",
- "https": {{HTTPS_ENABLED}},
+ "https": false,
"aaf": false,
"prometheus": true
},
@@ -16,7 +16,7 @@
"port": 6969,
"userName": "policyadmin",
"password": "zb!XztG34",
- "useHttps": {{HTTPS_ENABLED}},
+ "useHttps": false,
"aaf": false
},
"applicationParameters": {
@@ -27,13 +27,13 @@
"topic" : "POLICY-PDP-PAP",
"servers" : [ "message-router" ],
"topicCommInfrastructure" : "dmaap",
- "useHttps" : {{HTTPS_ENABLED}}
+ "useHttps" : false
}],
"topicSinks" : [{
"topic" : "POLICY-PDP-PAP",
"servers" : [ "message-router" ],
"topicCommInfrastructure" : "dmaap",
- "useHttps" : {{HTTPS_ENABLED}}
+ "useHttps" : false
}]
}
}
diff --git a/csit/config/xacml-pdp/groups.json b/csit/config/xacml-pdp/groups.json
new file mode 100644
index 00000000..0a7e5fe3
--- /dev/null
+++ b/csit/config/xacml-pdp/groups.json
@@ -0,0 +1,101 @@
+{
+ "groups": [
+ {
+ "name": "defaultGroup",
+ "version": "1.0.0",
+ "description": "The default group that registers all supported policy types and pdps.",
+ "pdpGroupState": "ACTIVE",
+ "pdpSubgroups": [
+ {
+ "pdpType": "xacml",
+ "supportedPolicyTypes": [
+ {
+ "name": "onap.policies.controlloop.guard.common.FrequencyLimiter",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.controlloop.guard.common.MinMax",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.controlloop.guard.common.Blacklist",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.controlloop.guard.common.Filter",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.controlloop.guard.coordination.FirstBlocksSecond",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.monitoring.*",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.*",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.AffinityPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.DistancePolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.HpaPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.OptimizationPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.PciPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.service.QueryPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.service.SubscriberPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.Vim_fit",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.VnfPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.native.Xacml",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.Naming",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.match.*",
+ "version": "1.0.0"
+ }
+ ],
+ "currentInstanceCount": 0,
+ "desiredInstanceCount": 1,
+ "policies": [
+ {
+ "name": "SDNC_Policy.ONAP_NF_NAMING_TIMESTAMP",
+ "version": "1.0.0"
+ }
+ ]
+ }
+ ]
+ }
+ ]
+}
diff --git a/csit/config/xacml-pdp/logback.xml b/csit/config/xacml-pdp/logback.xml
new file mode 100644
index 00000000..e075f905
--- /dev/null
+++ b/csit/config/xacml-pdp/logback.xml
@@ -0,0 +1,116 @@
+<!--
+ ============LICENSE_START=======================================================
+ Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ ================================================================================
+ 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
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ ============LICENSE_END=========================================================
+-->
+
+<configuration scan="true" scanPeriod="30 seconds" debug="false">
+
+ <property name="logDir" value="${POLICY_LOGS}" />
+
+ <property name="errorLog" value="error" />
+ <property name="debugLog" value="debug" />
+ <property name="networkLog" value="network" />
+
+ <property name="debugPattern"
+ value="[%d{yyyy-MM-dd'T'HH:mm:ss.SSS+00:00, UTC}|%level|%logger{0}|%thread] %msg%n" />
+ <property name="errorPattern" value="${debugPattern}" />
+ <property name="networkPattern" value="[%d{yyyy-MM-dd'T'HH:mm:ss.SSS+00:00, UTC}|%t]%m%n" />
+
+ <appender name="ErrorOut" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <file>${logDir}/${errorLog}.log</file>
+ <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+ <fileNamePattern>${logDir}/${errorLog}.%d{yyyy-MM-dd}.%i.log.zip
+ </fileNamePattern>
+ <maxFileSize>50MB</maxFileSize>
+ <maxHistory>30</maxHistory>
+ <totalSizeCap>10GB</totalSizeCap>
+ </rollingPolicy>
+ <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+ <level>WARN</level>
+ </filter>
+ <encoder>
+ <pattern>${errorPattern}</pattern>
+ </encoder>
+ </appender>
+
+ <appender name="AsyncErrorOut" class="ch.qos.logback.classic.AsyncAppender">
+ <appender-ref ref="ErrorOut" />
+ </appender>
+
+ <appender name="DebugOut" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <file>${logDir}/${debugLog}.log</file>
+ <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+ <fileNamePattern>${logDir}/${debugLog}.%d{yyyy-MM-dd}.%i.log.zip
+ </fileNamePattern>
+ <maxFileSize>50MB</maxFileSize>
+ <maxHistory>30</maxHistory>
+ <totalSizeCap>10GB</totalSizeCap>
+ </rollingPolicy>
+ <encoder>
+ <pattern>${debugPattern}</pattern>
+ </encoder>
+ </appender>
+
+ <appender name="AsyncDebugOut" class="ch.qos.logback.classic.AsyncAppender">
+ <appender-ref ref="DebugOut" />
+ </appender>
+
+ <appender name="NetworkOut" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <file>${logDir}/${networkLog}.log</file>
+ <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+ <fileNamePattern>${logDir}/${networkLog}.%d{yyyy-MM-dd}.%i.log.zip
+ </fileNamePattern>
+ <maxFileSize>50MB</maxFileSize>
+ <maxHistory>30</maxHistory>
+ <totalSizeCap>10GB</totalSizeCap>
+ </rollingPolicy>
+ <encoder>
+ <pattern>${networkPattern}</pattern>
+ </encoder>
+ </appender>
+
+ <appender name="AsyncNetworkOut" class="ch.qos.logback.classic.AsyncAppender">
+ <appender-ref ref="NetworkOut" />
+ </appender>
+
+ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <Pattern>[%d{yyyy-MM-dd'T'HH:mm:ss.SSS+00:00, UTC}|%level|%logger{0}|%thread] %msg%n</Pattern>
+ </encoder>
+ </appender>
+
+ <appender name="AsyncStdOut" class="ch.qos.logback.classic.AsyncAppender">
+ <appender-ref ref="STDOUT" />
+ </appender>
+
+ <logger name="network" level="INFO" additivity="false">
+ <appender-ref ref="AsyncNetworkOut" />
+ <appender-ref ref="AsyncStdOut" />
+ </logger>
+
+ <logger name="org.eclipse.jetty.server.RequestLog" level="info" additivity="false">
+ <appender-ref ref="AsyncNetworkOut" />
+ <appender-ref ref="AsyncStdOut" />
+ </logger>
+
+ <logger name="org.eclipse.jetty" level="ERROR" />
+
+ <root level="INFO">
+ <appender-ref ref="AsyncDebugOut" />
+ <appender-ref ref="AsyncErrorOut" />
+ <appender-ref ref="AsyncStdOut" />
+ </root>
+</configuration>
diff --git a/csit/db-migrator/plans/teardown.sh b/csit/db-migrator/plans/teardown.sh
index 30a0f48d..0483d84d 100755
--- a/csit/db-migrator/plans/teardown.sh
+++ b/csit/db-migrator/plans/teardown.sh
@@ -17,6 +17,4 @@
# SPDX-License-Identifier: Apache-2.0
# ============LICENSE_END=========================================================
-docker logs postgres
-
docker-compose -f ${SCRIPTS}/compose-postgres.yml down -v \ No newline at end of file
diff --git a/csit/distribution/plans/teardown.sh b/csit/distribution/plans/teardown.sh
index e451ba66..9bfdfe88 100755
--- a/csit/distribution/plans/teardown.sh
+++ b/csit/distribution/plans/teardown.sh
@@ -20,9 +20,4 @@
# SPDX-License-Identifier: Apache-2.0
# ============LICENSE_END=========================================================
-docker logs policy-api
-docker logs simulator
-docker logs policy-pap
-docker logs policy-distribution
-
docker-compose -f ${SCRIPTS}/docker-compose-all.yml down -v
diff --git a/csit/docker-compose-all.yml b/csit/docker-compose-all.yml
index a8a795ce..12f8b8c3 100644
--- a/csit/docker-compose-all.yml
+++ b/csit/docker-compose-all.yml
@@ -2,7 +2,7 @@
# ===========LICENSE_START====================================================
# Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved.
# Modifications Copyright (C) 2021 Bell Canada. All rights reserved.
-# Modification Copyright 2021. Nordix Foundation.
+# Modification Copyright 2021-2022 Nordix Foundation.
# ============================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -20,25 +20,25 @@
version: '2'
services:
mariadb:
- image: nexus3.onap.org:10001/mariadb:${POLICY_MARIADB_VER}
+ image: ${CONTAINER_LOCATION}mariadb:${POLICY_MARIADB_VER}
container_name: mariadb
hostname: mariadb
command: ['--lower-case-table-names=1', '--wait_timeout=28800']
- env_file: config/db/db.conf
+ env_file: ./config/db/db.conf
volumes:
- ./config/db:/docker-entrypoint-initdb.d:ro
- ./config/clamp/policy-clamp-create-tables.sql:/tmp/policy-clamp-create-tables.sql
- expose:
- - 3306
+ ports:
+ - 3306:3306
policy-db-migrator:
- image: nexus3.onap.org:10001/onap/policy-db-migrator:${POLICY_DOCKER_VERSION}
+ image: ${CONTAINER_LOCATION}onap/policy-db-migrator:${POLICY_DOCKER_VERSION}
container_name: policy-db-migrator
hostname: policy-db-migrator
depends_on:
- mariadb
expose:
- 6824
- env_file: config/db/db.conf
+ env_file: ./config/db/db.conf
environment:
SQL_DB: policyadmin
SQL_HOST: mariadb
@@ -52,7 +52,7 @@ services:
'mariadb', '3306'
]
simulator:
- image: nexus3.onap.org:10001/onap/policy-models-simulator:${POLICY_MODELS_VERSION}
+ image: ${CONTAINER_LOCATION}onap/policy-models-simulator:${POLICY_MODELS_VERSION}
container_name: simulator
hostname: simulator
networks:
@@ -66,26 +66,25 @@ services:
- vfc-sim
volumes:
- ./config/sim-all:/opt/app/policy/simulators/etc/mounted:ro
- - ./config/ks.jks:/opt/app/policy/simulators/etc/ssl/policy-keystore:ro
- - ./config/policy-truststore:/opt/app/policy/simulators/etc/ssl/policy-truststore:ro
+ - ./config/sim-all/logback.xml:/opt/app/policy/simulators/etc/mounted/logback.xml:ro
expose:
- 6666
- 6668
- 6669
- 6670
- - 3905
+ - 3904
- 6680
api:
- image: nexus3.onap.org:10001/onap/policy-api:${POLICY_API_VERSION}
+ image: ${CONTAINER_LOCATION}onap/policy-api:${POLICY_API_VERSION}
container_name: policy-api
depends_on:
- policy-db-migrator
hostname: policy-api
- expose:
- - 6969
+ ports:
+ - 30440:6969
volumes:
- - ./config/ks.jks:/opt/app/policy/api/etc/ssl/policy-keystore:ro
- - ./config/policy-truststore:/opt/app/policy/api/etc/ssl/policy-truststore:ro
+ - ./config/api/apiParameters.yaml:/opt/app/policy/api/etc/apiParameters.yaml:ro
+ - ./config/api/logback.xml:/opt/app/policy/api/etc/logback.xml:ro
- ./wait_for_port.sh:/opt/app/policy/api/bin/wait_for_port.sh:ro
entrypoint: ./wait_for_port.sh
command: [
@@ -94,74 +93,72 @@ services:
'policy-db-migrator', '6824'
]
pap:
- image: nexus3.onap.org:10001/onap/policy-pap:${POLICY_PAP_VERSION}
+ image: ${CONTAINER_LOCATION}onap/policy-pap:${POLICY_PAP_VERSION}
container_name: policy-pap
depends_on:
- mariadb
- simulator
- api
hostname: policy-pap
- expose:
- - 6969
+ ports:
+ - 30442:6969
volumes:
- ./config/pap/papParameters.yaml:/opt/app/policy/pap/etc/papParameters.yaml:ro
- - ./config/pap/groups.json:/opt/app/policy/pap/etc/mounted/groups.json:ro
- - ./config/ks.jks:/opt/app/policy/pap/etc/ssl/policy-keystore:ro
- - ./config/policy-truststore:/opt/app/policy/pap/etc/ssl/policy-truststore:ro
+ - ./config/${PROJECT}/groups.json:/opt/app/policy/pap/etc/mounted/groups.json:ro
+ - ./config/pap/logback.xml:/opt/app/policy/pap/etc/logback.xml:ro
- ./wait_for_port.sh:/opt/app/policy/pap/bin/wait_for_port.sh:ro
entrypoint: ./wait_for_port.sh
command: [
'-c', './policy-pap.sh',
'mariadb', '3306',
- 'message-router', '3905',
+ 'message-router', '3904',
'api', '6969'
]
xacml-pdp:
- image: nexus3.onap.org:10001/onap/policy-xacml-pdp:${POLICY_XACML_PDP_VERSION}
+ image: ${CONTAINER_LOCATION}onap/policy-xacml-pdp:${POLICY_XACML_PDP_VERSION}
container_name: policy-xacml-pdp
depends_on:
- mariadb
- simulator
- pap
hostname: policy-xacml-pdp
- expose:
- - 6969
+ ports:
+ - 30441:6969
volumes:
- ./config/xacml-pdp/defaultConfig.json:/opt/app/policy/pdpx/etc/defaultConfig.json:ro
- - ./config/ks.jks:/opt/app/policy/pdpx/etc/ssl/policy-keystore:ro
- - ./config/policy-truststore:/opt/app/policy/pdpx/etc/ssl/policy-truststore:ro
+ - ./config/xacml-pdp/logback.xml:/opt/app/policy/pdpx/etc/logback.xml:ro
- ./wait_for_port.sh:/opt/app/policy/pdpx/bin/wait_for_port.sh:ro
entrypoint: ./wait_for_port.sh
command: [
'-c', './policy-pdpx.sh',
'mariadb', '3306',
- 'message-router', '3905',
+ 'message-router', '3904',
'pap', '6969'
]
drools:
- image: nexus3.onap.org:10001/onap/policy-drools:${POLICY_DROOLS_PDP_VERSION}
+ image: ${CONTAINER_LOCATION}onap/policy-drools:${POLICY_DROOLS_PDP_VERSION}
container_name: drools
depends_on:
- mariadb
- simulator
- pap
hostname: drools
- expose:
- - 6969
- - 9696
+ ports:
+ - 30217:6969
+ - 30216:9696
volumes:
- - ./config/drools/custom:/tmp/policy-install/config:ro
+ - ./config/drools-pdp/custom:/tmp/policy-install/config:ro
- ./wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro
env_file:
- - config/drools/env/base.conf
+ - ./config/drools-pdp/env/base.conf
entrypoint: /opt/app/policy/bin/wait_for_port.sh
command: [
'-c', '/opt/app/policy/bin/pdpd-entrypoint.sh boot',
'mariadb', '3306',
- 'message-router', '3905'
+ 'message-router', '3904'
]
drools-apps:
- image: nexus3.onap.org:10001/onap/policy-pdpd-cl:${POLICY_DROOLS_APPS_VERSION}
+ image: ${CONTAINER_LOCATION}onap/policy-pdpd-cl:${POLICY_DROOLS_APPS_VERSION}
container_name: drools-apps
depends_on:
- mariadb
@@ -169,22 +166,21 @@ services:
- pap
- xacml-pdp
hostname: drools-apps
- expose:
- - 6969
- - 9696
+ ports:
+ - 30221:6969
+ - 30219:9696
volumes:
- - ./config/drools-apps/custom:/tmp/policy-install/config:ro
- - ./config/drools-apps/custom/feature-lifecycle.properties:/opt/app/policy/features/lifecycle/config/feature-lifecycle.properties:ro
+ - ./config/drools-applications/custom:/tmp/policy-install/config:ro
- ./wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro
env_file:
- - config/drools-apps/env/base.conf
- - config/drools-apps/env/feature-healthcheck.conf
- - config/drools-apps/env/feature-pooling-dmaap.conf
+ - ./config/drools-applications/env/base.conf
+ - ./config/drools-applications/env/feature-healthcheck.conf
+ - ./config/drools-applications/env/feature-pooling-dmaap.conf
entrypoint: /opt/app/policy/bin/wait_for_port.sh
command: [
'-c', '/opt/app/policy/bin/pdpd-cl-entrypoint.sh boot',
'mariadb', '3306',
- 'message-router', '3905',
+ 'message-router', '3904',
'pap', '6969',
'aai-sim', '6666',
'sdnc-sim', '6668',
@@ -192,30 +188,28 @@ services:
'vfc-sim', '6670'
]
apex-pdp:
- image: nexus3.onap.org:10001/onap/policy-apex-pdp:${POLICY_APEX_PDP_VERSION}
+ image: ${CONTAINER_LOCATION}onap/policy-apex-pdp:${POLICY_APEX_PDP_VERSION}
container_name: policy-apex-pdp
depends_on:
- mariadb
- simulator
- pap
hostname: policy-apex-pdp
- expose:
- - 6969
- - 23324
+ ports:
+ - 30237:6969
volumes:
- ./config/apex-pdp/OnapPfConfig.json:/opt/app/policy/apex-pdp/etc/onappf/config/OnapPfConfig.json:ro
- - ./config/ks.jks:/opt/app/policy/apex-pdp/etc/ssl/policy-keystore:ro
- - ./config/policy-truststore:/opt/app/policy/apex-pdp/etc/ssl/policy-truststore:ro
+ - ./config/apex-pdp/logback.xml:/opt/app/policy/apex-pdp/etc/logback.xml:ro
- ./wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro
entrypoint: /opt/app/policy/bin/wait_for_port.sh
command: [
'-c', '/opt/app/policy/apex-pdp/bin/apexOnapPf.sh -c /opt/app/policy/apex-pdp/etc/onappf/config/OnapPfConfig.json',
'mariadb', '3306',
- 'message-router', '3905',
+ 'message-router', '3904',
'pap', '6969'
]
distribution:
- image: nexus3.onap.org:10001/onap/policy-distribution:${POLICY_DISTRIBUTION_VERSION}
+ image: ${CONTAINER_LOCATION}onap/policy-distribution:${POLICY_DISTRIBUTION_VERSION}
container_name: policy-distribution
depends_on:
- mariadb
@@ -225,84 +219,129 @@ services:
hostname: policy-distribution
volumes:
- ./config/distribution/defaultConfig.json:/opt/app/policy/distribution/etc/defaultConfig.json:ro
- - ./config/ks.jks:/opt/app/policy/distribution/etc/ssl/policy-keystore:ro
- - ./config/policy-truststore:/opt/app/policy/distribution/etc/ssl/policy-truststore:ro
- ./distribution/config/temp/:/opt/app/policy/distribution/etc/temp/:ro
+ - ./config/distribution/logback.xml:/opt/app/policy/distribution/etc/logback.xml:ro
- ./wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro
entrypoint: /opt/app/policy/bin/wait_for_port.sh
command: [
'-c', './policy-dist.sh',
'mariadb', '3306',
- 'message-router', '3905',
+ 'message-router', '3904',
'pap', '6969',
'apex-pdp', '6969'
]
policy-clamp-runtime-acm:
- image: nexus3.onap.org:10001/onap/policy-clamp-runtime-acm:${POLICY_CLAMP_VERSION}
+ image: ${CONTAINER_LOCATION}onap/policy-clamp-runtime-acm:${POLICY_CLAMP_VERSION}
container_name: policy-clamp-runtime-acm
depends_on:
- mariadb
- simulator
hostname: policy-clamp-runtime-acm
- expose:
- - 6969
+ ports:
+ - 30258:6969
volumes:
- - ./config/policy-truststore:/opt/app/policy/clamp/etc/ssl/policy-truststore:ro
+ - ./config/clamp/AcRuntimeParameters.yaml:/opt/app/policy/clamp/etc/AcRuntimeParameters.yaml
+ - ./config/clamp/logback.xml:/opt/app/policy/clamp/etc/logback.xml:ro
- ./wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro
- - ./config/ks.jks:/opt/app/policy/clamp/etc/ssl/policy-keystore:ro
entrypoint: /opt/app/policy/bin/wait_for_port.sh
command: [
'-c', './acm-runtime.sh',
- 'message-router', '3905'
+ 'mariadb', '3306',
+ 'message-router', '3904'
]
policy-clamp-ac-http-ppnt:
- image: nexus3.onap.org:10001/onap/policy-clamp-ac-http-ppnt:${POLICY_CLAMP_VERSION}
+ image: ${CONTAINER_LOCATION}onap/policy-clamp-ac-http-ppnt:${POLICY_CLAMP_VERSION}
container_name: policy-clamp-ac-http-ppnt
+ depends_on:
+ - simulator
hostname: policy-clamp-ac-http-ppnt
- expose:
- - 6971
+ ports:
+ - 30290:6969
volumes:
- - ./config/policy-truststore:/opt/app/policy/clamp/etc/ssl/policy-truststore:ro
+ - ./config/clamp/HttpParticipantParameters.yaml:/opt/app/policy/clamp/etc/HttpParticipantParameters.yaml
+ - ./config/clamp/logback.xml:/opt/app/policy/clamp/etc/logback.xml:ro
- ./wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro
- - ./config/ks.jks:/opt/app/policy/clamp/etc/ssl/policy-keystore:ro
entrypoint: /opt/app/policy/bin/wait_for_port.sh
command: [
'-c', './http-participant.sh',
- 'message-router', '3905'
+ 'message-router', '3904'
]
policy-clamp-ac-k8s-ppnt:
- image: nexus3.onap.org:10001/onap/policy-clamp-ac-k8s-ppnt:${POLICY_CLAMP_VERSION}
+ image: ${CONTAINER_LOCATION}onap/policy-clamp-ac-k8s-ppnt:${POLICY_CLAMP_VERSION}
container_name: policy-clamp-ac-k8s-ppnt
+ depends_on:
+ - simulator
hostname: policy-clamp-ac-k8s-ppnt
- expose:
- - 6972
+ ports:
+ - 30295:6969
volumes:
- - ./config/policy-truststore:/opt/app/policy/clamp/etc/ssl/policy-truststore:ro
+ - ./config/clamp/KubernetesParticipantParameters.yaml:/opt/app/policy/clamp/etc/KubernetesParticipantParameters.yaml
+ - ./config/clamp/logback.xml:/opt/app/policy/clamp/etc/logback.xml:ro
- ./wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro
- - ./config/ks.jks:/opt/app/policy/clamp/etc/ssl/policy-keystore:ro
entrypoint: /opt/app/policy/bin/wait_for_port.sh
command: [
'-c', './kubernetes-participant.sh',
- 'message-router', '3905'
+ 'message-router', '3904'
]
policy-clamp-ac-pf-ppnt:
- image: nexus3.onap.org:10001/onap/policy-clamp-ac-pf-ppnt:${POLICY_CLAMP_VERSION}
+ image: ${CONTAINER_LOCATION}onap/policy-clamp-ac-pf-ppnt:${POLICY_CLAMP_VERSION}
container_name: policy-clamp-ac-pf-ppnt
depends_on:
- simulator
- api
- - policy-clamp-ac-http-ppnt
- - policy-clamp-ac-k8s-ppnt
hostname: policy-clamp-ac-pf-ppnt
- expose:
- - 6973
+ ports:
+ - 30218:6969
volumes:
- - ./config/policy-truststore:/opt/app/policy/clamp/etc/ssl/policy-truststore:ro
+ - ./config/clamp/PolicyParticipantParameters.yaml:/opt/app/policy/clamp/etc/PolicyParticipantParameters.yaml:ro
+ - ./config/clamp/logback.xml:/opt/app/policy/clamp/etc/logback.xml:ro
- ./wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro
- - ./config/ks.jks:/opt/app/policy/clamp/etc/ssl/policy-keystore:ro
- - ./config/clamp/PolicyParticipantParameters.yaml:/opt/app/policy/clamp/config/PolicyParticipantParameters.yaml:ro
entrypoint: /opt/app/policy/bin/wait_for_port.sh
command: [
'-c', './policy-participant.sh',
- 'message-router', '3905'
+ 'message-router', '3904',
+ 'api', '6969'
]
+ policy-gui:
+ image: ${CONTAINER_LOCATION}onap/policy-gui:latest
+ container_name: policy-gui
+ depends_on:
+ - policy-clamp-backend
+ hostname: policy-gui
+ environment:
+ CLAMP_URL: http://policy-clamp-backend:8445
+ CLAMP_DISABLE_SSL_VALIDATION: "true"
+ ports:
+ - 2445:2445
+ volumes:
+ - ./config/policy-gui/application.yaml:/opt/app/policy/gui/etc/application.yml
+ - ./config/policy-gui/logback.xml:/opt/app/policy/gui/etc/logback.xml:ro
+ - ./wait_for_port.sh:/opt/app/policy/gui/bin/wait_for_port.sh:ro
+ entrypoint: ./policy-gui.sh
+ working_dir: /opt/app/policy/gui/bin
+ command: ./policy-gui.sh
+ policy-clamp-backend:
+ image: ${CONTAINER_LOCATION}onap/policy-clamp-backend:${POLICY_CLAMP_VERSION}
+ container_name: policy-clamp-backend
+ depends_on:
+ - policy-clamp-runtime-acm
+ - distribution
+ hostname: policy-clamp-backend
+ environment:
+ POLICY_API_HOST: api
+ POLICY_PAP_HOST: pap
+ MARIADB_HOST: mariadb
+ RUNTIME_HOST: policy-clamp-runtime-acm
+ ports:
+ - 8445:8445
+ volumes:
+ - ./config/clamp/ClampBackend.properties:/opt/policy/clamp/config/ClampBackend.properties:ro
+ - ./config/clamp/logback-backend.xml:/opt/policy/clamp/config/logback.xml:ro
+ working_dir: /opt/policy/clamp
+ command: java
+ -Djava.security.egd=file:/dev/./urandom
+ -XX:MinRAMPercentage=50
+ -XX:MaxRAMPercentage=75
+ -jar ./policy-clamp-backend.jar
+ --spring.config.name=ClampBackend
+ --spring.config.location=/opt/policy/clamp/config/ClampBackend.properties
diff --git a/csit/docker-compose-gui-smoke.yml b/csit/docker-compose-gui-smoke.yml
deleted file mode 100644
index 8be6ec6e..00000000
--- a/csit/docker-compose-gui-smoke.yml
+++ /dev/null
@@ -1,361 +0,0 @@
-#
-# ===========LICENSE_START====================================================
-# Copyright (C) 2022 Nordix Foundation.
-# ============================================================================
-# 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
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ============LICENSE_END=====================================================
-#
-version: '2'
-services:
- mariadb:
- image: nexus3.onap.org:10001/mariadb:${POLICY_MARIADB_VER}
- container_name: mariadb
- hostname: mariadb
- command: ['--lower-case-table-names=1', '--wait_timeout=28800']
- env_file: ./config/db/db.conf
- volumes:
- - ./config/clamp/policy-clamp-create-tables.sql:/tmp/policy-clamp-create-tables.sql
- - ./config/db:/docker-entrypoint-initdb.d:ro
- ports:
- - "3306:3306"
- policy-db-migrator:
- image: nexus3.onap.org:10001/onap/policy-db-migrator:${POLICY_DOCKER_VERSION}
- container_name: policy-db-migrator
- hostname: policy-db-migrator
- depends_on:
- - mariadb
- expose:
- - 6824
- env_file: ./config/db/db.conf
- environment:
- SQL_DB: policyadmin
- SQL_HOST: mariadb
- volumes:
- - ./db_migrator_policy_init.sh:/opt/app/policy/bin/db_migrator_policy_init.sh:ro
- - ./wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro
- entrypoint: /opt/app/policy/bin/wait_for_port.sh
- command: [
- '-c',
- '/opt/app/policy/bin/db_migrator_policy_init.sh',
- 'mariadb', '3306'
- ]
- simulator:
- image: nexus3.onap.org:10001/onap/policy-models-simulator:${POLICY_MODELS_VERSION}
- container_name: simulator
- hostname: simulator
- networks:
- default:
- aliases:
- - message-router
- - aai-sim
- - grpc-sim
- - sdnc-sim
- - so-sim
- - vfc-sim
- volumes:
- - ./config/sim-all:/opt/app/policy/simulators/etc/mounted:ro
- - ./config/ks.jks:/opt/app/policy/simulators/etc/ssl/policy-keystore:ro
- - ./config/policy-truststore:/opt/app/policy/simulators/etc/ssl/policy-truststore:ro
- expose:
- - 6666
- - 6668
- - 6669
- - 6670
- - 3905
- - 6680
- api:
- image: nexus3.onap.org:10001/onap/policy-api:${POLICY_API_VERSION}
- container_name: policy-api
- depends_on:
- - policy-db-migrator
- hostname: policy-api
- expose:
- - 6969
- volumes:
- - ./config/ks.jks:/opt/app/policy/api/etc/ssl/policy-keystore:ro
- - ./config/policy-truststore:/opt/app/policy/api/etc/ssl/policy-truststore:ro
- - ./wait_for_port.sh:/opt/app/policy/api/bin/wait_for_port.sh:ro
- entrypoint: ./wait_for_port.sh
- command: [
- '-c', './policy-api.sh',
- 'mariadb', '3306',
- 'policy-db-migrator', '6824'
- ]
- pap:
- image: nexus3.onap.org:10001/onap/policy-pap:${POLICY_PAP_VERSION}
- container_name: policy-pap
- depends_on:
- - mariadb
- - simulator
- - api
- hostname: policy-pap
- expose:
- - 6969
- volumes:
- - ./config/pap/papParameters.yaml:/opt/app/policy/pap/etc/papParameters.yaml:ro
- - ./config/pap/groups.json:/opt/app/policy/pap/etc/mounted/groups.json:ro
- - ./config/ks.jks:/opt/app/policy/pap/etc/ssl/policy-keystore:ro
- - ./config/policy-truststore:/opt/app/policy/pap/etc/ssl/policy-truststore:ro
- - ./wait_for_port.sh:/opt/app/policy/pap/bin/wait_for_port.sh:ro
- entrypoint: ./wait_for_port.sh
- command: [
- '-c', './policy-pap.sh',
- 'mariadb', '3306',
- 'message-router', '3905',
- 'api', '6969'
- ]
- xacml-pdp:
- image: nexus3.onap.org:10001/onap/policy-xacml-pdp:${POLICY_XACML_PDP_VERSION}
- container_name: policy-xacml-pdp
- depends_on:
- - mariadb
- - simulator
- - pap
- hostname: policy-xacml-pdp
- expose:
- - 6969
- volumes:
- - ./config/xacml-pdp/defaultConfig.json:/opt/app/policy/pdpx/etc/defaultConfig.json:ro
- - ./config/ks.jks:/opt/app/policy/pdpx/etc/ssl/policy-keystore:ro
- - ./config/policy-truststore:/opt/app/policy/pdpx/etc/ssl/policy-truststore:ro
- - ./wait_for_port.sh:/opt/app/policy/pdpx/bin/wait_for_port.sh:ro
- entrypoint: ./wait_for_port.sh
- command: [
- '-c', './policy-pdpx.sh',
- 'mariadb', '3306',
- 'message-router', '3905',
- 'pap', '6969'
- ]
- drools:
- image: nexus3.onap.org:10001/onap/policy-drools:${POLICY_DROOLS_PDP_VERSION}
- container_name: drools
- depends_on:
- - mariadb
- - simulator
- - pap
- hostname: drools
- expose:
- - 6969
- - 9696
- volumes:
- - ./config/drools/custom:/tmp/policy-install/config:ro
- - ./wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro
- env_file:
- - ./config/drools/env/base.conf
- entrypoint: /opt/app/policy/bin/wait_for_port.sh
- command: [
- '-c', '/opt/app/policy/bin/pdpd-entrypoint.sh boot',
- 'mariadb', '3306',
- 'message-router', '3905'
- ]
- drools-apps:
- image: nexus3.onap.org:10001/onap/policy-pdpd-cl:${POLICY_DROOLS_APPS_VERSION}
- container_name: drools-apps
- depends_on:
- - mariadb
- - simulator
- - pap
- - xacml-pdp
- hostname: drools-apps
- expose:
- - 6969
- - 9696
- volumes:
- - ./config/drools-apps/custom:/tmp/policy-install/config:ro
- - ./config/feature-lifecycle.properties:/opt/app/policy/features/lifecycle/config/feature-lifecycle.properties:ro
- - ./wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro
- env_file:
- - ./config/drools-apps/env/base.conf
- - ./config/drools-apps/env/feature-healthcheck.conf
- - ./config/drools-apps/env/feature-pooling-dmaap.conf
- entrypoint: /opt/app/policy/bin/wait_for_port.sh
- command: [
- '-c', '/opt/app/policy/bin/pdpd-cl-entrypoint.sh boot',
- 'mariadb', '3306',
- 'message-router', '3905',
- 'pap', '6969',
- 'aai-sim', '6666',
- 'sdnc-sim', '6668',
- 'so-sim', '6669',
- 'vfc-sim', '6670'
- ]
- apex-pdp:
- image: nexus3.onap.org:10001/onap/policy-apex-pdp:${POLICY_APEX_PDP_VERSION}
- container_name: policy-apex-pdp
- depends_on:
- - mariadb
- - simulator
- - pap
- hostname: policy-apex-pdp
- expose:
- - 6969
- - 23324
- volumes:
- - ./config/apex-pdp/OnapPfConfig.json:/opt/app/policy/apex-pdp/etc/onappf/config/OnapPfConfig.json:ro
- - ./config/ks.jks:/opt/app/policy/apex-pdp/etc/ssl/policy-keystore:ro
- - ./config/policy-truststore:/opt/app/policy/apex-pdp/etc/ssl/policy-truststore:ro
- - ./wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro
- entrypoint: /opt/app/policy/bin/wait_for_port.sh
- command: [
- '-c', '/opt/app/policy/apex-pdp/bin/apexOnapPf.sh -c /opt/app/policy/apex-pdp/etc/onappf/config/OnapPfConfig.json',
- 'mariadb', '3306',
- 'message-router', '3905',
- 'pap', '6969'
- ]
- distribution:
- image: nexus3.onap.org:10001/onap/policy-distribution:${POLICY_DISTRIBUTION_VERSION}
- container_name: policy-distribution
- depends_on:
- - mariadb
- - api
- - pap
- - apex-pdp
- hostname: policy-distribution
- volumes:
- - ./config/distribution/defaultConfig.json:/opt/app/policy/distribution/etc/defaultConfig.json:ro
- - ./config/ks.jks:/opt/app/policy/distribution/etc/ssl/policy-keystore:ro
- - ./config/policy-truststore:/opt/app/policy/distribution/etc/ssl/policy-truststore:ro
- - ./distribution/config/temp/:/opt/app/policy/distribution/etc/temp/:ro
- - ./wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro
- entrypoint: /opt/app/policy/bin/wait_for_port.sh
- command: [
- '-c', './policy-dist.sh',
- 'mariadb', '3306',
- 'message-router', '3905',
- 'pap', '6969',
- 'apex-pdp', '6969'
- ]
- policy-clamp-runtime-acm:
- image: nexus3.onap.org:10001/onap/policy-clamp-runtime-acm:${POLICY_CLAMP_VERSION}
- container_name: policy-clamp-runtime-acm
- depends_on:
- - mariadb
- - simulator
- - policy-clamp-ac-http-ppnt
- - policy-clamp-ac-k8s-ppnt
- - policy-clamp-ac-pf-ppnt
- hostname: policy-clamp-runtime-acm
- expose:
- - 6969
- volumes:
- - ./config/policy-truststore:/opt/app/policy/clamp/etc/ssl/policy-truststore:ro
- - ./wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro
- - ./config/ks.jks:/opt/app/policy/clamp/etc/ssl/policy-keystore:ro
- - ./config/clamp/AcRuntimeParameters.yaml:/opt/app/policy/clamp/config/AcRuntimeParameters.yaml
- entrypoint: /opt/app/policy/bin/wait_for_port.sh
- command: [
- '-c', './acm-runtime.sh',
- 'message-router', '3905'
- ]
- policy-clamp-ac-http-ppnt:
- image: nexus3.onap.org:10001/onap/policy-clamp-ac-http-ppnt:${POLICY_CLAMP_VERSION}
- container_name: policy-clamp-ac-http-ppnt
- depends_on:
- - simulator
- hostname: policy-clamp-ac-http-ppnt
- expose:
- - 6971
- volumes:
- - ./config/policy-truststore:/opt/app/policy/clamp/etc/ssl/policy-truststore:ro
- - ./wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro
- - ./config/ks.jks:/opt/app/policy/clamp/etc/ssl/policy-keystore:ro
- entrypoint: /opt/app/policy/bin/wait_for_port.sh
- command: [
- '-c', './http-participant.sh',
- 'message-router', '3905'
- ]
- policy-clamp-ac-k8s-ppnt:
- image: nexus3.onap.org:10001/onap/policy-clamp-ac-k8s-ppnt:${POLICY_CLAMP_VERSION}
- container_name: policy-clamp-ac-k8s-ppnt
- depends_on:
- - simulator
- hostname: policy-clamp-ac-k8s-ppnt
- expose:
- - 6972
- volumes:
- - ./config/policy-truststore:/opt/app/policy/clamp/etc/ssl/policy-truststore:ro
- - ./wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro
- - ./config/ks.jks:/opt/app/policy/clamp/etc/ssl/policy-keystore:ro
- entrypoint: /opt/app/policy/bin/wait_for_port.sh
- command: [
- '-c', './kubernetes-participant.sh',
- 'message-router', '3905'
- ]
- policy-clamp-ac-pf-ppnt:
- image: nexus3.onap.org:10001/onap/policy-clamp-ac-pf-ppnt:${POLICY_CLAMP_VERSION}
- container_name: policy-clamp-ac-pf-ppnt
- depends_on:
- - simulator
- - api
- hostname: policy-clamp-ac-pf-ppnt
- expose:
- - 6973
- volumes:
- - ./config/policy-truststore:/opt/app/policy/clamp/etc/ssl/policy-truststore:ro
- - ./wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro
- - ./config/ks.jks:/opt/app/policy/clamp/etc/ssl/policy-keystore:ro
- - ./config/clamp/PolicyParticipantParameters.yaml:/opt/app/policy/clamp/config/PolicyParticipantParameters.yaml:ro
- entrypoint: /opt/app/policy/bin/wait_for_port.sh
- command: [
- '-c', './policy-participant.sh',
- 'message-router', '3905'
- ]
-
- policy-gui:
- image: nexus3.onap.org:10001/onap/policy-gui:latest
- container_name: policy-gui
- depends_on:
- - policy-clamp-backend
- hostname: policy-gui
- environment:
- CLAMP_URL: https://policy-clamp-backend:8443
- CLAMP_DISABLE_SSL_VALIDATION: "true"
- SERVER_SSL_CLIENT_AUTH: want
- KEYSTORE_PASSWD: Pol1cy_0nap
- TRUSTSTORE_PASSWD: Pol1cy_0nap
- ports:
- - "2443:2443"
- expose:
- - 2443
- volumes:
- - ./config/clamp/gui/application.yaml:/opt/app/policy/gui/etc/application.yaml
- - ./config/policy-truststore:/opt/app/policy/gui/etc/mounted/policy-truststore:ro
- - ./config/ks.jks:/opt/app/policy/gui/etc/mounted/policy-keystore:ro
- - ./wait_for_port.sh:/opt/app/policy/gui/bin/wait_for_port.sh:ro
- entrypoint: ./policy-gui.sh
- working_dir: /opt/app/policy/gui/bin
- command: ./policy-gui.sh
-
- policy-clamp-backend:
- image: nexus3.onap.org:10001/onap/policy-clamp-backend:${POLICY_CLAMP_VERSION}
- container_name: policy-clamp-backend
- depends_on:
- - policy-clamp-runtime-acm
- - distribution
- hostname: policy-clamp-backend
- environment:
- POLICY_API_HOST: api
- POLICY_PAP_HOST: pap
- MARIADB_HOST: mariadb
- RUNTIME_HOST: policy-clamp-runtime-acm
- ports:
- - "8443:8443"
- expose:
- - 8443
- volumes:
- - ./config/clamp/application-smoke.properties:/opt/policy/clamp/application-smoke.properties:ro
- - ./config/policy-truststore:/opt/policy/clamp/policy-truststore:ro
- - ./config/ks.jks:/opt/policy/clamp/policy-keystore:ro
- - ./config/clamp/org.onap.clamp.keyfile:/opt/policy/clamp/clamp-be-keyfile:ro
- working_dir: /opt/policy/clamp
- command: java -Djava.security.egd=file:/dev/./urandom -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=75 -jar ./policy-clamp-backend.jar --spring.config.name=application-smoke --spring.config.location=optional:classpath:/,optional:classpath:/config/,optional:file:./,optional:file:./config/
diff --git a/csit/drools-applications/plans/teardown.sh b/csit/drools-applications/plans/teardown.sh
index f1a8624f..72ade97b 100755
--- a/csit/drools-applications/plans/teardown.sh
+++ b/csit/drools-applications/plans/teardown.sh
@@ -18,10 +18,4 @@
# ============LICENSE_END=====================================================
#
-docker logs policy-api
-docker logs simulator
-docker logs policy-pap
-docker logs xacml-pdp
-docker logs drools-apps
-
docker-compose -f ${SCRIPTS}/docker-compose-all.yml down -v
diff --git a/csit/drools-applications/tests/drools-applications-test.robot b/csit/drools-applications/tests/drools-applications-test.robot
index a908f79b..c06631b9 100644
--- a/csit/drools-applications/tests/drools-applications-test.robot
+++ b/csit/drools-applications/tests/drools-applications-test.robot
@@ -213,8 +213,8 @@ VerifyController
PeformGetRequest
[Arguments] ${url} ${hostname} ${port} ${expectedstatus}
${auth}= Create List demo@people.osaaf.org demo123456!
- Log Creating session https://${hostname}:${port}
- ${session}= Create Session policy https://${hostname}:${port} auth=${auth}
+ Log Creating session http://${hostname}:${port}
+ ${session}= Create Session policy http://${hostname}:${port} auth=${auth}
${headers}= Create Dictionary Accept=application/json Content-Type=application/json
${resp}= GET On Session policy ${url} headers=${headers} expected_status=${expectedstatus}
Log Received response from policy ${resp.text}
@@ -224,8 +224,8 @@ PerformPostRequest
[Arguments] ${url} ${params} ${hostname} ${port} ${jsonfile} ${filepath} ${contenttype} ${expectedstatus}
${auth}= Create List policyadmin zb!XztG34
${postjson}= Get file ${filepath}/${jsonfile}
- Log Creating session https://${hostname}:${port}
- ${session}= Create Session policy https://${hostname}:${port} auth=${auth}
+ Log Creating session http://${hostname}:${port}
+ ${session}= Create Session policy http://${hostname}:${port} auth=${auth}
${headers}= Create Dictionary Accept=application/${contenttype} Content-Type=application/${contenttype}
${resp}= POST On Session policy ${url} params=${params} data=${postjson} headers=${headers} expected_status=${expectedstatus}
Log Received response from policy ${resp.text}
diff --git a/csit/drools-pdp/plans/teardown.sh b/csit/drools-pdp/plans/teardown.sh
index 6ec00513..c2b68155 100755
--- a/csit/drools-pdp/plans/teardown.sh
+++ b/csit/drools-pdp/plans/teardown.sh
@@ -16,9 +16,4 @@
# limitations under the License.
# ============LICENSE_END=========================================================
-docker logs policy-api
-docker logs simulator
-docker logs policy-pap
-docker logs drools
-
docker-compose -f ${SCRIPTS}/docker-compose-all.yml down -v
diff --git a/csit/drools-pdp/tests/drools-pdp-test.robot b/csit/drools-pdp/tests/drools-pdp-test.robot
index 68dc4ead..3d95b6a1 100644
--- a/csit/drools-pdp/tests/drools-pdp-test.robot
+++ b/csit/drools-pdp/tests/drools-pdp-test.robot
@@ -8,8 +8,8 @@ Library json
Alive
[Documentation] Runs Policy PDP Alive Check
${auth}= Create List demo@people.osaaf.org demo123456!
- Log Creating session https://${POLICY_DROOLS_IP}:9696
- ${session}= Create Session policy https://${POLICY_DROOLS_IP}:9696 auth=${auth}
+ Log Creating session http://${POLICY_DROOLS_IP}:9696
+ ${session}= Create Session policy http://${POLICY_DROOLS_IP}:9696 auth=${auth}
${headers}= Create Dictionary Accept=application/json Content-Type=application/json
${resp}= GET On Session policy /policy/pdp/engine headers=${headers} expected_status=200
Log Received response from policy ${resp.text}
@@ -18,8 +18,8 @@ Alive
Metrics
[Documentation] Verify drools-pdp is exporting metrics
${auth}= Create List demo@people.osaaf.org demo123456!
- Log Creating session https://${POLICY_DROOLS_IP}:9696
- ${session}= Create Session policy https://${POLICY_DROOLS_IP}:9696 auth=${auth}
+ Log Creating session http://${POLICY_DROOLS_IP}:9696
+ ${session}= Create Session policy http://${POLICY_DROOLS_IP}:9696 auth=${auth}
${headers}= Create Dictionary Accept=application/json Content-Type=application/json
${resp}= GET On Session policy /metrics headers=${headers} expected_status=200
Log Received response from policy ${resp.text}
diff --git a/csit/gen_keystore.sh b/csit/gen_keystore.sh
deleted file mode 100755
index 9b1cdfd6..00000000
--- a/csit/gen_keystore.sh
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/bash
-#
-# ===========LICENSE_START====================================================
-# Copyright (C) 2021 AT&T Intellectual Property. All rights reserved.
-# ============================================================================
-# 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
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ============LICENSE_END=====================================================
-#
-
-#
-# Generates a self-signed keystore for use by the various policy docker
-# images.
-#
-
-DIR="${0%/*}/config"
-cd "${DIR}"
-
-OUTFILE=ks.jks
-
-ALIAS="policy@policy.onap.org"
-PASS=Pol1cy_0nap
-
-dn="C=US, O=ONAP, OU=OSAAF, OU=policy@policy.onap.org:DEV, CN=policy"
-
-rm -f "${OUTFILE}"
-
-keytool -genkeypair -alias "${ALIAS}" -validity 30 \
- -keyalg RSA -dname "${dn}" -keystore "${OUTFILE}" \
- -keypass "${PASS}" -storepass "${PASS}"
-
-keytool -certreq -alias "${ALIAS}" -keystore ks.jks -file ks.csr \
- -storepass "${PASS}"
-
-openssl x509 -CA caroot.cer -CAkey cakey.pem -CAserial caserial.txt \
- -req -in ks.csr -out ks.cer -passin "pass:${PASS}" \
- -extfile dns_ssl.txt -days 30
-
-keytool -import -noprompt -file caroot.cer -keystore ks.jks \
- -storepass "${PASS}"
-
-keytool -import -alias "${ALIAS}" -file ks.cer -keystore ks.jks \
- -storepass "${PASS}"
-
-chmod 644 "$OUTFILE"
diff --git a/csit/gen_truststore.sh b/csit/gen_truststore.sh
deleted file mode 100755
index 748d5f30..00000000
--- a/csit/gen_truststore.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-#
-# ===========LICENSE_START====================================================
-# Copyright (C) 2021 AT&T Intellectual Property. All rights reserved.
-# ============================================================================
-# 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
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ============LICENSE_END=====================================================
-#
-
-#
-# Generates a root certificate and truststore for use by the various policy
-# docker images.
-#
-
-DIR="${0%/*}/config"
-cd "${DIR}"
-
-OUTFILE=policy-truststore
-ALIAS=onap.policy.csit.root.ca
-PASS=Pol1cy_0nap
-
-keytool -list -alias ${ALIAS} -keystore ${OUTFILE} -storepass "${PASS}" \
- >/dev/null 2>&1
-if [ $? -eq 0 ]
-then
- echo "Truststore already contains a policy root CA - not re-generating"
- exit 0
-fi
-
-openssl req -new -keyout cakey.pem -out careq.pem -passout "pass:${PASS}" \
- -subj "/C=US/ST=New Jersey/OU=ONAP/CN=policy.onap"
-
-openssl x509 -signkey cakey.pem -req -days 3650 -in careq.pem \
- -out caroot.cer -extensions v3_ca -passin "pass:${PASS}"
-
-keytool -import -noprompt -trustcacerts -alias ${ALIAS} \
- -file caroot.cer -keystore "${OUTFILE}" -storepass "${PASS}"
-
-chmod 644 "$OUTFILE"
diff --git a/csit/include-raw-integration-install-robotframework.sh b/csit/include-raw-integration-install-robotframework.sh
index 22f71a73..2711d18e 100755
--- a/csit/include-raw-integration-install-robotframework.sh
+++ b/csit/include-raw-integration-install-robotframework.sh
@@ -2,7 +2,7 @@
#
# ============LICENSE_START===================================================
# Copyright (c) 2016 The Linux Foundation and others.
-# Modification Copyright 2021-2022 Nordix Foundation.
+# Modification Copyright 2021. Nordix Foundation.
# Modification Copyright 2021 AT&T Intellectual Property. All rights reserved.
# ============================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/csit/make_topic.sh b/csit/make_topic.sh
index 77e0a2dd..05d11f3c 100755
--- a/csit/make_topic.sh
+++ b/csit/make_topic.sh
@@ -2,6 +2,7 @@
#
# ===========LICENSE_START====================================================
# Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright (C) 2022 Nordix Foundation.
# ============================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -29,5 +30,5 @@ fi
topic="${1}"
-curl -s -k "https://${SIM_IP}:3905/events/${topic}/script/1?limit=1&timeout=0"
+curl -s -k "http://${SIM_IP}:3904/events/${topic}/script/1?limit=1&timeout=0"
echo
diff --git a/csit/metrics/prometheus.yml b/csit/metrics/prometheus.yml
index 1b292cd7..c2e0cf10 100644
--- a/csit/metrics/prometheus.yml
+++ b/csit/metrics/prometheus.yml
@@ -84,3 +84,16 @@ scrape_configs:
basic_auth:
username: "healthcheck"
password: "zb!XztG34"
+
+ - job_name: "acm-metrics"
+ metrics_path: "/prometheus"
+ static_configs:
+ - targets:
+ - "policy-clamp-runtime-acm:6969"
+ basic_auth:
+ username: "runtimeUser"
+ password: "zb!XztG34"
+
+ - job_name: "node"
+ static_configs:
+ - targets: ["node-exporter:9100"]
diff --git a/csit/onset.sh b/csit/onset.sh
index 06b0c9fd..251b5b51 100755
--- a/csit/onset.sh
+++ b/csit/onset.sh
@@ -2,6 +2,7 @@
#
# ===========LICENSE_START====================================================
# Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright (C) 2022 Nordix Foundation.
# ============================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -28,5 +29,5 @@ then
fi
curl -k -H "Content-type: application/json" --data-binary @$1 \
- https://${SIM_IP}:3905/events/unauthenticated.DCAE_CL_OUTPUT
+ http://${SIM_IP}:3904/events/unauthenticated.DCAE_CL_OUTPUT
echo
diff --git a/csit/pap/plans/setup.sh b/csit/pap/plans/setup.sh
index 8612d2bf..c5b75937 100755
--- a/csit/pap/plans/setup.sh
+++ b/csit/pap/plans/setup.sh
@@ -2,6 +2,7 @@
# ============LICENSE_START=======================================================
# Copyright (C) 2019-2022 Nordix Foundation.
# Modifications Copyright (C) 2019-2021 AT&T Intellectual Property.
+# Modifications Copyright (C) 2022 Nordix Foundation.
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -23,13 +24,17 @@ python3 -m pip uninstall -y docker-py
python3 -m pip uninstall -y docker
python3 -m pip install -U docker
-sudo apt-get -y install libxml2-utils
-
source "${SCRIPTS}"/get-versions.sh
+
+sudo apt-get -y install libxml2-utils
bash "${SCRIPTS}"/get-models-examples.sh
-docker-compose -f "${SCRIPTS}"/docker-compose-all.yml up -d pap
+echo "${POLICY_PAP_VERSION}"
+
+cd "${SCRIPTS}"
+docker-compose -f "${SCRIPTS}"/docker-compose-all.yml up -d pap apex-pdp
+sleep 10
unset http_proxy https_proxy
POLICY_PAP_IP=$(get-instance-ip.sh policy-pap)
@@ -43,7 +48,6 @@ echo MARIADB IP IS "${MARIADB_IP}"
# wait for the app to start up
"${SCRIPTS}"/wait_for_port.sh "${POLICY_PAP_IP}" 6969
-
DATA=${WORKSPACE}/models/models-examples/src/main/resources/policies
NODETEMPLATES=${WORKSPACE}/models/models-examples/src/main/resources/nodetemplates
diff --git a/csit/pap/plans/teardown.sh b/csit/pap/plans/teardown.sh
index 10c5f789..0d4c6ed2 100755
--- a/csit/pap/plans/teardown.sh
+++ b/csit/pap/plans/teardown.sh
@@ -18,8 +18,4 @@
# SPDX-License-Identifier: Apache-2.0
# ============LICENSE_END=========================================================
-docker logs policy-api
-docker logs simulator
-docker logs policy-pap
-
docker-compose -f ${SCRIPTS}/docker-compose-all.yml down -v
diff --git a/csit/pap/tests/pap-test.robot b/csit/pap/tests/pap-test.robot
index 203ddd6c..c2ad8370 100644
--- a/csit/pap/tests/pap-test.robot
+++ b/csit/pap/tests/pap-test.robot
@@ -46,7 +46,6 @@ Metrics
Should Contain ${resp.text} http_server_requests_seconds_count{exception="None",method="GET",outcome="SUCCESS",status="200",uri="/policy/pap/v1/components/healthcheck",} 1.0
Should Contain ${resp.text} spring_data_repository_invocations_seconds_count{exception="None",method="save",repository="PdpGroupRepository",state="SUCCESS",} 1.0
Should Contain ${resp.text} spring_data_repository_invocations_seconds_count{exception="None",method="findByKeyName",repository="PdpGroupRepository",state="SUCCESS",} 1.0
- Should Contain ${resp.text} spring_data_repository_invocations_seconds_count{exception="None",method="findAll",repository="PdpGroupRepository",state="SUCCESS",} 1.0
Should Contain ${resp.text} spring_data_repository_invocations_seconds_count{exception="None",method="findAll",repository="PolicyStatusRepository",state="SUCCESS",} 1.0
Statistics
@@ -106,7 +105,8 @@ QueryPdpGroupsAfterUndeploy
QueryPdpGroups 2 defaultGroup ACTIVE 0 testGroup ACTIVE 0
QueryPolicyAuditAfterUnDeploy
- [Documentation] Verify policy audit record after undeploy
+ [Documentation] Verify policy audit record after undeploy
+ Sleep 60 seconds
QueryPolicyAudit /policy/pap/v1/policies/audit 200 testGroup pdpTypeA onap.restart.tca UNDEPLOYMENT
QueryPolicyAuditWithMetadataSetAfterUnDeploy
diff --git a/csit/prepare-config-files.py b/csit/prepare-config-files.py
deleted file mode 100755
index 4eaa3422..00000000
--- a/csit/prepare-config-files.py
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/usr/bin/python3
-#
-# ============LICENSE_START====================================================
-# Copyright (C) 2022 Nordix Foundation.
-# =============================================================================
-# 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
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-# ============LICENSE_END======================================================
-
-import os
-import argparse
-
-if __name__ == '__main__':
- parser = argparse.ArgumentParser(description='Process configuration files for https/ssl '
- 'disabling.')
- parser.add_argument('--https', default="true",
- help='enable or disable https/ssl connection. '
- 'use https=true or https=false')
-
- https_enabled = parser.parse_args().https
- message_router_port = '3905' if https_enabled == "true" else '3904'
- protocol = 'https://' if https_enabled == "true" else 'http://'
-
- current_dir = os.getcwd()
- config_dir = current_dir + "/config/"
-
- files = []
- for (dirpath, dirnames, filenames) in os.walk(config_dir):
- for filename in filenames:
- files.append(os.path.join(dirpath, filename))
-
- for file in files:
- try:
- with open(file, 'r+') as f:
- content = f.read()
- new_content = content.replace("{{HTTPS_ENABLED}}", https_enabled)
- new_content = new_content.replace("{{PROTOCOL}}", protocol)
- new_content = new_content.replace("{{MESSAGE_ROUTER_PORT}}", message_router_port)
-
- if new_content != content:
- f.seek(0)
- f.truncate()
- f.write(new_content)
- print("File {0} updated!".format(file))
- except UnicodeDecodeError:
- print("File didn't open: ", file)
-
- exit(0)
diff --git a/csit/pylibs.txt b/csit/pylibs.txt
index d6250dba..a8d8c4e3 100644
--- a/csit/pylibs.txt
+++ b/csit/pylibs.txt
@@ -7,7 +7,6 @@ requests
robotframework-httplibrary
robotframework-requests
robotframework-selenium2library
-robotframework-extendedselenium2library
robotframework-sshlibrary
scapy
# Module jsonpath is needed by current AAA idmlite suite.
diff --git a/csit/run-project-csit.sh b/csit/run-project-csit.sh
index c0f8d07a..fd20c6af 100755
--- a/csit/run-project-csit.sh
+++ b/csit/run-project-csit.sh
@@ -31,10 +31,13 @@ function on_exit(){
rsync -av "${WORKDIR}/" "${WORKSPACE}/csit/archives/${PROJECT}"
fi
# Record list of active docker containers
- docker ps --format "{{.Image}}" > "${WORKSPACE}/csit/archives/${PROJECT}/_docker-images.log"
+ docker ps
+
+ # Show the logs from all containers
+ docker-compose -f "${WORKSPACE}/csit/docker-compose-all.yml" logs
# show memory consumption after all docker instances initialized
- docker_stats | tee "${WORKSPACE}/csit/archives/${PROJECT}/_sysinfo-2-after-robot.txt"
+ docker_stats
fi
# Run teardown script plan if it exists
cd "${TESTPLANDIR}/plans/"
@@ -51,16 +54,23 @@ function on_exit(){
trap on_exit EXIT
function docker_stats(){
- #General memory details
- echo "> top -bn1 | head -3"
- top -bn1 | head -3
- echo
-
- echo "> free -h"
- free -h
- echo
+ # General memory details
+ if [ "$(uname -s)" == "Darwin" ]
+ then
+ echo "> top -l1 | head -10"
+ sh -c "top -l1 | head -10"
+ echo
+ else
+ echo "> top -bn1 | head -3"
+ sh -c "top -bn1 | head -3"
+ echo
+
+ echo "> free -h"
+ sh -c "free -h"
+ echo
+ fi
- #Memory details per Docker
+ # Memory details per Docker
echo "> docker ps"
docker ps
echo
@@ -120,6 +130,19 @@ function source_safely() {
# main
#
+if $(docker images | grep -q "onap\/policy-api")
+then
+ echo where
+ export CONTAINER_LOCATION=$(
+ docker images |
+ grep onap/policy-api |
+ head -1 |
+ sed 's/onap\/policy-api.*$//'
+ )
+else
+ export CONTAINER_LOCATION="nexus3.onap.org:10001/"
+fi
+
# set and save options for quick failure
harden_set && save_set
@@ -145,10 +168,6 @@ export ROBOT_VARIABLES=
# get the plan from git clone
source "${SCRIPTS}"/get-branch.sh
-# Prepare configuration files
-cd "${WORKSPACE}/csit"
-python3 ./prepare-config-files.py --https=true
-
export PROJECT="${1}"
cd ${WORKSPACE}
@@ -165,25 +184,12 @@ source_safely "${SCRIPTS}/prepare-csit.sh"
# Activate the virtualenv containing all the required libraries installed by prepare-csit.sh
source_safely "${ROBOT_VENV}/bin/activate"
-WORKDIR=$(mktemp -d --suffix=-robot-workdir)
+WORKDIR=$(mktemp -d)
cd "${WORKDIR}"
# Sign in to nexus3 docker repo
docker login -u docker -p docker nexus3.onap.org:10001
-# Generate truststore and keystore to be used by repos
-#${SCRIPTS}/gen_truststore.sh
-#${SCRIPTS}/gen_keystore.sh
-cp ${SCRIPTS}/config/ks.jks ${SCRIPTS}/config/drools/custom/policy-keystore
-cp ${SCRIPTS}/config/ks.jks ${SCRIPTS}/config/drools-apps/custom/policy-keystore
-cp ${SCRIPTS}/config/policy-truststore \
- ${SCRIPTS}/config/drools/custom/policy-truststore
-cp ${SCRIPTS}/config/policy-truststore \
- ${SCRIPTS}/config/drools-apps/custom/policy-truststore
-chmod 644 \
- ${SCRIPTS}/config/drools/custom/policy-* \
- ${SCRIPTS}/config/drools-apps/custom/policy-*
-
# Run setup script plan if it exists
cd "${TESTPLANDIR}/plans/"
SETUP="${TESTPLANDIR}/plans/setup.sh"
@@ -200,7 +206,7 @@ cd "${WORKDIR}"
echo "Reading the testplan:"
cat "${TESTPLANDIR}/plans/testplan.txt" | egrep -v '(^[[:space:]]*#|^[[:space:]]*$)' | sed "s|^|${TESTPLANDIR}/tests/|" > testplan.txt
cat testplan.txt
-SUITES=$( xargs -a testplan.txt )
+SUITES=$( xargs < testplan.txt )
echo ROBOT_VARIABLES="${ROBOT_VARIABLES}"
echo "Starting Robot test suites ${SUITES} ..."
diff --git a/csit/start-gui-smoke-components.sh b/csit/start-all.sh
index 4fe36a01..15210aab 100755
--- a/csit/start-gui-smoke-components.sh
+++ b/csit/start-all.sh
@@ -18,12 +18,8 @@
SCRIPTS=$(git rev-parse --show-toplevel)
export SCRIPTS="${SCRIPTS}"/csit
-cd ${SCRIPTS}
+source "${SCRIPTS}"/get-versions.sh
-python3 ./prepare-config-files.py --https=true
+docker-compose -f "${SCRIPTS}"/docker-compose-all.yml up -d policy-gui
-source ./get-versions.sh
-
-docker-compose -f docker-compose-gui-smoke.yml up -d policy-gui
-
-echo "Clamp GUI: https://localhost:2443/clamp"
+echo "Clamp GUI: https://localhost:2445/clamp"
diff --git a/csit/start-grafana.sh b/csit/start-grafana.sh
index 0350ad25..e081d04c 100755
--- a/csit/start-grafana.sh
+++ b/csit/start-grafana.sh
@@ -21,20 +21,16 @@
SCRIPTS=$(git rev-parse --show-toplevel)
export SCRIPTS="${SCRIPTS}"/csit
-cd ${SCRIPTS}
-
-python3 ./prepare-config-files.py --https=false
-
-source ./get-versions.sh
+source "${SCRIPTS}"/get-versions.sh
export PROJECT="${1}"
if [ -z "${PROJECT}" ]; then
echo "Starting all components..."
- docker-compose -f ./compose-grafana.yml up -d
+ docker-compose -f "${SCRIPTS}"/compose-grafana.yml up -d
else
echo "Starting ${PROJECT} application..."
- docker-compose -f ./compose-grafana.yml up -d "${PROJECT}" grafana
+ docker-compose -f "${SCRIPTS}"/compose-grafana.yml up -d "${PROJECT}" grafana
fi
prometheus=$(docker inspect -f '{{range.NetworkSettings.Networks}}{{.IPAddress}}{{end}}' prometheus)
diff --git a/csit/stop-gui-smoke.sh b/csit/stop-all.sh
index c69069b3..4e6b0aa6 100755
--- a/csit/stop-gui-smoke.sh
+++ b/csit/stop-all.sh
@@ -23,4 +23,4 @@ export SCRIPTS="${SCRIPTS}"/csit
source "${SCRIPTS}"/get-versions.sh
-docker-compose -f "${SCRIPTS}"/docker-compose-gui-smoke.yml down
+docker-compose -f "${SCRIPTS}"/docker-compose-all.yml down
diff --git a/csit/wait_for_port.sh b/csit/wait_for_port.sh
index 9262ba32..5a8be250 100755
--- a/csit/wait_for_port.sh
+++ b/csit/wait_for_port.sh
@@ -62,6 +62,11 @@ do
while [ "$tmout" -gt 0 ]
do
+ if command -v docker > /dev/null 2>&1
+ then
+ docker ps
+ fi
+
nc -vz "$host" "$port"
rc=$?
@@ -69,7 +74,6 @@ do
then
break
else
- docker ps
tmout=$((tmout-1))
sleep 1
fi
diff --git a/csit/wait_topic.sh b/csit/wait_topic.sh
index 64b6c9f3..a6d997d0 100755
--- a/csit/wait_topic.sh
+++ b/csit/wait_topic.sh
@@ -2,6 +2,7 @@
#
# ===========LICENSE_START====================================================
# Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright (C) 2022 Nordix Foundation.
# ============================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -39,7 +40,7 @@ matched=no
while [ ${matched} = "no" ]
do
- msg=`curl -s -k "https://${SIM_IP}:3905/events/${topic}/script/1?limit=1"`
+ msg=`curl -s -k "http://${SIM_IP}:3904/events/${topic}/script/1?limit=1"`
if [ $? -ne 0 -o "${msg}" = "[]" ]
then
echo not found >&2
diff --git a/csit/xacml-pdp/plans/setup.sh b/csit/xacml-pdp/plans/setup.sh
index c99a0318..705c8202 100755
--- a/csit/xacml-pdp/plans/setup.sh
+++ b/csit/xacml-pdp/plans/setup.sh
@@ -40,7 +40,7 @@ POLICY_PAP_IP=$(get-instance-ip.sh policy-pap)
export SIM_IP
-echo PDP IP IS "${POLICY_PDPX_IP}"
+echo XACML-PDP IP IS "${POLICY_PDPX_IP}"
echo API IP IS "${POLICY_API_IP}"
echo PAP IP IS "${POLICY_PAP_IP}"
echo MARIADB IP IS "${MARIADB_IP}"
diff --git a/csit/xacml-pdp/plans/teardown.sh b/csit/xacml-pdp/plans/teardown.sh
index 3e2fc5f7..6f77caa4 100755
--- a/csit/xacml-pdp/plans/teardown.sh
+++ b/csit/xacml-pdp/plans/teardown.sh
@@ -18,9 +18,4 @@
# SPDX-License-Identifier: Apache-2.0
# ============LICENSE_END=========================================================
-docker logs policy-api
-docker logs simulator
-docker logs policy-pap
-docker logs xacml-pdp
-
docker-compose -f ${SCRIPTS}/docker-compose-all.yml down -v