From 02d8fad0dfa0c007386beae24e25bbbd0eed130b Mon Sep 17 00:00:00 2001 From: liamfallon Date: Mon, 12 Sep 2022 16:01:26 +0100 Subject: Convert CSIT tests to use HTTP rather than HTTPS This commit converts the CSITs from HTTPS to HTTP. It also does some refactoring and tidying up on the CSIT environment. Issue-ID: POLICY-4338 Change-Id: I02afa5c7a585470fa0bda521e97bf1cdcf6a95c2 Signed-off-by: liamfallon --- .gitignore | 5 + csit/apex-pdp/tests/apex-pdp-test.robot | 2 +- .../data/onap.policies.apex.Simplecontrolloop.json | 8 +- csit/clamp/plans/setup.sh | 7 +- csit/clamp/tests/policy-clamp-test.robot | 28 +-- csit/common-library.robot | 16 +- csit/config/apex-pdp/OnapPfConfig.json | 6 +- csit/config/api/defaultConfig.json | 57 ++++++ csit/config/api/logback.xml | 207 +++++++++++++++++++++ csit/config/cakey.pem | 30 --- csit/config/careq.pem | 16 -- csit/config/caroot.cer | 19 -- csit/config/caserial.txt | 1 - csit/config/clamp/ClRuntimeParameters.yaml | 7 +- csit/config/clamp/HttpParticipantParameters.yaml | 9 +- .../clamp/KubernetesParticipantParameters.yaml | 7 +- csit/config/clamp/PolicyParticipantParameters.yaml | 13 +- csit/config/distribution/defaultConfig.json | 6 +- .../custom/feature-lifecycle.properties | 5 +- csit/config/drools-apps/env/base.conf | 9 +- csit/config/drools/env/base.conf | 7 +- csit/config/ks.cer | 29 --- csit/config/ks.csr | 18 -- csit/config/ks.jks | Bin 5001 -> 0 bytes csit/config/pap/defaultConfig.json | 12 +- csit/config/pap/logback.xml | 120 ++++++++++++ csit/config/policy-truststore | Bin 125108 -> 0 bytes csit/config/sim-all/simParameters.json | 18 +- csit/config/xacml-pdp/defaultConfig.json | 8 +- csit/docker-compose-all.yml | 80 ++++---- .../tests/drools-applications-test.robot | 8 +- csit/drools-pdp/tests/drools-pdp-test.robot | 8 +- csit/gen_keystore.sh | 54 ------ csit/gen_truststore.sh | 49 ----- csit/make_topic.sh | 3 +- csit/onset.sh | 3 +- csit/run-project-csit.sh | 64 ++++--- csit/wait_for_port.sh | 6 +- csit/wait_topic.sh | 3 +- policy-jdk/alpine/pom.xml | 107 ++++++++++- policy-jdk/alpine/src/main/docker/Dockerfile | 6 +- policy-jre/alpine/pom.xml | 109 ++++++++++- policy-jre/alpine/src/main/docker/Dockerfile | 7 +- 43 files changed, 788 insertions(+), 389 deletions(-) create mode 100644 csit/config/api/defaultConfig.json create mode 100644 csit/config/api/logback.xml delete mode 100644 csit/config/cakey.pem delete mode 100644 csit/config/careq.pem delete mode 100644 csit/config/caroot.cer delete mode 100644 csit/config/caserial.txt delete mode 100644 csit/config/ks.cer delete mode 100644 csit/config/ks.csr delete mode 100644 csit/config/ks.jks create mode 100644 csit/config/pap/logback.xml delete mode 100644 csit/config/policy-truststore delete mode 100755 csit/gen_keystore.sh delete mode 100755 csit/gen_truststore.sh diff --git a/.gitignore b/.gitignore index abced7c6..4326052c 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,8 @@ install.log* *.sw? **/*.iml .idea/ +csit/archives +env.properties +.pydevproject +models +csar_temp.csar diff --git a/csit/apex-pdp/tests/apex-pdp-test.robot b/csit/apex-pdp/tests/apex-pdp-test.robot index 60497229..31ff7194 100644 --- a/csit/apex-pdp/tests/apex-pdp-test.robot +++ b/csit/apex-pdp/tests/apex-pdp-test.robot @@ -62,7 +62,7 @@ RunEventOnApexEngine TriggerAndVerifyControlLoopPolicy [Documentation] Send 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/VesEvent.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} diff --git a/csit/apex-pdp/tests/data/onap.policies.apex.Simplecontrolloop.json b/csit/apex-pdp/tests/data/onap.policies.apex.Simplecontrolloop.json index 456e192f..0224e61d 100644 --- a/csit/apex-pdp/tests/data/onap.policies.apex.Simplecontrolloop.json +++ b/csit/apex-pdp/tests/data/onap.policies.apex.Simplecontrolloop.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" } ] }, @@ -2758,7 +2758,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": { @@ -2771,7 +2771,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": [ @@ -2859,7 +2859,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/clamp/plans/setup.sh b/csit/clamp/plans/setup.sh index 5777b388..0f6141b5 100755 --- a/csit/clamp/plans/setup.sh +++ b/csit/clamp/plans/setup.sh @@ -1,6 +1,6 @@ #!/bin/bash # ============LICENSE_START======================================================= -# Copyright (C) 2021 Nordix Foundation. +# 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. @@ -33,6 +33,8 @@ sleep 300 unset http_proxy https_proxy POLICY_CONTROLLOOP_RUNTIME_IP=`get-instance-ip.sh policy-clamp-cl-runtime` +MARIADB_IP=$(get-instance-ip.sh mariadb) +DMAAP_IP=$(get-instance-ip.sh simulator) POLICY_PARTICIPANT_IP=`get-instance-ip.sh policy-clamp-cl-pf-ppnt` K8S_PARTICIPANT_IP=`get-instance-ip.sh policy-clamp-cl-k8s-ppnt` HTTP_PARTICIPANT_IP=`get-instance-ip.sh policy-clamp-cl-http-ppnt` @@ -40,7 +42,8 @@ MARIADB_IP=`get-instance-ip.sh mariadb` DMAAP_IP=`get-instance-ip.sh simulator` POLICY_API_IP=`get-instance-ip.sh policy-api` -echo MARIADB IP IS ${MARIADB_IP} +echo MARIADB IP IS "${MARIADB_IP}" +echo DMAAP_IP IS "${DMAAP_IP}" echo DMAAP_IP IS ${DMAAP_IP} echo API IP IS ${POLICY_API_IP} echo POLICY CONTROLLOOP RUNTIME IP IS ${POLICY_CONTROLLOOP_RUNTIME_IP} diff --git a/csit/clamp/tests/policy-clamp-test.robot b/csit/clamp/tests/policy-clamp-test.robot index 94b3d54a..bb590f52 100644 --- a/csit/clamp/tests/policy-clamp-test.robot +++ b/csit/clamp/tests/policy-clamp-test.robot @@ -9,9 +9,9 @@ Library json CommissionControlLoopV1 [Documentation] Commission control loop. ${auth}= Create List healthcheck zb!XztG34 - Log Creating session https://${POLICY_CONTROLLOOP_RUNTIME_IP}:6969 + Log Creating session http://${POLICY_CONTROLLOOP_RUNTIME_IP}:6969 ${postyaml}= Get file ${CURDIR}/data/PMSHMultipleCLTosca.yaml - ${session}= Create Session policy https://${POLICY_CONTROLLOOP_RUNTIME_IP}:6969 auth=${auth} + ${session}= Create Session policy http://${POLICY_CONTROLLOOP_RUNTIME_IP}:6969 auth=${auth} ${headers}= Create Dictionary Accept=application/yaml Content-Type=application/yaml ${resp}= POST On Session policy /onap/controlloop/v2/commission data=${postyaml} headers=${headers} Log Received response from controlloop runtime ${resp.text} @@ -20,9 +20,9 @@ CommissionControlLoopV1 InstantiateControlLoopV1 [Documentation] Instantiate control loop. ${auth}= Create List healthcheck zb!XztG34 - Log Creating session https://${POLICY_CONTROLLOOP_RUNTIME_IP}:6969 + Log Creating session http://${POLICY_CONTROLLOOP_RUNTIME_IP}:6969 ${postjson}= Get file ${CURDIR}/data/InstantiateCL.json - ${session}= Create Session policy https://${POLICY_CONTROLLOOP_RUNTIME_IP}:6969 auth=${auth} + ${session}= Create Session policy http://${POLICY_CONTROLLOOP_RUNTIME_IP}:6969 auth=${auth} ${headers}= Create Dictionary Accept=application/json Content-Type=application/json ${resp}= POST On Session policy /onap/controlloop/v2/instantiation data=${postjson} headers=${headers} Log Received response from controlloop runtime ${resp.text} @@ -31,9 +31,9 @@ InstantiateControlLoopV1 PassivateControlLoop [Documentation] Passivate control loop. ${auth}= Create List healthcheck zb!XztG34 - Log Creating session https://${POLICY_CONTROLLOOP_RUNTIME_IP}:6969 + Log Creating session http://${POLICY_CONTROLLOOP_RUNTIME_IP}:6969 ${postjson}= Get file ${CURDIR}/data/PassivateCL.json - ${session}= Create Session policy https://${POLICY_CONTROLLOOP_RUNTIME_IP}:6969 auth=${auth} + ${session}= Create Session policy http://${POLICY_CONTROLLOOP_RUNTIME_IP}:6969 auth=${auth} ${headers}= Create Dictionary Accept=application/json Content-Type=application/json ${resp}= PUT On Session policy /onap/controlloop/v2/instantiation/command data=${postjson} headers=${headers} Log Received response from controlloop runtime ${resp.text} @@ -42,8 +42,8 @@ PassivateControlLoop QueryPolicies [Documentation] Runs Policy Participant Query New Policies ${auth}= Create List healthcheck 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 healthcheck 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 StateChangeRunningControlLoop [Documentation] ControlLoop State Change to RUNNING. ${auth}= Create List healthcheck zb!XztG34 - Log Creating session https://${POLICY_CONTROLLOOP_RUNTIME_IP}:6969 + Log Creating session http://${POLICY_CONTROLLOOP_RUNTIME_IP}:6969 ${postjson}= Get file ${CURDIR}/data/StateChangeRunningCL.json - ${session}= Create Session policy https://${POLICY_CONTROLLOOP_RUNTIME_IP}:6969 auth=${auth} + ${session}= Create Session policy http://${POLICY_CONTROLLOOP_RUNTIME_IP}:6969 auth=${auth} ${headers}= Create Dictionary Accept=application/json Content-Type=application/json ${resp}= PUT On Session policy /onap/controlloop/v2/instantiation/command data=${postjson} headers=${headers} expected_status=406 Log Received response from controlloop runtime ${resp.text} @@ -72,8 +72,8 @@ StateChangeRunningControlLoop QueryInstantiatedCLs [Documentation] Get Instantiated ControlLoops ${auth}= Create List healthcheck zb!XztG34 - Log Creating session https://${POLICY_CONTROLLOOP_RUNTIME_IP}:6969 - ${session}= Create Session policy https://${POLICY_CONTROLLOOP_RUNTIME_IP}:6969 auth=${auth} + Log Creating session http://${POLICY_CONTROLLOOP_RUNTIME_IP}:6969 + ${session}= Create Session policy http://${POLICY_CONTROLLOOP_RUNTIME_IP}:6969 auth=${auth} ${headers}= Create Dictionary Accept=application/json Content-Type=application/json ${resp}= GET On Session policy /onap/controlloop/v2/instantiation headers=${headers} Log Received response from controlloop runtime ${resp.text} diff --git a/csit/common-library.robot b/csit/common-library.robot index 639d32a8..e2e89ea0 100644 --- a/csit/common-library.robot +++ b/csit/common-library.robot @@ -57,8 +57,8 @@ QueryPolicyStatus PerformPostRequest [Arguments] ${hostname} ${url} ${expectedstatus} ${postjson} ${params} ${auth}= Create List healthcheck zb!XztG34 - 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} @@ -67,8 +67,8 @@ PerformPostRequest PerformPutRequest [Arguments] ${hostname} ${url} ${expectedstatus} ${params} ${auth}= Create List healthcheck zb!XztG34 - 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} @@ -77,8 +77,8 @@ PerformPutRequest PerformGetRequest [Arguments] ${hostname} ${url} ${expectedstatus} ${params} ${auth}= Create List healthcheck zb!XztG34 - 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} @@ -87,8 +87,8 @@ PerformGetRequest PerformDeleteRequest [Arguments] ${hostname} ${url} ${expectedstatus} ${auth}= Create List healthcheck zb!XztG34 - 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} diff --git a/csit/config/apex-pdp/OnapPfConfig.json b/csit/config/apex-pdp/OnapPfConfig.json index d46a8b20..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": true, + "https": false, "prometheus": true }, "pdpStatusParameters":{ @@ -29,13 +29,13 @@ "topic" : "POLICY-PDP-PAP", "servers" : [ "message-router" ], "topicCommInfrastructure" : "dmaap", - "useHttps" : true + "useHttps" : false }], "topicSinks" : [{ "topic" : "POLICY-PDP-PAP", "servers" : [ "message-router" ], "topicCommInfrastructure" : "dmaap", - "useHttps" : true + "useHttps" : false }] } } diff --git a/csit/config/api/defaultConfig.json b/csit/config/api/defaultConfig.json new file mode 100644 index 00000000..b6270005 --- /dev/null +++ b/csit/config/api/defaultConfig.json @@ -0,0 +1,57 @@ +{ + "name": "ApiGroup", + "restServerParameters": { + "host": "0.0.0.0", + "port": 6969, + "userName": "healthcheck", + "password": "zb!XztG34", + "https": false, + "aaf": false, + "prometheus": true + }, + "databaseProviderParameters": { + "name": "PolicyProviderParameterGroup", + "implementation": "org.onap.policy.models.provider.impl.DatabasePolicyModelsProviderImpl", + "databaseDriver": "org.mariadb.jdbc.Driver", + "databaseUrl": "jdbc:mariadb://mariadb:3306/policyadmin", + "databaseUser": "policy_user", + "databasePassword": "policy_user", + "persistenceUnit": "PolicyMariaDb" + }, + "preloadPolicyTypes": [ + "policytypes/onap.policies.monitoring.tcagen2.yaml", + "policytypes/onap.policies.monitoring.dcaegen2.collectors.datafile.datafile-app-server.yaml", + "policytypes/onap.policies.monitoring.dcae-restconfcollector.yaml", + "policytypes/onap.policies.monitoring.dcae-pm-subscription-handler.yaml", + "policytypes/onap.policies.monitoring.dcae-pm-mapper.yaml", + "policytypes/onap.policies.Optimization.yaml", + "policytypes/onap.policies.optimization.Resource.yaml", + "policytypes/onap.policies.optimization.Service.yaml", + "policytypes/onap.policies.optimization.resource.AffinityPolicy.yaml", + "policytypes/onap.policies.optimization.resource.DistancePolicy.yaml", + "policytypes/onap.policies.optimization.resource.HpaPolicy.yaml", + "policytypes/onap.policies.optimization.resource.OptimizationPolicy.yaml", + "policytypes/onap.policies.optimization.resource.PciPolicy.yaml", + "policytypes/onap.policies.optimization.service.QueryPolicy.yaml", + "policytypes/onap.policies.optimization.service.SubscriberPolicy.yaml", + "policytypes/onap.policies.optimization.resource.Vim_fit.yaml", + "policytypes/onap.policies.optimization.resource.VnfPolicy.yaml", + "policytypes/onap.policies.controlloop.guard.Common.yaml", + "policytypes/onap.policies.controlloop.guard.common.Blacklist.yaml", + "policytypes/onap.policies.controlloop.guard.common.FrequencyLimiter.yaml", + "policytypes/onap.policies.controlloop.guard.common.MinMax.yaml", + "policytypes/onap.policies.controlloop.guard.common.Filter.yaml", + "policytypes/onap.policies.controlloop.guard.coordination.FirstBlocksSecond.yaml", + "policytypes/onap.policies.Naming.yaml", + "policytypes/onap.policies.Match.yaml", + "policytypes/onap.policies.native.Drools.yaml", + "policytypes/onap.policies.native.Xacml.yaml", + "policytypes/onap.policies.native.Apex.yaml", + "policytypes/onap.policies.controlloop.operational.Common.yaml", + "policytypes/onap.policies.controlloop.operational.common.Apex.yaml", + "policytypes/onap.policies.controlloop.operational.common.Drools.yaml" + ], + "preloadPolicies" : [ + "policies/sdnc.policy.naming.input.tosca.yaml" + ] +} 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 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${logDir}/${errorLog}.log + + ${logDir}/${errorLog}.%d{yyyy-MM-dd}.%i.log.zip + + 50MB + 30 + 10GB + + + WARN + + + ${errorPattern} + + + + + + + + + ${logDir}/${debugLog}.log + + ${logDir}/${debugLog}.%d{yyyy-MM-dd}.%i.log.zip + + 50MB + 30 + 10GB + + + ${debugPattern} + + + + + + + + + ${logDir}/${networkLog}.log + + ${logDir}/${networkLog}.%d{yyyy-MM-dd}.%i.log.zip + + 50MB + 30 + 10GB + + + ${networkPattern} + + + + + + + + + ${logDir}/${metricLog}.log + + ${logDir}/${metricLog}.%d{yyyy-MM-dd}.%i.log.zip + + 50MB + 30 + 10GB + + + ${metricPattern} + + + + + + + + + ${logDir}/${transactionLog}.log + + ${logDir}/${transactionLog}.%d{yyyy-MM-dd}.%i.log.zip + + 50MB + 30 + 10GB + + + ${transactionPattern} + + + + + + + + + + [%d{yyyy-MM-dd'T'HH:mm:ss.SSS+00:00, UTC}|%level|%logger{0}|%thread] %msg%n + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/csit/config/cakey.pem b/csit/config/cakey.pem deleted file mode 100644 index 7ab3ba69..00000000 --- a/csit/config/cakey.pem +++ /dev/null @@ -1,30 +0,0 @@ ------BEGIN ENCRYPTED PRIVATE KEY----- -MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIn7IXl9tp53oCAggA -MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECM9vPkP/Ay5JBIIEyIHDtrUSJOPo -OT/ZqNZ2hCxa7nwJUPAE09elPML75FGLXFuKmZXSEKMsC5peGvFVBE0B1mRUVWob -CJQ8SMiMRfs8esQ7lH/MMwtVB40gjsjHgxZTcBJlzSOm26aXzm+M8TFLLrXLiN4g -bgRtdv2xESuZvb8oxz4/jysuhdVKGcsyFiOPvmC+sEwH4Np9Wb1XlKrgwNa1KIXz -SkEeqD8R5JYsn5PaVgXkC8idMXGePFR22Zp30FjF1PbXD8Mj4E8+DOTbBd1t61je -MMGQBmrhCSW/MMRc4Ae+Dpgggv1YeqDROXrJtA0tVOXMZ/S2Dx+zbVTiEyTfoXIf -3wHaMiQdavG90OQiX2QfffA8FNRf5Mhy6gPa8DmCEgYM0xdunZBju294O4rnfmzp -EIyocxfC2naICvHxRYkCSOz1M8y8X4vOOnkYYMsoKovznkGRQUBmXDox5ker4x8F -KnZpyaNsK0x3YxG9sBtQwd2HqxRsiNVEuMhCmS2GU1DKwnjW/UyyHPA0k61Y2Mph -l7K4xTxiSzk5kBIBq6UOdP1dFyt5VO8n5/heIl1Dt9F+xJomiX7aQOimKpmNTBr4 -unzNo4EZ6Xx9oO93LuybzH3zAOGat5JZ6hALHqmZ4/11+LR1Kn+vsc+VLuLnf0dR -BiXBihgec7k1paItLZmo4AeRoWoxuGxeZkDQxr/m3xpySsVW1A0NtlyfLx2Wc2a5 -SLRNJ7fGRmrxPm+46iD+um41LR47tT5umYm2gdNyvt8vk0TjU87RMaP+OzqpA+kS -+B4ep0gIX+8n2+AutTtAjm5V4dhW2lxvmJzlFA6R9rjlXuG1VupyTK729E6zPCzP -BmkRxQnLl4+RWjA+z0ODIRmvar/LJwG2NTRvigB6F5vX0h5Xh6HmiqVD/JpuANxF -zlKXLa+pxNnCuMxa7dRbG0FLYE70NTL61nyK/d5nIcbDTz3zkLdNSTE2j85TaohG -4WJE6NWpyUGqPTArG7ebWj4CDXbL+vJJsFwbisCD4B3xYtLKgKwGnea6mWBLAuLH -myE6U8Ixr8ldl91kFKJoDHcfJKh2m31sXOY3PSpCxpr1MDBvPhpcuQRVe0ees1PX -WZaW6oacsLSpjzzNY44MYxXDP+ciTM2602VVCXtt6+74NC0bvAzSIeY5lmOqTlA1 -xWSDfbZ+T7NbFpdFcjuApiyzsL41rEEnaqgWcA2ldBisQNeQut7xHjcTeFzeNyTe -Zy3e76wOi0fT5MZbsQLDcIUCW3deYgoBdeivTpMvfHnJImsKhGnO9kQGLwgSqgN8 -MU3abOhobfVtLIilYfqlm46XKFcsudL7wKrEhzx8D9vBHmN40WKu4A7oQQgmg+8Y -YZfUHDKGViIaqcieR9+6C3VQhDKLK4OBfg2g5b9bOqe6Fo+nXZI5pf/jxfP8eHXc -7xCvHbOahOy+R5LubLLxAJtQaf4X63bCJDKutJa5iCGi87rAwxh7sm0B7mkC4XpD -ont+Ose4GeiytJqqe6LlDdIjD7wQOAoBhb4DqX50tNiGa5ymBJEQ5Lq456dLUtY+ -5r7ARnBifzrKPSXqE79GNUMceI7BQlot/72WQIuD6MwBTe6FCUoNM+zMF4zzi7Ph -9MX3EFimqcL8H4x3wD1g4w== ------END ENCRYPTED PRIVATE KEY----- diff --git a/csit/config/careq.pem b/csit/config/careq.pem deleted file mode 100644 index 57b414d8..00000000 --- a/csit/config/careq.pem +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIICjDCCAXQCAQAwRzELMAkGA1UEBhMCVVMxEzARBgNVBAgMCk5ldyBKZXJzZXkx -DTALBgNVBAsMBE9OQVAxFDASBgNVBAMMC3BvbGljeS5vbmFwMIIBIjANBgkqhkiG -9w0BAQEFAAOCAQ8AMIIBCgKCAQEAozkMogBnADQwOp36opXoqvPKwlduH6bXH40o -zVLiTKLnKIFJ2edR7npSNGLMTvnFfIKg+L/yq+mcS6tjubm07uXF/LYxf2ie2WNW -itk4GBtvqREqr6ayo+q9AJ8aq35uhHylVq8OXFYLLOAJ8hhZAcuoAy3zjVYpNzh7 -reCbIp5GtIJanR3mior5ZD2Yr/D88QoSPpdMl13ezWDxoC8EwtZp2uul6x63t8i+ -GXcy5OWOH8WMvRe6E5FJptWaMvSkDVzDZVZQnDQpmQg2Fu+N/LkV0m/dCjEB++vz -DYWpK/X1LWtX+X1ZP++Dgt+Uk9MuueN1sc+SkqcF4Wh0N6mY5wIDAQABoAAwDQYJ -KoZIhvcNAQELBQADggEBAET3HRrtAz/COoIemC8Oo6JJm2f9umM0QPq0bijUA81Z -SFvnzfNhMZnvHdsAEl/VsBlqCSA+JLrPoXYhFV9YOYMHakuMToa7okW3yPPWbZRh -grFMCfRAO1j0INHA4emLASRkbEOE+R1ngkdoFv/EX0ImcyfMo/N+ls52QIAKo5cV -/Y6P0uXPqr4yOAaDZAyTKveQGdu1++SkTpZBBNdmq352FyARpH1CTB28oTy5tpl/ -wETVCcMxi9MYET4MGQSxQga91xyntjczjWGqnMpkTe35DVl4qAdrtkZHcvgM4WQ5 -HTxc7sBCRzvEAdI7a+uG6Tb5pJ4hvwCtjuIZApzsZWU= ------END CERTIFICATE REQUEST----- diff --git a/csit/config/caroot.cer b/csit/config/caroot.cer deleted file mode 100644 index f09d7630..00000000 --- a/csit/config/caroot.cer +++ /dev/null @@ -1,19 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDFTCCAf0CFF9v497aX5+9X6xnUe8EUAITW8hpMA0GCSqGSIb3DQEBCwUAMEcx -CzAJBgNVBAYTAlVTMRMwEQYDVQQIDApOZXcgSmVyc2V5MQ0wCwYDVQQLDARPTkFQ -MRQwEgYDVQQDDAtwb2xpY3kub25hcDAeFw0yMjA5MDUxMzQzMDhaFw0zMjA5MDIx -MzQzMDhaMEcxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApOZXcgSmVyc2V5MQ0wCwYD -VQQLDARPTkFQMRQwEgYDVQQDDAtwb2xpY3kub25hcDCCASIwDQYJKoZIhvcNAQEB -BQADggEPADCCAQoCggEBAKM5DKIAZwA0MDqd+qKV6KrzysJXbh+m1x+NKM1S4kyi -5yiBSdnnUe56UjRizE75xXyCoPi/8qvpnEurY7m5tO7lxfy2MX9ontljVorZOBgb -b6kRKq+msqPqvQCfGqt+boR8pVavDlxWCyzgCfIYWQHLqAMt841WKTc4e63gmyKe -RrSCWp0d5oqK+WQ9mK/w/PEKEj6XTJdd3s1g8aAvBMLWadrrpeset7fIvhl3MuTl -jh/FjL0XuhORSabVmjL0pA1cw2VWUJw0KZkINhbvjfy5FdJv3QoxAfvr8w2FqSv1 -9S1rV/l9WT/vg4LflJPTLrnjdbHPkpKnBeFodDepmOcCAwEAATANBgkqhkiG9w0B -AQsFAAOCAQEAaWmjOUU0XyWpt27D8U2+2OIbWyeUz9L9HBppVzcadJo1CdNR2nvK -eESF12rg5uRy8E7gOKaYw1TZ7eLiTEAX2qkRaSknn72zQ6JcmRYKAOkA0qUhXKy9 -Jq+wo3M68mO7lam7BKqADPEq6a1t/QXWchA0mpQFbLM6w0l5V8k3cZqDRBiRgU1f -CNFEGY/YlT3r28jUbuYh1WerBPxw28TkFKaoxVvJ6FkAVqu0DYSexW+Y9ewRz4kK -9tXTIWYk87Q1F4gJc1f9rvgKMMcrWkIwb1AExkf35TBlKtVwCACqgNoMnszDMMf/ -/WCpM5vmC/6YoHpX5gD9GnoEk6MkYWbxKQ== ------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/ClRuntimeParameters.yaml b/csit/config/clamp/ClRuntimeParameters.yaml index d399b82b..170fe722 100644 --- a/csit/config/clamp/ClRuntimeParameters.yaml +++ b/csit/config/clamp/ClRuntimeParameters.yaml @@ -16,7 +16,8 @@ server: context-path: /onap/controlloop error: path: /error - + ssl: + enabled: false runtime: supervisionScannerIntervalSec: 1000 @@ -44,14 +45,14 @@ runtime: - ${topicServer:message-router} topicCommInfrastructure: dmaap fetchTimeout: 15000 - useHttps: true + useHttps: false topicSinks: - topic: POLICY-CLRUNTIME-PARTICIPANT servers: - ${topicServer:message-router} topicCommInfrastructure: dmaap - useHttps: true + useHttps: false management: endpoints: diff --git a/csit/config/clamp/HttpParticipantParameters.yaml b/csit/config/clamp/HttpParticipantParameters.yaml index be421fca..609fc7eb 100644 --- a/csit/config/clamp/HttpParticipantParameters.yaml +++ b/csit/config/clamp/HttpParticipantParameters.yaml @@ -15,10 +15,15 @@ participant: - ${topicServer:message-router} topicCommInfrastructure: dmaap fetchTimeout: 15000 - useHttps: true + useHttps: false topicSinks: - topic: POLICY-CLRUNTIME-PARTICIPANT servers: - ${topicServer:message-router} topicCommInfrastructure: dmaap - useHttps: true + useHttps: false + +server: + ssl: + enabled: false + \ No newline at end of file diff --git a/csit/config/clamp/KubernetesParticipantParameters.yaml b/csit/config/clamp/KubernetesParticipantParameters.yaml index d605cfa1..76b8d765 100644 --- a/csit/config/clamp/KubernetesParticipantParameters.yaml +++ b/csit/config/clamp/KubernetesParticipantParameters.yaml @@ -26,26 +26,29 @@ participant: - ${topicServer:message-router} topicCommInfrastructure: dmaap fetchTimeout: 15000 - useHttps: true + useHttps: false topicSinks: - topic: POLICY-CLRUNTIME-PARTICIPANT servers: - ${topicServer:message-router} topicCommInfrastructure: dmaap - useHttps: true + useHttps: false management: endpoints: web: exposure: include: "loggers,logfile,health,info,metrics,threaddump,heapdump" + server: # Configuration of the HTTP/REST server. The parameters are defined and handled by the springboot framework. # See springboot documentation. port: 8083 servlet: context-path: /onap/k8sparticipant + ssl: + enabled: false logging: # Configuration of logging diff --git a/csit/config/clamp/PolicyParticipantParameters.yaml b/csit/config/clamp/PolicyParticipantParameters.yaml index 625b15b8..f490538a 100644 --- a/csit/config/clamp/PolicyParticipantParameters.yaml +++ b/csit/config/clamp/PolicyParticipantParameters.yaml @@ -8,7 +8,7 @@ participant: port: 6969 userName: healthcheck password: zb!XztG34 - useHttps: true + useHttps: false allowSelfSignedCerts: true policyPapParameters: clientName: pap @@ -16,7 +16,7 @@ participant: port: 6969 userName: healthcheck password: zb!XztG34 - useHttps: true + useHttps: false allowSelfSignedCerts: true intermediaryParameters: reportingTimeIntervalMs: 120000 @@ -35,11 +35,16 @@ participant: - ${topicServer:message-router} topicCommInfrastructure: dmaap fetchTimeout: 15000 - useHttps: true + useHttps: false topicSinks: - topic: POLICY-CLRUNTIME-PARTICIPANT servers: - ${topicServer:message-router} topicCommInfrastructure: dmaap - useHttps: true + useHttps: false + +server: + ssl: + enabled: false + \ No newline at end of file diff --git a/csit/config/distribution/defaultConfig.json b/csit/config/distribution/defaultConfig.json index ba1a682c..6b4755b4 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": true, + "https": false, "prometheus": true }, "receptionHandlerParameters":{ @@ -59,7 +59,7 @@ "port": 6969, "userName": "healthcheck", "password": "zb!XztG34", - "useHttps": true + "useHttps": false }, "papParameters": { "clientName": "policy-pap", @@ -67,7 +67,7 @@ "port": 6969, "userName": "healthcheck", "password": "zb!XztG34", - "useHttps": true + "useHttps": false }, "deployPolicies": true } diff --git a/csit/config/drools-apps/custom/feature-lifecycle.properties b/csit/config/drools-apps/custom/feature-lifecycle.properties index 911cdca5..36233985 100644 --- a/csit/config/drools-apps/custom/feature-lifecycle.properties +++ b/csit/config/drools-apps/custom/feature-lifecycle.properties @@ -2,6 +2,7 @@ # ONAP # ================================================================================ # Copyright (C) 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,10 +30,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=true +dmaap.source.topics.POLICY-PDP-PAP.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=true +dmaap.sink.topics.POLICY-PDP-PAP.https=false diff --git a/csit/config/drools-apps/env/base.conf b/csit/config/drools-apps/env/base.conf index 3ec5e831..9466e1c9 100644 --- a/csit/config/drools-apps/env/base.conf +++ b/csit/config/drools-apps/env/base.conf @@ -1,6 +1,7 @@ # ============LICENSE_START================================================== # Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved. # Modifications Copyright (C) 2021 Bell Canada. 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. @@ -59,7 +60,7 @@ AAF_HOST=aaf.api.simpledemo.onap.org # HTTP Servers -HTTP_SERVER_HTTPS=true +HTTP_SERVER_HTTPS=false PROMETHEUS=true # PDP-D DMaaP configuration channel @@ -94,6 +95,7 @@ PDP_PASSWORD=zb!XztG34 PDP_CLIENT_USERNAME=python PDP_CLIENT_PASSWORD=test PDP_ENVIRONMENT=TEST +PDP_HTTPS=false # DCAE DMaaP @@ -104,7 +106,7 @@ DCAE_CONSUMER_GROUP=dcae.policy.shared # Open DMaaP DMAAP_SERVERS=message-router -DMAAP_HTTPS=true +DMAAP_HTTPS=false # AAI @@ -113,13 +115,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/env/base.conf b/csit/config/drools/env/base.conf index 8f3c4c0d..b1ad609e 100644 --- a/csit/config/drools/env/base.conf +++ b/csit/config/drools/env/base.conf @@ -1,6 +1,7 @@ # ============LICENSE_START======================================================= # Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved. # Modifications Copyright (C) 2021 Bell Canada. 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. @@ -59,7 +60,7 @@ AAF_HOST=aaf.api.simpledemo.onap.org # HTTP Servers -HTTP_SERVER_HTTPS=true +HTTP_SERVER_HTTPS=false PROMETHEUS=true # PDP-D DMaaP configuration channel @@ -93,6 +94,7 @@ PDP_PASSWORD= PDP_CLIENT_USERNAME= PDP_CLIENT_PASSWORD= PDP_ENVIRONMENT= +PDP_HTTPS=false GUARD_DISABLED=false # DCAE DMaaP @@ -104,7 +106,7 @@ DCAE_CONSUMER_GROUP=dcae.policy.shared # Open DMaaP DMAAP_SERVERS=mr.api.simpledemo.onap.org -DMAAP_HTTPS=true +DMAAP_HTTPS=false # AAI @@ -113,6 +115,7 @@ AAI_PORT=8443 AAI_CONTEXT_URI= AAI_USERNAME=policy@policy.onap.org AAI_PASSWORD=demo123456! +AAI_HTTPS=false # MSO diff --git a/csit/config/ks.cer b/csit/config/ks.cer deleted file mode 100644 index 463098c7..00000000 --- a/csit/config/ks.cer +++ /dev/null @@ -1,29 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE+jCCA+KgAwIBAgIUNDLU1bXxnW46HpC3FmOFcJungPYwDQYJKoZIhvcNAQEL -BQAwRzELMAkGA1UEBhMCVVMxEzARBgNVBAgMCk5ldyBKZXJzZXkxDTALBgNVBAsM -BE9OQVAxFDASBgNVBAMMC3BvbGljeS5vbmFwMB4XDTIyMDkwNTEzNDMxMFoXDTIy -MTAwNTEzNDMxMFowYjEPMA0GA1UEAxMGcG9saWN5MSMwIQYDVQQLDBpwb2xpY3lA -cG9saWN5Lm9uYXAub3JnOkRFVjEOMAwGA1UECxMFT1NBQUYxDTALBgNVBAoTBE9O -QVAxCzAJBgNVBAYTAlVTMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA -jS6rhuIhW3O8I12CEwPqpvseVLrghXU5JnBiOhWUbVsMwbAhQvGbte5Z7k8kmPEd -c84xfpmFHl/4jP2ada/QbJIT5kIrqBcocivyXIbztnThsCWPbKFBduvvtRxTCN+X -0iSNux6vyHpfFB4PONzy/CdtRjgeO9Rbm4xYOgvvtLXGVuJ9oELMPNfVr5kFUUnv -L9F7alE0wEVC1uDnU9EmGZFnEkfLLkcTVYUtlI8xzXSf24KN6ZjGHK2m8454PuK0 -/H1a1F5M4IdseVQK/OrOPxwGVgVZAIL0NIaw0i27Lu0S4t6Wpf5MtnYZmNix/8Pp -qWeHaD5bUKVw93kigTw8PwIDAQABo4IBwTCCAb0wggEsBgNVHREEggEjMIIBH4IG -cG9saWN5ggZkcm9vbHOCC2Ryb29scy5vbmFwgg9wb2xpY3ktYXBleC1wZHCCFHBv -bGljeS1hcGV4LXBkcC5vbmFwggpwb2xpY3ktYXBpgg9wb2xpY3ktYXBpLm9uYXCC -E3BvbGljeS1kaXN0cmlidXRpb26CGHBvbGljeS1kaXN0cmlidXRpb24ub25hcIIK -cG9saWN5LXBhcIIPcG9saWN5LXBhcC5vbmFwghBwb2xpY3kteGFjbWwtcGRwghVw -b2xpY3kteGFjbWwtcGRwLm9uYXCCCXNpbXVsYXRvcoIHYWFpLXNpbYIIZ3JwYy1z -aW2CCHNkbmMtc2ltggZzby1zaW2CB3ZmYy1zaW2CDm1lc3NhZ2Utcm91dGVyMB0G -A1UdDgQWBBSznyg3j4ur3Wgde/s77TiApn3lGzBsBgNVHSMEZTBjoUukSTBHMQsw -CQYDVQQGEwJVUzETMBEGA1UECAwKTmV3IEplcnNleTENMAsGA1UECwwET05BUDEU -MBIGA1UEAwwLcG9saWN5Lm9uYXCCFF9v497aX5+9X6xnUe8EUAITW8hpMA0GCSqG -SIb3DQEBCwUAA4IBAQAOylfCbpJXxWdjUvdevkHvmSjBuX2IqrAohptTs/lutDFx -fm5l7ymTudg0CLPI+iYjG25ykf2ysUhxCk4VWjE6L2B4XGo6d4S1n5Gef0XDpWkA -zASUn1M22rkJWZsM55Kti6l57T++eiBzo6KjM3NzX4+a9P7ZzacrKMpNxBitq+IE -iJiY0INSlwO3kvUrqm7nWShgSQVksTzYVZHjZmVj9VaVo8Q49EIrHEpxAKgC/Y0M -dtZy6n2wvSurdcJtRMRZAows1pi3jFA/U82H3menh3dAhwr3hrRSfdjbzMg2HVeX -Z6vhpJ2xPa46US9j+sbL/6YriZOADkdcNe4C54qD ------END CERTIFICATE----- diff --git a/csit/config/ks.csr b/csit/config/ks.csr deleted file mode 100644 index 6c405de1..00000000 --- a/csit/config/ks.csr +++ /dev/null @@ -1,18 +0,0 @@ ------BEGIN NEW CERTIFICATE REQUEST----- -MIIC1zCCAb8CAQAwYjEPMA0GA1UEAxMGcG9saWN5MSMwIQYDVQQLDBpwb2xpY3lA -cG9saWN5Lm9uYXAub3JnOkRFVjEOMAwGA1UECxMFT1NBQUYxDTALBgNVBAoTBE9O -QVAxCzAJBgNVBAYTAlVTMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA -jS6rhuIhW3O8I12CEwPqpvseVLrghXU5JnBiOhWUbVsMwbAhQvGbte5Z7k8kmPEd -c84xfpmFHl/4jP2ada/QbJIT5kIrqBcocivyXIbztnThsCWPbKFBduvvtRxTCN+X -0iSNux6vyHpfFB4PONzy/CdtRjgeO9Rbm4xYOgvvtLXGVuJ9oELMPNfVr5kFUUnv -L9F7alE0wEVC1uDnU9EmGZFnEkfLLkcTVYUtlI8xzXSf24KN6ZjGHK2m8454PuK0 -/H1a1F5M4IdseVQK/OrOPxwGVgVZAIL0NIaw0i27Lu0S4t6Wpf5MtnYZmNix/8Pp -qWeHaD5bUKVw93kigTw8PwIDAQABoDAwLgYJKoZIhvcNAQkOMSEwHzAdBgNVHQ4E -FgQUs58oN4+Lq91oHXv7O+04gKZ95RswDQYJKoZIhvcNAQELBQADggEBAAwlPDBX -urNeBAuIW8whtTPeuvDxlNYyotxvgJSD1wDmdYVFTd2lE0ibyCcc/6lKr9LYyjt9 -zpN+6CQOVk2rKTstbI0ZEmAbOA4p4dFOhPBmrOTdghc30NCNuoqnnUiOGsy4fkrh -4uT46trLKhDdYlKEYWBeG3GfVyxhV1Zzf6ftf8Ab4TgFfacThpfe5cv9TLT9Nmpl -cTcd2EwuRtkx9EpK/mqKqNTO0ZHB+aJ6YsrXxErNBd1zkeD0+mdU/CFgXJw1t2G7 -bARt8ybQ/caD9gjPL9sdrmV3dbG10d0saWcJc8KqzImURmnsu+Wdzf6kcSGwuHjU -vgMUceeN155oQwg= ------END NEW CERTIFICATE REQUEST----- diff --git a/csit/config/ks.jks b/csit/config/ks.jks deleted file mode 100644 index b3603086..00000000 Binary files a/csit/config/ks.jks and /dev/null differ diff --git a/csit/config/pap/defaultConfig.json b/csit/config/pap/defaultConfig.json index b7c5b310..2b2b2c53 100644 --- a/csit/config/pap/defaultConfig.json +++ b/csit/config/pap/defaultConfig.json @@ -5,7 +5,7 @@ "port": 6969, "userName": "healthcheck", "password": "zb!XztG34", - "https": true, + "https": false, "aaf": false, "prometheus": true }, @@ -35,7 +35,7 @@ "topic" : "POLICY-PDP-PAP", "servers" : [ "message-router" ], "topicCommInfrastructure" : "dmaap", - "useHttps": true + "useHttps": false }, { "topic" : "POLICY-HEARTBEAT", @@ -43,19 +43,19 @@ "consumerGroup": "policy-pap", "servers" : [ "message-router" ], "topicCommInfrastructure" : "dmaap", - "useHttps": true + "useHttps": false }], "topicSinks" : [{ "topic" : "POLICY-PDP-PAP", "servers" : [ "message-router" ], "topicCommInfrastructure" : "dmaap", - "useHttps": true + "useHttps": false }, { "topic" : "POLICY-NOTIFICATION", "servers" : [ "message-router" ], "topicCommInfrastructure" : "dmaap", - "useHttps": true + "useHttps": false }] }, "healthCheckRestClientParameters":[{ @@ -64,7 +64,7 @@ "port": 6969, "userName": "healthcheck", "password": "zb!XztG34", - "useHttps": true, + "useHttps": false, "basePath": "policy/api/v1/healthcheck" }] } 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 @@ + + + + + + + + + + + + + + + + ${logDir}/${errorLog}.log + + ${logDir}/${errorLog}.%d{yyyy-MM-dd}.%i.log.zip + + 50MB + 30 + 10GB + + + WARN + + + ${errorPattern} + + + + + + + + + ${logDir}/${debugLog}.log + + ${logDir}/${debugLog}.%d{yyyy-MM-dd}.%i.log.zip + + 50MB + 30 + 10GB + + + ${debugPattern} + + + + + + + + + ${logDir}/${networkLog}.log + + ${logDir}/${networkLog}.%d{yyyy-MM-dd}.%i.log.zip + + 50MB + 30 + 10GB + + + ${networkPattern} + + + + + + + + + + [%d{yyyy-MM-dd'T'HH:mm:ss.SSS+00:00, UTC}|%level|%logger{0}|%thread] %msg%n + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/csit/config/policy-truststore b/csit/config/policy-truststore deleted file mode 100644 index 0b78cafb..00000000 Binary files a/csit/config/policy-truststore and /dev/null differ diff --git a/csit/config/sim-all/simParameters.json b/csit/config/sim-all/simParameters.json index 84c6e372..6c81f0a1 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": 3905, - "https": true + "port": 3904, + "https": false }, { "name": "A&AI simulator", "providerClass": "org.onap.policy.simulators.AaiSimulatorJaxRs", "host": "0.0.0.0", "port": 6666, - "https": true, + "https": false, "userName": "policy@policy.onap.org", "password": "demo123456!" }, @@ -25,7 +25,7 @@ "providerClass": "org.onap.policy.simulators.SdncSimulatorJaxRs", "host": "0.0.0.0", "port": 6668, - "https": true + "https": false }, { "name": "SO simulator", @@ -41,7 +41,7 @@ "providerClass": "org.onap.policy.simulators.VfcSimulatorJaxRs", "host": "0.0.0.0", "port": 6670, - "https": true + "https": false } ], "topicSinks": [ @@ -49,7 +49,7 @@ "topic": "APPC-CL", "servers": ["${HOST_NAME}"], "topicCommInfrastructure": "DMAAP", - "useHttps": true, + "useHttps": false, "apiKey": "some-key", "apiSecret": "some-secret" }, @@ -57,7 +57,7 @@ "topic": "APPC-LCM-WRITE", "servers": ["${HOST_NAME}"], "topicCommInfrastructure": "DMAAP", - "useHttps": true, + "useHttps": false, "apiKey": "some-key", "apiSecret": "some-secret" } @@ -67,7 +67,7 @@ "topic": "APPC-CL", "servers": ["${HOST_NAME}"], "topicCommInfrastructure": "DMAAP", - "useHttps": true, + "useHttps": false, "apiKey": "some-key", "apiSecret": "some-secret" }, @@ -75,7 +75,7 @@ "topic": "APPC-LCM-READ", "servers": ["${HOST_NAME}"], "topicCommInfrastructure": "DMAAP", - "useHttps": true, + "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 f6ee81a4..9d4b722e 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": true, + "https": false, "aaf": false, "prometheus": true }, @@ -16,7 +16,7 @@ "port": 6969, "userName": "healthcheck", "password": "zb!XztG34", - "useHttps": true, + "useHttps": false, "aaf": false }, "applicationParameters": { @@ -27,13 +27,13 @@ "topic" : "POLICY-PDP-PAP", "servers" : [ "message-router" ], "topicCommInfrastructure" : "dmaap", - "useHttps" : true + "useHttps" : false }], "topicSinks" : [{ "topic" : "POLICY-PDP-PAP", "servers" : [ "message-router" ], "topicCommInfrastructure" : "dmaap", - "useHttps" : true + "useHttps" : false }] } } diff --git a/csit/docker-compose-all.yml b/csit/docker-compose-all.yml index 55b69435..0e84caf1 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. +# 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. @@ -20,7 +20,7 @@ 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'] @@ -30,7 +30,7 @@ services: expose: - 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: @@ -51,7 +51,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: @@ -65,17 +65,15 @@ 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 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 @@ -83,8 +81,8 @@ services: 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 + - ./config/api/defaultConfig.json:/opt/app/policy/api/etc/defaultConfig.json: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: [ @@ -93,7 +91,7 @@ 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 @@ -104,19 +102,18 @@ services: - 6969 volumes: - ./config/pap/defaultConfig.json:/opt/app/policy/pap/etc/defaultConfig.json:ro + - ./config/pap/logback.xml:/opt/app/policy/pap/etc/logback.xml: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', + '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 @@ -127,18 +124,16 @@ services: - 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', + '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 @@ -157,10 +152,10 @@ services: 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 @@ -183,7 +178,7 @@ services: 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', @@ -191,7 +186,7 @@ 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 @@ -203,18 +198,16 @@ services: - 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', + '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 @@ -224,20 +217,18 @@ 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 - ./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-cl-runtime: - image: nexus3.onap.org:10001/onap/policy-clamp-cl-runtime:${POLICY_CLAMP_VERSION} + image: ${CONTAINER_LOCATION}onap/policy-clamp-cl-runtime:${POLICY_CLAMP_VERSION} container_name: policy-clamp-cl-runtime depends_on: - mariadb @@ -249,32 +240,30 @@ services: expose: - 6969 volumes: - - ./config/policy-truststore:/opt/app/policy/clamp/etc/ssl/policy-truststore:ro + - ./config/clamp/ClRuntimeParameters.yaml:/opt/app/policy/clamp/config/ClRuntimeParameters.yaml: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', './controlloop-runtime.sh', - 'message-router', '3905', + 'message-router', '3904', 'policy-clamp-cl-k8s-ppnt', '8083' ] policy-clamp-cl-http-ppnt: - image: nexus3.onap.org:10001/onap/policy-clamp-cl-http-ppnt:${POLICY_CLAMP_VERSION} + image: ${CONTAINER_LOCATION}onap/policy-clamp-cl-http-ppnt:${POLICY_CLAMP_VERSION} container_name: policy-clamp-cl-http-ppnt depends_on: - simulator hostname: policy-clamp-cl-http-ppnt volumes: - - ./config/policy-truststore:/opt/app/policy/clamp/etc/ssl/policy-truststore:ro + - ./config/clamp/HttpParticipantParameters.yaml:/opt/app/policy/clamp/config/HttpParticipantParameters.yaml: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-cl-k8s-ppnt: - image: nexus3.onap.org:10001/onap/policy-clamp-cl-k8s-ppnt:${POLICY_CLAMP_VERSION} + image: ${CONTAINER_LOCATION}onap/policy-clamp-cl-k8s-ppnt:${POLICY_CLAMP_VERSION} container_name: policy-clamp-cl-k8s-ppnt depends_on: - simulator @@ -282,28 +271,25 @@ services: expose: - 8083 volumes: - - ./config/policy-truststore:/opt/app/policy/clamp/etc/ssl/policy-truststore:ro + - ./config/clamp/KubernetesParticipantParameters.yaml:/opt/app/policy/clamp/config/KubernetesParticipantParameters.yaml: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-cl-pf-ppnt: - image: nexus3.onap.org:10001/onap/policy-clamp-cl-pf-ppnt:${POLICY_CLAMP_VERSION} + image: ${CONTAINER_LOCATION}onap/policy-clamp-cl-pf-ppnt:${POLICY_CLAMP_VERSION} container_name: policy-clamp-cl-pf-ppnt depends_on: - simulator - api hostname: policy-clamp-cl-pf-ppnt 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 + - ./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-participant.sh', - 'message-router', '3905' + 'message-router', '3904' ] diff --git a/csit/drools-applications/tests/drools-applications-test.robot b/csit/drools-applications/tests/drools-applications-test.robot index 60bccfed..57853163 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 healthcheck zb!XztG34 ${postjson}= Get file ${filepath}/${jsonfile} - 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/${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/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/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/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/run-project-csit.sh b/csit/run-project-csit.sh index 4798ac18..e8f8569f 100755 --- a/csit/run-project-csit.sh +++ b/csit/run-project-csit.sh @@ -3,7 +3,7 @@ # Copyright 2016-2017 Huawei Technologies Co., Ltd. # Modification Copyright 2019 © Samsung Electronics Co., Ltd. # Modification Copyright 2021 © AT&T Intellectual Property. -# 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. @@ -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 @@ -161,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" @@ -196,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/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/policy-jdk/alpine/pom.xml b/policy-jdk/alpine/pom.xml index 18afc632..ae8ffd95 100644 --- a/policy-jdk/alpine/pom.xml +++ b/policy-jdk/alpine/pom.xml @@ -2,6 +2,7 @@ ============LICENSE_START======================================================= Copyright (C) 2019 Ericsson, Tieto. All rights reserved. Modifications Copyright (C) 2020 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. @@ -37,8 +38,95 @@ onap/policy-jdk-alpine + onap/integration-python + 9.1.0 + + + + baseImage + + + aarch64 + + + + + + org.apache.maven.plugins + maven-scm-plugin + 1.13.0 + + + org.codehaus.plexus + plexus-utils + 3.4.2 + + + org.apache.maven.scm + maven-scm-provider-gitexe + 1.13.0 + + + + connection + src/main/resources/meta + + + + checkout-onap-python + validate + + scm:git:https://gerrit.onap.org/r/integration/docker/onap-python + ${project.build.directory}/onap-python + + + checkout + + + + + + io.fabric8 + docker-maven-plugin + + + + generate-python-image + initialize + + true + 1.23 + ${docker.pull.registry} + ${docker.push.registry} + + + ${integration.python.name} + + try + ${project.build.directory}/onap-python + Dockerfile + + ${integration.python.version} + ${integration.python.version}-${maven.build.timestamp} + ${project.docker.latest.minmax.tag.version} + + + + + + + build + + + + + + + + + ${project.artifactId}-${project.version} @@ -58,6 +146,10 @@ + + io.github.git-commit-id + git-commit-id-maven-plugin + io.fabric8 docker-maven-plugin @@ -78,6 +170,10 @@ ${project.version}-${maven.build.timestamp} ${project.docker.latest.minmax.tag.version} + + ${integration.python.name} + ${integration.python.version} + @@ -85,8 +181,8 @@ - clean-images - pre-clean + clean-jdk-image + prepare-package remove @@ -96,15 +192,15 @@ - generate-images - generate-sources + generate-jdk-image + package build - push-images + push-jdk-image deploy build @@ -133,3 +229,4 @@ + diff --git a/policy-jdk/alpine/src/main/docker/Dockerfile b/policy-jdk/alpine/src/main/docker/Dockerfile index 7f8fd91b..1922e394 100644 --- a/policy-jdk/alpine/src/main/docker/Dockerfile +++ b/policy-jdk/alpine/src/main/docker/Dockerfile @@ -1,7 +1,7 @@ # ============LICENSE_START======================================================= # Copyright (C) 2019 Tieto. All rights reserved. # Modifications Copyright (C) 2020, 2021 AT&T Intellectual Property. All rights reserved. -# Modifications Copyright (C) 2020 Nordix Foundation. +# Modifications Copyright (C) 2020,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,8 +23,10 @@ # $JAVA_HOME is set to /usr/lib/jvm/java-11-openjdk # more details at https://hub.docker.com/_/openjdk -FROM onap/integration-python:9.1.0 +ARG INTEGRATION_PYTHON_NAME=${INTEGRATION_PYTHON_NAME} +ARG INTEGRATION_PYTHON_VERSION=${INTEGRATION_PYTHON_VERSION} +FROM ${INTEGRATION_PYTHON_NAME}:${INTEGRATION_PYTHON_VERSION} LABEL maintainer="Policy Team" ENV POLICY_HOME=/opt/app/policy diff --git a/policy-jre/alpine/pom.xml b/policy-jre/alpine/pom.xml index 7704aedf..f49553c8 100644 --- a/policy-jre/alpine/pom.xml +++ b/policy-jre/alpine/pom.xml @@ -2,6 +2,7 @@ ============LICENSE_START======================================================= Copyright (C) 2019 Ericsson, Tieto. All rights reserved. Modifications Copyright (C) 2020 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. @@ -30,6 +31,7 @@ 2.3.3-SNAPSHOT + pom policy-jre-alpine Policy alpine jre docker image @@ -37,8 +39,95 @@ onap/policy-jre-alpine + onap/integration-java11 + 9.0.0 + + + + baseImage + + + aarch64 + + + + + + org.apache.maven.plugins + maven-scm-plugin + 1.13.0 + + + org.codehaus.plexus + plexus-utils + 3.4.2 + + + org.apache.maven.scm + maven-scm-provider-gitexe + 1.13.0 + + + + connection + src/main/resources/meta + + + + checkout-onap-python + validate + + scm:git:https://gerrit.onap.org/r/integration/docker/onap-java11 + ${project.build.directory}/onap-java11 + + + checkout + + + + + + io.fabric8 + docker-maven-plugin + + + + generate-base-image + initialize + + true + 1.23 + ${docker.pull.registry} + ${docker.push.registry} + + + ${integration.java.name} + + try + ${project.build.directory}/onap-java11 + BareAlpine.Dockerfile + + ${integration.java.version} + ${integration.java.version}-${maven.build.timestamp} + ${project.docker.latest.minmax.tag.version} + + + + + + + build + + + + + + + + + ${project.artifactId}-${project.version} @@ -48,7 +137,7 @@ 2.1.1 - validate + prepare-package execute @@ -58,6 +147,10 @@ + + io.github.git-commit-id + git-commit-id-maven-plugin + io.fabric8 docker-maven-plugin @@ -78,6 +171,10 @@ ${project.version}-${maven.build.timestamp} ${project.docker.latest.minmax.tag.version} + + ${integration.java.name} + ${integration.java.version} + @@ -85,8 +182,8 @@ - clean-images - pre-clean + clean-jre-image + prepare-package remove @@ -96,15 +193,15 @@ - generate-images - generate-sources + generate-jre-image + package build - push-images + push-jre-image deploy build diff --git a/policy-jre/alpine/src/main/docker/Dockerfile b/policy-jre/alpine/src/main/docker/Dockerfile index 803cc178..7bab899a 100644 --- a/policy-jre/alpine/src/main/docker/Dockerfile +++ b/policy-jre/alpine/src/main/docker/Dockerfile @@ -1,7 +1,7 @@ # ============LICENSE_START======================================================= # Copyright (C) 2019 Tieto. All rights reserved. # Modifications Copyright (C) 2020, 2021 AT&T Intellectual Property. All rights reserved. -# Modifications Copyright (C) 2020 Nordix Foundation. +# Modifications Copyright (C) 2020,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,7 +23,10 @@ # $JAVA_HOME is set to /usr/lib/jvm/java-11-openjdk # more details at https://hub.docker.com/_/openjdk -FROM onap/integration-java11:9.0.0 +ARG INTEGRATION_JAVA_NAME=${INTEGRATION_JAVA_NAME} +ARG INTEGRATION_JAVA_VERSION=${INTEGRATION_JAVA_VERSION} + +FROM ${INTEGRATION_JAVA_NAME}:${INTEGRATION_JAVA_VERSION} LABEL maintainer="Policy Team" -- cgit 1.2.3-korg