From faac45b578a29078700b5ea003c69cedc1a17b5f Mon Sep 17 00:00:00 2001 From: liamfallon Date: Thu, 1 Sep 2022 12:05:47 +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 didying up on the CSIT environment. Issue-ID: POLICY-4338 Change-Id: Ie19908a8d2a457df3ae5f4e490d5528889f395c8 Signed-off-by: liamfallon --- csit/config/clamp/AcRuntimeParameters.yaml | 6 +- csit/config/clamp/HttpParticipantParameters.yaml | 8 +- .../clamp/KubernetesParticipantParameters.yaml | 8 +- csit/config/clamp/PolicyParticipantParameters.yaml | 12 +- csit/config/clamp/application-smoke.properties | 12 +- csit/config/clamp/groups.json | 137 +++++++++++++++++++++ 6 files changed, 160 insertions(+), 23 deletions(-) create mode 100644 csit/config/clamp/groups.json (limited to 'csit/config/clamp') diff --git a/csit/config/clamp/AcRuntimeParameters.yaml b/csit/config/clamp/AcRuntimeParameters.yaml index d70627f1..e437dd20 100644 --- a/csit/config/clamp/AcRuntimeParameters.yaml +++ b/csit/config/clamp/AcRuntimeParameters.yaml @@ -33,7 +33,7 @@ security: server: port: 6969 ssl: - enabled: {{HTTPS_ENABLED}} + enabled: false error: path: /error @@ -52,14 +52,14 @@ runtime: - ${topicServer:message-router} topicCommInfrastructure: dmaap fetchTimeout: 15000 - useHttps: {{HTTPS_ENABLED}} + useHttps: false topicSinks: - topic: POLICY-ACRUNTIME-PARTICIPANT servers: - ${topicServer:message-router} topicCommInfrastructure: dmaap - useHttps: {{HTTPS_ENABLED}} + useHttps: false management: endpoints: diff --git a/csit/config/clamp/HttpParticipantParameters.yaml b/csit/config/clamp/HttpParticipantParameters.yaml index 62b9dc46..15768882 100644 --- a/csit/config/clamp/HttpParticipantParameters.yaml +++ b/csit/config/clamp/HttpParticipantParameters.yaml @@ -22,21 +22,21 @@ participant: - ${topicServer:message-router} topicCommInfrastructure: dmaap fetchTimeout: 15000 - useHttps: {{HTTPS_ENABLED}} + useHttps: false topicSinks: - topic: POLICY-ACRUNTIME-PARTICIPANT servers: - ${topicServer:message-router} topicCommInfrastructure: dmaap - useHttps: {{HTTPS_ENABLED}} + useHttps: false management: endpoints: web: exposure: include: health, metrics, prometheus server: - port: 8084 + port: 6969 ssl: - enabled: {{HTTPS_ENABLED}} + 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 49c568cb..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: {{HTTPS_ENABLED}} + useHttps: false topicSinks: - topic: POLICY-ACRUNTIME-PARTICIPANT servers: - ${topicServer:message-router} topicCommInfrastructure: dmaap - useHttps: {{HTTPS_ENABLED}} + useHttps: false management: endpoints: @@ -41,9 +41,9 @@ management: exposure: include: health, metrics, prometheus server: - port: 8083 + port: 6969 ssl: - enabled: {{HTTPS_ENABLED}} + 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 73d40d4b..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: {{HTTPS_ENABLED}} + useHttps: false allowSelfSignedCerts: true policyPapParameters: clientName: pap @@ -21,7 +21,7 @@ participant: port: 6969 userName: policyadmin password: zb!XztG34 - useHttps: {{HTTPS_ENABLED}} + useHttps: false allowSelfSignedCerts: true intermediaryParameters: reportingTimeIntervalMs: 120000 @@ -40,22 +40,22 @@ participant: - ${topicServer:message-router} topicCommInfrastructure: dmaap fetchTimeout: 15000 - useHttps: {{HTTPS_ENABLED}} + useHttps: false topicSinks: - topic: POLICY-ACRUNTIME-PARTICIPANT servers: - ${topicServer:message-router} topicCommInfrastructure: dmaap - useHttps: {{HTTPS_ENABLED}} + useHttps: false management: endpoints: web: exposure: include: health, metrics, prometheus server: - port: 8085 + port: 6969 ssl: - enabled: {{HTTPS_ENABLED}} + enabled: false servlet: context-path: /onap/policy/clamp/acm/policyparticipant diff --git a/csit/config/clamp/application-smoke.properties b/csit/config/clamp/application-smoke.properties index 40578077..6910b68b 100644 --- a/csit/config/clamp/application-smoke.properties +++ b/csit/config/clamp/application-smoke.properties @@ -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/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": [] + } + ] + } + ] +} -- cgit 1.2.3-korg