From dc2d473581b2837aec02d017f1a8dcc5d4d06ecd Mon Sep 17 00:00:00 2001 From: Ram Krishna Verma Date: Tue, 31 Aug 2021 17:11:06 -0400 Subject: Add CSIT test for consolidated healthcheck Adding CSIT test for consolidated healthcheck. Also, verifying the an external groups file can be mounted to replace PapDb.json present inside the docker image for database initialization. Issue-ID: POLICY-3609 Change-Id: Icf2585d9d9df7e820fbddfbd1fe044b5a9e29cb3 Signed-off-by: Ram Krishna Verma --- csit/config/pap/groups.json | 137 ++++++++++++++++++++++++++++++++++++++++++ csit/docker-compose-all.yml | 1 + csit/pap/tests/pap-test.robot | 5 ++ 3 files changed, 143 insertions(+) create mode 100644 csit/config/pap/groups.json diff --git a/csit/config/pap/groups.json b/csit/config/pap/groups.json new file mode 100644 index 00000000..cf52fd89 --- /dev/null +++ b/csit/config/pap/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": 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": [ + { + "name": "onap.policies.controlloop.operational.common.Apex", + "version": "1.0.0" + }, + { + "name": "onap.policies.native.Apex", + "version": "1.0.0" + } + ], + "currentInstanceCount": 1, + "desiredInstanceCount": 1, + "policies": [] + } + ] + } + ] +} diff --git a/csit/docker-compose-all.yml b/csit/docker-compose-all.yml index 50b20548..c2b3af3f 100644 --- a/csit/docker-compose-all.yml +++ b/csit/docker-compose-all.yml @@ -104,6 +104,7 @@ services: - 6969 volumes: - ./config/pap/defaultConfig.json:/opt/app/policy/pap/etc/defaultConfig.json: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 diff --git a/csit/pap/tests/pap-test.robot b/csit/pap/tests/pap-test.robot index a5959141..b666eb50 100644 --- a/csit/pap/tests/pap-test.robot +++ b/csit/pap/tests/pap-test.robot @@ -16,6 +16,11 @@ Healthcheck ${resp}= PerformGetRequest ${POLICY_PAP_IP} /policy/pap/v1/healthcheck 200 null Should Be Equal As Strings ${resp.json()['code']} 200 +Consolidated Healthcheck + [Documentation] Verify policy consolidated health check + ${resp}= PerformGetRequest ${POLICY_PAP_IP} /policy/pap/v1/components/healthcheck 200 null + Should Be Equal As Strings ${resp.json()['healthy']} True + Metrics [Documentation] Verify policy pap is exporting prometheus metrics ${resp}= PerformGetRequest ${POLICY_PAP_IP} /metrics 200 null -- cgit 1.2.3-korg