summaryrefslogtreecommitdiffstats
path: root/csit/config
diff options
context:
space:
mode:
Diffstat (limited to 'csit/config')
-rw-r--r--csit/config/apex-pdp/OnapPfConfig.json6
-rw-r--r--csit/config/api/apiParameters.yaml67
-rw-r--r--csit/config/distribution/defaultConfig.json6
-rw-r--r--csit/config/drools-apps/custom/feature-lifecycle.properties4
-rw-r--r--csit/config/drools-apps/env/base.conf2
-rw-r--r--csit/config/drools/env/base.conf2
-rw-r--r--csit/config/pap/papParameters.yaml12
-rw-r--r--csit/config/sim-all/simParameters.json18
-rw-r--r--csit/config/xacml-pdp/defaultConfig.json8
9 files changed, 96 insertions, 29 deletions
diff --git a/csit/config/apex-pdp/OnapPfConfig.json b/csit/config/apex-pdp/OnapPfConfig.json
index d46a8b20..74085a19 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": {{HTTPS_ENABLED}},
"prometheus": true
},
"pdpStatusParameters":{
@@ -29,13 +29,13 @@
"topic" : "POLICY-PDP-PAP",
"servers" : [ "message-router" ],
"topicCommInfrastructure" : "dmaap",
- "useHttps" : true
+ "useHttps" : {{HTTPS_ENABLED}}
}],
"topicSinks" : [{
"topic" : "POLICY-PDP-PAP",
"servers" : [ "message-router" ],
"topicCommInfrastructure" : "dmaap",
- "useHttps" : true
+ "useHttps" : {{HTTPS_ENABLED}}
}]
}
}
diff --git a/csit/config/api/apiParameters.yaml b/csit/config/api/apiParameters.yaml
new file mode 100644
index 00000000..93b7c1b8
--- /dev/null
+++ b/csit/config/api/apiParameters.yaml
@@ -0,0 +1,67 @@
+server:
+ port: 6969
+ ssl:
+ enabled: false
+
+spring:
+ security.user:
+ name: policyadmin
+ password: zb!XztG34
+ mvc.converters.preferred-json-mapper: gson
+
+policy-api:
+ name: ApiGroup
+ aaf: false
+
+database:
+ name: PolicyProviderParameterGroup
+ implementation: org.onap.policy.models.provider.impl.DatabasePolicyModelsProviderImpl
+ driver: org.mariadb.jdbc.Driver
+ url: jdbc:mariadb://mariadb:3306/policyadmin
+ user: policy_user
+ password: policy_user
+ persistenceUnit: PolicyDb
+
+policy-preload:
+ policyTypes:
+ - 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
+ policies:
+ - policies/sdnc.policy.naming.input.tosca.yaml
+
+management:
+ endpoints:
+ web:
+ base-path: /
+ exposure:
+ include: health,metrics,prometheus
+ path-mapping.prometheus: metrics \ No newline at end of file
diff --git a/csit/config/distribution/defaultConfig.json b/csit/config/distribution/defaultConfig.json
index 05640d92..50cb822e 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": {{HTTPS_ENABLED}},
"prometheus": true
},
"receptionHandlerParameters":{
@@ -59,7 +59,7 @@
"port": 6969,
"userName": "policyadmin",
"password": "zb!XztG34",
- "useHttps": true
+ "useHttps": {{HTTPS_ENABLED}}
},
"papParameters": {
"clientName": "policy-pap",
@@ -67,7 +67,7 @@
"port": 6969,
"userName": "policyadmin",
"password": "zb!XztG34",
- "useHttps": true
+ "useHttps": {{HTTPS_ENABLED}}
},
"deployPolicies": true
}
diff --git a/csit/config/drools-apps/custom/feature-lifecycle.properties b/csit/config/drools-apps/custom/feature-lifecycle.properties
index 911cdca5..edf0759f 100644
--- a/csit/config/drools-apps/custom/feature-lifecycle.properties
+++ b/csit/config/drools-apps/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=true
+dmaap.source.topics.POLICY-PDP-PAP.https={{HTTPS_ENABLED}}
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={{HTTPS_ENABLED}}
diff --git a/csit/config/drools-apps/env/base.conf b/csit/config/drools-apps/env/base.conf
index 3ec5e831..9a3f80da 100644
--- a/csit/config/drools-apps/env/base.conf
+++ b/csit/config/drools-apps/env/base.conf
@@ -59,7 +59,7 @@ AAF_HOST=aaf.api.simpledemo.onap.org
# HTTP Servers
-HTTP_SERVER_HTTPS=true
+HTTP_SERVER_HTTPS={{HTTPS_ENABLED}}
PROMETHEUS=true
# PDP-D DMaaP configuration channel
diff --git a/csit/config/drools/env/base.conf b/csit/config/drools/env/base.conf
index 8f3c4c0d..9871d62c 100644
--- a/csit/config/drools/env/base.conf
+++ b/csit/config/drools/env/base.conf
@@ -59,7 +59,7 @@ AAF_HOST=aaf.api.simpledemo.onap.org
# HTTP Servers
-HTTP_SERVER_HTTPS=true
+HTTP_SERVER_HTTPS={{HTTPS_ENABLED}}
PROMETHEUS=true
# PDP-D DMaaP configuration channel
diff --git a/csit/config/pap/papParameters.yaml b/csit/config/pap/papParameters.yaml
index 8b4c0ce3..00912def 100644
--- a/csit/config/pap/papParameters.yaml
+++ b/csit/config/pap/papParameters.yaml
@@ -24,7 +24,7 @@ spring:
server:
port: 6969
ssl:
- enabled: true
+ enabled: {{HTTPS_ENABLED}}
pap:
name: PapGroup
@@ -43,7 +43,7 @@ pap:
servers:
- message-router
topicCommInfrastructure: dmaap
- useHttps: true
+ useHttps: {{HTTPS_ENABLED}}
fetchTimeout: 15000
- topic: POLICY-HEARTBEAT
effectiveTopic: POLICY-PDP-PAP
@@ -51,26 +51,26 @@ pap:
servers:
- message-router
topicCommInfrastructure: dmaap
- useHttps: true
+ useHttps: {{HTTPS_ENABLED}}
fetchTimeout: 15000
topicSinks:
- topic: POLICY-PDP-PAP
servers:
- message-router
topicCommInfrastructure: dmaap
- useHttps: true
+ useHttps: {{HTTPS_ENABLED}}
- topic: POLICY-NOTIFICATION
servers:
- message-router
topicCommInfrastructure: dmaap
- useHttps: true
+ useHttps: {{HTTPS_ENABLED}}
healthCheckRestClientParameters:
- clientName: api
hostname: policy-api
port: 6969
userName: policyadmin
password: zb!XztG34
- useHttps: true
+ useHttps: {{HTTPS_ENABLED}}
basePath: policy/api/v1/healthcheck
management:
diff --git a/csit/config/sim-all/simParameters.json b/csit/config/sim-all/simParameters.json
index e33710c9..3d348125 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": {{MESSAGE_ROUTER_PORT}},
+ "https": {{HTTPS_ENABLED}}
},
{
"name": "A&AI simulator",
"providerClass": "org.onap.policy.simulators.AaiSimulatorJaxRs",
"host": "0.0.0.0",
"port": 6666,
- "https": true,
+ "https": {{HTTPS_ENABLED}},
"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": true
+ "https": {{HTTPS_ENABLED}}
},
{
"name": "SO simulator",
@@ -42,7 +42,7 @@
"providerClass": "org.onap.policy.simulators.VfcSimulatorJaxRs",
"host": "0.0.0.0",
"port": 6670,
- "https": true
+ "https": {{HTTPS_ENABLED}}
}
],
"topicSinks": [
@@ -50,7 +50,7 @@
"topic": "APPC-CL",
"servers": ["${HOST_NAME}"],
"topicCommInfrastructure": "DMAAP",
- "useHttps": true,
+ "useHttps": {{HTTPS_ENABLED}},
"apiKey": "some-key",
"apiSecret": "some-secret"
},
@@ -58,7 +58,7 @@
"topic": "APPC-LCM-WRITE",
"servers": ["${HOST_NAME}"],
"topicCommInfrastructure": "DMAAP",
- "useHttps": true,
+ "useHttps": {{HTTPS_ENABLED}},
"apiKey": "some-key",
"apiSecret": "some-secret"
}
@@ -68,7 +68,7 @@
"topic": "APPC-CL",
"servers": ["${HOST_NAME}"],
"topicCommInfrastructure": "DMAAP",
- "useHttps": true,
+ "useHttps": {{HTTPS_ENABLED}},
"apiKey": "some-key",
"apiSecret": "some-secret"
},
@@ -76,7 +76,7 @@
"topic": "APPC-LCM-READ",
"servers": ["${HOST_NAME}"],
"topicCommInfrastructure": "DMAAP",
- "useHttps": true,
+ "useHttps": {{HTTPS_ENABLED}},
"apiKey": "some-key",
"apiSecret": "some-secret"
}
diff --git a/csit/config/xacml-pdp/defaultConfig.json b/csit/config/xacml-pdp/defaultConfig.json
index e2536ce1..6ee07698 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": {{HTTPS_ENABLED}},
"aaf": false,
"prometheus": true
},
@@ -16,7 +16,7 @@
"port": 6969,
"userName": "policyadmin",
"password": "zb!XztG34",
- "useHttps": true,
+ "useHttps": {{HTTPS_ENABLED}},
"aaf": false
},
"applicationParameters": {
@@ -27,13 +27,13 @@
"topic" : "POLICY-PDP-PAP",
"servers" : [ "message-router" ],
"topicCommInfrastructure" : "dmaap",
- "useHttps" : true
+ "useHttps" : {{HTTPS_ENABLED}}
}],
"topicSinks" : [{
"topic" : "POLICY-PDP-PAP",
"servers" : [ "message-router" ],
"topicCommInfrastructure" : "dmaap",
- "useHttps" : true
+ "useHttps" : {{HTTPS_ENABLED}}
}]
}
}