From 3bd15a55aeb69c1caad1a1f32175cb3b7797733a Mon Sep 17 00:00:00 2001 From: Lianhao Lu Date: Wed, 7 Nov 2018 11:46:28 +0800 Subject: S3P: added FileSystemReceptionHandler plugin For S3P test, we need to add a new FileSystemRecpetionHandler plugin which monitors a local directory for newly come csar files. This patch added the plugin code as well as the configuration file for s3p to use. Change-Id: I8f1e65489abde15ae32c54d819bbc6e7cbdf36d0 Issue-ID: POLICY-837 Signed-off-by: Lianhao Lu --- packages/policy-distribution-docker/pom.xml | 2 +- .../src/main/docker/policy-dist.sh | 11 +++- packages/policy-distribution-tarball/pom.xml | 2 +- .../src/main/resources/etc/s3pConfig.json | 68 ++++++++++++++++++++++ 4 files changed, 79 insertions(+), 4 deletions(-) create mode 100644 packages/policy-distribution-tarball/src/main/resources/etc/s3pConfig.json (limited to 'packages') diff --git a/packages/policy-distribution-docker/pom.xml b/packages/policy-distribution-docker/pom.xml index ae0ce979..45a4621d 100644 --- a/packages/policy-distribution-docker/pom.xml +++ b/packages/policy-distribution-docker/pom.xml @@ -26,7 +26,7 @@ org.onap.policy.distribution packages - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT pom diff --git a/packages/policy-distribution-docker/src/main/docker/policy-dist.sh b/packages/policy-distribution-docker/src/main/docker/policy-dist.sh index a6366c05..ebb6b8d2 100644 --- a/packages/policy-distribution-docker/src/main/docker/policy-dist.sh +++ b/packages/policy-distribution-docker/src/main/docker/policy-dist.sh @@ -22,10 +22,17 @@ JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64/ POLICY_DISTRIBUTION_HOME=/opt/app/policy/distribution -CONFIG_FILE=$1 +if [ "$#" -eq 1 ]; then + CONFIG_FILE=$1 +else + CONFIG_FILE=${CONFIG_FILE} +fi + if [ -z "$CONFIG_FILE" ] then - CONFIG_FILE=$POLICY_DISTRIBUTION_HOME/etc/defaultConfig.json + CONFIG_FILE="$POLICY_DISTRIBUTION_HOME/etc/defaultConfig.json" fi +echo "Policy distribution config file: $CONFIG_FILE" + $JAVA_HOME/bin/java -cp "$POLICY_DISTRIBUTION_HOME/etc:$POLICY_DISTRIBUTION_HOME/lib/*" org.onap.policy.distribution.main.startstop.Main -c $CONFIG_FILE diff --git a/packages/policy-distribution-tarball/pom.xml b/packages/policy-distribution-tarball/pom.xml index 7e23a147..b67f4f9d 100644 --- a/packages/policy-distribution-tarball/pom.xml +++ b/packages/policy-distribution-tarball/pom.xml @@ -24,7 +24,7 @@ org.onap.policy.distribution packages - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT policy-distribution-tarball diff --git a/packages/policy-distribution-tarball/src/main/resources/etc/s3pConfig.json b/packages/policy-distribution-tarball/src/main/resources/etc/s3pConfig.json new file mode 100644 index 00000000..6124ffb0 --- /dev/null +++ b/packages/policy-distribution-tarball/src/main/resources/etc/s3pConfig.json @@ -0,0 +1,68 @@ +{ + "name":"SDCDistributionGroup", + "restServerParameters":{ + "host":"0.0.0.0", + "port":6969, + "userName":"healthcheck", + "password":"zb!XztG34" + }, + "receptionHandlerParameters":{ + "S3PReceptionHandler":{ + "receptionHandlerType":"S3P", + "receptionHandlerClassName":"org.onap.policy.distribution.reception.handling.sdc.FileSystemReceptionHandler", + "receptionHandlerConfigurationName":"fileConfiguration", + "pluginHandlerParameters":{ + "policyDecoders":{ + "CsarDecoder":{ + "decoderType":"CsarDecoder", + "decoderClassName":"org.onap.policy.distribution.reception.decoding.pdpx.PolicyDecoderCsarPdpx", + "decoderConfigurationName": "csarToOptimizationPolicyConfiguration" + } + }, + "policyForwarders":{ + "PAPEngineForwarder":{ + "forwarderType":"PAPEngine", + "forwarderClassName":"org.onap.policy.distribution.forwarding.xacml.pdp.XacmlPdpPolicyForwarder", + "forwarderConfigurationName": "xacmlPdpConfiguration" + } + } + } + } + }, + "receptionHandlerConfigurationParameters":{ + "fileConfiguration":{ + "parameterClassName":"org.onap.policy.distribution.reception.handling.sdc.FileSystemReceptionHandlerConfigurationParameterGroup", + "parameters":{ + "watchPath": "/tmp/policy_distribution/csar/" + } + } + }, + "policyDecoderConfigurationParameters":{ + "csarToOptimizationPolicyConfiguration":{ + "parameterClassName":"org.onap.policy.distribution.reception.decoding.pdpx.PolicyDecoderCsarPdpxConfigurationParameterGroup", + "parameters":{ + "policyNamePrefix": "oofCasablanca", + "onapName": "OOF", + "version": "1.0", + "priority": "3", + "riskType": "Test", + "riskLevel": "2" + } + } + }, + "policyForwarderConfigurationParameters":{ + "xacmlPdpConfiguration":{ + "parameterClassName":"org.onap.policy.distribution.forwarding.xacml.pdp.XacmlPdpPolicyForwarderParameterGroup", + "parameters":{ + "useHttps": true, + "hostname": "pdp", + "port": 8081, + "userName": "testpdp", + "password": "alpha123", + "clientAuth": "cHl0aG9uOnRlc3Q=", + "isManaged": true, + "pdpGroup": "default" + } + } + } +} -- cgit 1.2.3-korg