From eabc69580026cad20f2ea5448f6cc7e604359d1f Mon Sep 17 00:00:00 2001 From: "a.sreekumar" Date: Thu, 11 Apr 2019 16:56:29 +0000 Subject: [PATCH] Changes for packaging services-onappf and some refactoring 1) Added the code for packaging PDP-A. 2) Updating the package names. 3) Updating the dependencies in services-onappf. Some dependencies can be removed as they are brought in while packaging. 4) Some other minor changes. Change-Id: Idf62d7854f3435806a9e8aa975138fbfd45e3ea8 Issue-ID: POLICY-1632 Signed-off-by: a.sreekumar --- packages/apex-pdp-package-full/pom.xml | 15 ++- .../src/main/package/scripts/apexApps.bat | 2 + .../src/main/package/scripts/apexApps.sh | 2 + .../src/main/package/scripts/apexOnapPf.bat | 52 ++++++++ .../src/main/package/scripts/apexOnapPf.sh | 67 ++++++++++ services/services-onappf/pom.xml | 137 +++------------------ .../onappf}/ApexStarterActivator.java | 22 ++-- .../onappf}/ApexStarterCommandLineArguments.java | 6 +- .../onappf}/ApexStarterConstants.java | 2 +- .../onappf}/ApexStarterMain.java | 8 +- .../onappf}/comm/PdpStateChangeListener.java | 4 +- .../onappf}/comm/PdpStatusPublisher.java | 4 +- .../onappf}/comm/PdpUpdateListener.java | 4 +- .../onappf}/exception/ApexStarterException.java | 2 +- .../exception/ApexStarterRunTimeException.java | 2 +- .../onappf/handler}/ApexEngineHandler.java | 6 +- .../onappf}/handler/PdpMessageHandler.java | 8 +- .../handler/PdpStateChangeMessageHandler.java | 9 +- .../onappf}/handler/PdpUpdateMessageHandler.java | 9 +- .../parameters/ApexStarterParameterGroup.java | 2 +- .../parameters/ApexStarterParameterHandler.java | 6 +- .../onappf}/parameters/PdpStatusParameters.java | 2 +- .../ToscaPolicyTypeIdentifierParameters.java | 2 +- .../src/main/resources/config/OnapPfConfig.json | 9 ++ .../src/main/resources/config/topic.properties | 23 ++++ .../onappf}/TestApexStarterActivator.java | 13 +- .../onappf}/TestApexStarterConstants.java | 3 +- .../onappf}/TestApexStarterMain.java | 9 +- .../onappf}/comm/TestPdpStateChangeListener.java | 16 +-- .../onappf}/comm/TestPdpUpdateListener.java | 17 +-- .../onappf}/exception/TestExceptions.java | 4 +- .../onappf}/parameters/CommonTestData.java | 3 +- .../parameters/TestApexStarterParameterGroup.java | 4 +- .../TestApexStarterParameterHandler.java | 8 +- .../parameters/TestPdpStatusParameters.java | 3 +- .../resources/ApexStarterConfigParameters.json | 7 +- .../src/test/resources/topic.properties | 18 +++ 37 files changed, 302 insertions(+), 208 deletions(-) create mode 100644 packages/apex-pdp-package-full/src/main/package/scripts/apexOnapPf.bat create mode 100644 packages/apex-pdp-package-full/src/main/package/scripts/apexOnapPf.sh rename services/services-onappf/src/main/java/org/onap/policy/apex/{starter => services/onappf}/ApexStarterActivator.java (90%) rename services/services-onappf/src/main/java/org/onap/policy/apex/{starter => services/onappf}/ApexStarterCommandLineArguments.java (97%) rename services/services-onappf/src/main/java/org/onap/policy/apex/{starter => services/onappf}/ApexStarterConstants.java (97%) rename services/services-onappf/src/main/java/org/onap/policy/apex/{starter => services/onappf}/ApexStarterMain.java (94%) rename services/services-onappf/src/main/java/org/onap/policy/apex/{starter => services/onappf}/comm/PdpStateChangeListener.java (93%) rename services/services-onappf/src/main/java/org/onap/policy/apex/{starter => services/onappf}/comm/PdpStatusPublisher.java (95%) rename services/services-onappf/src/main/java/org/onap/policy/apex/{starter => services/onappf}/comm/PdpUpdateListener.java (93%) rename services/services-onappf/src/main/java/org/onap/policy/apex/{starter => services/onappf}/exception/ApexStarterException.java (97%) rename services/services-onappf/src/main/java/org/onap/policy/apex/{starter => services/onappf}/exception/ApexStarterRunTimeException.java (97%) rename services/services-onappf/src/main/java/org/onap/policy/apex/{starter/engine => services/onappf/handler}/ApexEngineHandler.java (94%) rename services/services-onappf/src/main/java/org/onap/policy/apex/{starter => services/onappf}/handler/PdpMessageHandler.java (95%) rename services/services-onappf/src/main/java/org/onap/policy/apex/{starter => services/onappf}/handler/PdpStateChangeMessageHandler.java (95%) rename services/services-onappf/src/main/java/org/onap/policy/apex/{starter => services/onappf}/handler/PdpUpdateMessageHandler.java (96%) rename services/services-onappf/src/main/java/org/onap/policy/apex/{starter => services/onappf}/parameters/ApexStarterParameterGroup.java (96%) rename services/services-onappf/src/main/java/org/onap/policy/apex/{starter => services/onappf}/parameters/ApexStarterParameterHandler.java (94%) rename services/services-onappf/src/main/java/org/onap/policy/apex/{starter => services/onappf}/parameters/PdpStatusParameters.java (96%) rename services/services-onappf/src/main/java/org/onap/policy/apex/{starter => services/onappf}/parameters/ToscaPolicyTypeIdentifierParameters.java (96%) create mode 100644 services/services-onappf/src/main/resources/config/OnapPfConfig.json create mode 100644 services/services-onappf/src/main/resources/config/topic.properties rename services/services-onappf/src/test/java/org/onap/policy/apex/{starter => services/onappf}/TestApexStarterActivator.java (87%) rename services/services-onappf/src/test/java/org/onap/policy/apex/{starter => services/onappf}/TestApexStarterConstants.java (92%) rename services/services-onappf/src/test/java/org/onap/policy/apex/{starter => services/onappf}/TestApexStarterMain.java (90%) rename services/services-onappf/src/test/java/org/onap/policy/apex/{starter => services/onappf}/comm/TestPdpStateChangeListener.java (91%) rename services/services-onappf/src/test/java/org/onap/policy/apex/{starter => services/onappf}/comm/TestPdpUpdateListener.java (89%) rename services/services-onappf/src/test/java/org/onap/policy/apex/{starter => services/onappf}/exception/TestExceptions.java (86%) rename services/services-onappf/src/test/java/org/onap/policy/apex/{starter => services/onappf}/parameters/CommonTestData.java (96%) rename services/services-onappf/src/test/java/org/onap/policy/apex/{starter => services/onappf}/parameters/TestApexStarterParameterGroup.java (96%) rename services/services-onappf/src/test/java/org/onap/policy/apex/{starter => services/onappf}/parameters/TestApexStarterParameterHandler.java (94%) rename services/services-onappf/src/test/java/org/onap/policy/apex/{starter => services/onappf}/parameters/TestPdpStatusParameters.java (94%) diff --git a/packages/apex-pdp-package-full/pom.xml b/packages/apex-pdp-package-full/pom.xml index de2ccf773..078088bad 100644 --- a/packages/apex-pdp-package-full/pom.xml +++ b/packages/apex-pdp-package-full/pom.xml @@ -40,7 +40,11 @@ services-engine ${project.version} - + + org.onap.policy.apex-pdp.services + services-onappf + ${project.version} + org.onap.policy.apex-pdp.client @@ -278,6 +282,15 @@ + + org.onap.policy.apex-pdp.services + services-onappf + ${project.version} + jar + false + ${project.build.directory}/etc/onappf + config/* + org.onap.policy.apex-pdp.auth cli-editor diff --git a/packages/apex-pdp-package-full/src/main/package/scripts/apexApps.bat b/packages/apex-pdp-package-full/src/main/package/scripts/apexApps.bat index 848498b1e..9798fa545 100644 --- a/packages/apex-pdp-package-full/src/main/package/scripts/apexApps.bat +++ b/packages/apex-pdp-package-full/src/main/package/scripts/apexApps.bat @@ -82,6 +82,7 @@ set APEX_APP_MAP[eng-deployment]=java -Dlogback.configurationFile=%APEX_HOME%\et set APEX_APP_MAP[eng-monitoring]=java -Dlogback.configurationFile=%APEX_HOME%\etc\logback.xml -jar %APEX_HOME%\lib\applications\client-monitoring-%_VERSION%-monitoring.jar set APEX_APP_MAP[full-client]=java -Dlogback.configurationFile=%APEX_HOME%\etc\logback.xml -jar %APEX_HOME%\lib\applications\client-full-%_VERSION%-full.jar set APEX_APP_MAP[event-generator]=java -Dlogback.configurationFile=%APEX_HOME%\etc\logback.xml -cp %CLASSPATH% %_CONFIG% org.onap.policy.apex.testsuites.performance.benchmark.eventgenerator.EventGenerator +set APEX_APP_MAP[onappf]=java -Dlogback.configurationFile=%APEX_HOME%\etc\logback.xml -cp %CLASSPATH% %_CONFIG% org.onap.policy.apex.services.onappf.ApexStarterMain :: array of applications with name=description :: declare -A APEX_APP_DESCR_MAP @@ -96,6 +97,7 @@ set APEX_APP_DESCR_MAP[eng-deployment]=starts the APEX deployment client in a si set APEX_APP_DESCR_MAP[eng-monitoring]=starts the APEX engine monitoring client in a simple webserver set APEX_APP_DESCR_MAP[full-client]=starts the full APEX client (rest editor, deployment, monitoring) in a simple webserver set APEX_APP_DESCR_MAP["event-generator"]=starts the event generator in a simple webserver for performance testing +set APEX_APP_DESCR_MAP[onappf]=starts the ApexStarter which handles the Apex Engine based on instructions from PAP :: no command line means help, -h means help if "%1" == "" goto Help diff --git a/packages/apex-pdp-package-full/src/main/package/scripts/apexApps.sh b/packages/apex-pdp-package-full/src/main/package/scripts/apexApps.sh index c5569baaa..52e1f3df9 100755 --- a/packages/apex-pdp-package-full/src/main/package/scripts/apexApps.sh +++ b/packages/apex-pdp-package-full/src/main/package/scripts/apexApps.sh @@ -91,6 +91,7 @@ APEX_APP_MAP["eng-deployment"]="java -Dlogback.configurationFile=$APEX_HOME/etc/ APEX_APP_MAP["eng-monitoring"]="java -Dlogback.configurationFile=$APEX_HOME/etc/logback.xml -jar $APEX_HOME/lib/applications/client-monitoring-$_version-monitoring.jar" APEX_APP_MAP["full-client"]="java -Dlogback.configurationFile=$APEX_HOME/etc/logback.xml -jar $APEX_HOME/lib/applications/client-full-$_version-full.jar" APEX_APP_MAP["event-gen"]="java -Dlogback.configurationFile=$APEX_HOME/etc/logback.xml -cp ${CLASSPATH} $_config org.onap.policy.apex.testsuites.performance.benchmark.eventgenerator.EventGenerator" +APEX_APP_MAP["onappf"]="java -Dlogback.configurationFile=$APEX_HOME/etc/logback.xml -cp ${CLASSPATH} $_config org.onap.policy.apex.services.onappf.ApexStarterMain" ## array of applications with name=description declare -A APEX_APP_DESCR_MAP @@ -105,6 +106,7 @@ APEX_APP_DESCR_MAP["eng-deployment"]="starts the APEX deployment client in a sim APEX_APP_DESCR_MAP["eng-monitoring"]="starts the APEX engine monitoring client in a simple webserver" APEX_APP_DESCR_MAP["full-client"]="starts the full APEX client (rest editor, deployment, monitoring) in a simple webserver" APEX_APP_DESCR_MAP["event-generator"]="starts the event generator in a simple webserver for performance testing" +APEX_APP_DESCR_MAP["onappf"]="starts the ApexStarter which handles the Apex Engine based on instructions from PAP" ## ## Help screen and exit condition (i.e. too few arguments) diff --git a/packages/apex-pdp-package-full/src/main/package/scripts/apexOnapPf.bat b/packages/apex-pdp-package-full/src/main/package/scripts/apexOnapPf.bat new file mode 100644 index 000000000..45531233d --- /dev/null +++ b/packages/apex-pdp-package-full/src/main/package/scripts/apexOnapPf.bat @@ -0,0 +1,52 @@ +:: ============LICENSE_START======================================================= +:: Copyright (C) 2019 Nordix Foundation. +:: ================================================================================ +:: 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. +:: +:: SPDX-License-Identifier: Apache-2.0 +:: ============LICENSE_END========================================================= + +:: +:: Script to run the onappf PDP-A, calls apexApps.bat +:: +:: @package org.onap.policy.apex +:: @author Ajith Sreekumar +:: @version v1.0.0 + +:: +:: DO NOT CHANGE CODE BELOW, unless you know what you are doing +:: + +@echo off +setlocal enableDelayedExpansion + + +if defined APEX_HOME ( + if exist "%APEX_HOME%\" ( + set _dummy=dir + ) else ( + echo[ + echo Apex directory 'APEX_HOME' not a directory + echo Please set environment for 'APEX_HOME' + echo[ + exit /b + ) +) else ( + echo[ + echo Apex directory 'APEX_HOME' not set + echo Please set environment for 'APEX_HOME' + echo[ + exit /b +) + +%APEX_HOME%\bin\apexApps.bat onappf %* diff --git a/packages/apex-pdp-package-full/src/main/package/scripts/apexOnapPf.sh b/packages/apex-pdp-package-full/src/main/package/scripts/apexOnapPf.sh new file mode 100644 index 000000000..3eaa25937 --- /dev/null +++ b/packages/apex-pdp-package-full/src/main/package/scripts/apexOnapPf.sh @@ -0,0 +1,67 @@ +#!/bin/bash +# +# ============LICENSE_START======================================================= +# Copyright (C) 2019 Nordix Foundation. +# ================================================================================ +# 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. +# +# SPDX-License-Identifier: Apache-2.0 +# ============LICENSE_END========================================================= +# + + +## +## Script to run onappf PDP-A, calls apexApps.sh +## +## @package org.onap.policy.apex +## @author Ajith Sreekumar +## @version v1.0.0 + + +if [ -z $APEX_USER ] +then + APEX_USER="apexuser" +fi + +id $APEX_USER > /dev/null 2>& 1 +if [ "$?" -ne "0" ] +then + echo 'cannot run apex, user "'$APEX_USER'" does not exit' + exit +fi + +if [ $(whoami) != "$APEX_USER" ] +then + echo 'Apex must be run as user "'$APEX_USER'"' + exit +fi + +if [ -z $APEX_HOME ] +then + APEX_HOME="/opt/app/policy/apex-pdp" +fi + +if [ ! -d $APEX_HOME ] +then + echo + echo 'Apex directory "'$APEX_HOME'" not set or not a directory' + echo "Please set environment for 'APEX_HOME'" + exit +fi + +if [ $(whoami) == "$APEX_USER" ] +then + $APEX_HOME/bin/apexApps.sh onappf $* +else + su $APEX_USER -c "$APEX_HOME/bin/apexApps.sh onappf $*" +fi diff --git a/services/services-onappf/pom.xml b/services/services-onappf/pom.xml index ef23ae76f..81df89483 100644 --- a/services/services-onappf/pom.xml +++ b/services/services-onappf/pom.xml @@ -33,131 +33,11 @@ This module handles the registration/deregistration of apex-pdp to ONAP Policy Framework. - - junit - junit - test - org.onap.policy.apex-pdp.services services-engine ${project.version} - - - org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-distribution - plugins-context-distribution-hazelcast - ${project.version} - - - org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-distribution - plugins-context-distribution-infinispan - ${project.version} - - - - - org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-locking - plugins-context-locking-hazelcast - ${project.version} - - - org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-locking - plugins-context-locking-curator - ${project.version} - - - - - org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-schema - plugins-context-schema-avro - ${project.version} - - - - - org.onap.policy.apex-pdp.plugins.plugins-executor - plugins-executor-java - ${project.version} - - - org.onap.policy.apex-pdp.plugins.plugins-executor - plugins-executor-javascript - ${project.version} - - - org.onap.policy.apex-pdp.plugins.plugins-executor - plugins-executor-jruby - ${project.version} - - - org.onap.policy.apex-pdp.plugins.plugins-executor - plugins-executor-jython - ${project.version} - - - org.onap.policy.apex-pdp.plugins.plugins-executor - plugins-executor-mvel - ${project.version} - - - - - org.onap.policy.apex-pdp.plugins.plugins-persistence.plugins-persistence-jpa - plugins-persistence-jpa-eclipselink - ${project.version} - - - org.onap.policy.apex-pdp.plugins.plugins-persistence.plugins-persistence-jpa - plugins-persistence-jpa-hibernate - ${project.version} - - - - - org.onap.policy.apex-pdp.plugins.plugins-event.plugins-event-carrier - plugins-event-carrier-kafka - ${project.version} - - - org.onap.policy.apex-pdp.plugins.plugins-event.plugins-event-carrier - plugins-event-carrier-websocket - ${project.version} - - - org.onap.policy.apex-pdp.plugins.plugins-event.plugins-event-carrier - plugins-event-carrier-jms - ${project.version} - - - org.onap.policy.apex-pdp.plugins.plugins-event.plugins-event-carrier - plugins-event-carrier-restclient - ${project.version} - - - org.onap.policy.apex-pdp.plugins.plugins-event.plugins-event-carrier - plugins-event-carrier-restserver - ${project.version} - - - org.onap.policy.apex-pdp.plugins.plugins-event.plugins-event-carrier - plugins-event-carrier-restrequestor - ${project.version} - - - - - org.onap.policy.apex-pdp.plugins.plugins-event.plugins-event-protocol - plugins-event-protocol-xml - ${project.version} - - - org.onap.policy.apex-pdp.plugins.plugins-event.plugins-event-protocol - plugins-event-protocol-jms - ${project.version} - - - org.onap.policy.common policy-endpoints @@ -182,16 +62,22 @@ javax.ws.rs javax.ws.rs-api + + org.glassfish.hk2 + hk2-api + + + org.glassfish.hk2.external + javax.inject + ${version.policy.common} - org.glassfish.jersey.inject jersey-hk2 ${version.jersey} - org.onap.policy.common utils-test @@ -208,6 +94,8 @@ ${version.policy.models} + + org.assertj assertj-core @@ -218,5 +106,10 @@ powermock-api-mockito test + + junit + junit + test + diff --git a/services/services-onappf/src/main/java/org/onap/policy/apex/starter/ApexStarterActivator.java b/services/services-onappf/src/main/java/org/onap/policy/apex/services/onappf/ApexStarterActivator.java similarity index 90% rename from services/services-onappf/src/main/java/org/onap/policy/apex/starter/ApexStarterActivator.java rename to services/services-onappf/src/main/java/org/onap/policy/apex/services/onappf/ApexStarterActivator.java index b33d792a0..0da554d75 100644 --- a/services/services-onappf/src/main/java/org/onap/policy/apex/starter/ApexStarterActivator.java +++ b/services/services-onappf/src/main/java/org/onap/policy/apex/services/onappf/ApexStarterActivator.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.policy.apex.starter; +package org.onap.policy.apex.services.onappf; import java.util.List; import java.util.Properties; @@ -26,13 +26,13 @@ import java.util.Properties; import lombok.Getter; import lombok.Setter; -import org.onap.policy.apex.starter.comm.PdpStateChangeListener; -import org.onap.policy.apex.starter.comm.PdpStatusPublisher; -import org.onap.policy.apex.starter.comm.PdpUpdateListener; -import org.onap.policy.apex.starter.exception.ApexStarterException; -import org.onap.policy.apex.starter.exception.ApexStarterRunTimeException; -import org.onap.policy.apex.starter.handler.PdpMessageHandler; -import org.onap.policy.apex.starter.parameters.ApexStarterParameterGroup; +import org.onap.policy.apex.services.onappf.comm.PdpStateChangeListener; +import org.onap.policy.apex.services.onappf.comm.PdpStatusPublisher; +import org.onap.policy.apex.services.onappf.comm.PdpUpdateListener; +import org.onap.policy.apex.services.onappf.exception.ApexStarterException; +import org.onap.policy.apex.services.onappf.exception.ApexStarterRunTimeException; +import org.onap.policy.apex.services.onappf.handler.PdpMessageHandler; +import org.onap.policy.apex.services.onappf.parameters.ApexStarterParameterGroup; import org.onap.policy.common.endpoints.event.comm.TopicEndpoint; import org.onap.policy.common.endpoints.event.comm.TopicSink; import org.onap.policy.common.endpoints.event.comm.TopicSource; @@ -128,8 +128,6 @@ public class ApexStarterActivator { private void stopAndRemovePdpStatusPublisher() { final PdpStatusPublisher pdpStatusPublisher = Registry.get(ApexStarterConstants.REG_PDP_STATUS_PUBLISHER, PdpStatusPublisher.class); - // send a final heartbeat with terminated status - pdpStatusPublisher.send(new PdpMessageHandler().getTerminatedPdpStatus()); pdpStatusPublisher.terminate(); Registry.unregister(ApexStarterConstants.REG_PDP_STATUS_PUBLISHER); } @@ -164,6 +162,10 @@ public class ApexStarterActivator { throw new IllegalStateException("activator is not running"); } try { + final PdpStatusPublisher pdpStatusPublisher = + Registry.get(ApexStarterConstants.REG_PDP_STATUS_PUBLISHER, PdpStatusPublisher.class); + // send a final heartbeat with terminated status + pdpStatusPublisher.send(new PdpMessageHandler().getTerminatedPdpStatus()); manager.stop(); Registry.unregister(ApexStarterConstants.REG_APEX_STARTER_ACTIVATOR); } catch (final ServiceManagerException exp) { diff --git a/services/services-onappf/src/main/java/org/onap/policy/apex/starter/ApexStarterCommandLineArguments.java b/services/services-onappf/src/main/java/org/onap/policy/apex/services/onappf/ApexStarterCommandLineArguments.java similarity index 97% rename from services/services-onappf/src/main/java/org/onap/policy/apex/starter/ApexStarterCommandLineArguments.java rename to services/services-onappf/src/main/java/org/onap/policy/apex/services/onappf/ApexStarterCommandLineArguments.java index f1d082fcb..152182b52 100644 --- a/services/services-onappf/src/main/java/org/onap/policy/apex/starter/ApexStarterCommandLineArguments.java +++ b/services/services-onappf/src/main/java/org/onap/policy/apex/services/onappf/ApexStarterCommandLineArguments.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.policy.apex.starter; +package org.onap.policy.apex.services.onappf; import java.io.File; import java.io.PrintWriter; @@ -33,8 +33,8 @@ import org.apache.commons.cli.Option; import org.apache.commons.cli.Options; import org.apache.commons.cli.ParseException; import org.apache.log4j.chainsaw.Main; -import org.onap.policy.apex.starter.exception.ApexStarterException; -import org.onap.policy.apex.starter.exception.ApexStarterRunTimeException; +import org.onap.policy.apex.services.onappf.exception.ApexStarterException; +import org.onap.policy.apex.services.onappf.exception.ApexStarterRunTimeException; import org.onap.policy.common.utils.resources.ResourceUtils; /** diff --git a/services/services-onappf/src/main/java/org/onap/policy/apex/starter/ApexStarterConstants.java b/services/services-onappf/src/main/java/org/onap/policy/apex/services/onappf/ApexStarterConstants.java similarity index 97% rename from services/services-onappf/src/main/java/org/onap/policy/apex/starter/ApexStarterConstants.java rename to services/services-onappf/src/main/java/org/onap/policy/apex/services/onappf/ApexStarterConstants.java index 6173872e0..c6dbf5fe3 100644 --- a/services/services-onappf/src/main/java/org/onap/policy/apex/starter/ApexStarterConstants.java +++ b/services/services-onappf/src/main/java/org/onap/policy/apex/services/onappf/ApexStarterConstants.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.policy.apex.starter; +package org.onap.policy.apex.services.onappf; /** * Names of various items contained in the Registry. diff --git a/services/services-onappf/src/main/java/org/onap/policy/apex/starter/ApexStarterMain.java b/services/services-onappf/src/main/java/org/onap/policy/apex/services/onappf/ApexStarterMain.java similarity index 94% rename from services/services-onappf/src/main/java/org/onap/policy/apex/starter/ApexStarterMain.java rename to services/services-onappf/src/main/java/org/onap/policy/apex/services/onappf/ApexStarterMain.java index e4465ed92..22611c51b 100644 --- a/services/services-onappf/src/main/java/org/onap/policy/apex/starter/ApexStarterMain.java +++ b/services/services-onappf/src/main/java/org/onap/policy/apex/services/onappf/ApexStarterMain.java @@ -18,15 +18,15 @@ * ============LICENSE_END========================================================= */ -package org.onap.policy.apex.starter; +package org.onap.policy.apex.services.onappf; import java.io.FileInputStream; import java.util.Arrays; import java.util.Properties; -import org.onap.policy.apex.starter.exception.ApexStarterException; -import org.onap.policy.apex.starter.parameters.ApexStarterParameterGroup; -import org.onap.policy.apex.starter.parameters.ApexStarterParameterHandler; +import org.onap.policy.apex.services.onappf.exception.ApexStarterException; +import org.onap.policy.apex.services.onappf.parameters.ApexStarterParameterGroup; +import org.onap.policy.apex.services.onappf.parameters.ApexStarterParameterHandler; import org.onap.policy.common.utils.services.Registry; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/services/services-onappf/src/main/java/org/onap/policy/apex/starter/comm/PdpStateChangeListener.java b/services/services-onappf/src/main/java/org/onap/policy/apex/services/onappf/comm/PdpStateChangeListener.java similarity index 93% rename from services/services-onappf/src/main/java/org/onap/policy/apex/starter/comm/PdpStateChangeListener.java rename to services/services-onappf/src/main/java/org/onap/policy/apex/services/onappf/comm/PdpStateChangeListener.java index 0bd0d935f..404749051 100644 --- a/services/services-onappf/src/main/java/org/onap/policy/apex/starter/comm/PdpStateChangeListener.java +++ b/services/services-onappf/src/main/java/org/onap/policy/apex/services/onappf/comm/PdpStateChangeListener.java @@ -18,9 +18,9 @@ * ============LICENSE_END========================================================= */ -package org.onap.policy.apex.starter.comm; +package org.onap.policy.apex.services.onappf.comm; -import org.onap.policy.apex.starter.handler.PdpStateChangeMessageHandler; +import org.onap.policy.apex.services.onappf.handler.PdpStateChangeMessageHandler; import org.onap.policy.common.endpoints.event.comm.Topic.CommInfrastructure; import org.onap.policy.common.endpoints.listeners.ScoListener; import org.onap.policy.common.utils.coder.StandardCoderObject; diff --git a/services/services-onappf/src/main/java/org/onap/policy/apex/starter/comm/PdpStatusPublisher.java b/services/services-onappf/src/main/java/org/onap/policy/apex/services/onappf/comm/PdpStatusPublisher.java similarity index 95% rename from services/services-onappf/src/main/java/org/onap/policy/apex/starter/comm/PdpStatusPublisher.java rename to services/services-onappf/src/main/java/org/onap/policy/apex/services/onappf/comm/PdpStatusPublisher.java index 69c9dd18d..211fe1316 100644 --- a/services/services-onappf/src/main/java/org/onap/policy/apex/starter/comm/PdpStatusPublisher.java +++ b/services/services-onappf/src/main/java/org/onap/policy/apex/services/onappf/comm/PdpStatusPublisher.java @@ -18,13 +18,13 @@ * ============LICENSE_END========================================================= */ -package org.onap.policy.apex.starter.comm; +package org.onap.policy.apex.services.onappf.comm; import java.util.List; import java.util.Timer; import java.util.TimerTask; -import org.onap.policy.apex.starter.handler.PdpMessageHandler; +import org.onap.policy.apex.services.onappf.handler.PdpMessageHandler; import org.onap.policy.common.endpoints.event.comm.TopicSink; import org.onap.policy.common.endpoints.event.comm.client.TopicSinkClient; import org.onap.policy.models.pdp.concepts.PdpStatus; diff --git a/services/services-onappf/src/main/java/org/onap/policy/apex/starter/comm/PdpUpdateListener.java b/services/services-onappf/src/main/java/org/onap/policy/apex/services/onappf/comm/PdpUpdateListener.java similarity index 93% rename from services/services-onappf/src/main/java/org/onap/policy/apex/starter/comm/PdpUpdateListener.java rename to services/services-onappf/src/main/java/org/onap/policy/apex/services/onappf/comm/PdpUpdateListener.java index 46ce30e57..5633d60fb 100644 --- a/services/services-onappf/src/main/java/org/onap/policy/apex/starter/comm/PdpUpdateListener.java +++ b/services/services-onappf/src/main/java/org/onap/policy/apex/services/onappf/comm/PdpUpdateListener.java @@ -18,9 +18,9 @@ * ============LICENSE_END========================================================= */ -package org.onap.policy.apex.starter.comm; +package org.onap.policy.apex.services.onappf.comm; -import org.onap.policy.apex.starter.handler.PdpUpdateMessageHandler; +import org.onap.policy.apex.services.onappf.handler.PdpUpdateMessageHandler; import org.onap.policy.common.endpoints.event.comm.Topic.CommInfrastructure; import org.onap.policy.common.endpoints.listeners.ScoListener; import org.onap.policy.common.utils.coder.StandardCoderObject; diff --git a/services/services-onappf/src/main/java/org/onap/policy/apex/starter/exception/ApexStarterException.java b/services/services-onappf/src/main/java/org/onap/policy/apex/services/onappf/exception/ApexStarterException.java similarity index 97% rename from services/services-onappf/src/main/java/org/onap/policy/apex/starter/exception/ApexStarterException.java rename to services/services-onappf/src/main/java/org/onap/policy/apex/services/onappf/exception/ApexStarterException.java index 7062e377b..461d758c9 100644 --- a/services/services-onappf/src/main/java/org/onap/policy/apex/starter/exception/ApexStarterException.java +++ b/services/services-onappf/src/main/java/org/onap/policy/apex/services/onappf/exception/ApexStarterException.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.policy.apex.starter.exception; +package org.onap.policy.apex.services.onappf.exception; /** * This exception will be called if an error occurs in apex starter. diff --git a/services/services-onappf/src/main/java/org/onap/policy/apex/starter/exception/ApexStarterRunTimeException.java b/services/services-onappf/src/main/java/org/onap/policy/apex/services/onappf/exception/ApexStarterRunTimeException.java similarity index 97% rename from services/services-onappf/src/main/java/org/onap/policy/apex/starter/exception/ApexStarterRunTimeException.java rename to services/services-onappf/src/main/java/org/onap/policy/apex/services/onappf/exception/ApexStarterRunTimeException.java index f15b55d33..a1c970a56 100644 --- a/services/services-onappf/src/main/java/org/onap/policy/apex/starter/exception/ApexStarterRunTimeException.java +++ b/services/services-onappf/src/main/java/org/onap/policy/apex/services/onappf/exception/ApexStarterRunTimeException.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.policy.apex.starter.exception; +package org.onap.policy.apex.services.onappf.exception; /** * This runtime exception will be called if a runtime error occurs when using apex starter. diff --git a/services/services-onappf/src/main/java/org/onap/policy/apex/starter/engine/ApexEngineHandler.java b/services/services-onappf/src/main/java/org/onap/policy/apex/services/onappf/handler/ApexEngineHandler.java similarity index 94% rename from services/services-onappf/src/main/java/org/onap/policy/apex/starter/engine/ApexEngineHandler.java rename to services/services-onappf/src/main/java/org/onap/policy/apex/services/onappf/handler/ApexEngineHandler.java index e58b0db76..83e1b77c6 100644 --- a/services/services-onappf/src/main/java/org/onap/policy/apex/starter/engine/ApexEngineHandler.java +++ b/services/services-onappf/src/main/java/org/onap/policy/apex/services/onappf/handler/ApexEngineHandler.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.policy.apex.starter.engine; +package org.onap.policy.apex.services.onappf.handler; import com.google.gson.JsonObject; @@ -30,7 +30,7 @@ import java.nio.file.Path; import org.onap.policy.apex.model.basicmodel.concepts.ApexException; import org.onap.policy.apex.service.engine.main.ApexMain; -import org.onap.policy.apex.starter.exception.ApexStarterException; +import org.onap.policy.apex.services.onappf.exception.ApexStarterException; import org.onap.policy.common.utils.coder.CoderException; import org.onap.policy.common.utils.coder.StandardCoder; import org.slf4j.Logger; @@ -70,7 +70,7 @@ public class ApexEngineHandler { final String modelFilePath = createFile(policyModel, "modelFile"); final String apexConfigFilePath = createFile(apexConfig, "apexConfigFile"); - final String[] apexArgs = { "-rfr", "target/classes", "-c", apexConfigFilePath, "-m", modelFilePath }; + final String[] apexArgs = { "-c", apexConfigFilePath, "-m", modelFilePath }; LOGGER.debug("Starting apex engine."); apexMain = new ApexMain(apexArgs); } diff --git a/services/services-onappf/src/main/java/org/onap/policy/apex/starter/handler/PdpMessageHandler.java b/services/services-onappf/src/main/java/org/onap/policy/apex/services/onappf/handler/PdpMessageHandler.java similarity index 95% rename from services/services-onappf/src/main/java/org/onap/policy/apex/starter/handler/PdpMessageHandler.java rename to services/services-onappf/src/main/java/org/onap/policy/apex/services/onappf/handler/PdpMessageHandler.java index be76938f3..e3f0c04a1 100644 --- a/services/services-onappf/src/main/java/org/onap/policy/apex/starter/handler/PdpMessageHandler.java +++ b/services/services-onappf/src/main/java/org/onap/policy/apex/services/onappf/handler/PdpMessageHandler.java @@ -18,14 +18,14 @@ * ============LICENSE_END========================================================= */ -package org.onap.policy.apex.starter.handler; +package org.onap.policy.apex.services.onappf.handler; import java.util.ArrayList; import java.util.List; -import org.onap.policy.apex.starter.ApexStarterConstants; -import org.onap.policy.apex.starter.parameters.PdpStatusParameters; -import org.onap.policy.apex.starter.parameters.ToscaPolicyTypeIdentifierParameters; +import org.onap.policy.apex.services.onappf.ApexStarterConstants; +import org.onap.policy.apex.services.onappf.parameters.PdpStatusParameters; +import org.onap.policy.apex.services.onappf.parameters.ToscaPolicyTypeIdentifierParameters; import org.onap.policy.common.utils.services.Registry; import org.onap.policy.models.pdp.concepts.PdpResponseDetails; import org.onap.policy.models.pdp.concepts.PdpStatus; diff --git a/services/services-onappf/src/main/java/org/onap/policy/apex/starter/handler/PdpStateChangeMessageHandler.java b/services/services-onappf/src/main/java/org/onap/policy/apex/services/onappf/handler/PdpStateChangeMessageHandler.java similarity index 95% rename from services/services-onappf/src/main/java/org/onap/policy/apex/starter/handler/PdpStateChangeMessageHandler.java rename to services/services-onappf/src/main/java/org/onap/policy/apex/services/onappf/handler/PdpStateChangeMessageHandler.java index 9f97fb24b..3a186aed6 100644 --- a/services/services-onappf/src/main/java/org/onap/policy/apex/starter/handler/PdpStateChangeMessageHandler.java +++ b/services/services-onappf/src/main/java/org/onap/policy/apex/services/onappf/handler/PdpStateChangeMessageHandler.java @@ -18,14 +18,13 @@ * ============LICENSE_END========================================================= */ -package org.onap.policy.apex.starter.handler; +package org.onap.policy.apex.services.onappf.handler; import java.util.List; -import org.onap.policy.apex.starter.ApexStarterConstants; -import org.onap.policy.apex.starter.comm.PdpStatusPublisher; -import org.onap.policy.apex.starter.engine.ApexEngineHandler; -import org.onap.policy.apex.starter.exception.ApexStarterException; +import org.onap.policy.apex.services.onappf.ApexStarterConstants; +import org.onap.policy.apex.services.onappf.comm.PdpStatusPublisher; +import org.onap.policy.apex.services.onappf.exception.ApexStarterException; import org.onap.policy.common.utils.services.Registry; import org.onap.policy.models.pdp.concepts.PdpResponseDetails; import org.onap.policy.models.pdp.concepts.PdpStateChange; diff --git a/services/services-onappf/src/main/java/org/onap/policy/apex/starter/handler/PdpUpdateMessageHandler.java b/services/services-onappf/src/main/java/org/onap/policy/apex/services/onappf/handler/PdpUpdateMessageHandler.java similarity index 96% rename from services/services-onappf/src/main/java/org/onap/policy/apex/starter/handler/PdpUpdateMessageHandler.java rename to services/services-onappf/src/main/java/org/onap/policy/apex/services/onappf/handler/PdpUpdateMessageHandler.java index 5198c229e..3ad5477cd 100644 --- a/services/services-onappf/src/main/java/org/onap/policy/apex/starter/handler/PdpUpdateMessageHandler.java +++ b/services/services-onappf/src/main/java/org/onap/policy/apex/services/onappf/handler/PdpUpdateMessageHandler.java @@ -18,14 +18,13 @@ * ============LICENSE_END========================================================= */ -package org.onap.policy.apex.starter.handler; +package org.onap.policy.apex.services.onappf.handler; import java.util.List; -import org.onap.policy.apex.starter.ApexStarterConstants; -import org.onap.policy.apex.starter.comm.PdpStatusPublisher; -import org.onap.policy.apex.starter.engine.ApexEngineHandler; -import org.onap.policy.apex.starter.exception.ApexStarterException; +import org.onap.policy.apex.services.onappf.ApexStarterConstants; +import org.onap.policy.apex.services.onappf.comm.PdpStatusPublisher; +import org.onap.policy.apex.services.onappf.exception.ApexStarterException; import org.onap.policy.common.endpoints.event.comm.TopicSink; import org.onap.policy.common.utils.services.Registry; import org.onap.policy.models.pdp.concepts.PdpResponseDetails; diff --git a/services/services-onappf/src/main/java/org/onap/policy/apex/starter/parameters/ApexStarterParameterGroup.java b/services/services-onappf/src/main/java/org/onap/policy/apex/services/onappf/parameters/ApexStarterParameterGroup.java similarity index 96% rename from services/services-onappf/src/main/java/org/onap/policy/apex/starter/parameters/ApexStarterParameterGroup.java rename to services/services-onappf/src/main/java/org/onap/policy/apex/services/onappf/parameters/ApexStarterParameterGroup.java index 68299480e..523e37337 100644 --- a/services/services-onappf/src/main/java/org/onap/policy/apex/starter/parameters/ApexStarterParameterGroup.java +++ b/services/services-onappf/src/main/java/org/onap/policy/apex/services/onappf/parameters/ApexStarterParameterGroup.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.policy.apex.starter.parameters; +package org.onap.policy.apex.services.onappf.parameters; import lombok.Getter; diff --git a/services/services-onappf/src/main/java/org/onap/policy/apex/starter/parameters/ApexStarterParameterHandler.java b/services/services-onappf/src/main/java/org/onap/policy/apex/services/onappf/parameters/ApexStarterParameterHandler.java similarity index 94% rename from services/services-onappf/src/main/java/org/onap/policy/apex/starter/parameters/ApexStarterParameterHandler.java rename to services/services-onappf/src/main/java/org/onap/policy/apex/services/onappf/parameters/ApexStarterParameterHandler.java index dae4b8334..ed7c00f10 100644 --- a/services/services-onappf/src/main/java/org/onap/policy/apex/starter/parameters/ApexStarterParameterHandler.java +++ b/services/services-onappf/src/main/java/org/onap/policy/apex/services/onappf/parameters/ApexStarterParameterHandler.java @@ -18,12 +18,12 @@ * ============LICENSE_END========================================================= */ -package org.onap.policy.apex.starter.parameters; +package org.onap.policy.apex.services.onappf.parameters; import java.io.File; -import org.onap.policy.apex.starter.ApexStarterCommandLineArguments; -import org.onap.policy.apex.starter.exception.ApexStarterException; +import org.onap.policy.apex.services.onappf.ApexStarterCommandLineArguments; +import org.onap.policy.apex.services.onappf.exception.ApexStarterException; import org.onap.policy.common.parameters.GroupValidationResult; import org.onap.policy.common.utils.coder.Coder; import org.onap.policy.common.utils.coder.CoderException; diff --git a/services/services-onappf/src/main/java/org/onap/policy/apex/starter/parameters/PdpStatusParameters.java b/services/services-onappf/src/main/java/org/onap/policy/apex/services/onappf/parameters/PdpStatusParameters.java similarity index 96% rename from services/services-onappf/src/main/java/org/onap/policy/apex/starter/parameters/PdpStatusParameters.java rename to services/services-onappf/src/main/java/org/onap/policy/apex/services/onappf/parameters/PdpStatusParameters.java index fbc94193d..962a98e4c 100644 --- a/services/services-onappf/src/main/java/org/onap/policy/apex/starter/parameters/PdpStatusParameters.java +++ b/services/services-onappf/src/main/java/org/onap/policy/apex/services/onappf/parameters/PdpStatusParameters.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.policy.apex.starter.parameters; +package org.onap.policy.apex.services.onappf.parameters; import java.util.List; diff --git a/services/services-onappf/src/main/java/org/onap/policy/apex/starter/parameters/ToscaPolicyTypeIdentifierParameters.java b/services/services-onappf/src/main/java/org/onap/policy/apex/services/onappf/parameters/ToscaPolicyTypeIdentifierParameters.java similarity index 96% rename from services/services-onappf/src/main/java/org/onap/policy/apex/starter/parameters/ToscaPolicyTypeIdentifierParameters.java rename to services/services-onappf/src/main/java/org/onap/policy/apex/services/onappf/parameters/ToscaPolicyTypeIdentifierParameters.java index 37e27492e..a08b9347c 100644 --- a/services/services-onappf/src/main/java/org/onap/policy/apex/starter/parameters/ToscaPolicyTypeIdentifierParameters.java +++ b/services/services-onappf/src/main/java/org/onap/policy/apex/services/onappf/parameters/ToscaPolicyTypeIdentifierParameters.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.policy.apex.starter.parameters; +package org.onap.policy.apex.services.onappf.parameters; import lombok.EqualsAndHashCode; import lombok.Getter; diff --git a/services/services-onappf/src/main/resources/config/OnapPfConfig.json b/services/services-onappf/src/main/resources/config/OnapPfConfig.json new file mode 100644 index 000000000..5684f1d4e --- /dev/null +++ b/services/services-onappf/src/main/resources/config/OnapPfConfig.json @@ -0,0 +1,9 @@ +{ + "name":"OnapPfParameterGroup", + "pdpStatusParameters":{ + "timeIntervalMs": 120000, + "pdpType":"apex", + "description":"Pdp Heartbeat", + "supportedPolicyTypes":[{"name":"onap.policies.controlloop.Operational","version":"1.0.0"}] + } +} \ No newline at end of file diff --git a/services/services-onappf/src/main/resources/config/topic.properties b/services/services-onappf/src/main/resources/config/topic.properties new file mode 100644 index 000000000..b61626b2d --- /dev/null +++ b/services/services-onappf/src/main/resources/config/topic.properties @@ -0,0 +1,23 @@ +# ============LICENSE_START======================================================= +# Copyright (C) 2019 Nordix Foundation. +# ================================================================================ +# 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. +# +# SPDX-License-Identifier: Apache-2.0 +# ============LICENSE_END========================================================= + +dmaap.source.topics=POLICY-PDP-PAP +dmaap.sink.topics=POLICY-PDP-PAP + +dmaap.source.topics.POLICY-PDP-PAP.servers= message-router +dmaap.sink.topics.POLICY-PDP-PAP.servers= message-router \ No newline at end of file diff --git a/services/services-onappf/src/test/java/org/onap/policy/apex/starter/TestApexStarterActivator.java b/services/services-onappf/src/test/java/org/onap/policy/apex/services/onappf/TestApexStarterActivator.java similarity index 87% rename from services/services-onappf/src/test/java/org/onap/policy/apex/starter/TestApexStarterActivator.java rename to services/services-onappf/src/test/java/org/onap/policy/apex/services/onappf/TestApexStarterActivator.java index 6da3a5eb6..238a89f66 100644 --- a/services/services-onappf/src/test/java/org/onap/policy/apex/starter/TestApexStarterActivator.java +++ b/services/services-onappf/src/test/java/org/onap/policy/apex/services/onappf/TestApexStarterActivator.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.policy.apex.starter; +package org.onap.policy.apex.services.onappf; import static org.assertj.core.api.Assertions.assertThatIllegalStateException; import static org.junit.Assert.assertEquals; @@ -33,10 +33,13 @@ import java.util.Properties; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.onap.policy.apex.starter.exception.ApexStarterException; -import org.onap.policy.apex.starter.parameters.ApexStarterParameterGroup; -import org.onap.policy.apex.starter.parameters.ApexStarterParameterHandler; -import org.onap.policy.apex.starter.parameters.CommonTestData; +import org.onap.policy.apex.services.onappf.ApexStarterActivator; +import org.onap.policy.apex.services.onappf.ApexStarterCommandLineArguments; +import org.onap.policy.apex.services.onappf.ApexStarterConstants; +import org.onap.policy.apex.services.onappf.exception.ApexStarterException; +import org.onap.policy.apex.services.onappf.parameters.ApexStarterParameterGroup; +import org.onap.policy.apex.services.onappf.parameters.ApexStarterParameterHandler; +import org.onap.policy.apex.services.onappf.parameters.CommonTestData; import org.onap.policy.common.utils.services.Registry; import org.onap.policy.models.pdp.concepts.PdpStatus; diff --git a/services/services-onappf/src/test/java/org/onap/policy/apex/starter/TestApexStarterConstants.java b/services/services-onappf/src/test/java/org/onap/policy/apex/services/onappf/TestApexStarterConstants.java similarity index 92% rename from services/services-onappf/src/test/java/org/onap/policy/apex/starter/TestApexStarterConstants.java rename to services/services-onappf/src/test/java/org/onap/policy/apex/services/onappf/TestApexStarterConstants.java index 08e56cdf8..52ca94439 100644 --- a/services/services-onappf/src/test/java/org/onap/policy/apex/starter/TestApexStarterConstants.java +++ b/services/services-onappf/src/test/java/org/onap/policy/apex/services/onappf/TestApexStarterConstants.java @@ -18,9 +18,10 @@ * ============LICENSE_END========================================================= */ -package org.onap.policy.apex.starter; +package org.onap.policy.apex.services.onappf; import org.junit.Test; +import org.onap.policy.apex.services.onappf.ApexStarterConstants; import org.powermock.reflect.Whitebox; /** diff --git a/services/services-onappf/src/test/java/org/onap/policy/apex/starter/TestApexStarterMain.java b/services/services-onappf/src/test/java/org/onap/policy/apex/services/onappf/TestApexStarterMain.java similarity index 90% rename from services/services-onappf/src/test/java/org/onap/policy/apex/starter/TestApexStarterMain.java rename to services/services-onappf/src/test/java/org/onap/policy/apex/services/onappf/TestApexStarterMain.java index 3005e320a..c5c0fc483 100644 --- a/services/services-onappf/src/test/java/org/onap/policy/apex/starter/TestApexStarterMain.java +++ b/services/services-onappf/src/test/java/org/onap/policy/apex/services/onappf/TestApexStarterMain.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.policy.apex.starter; +package org.onap.policy.apex.services.onappf; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -27,8 +27,11 @@ import static org.junit.Assert.assertTrue; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.onap.policy.apex.starter.exception.ApexStarterException; -import org.onap.policy.apex.starter.parameters.CommonTestData; +import org.onap.policy.apex.services.onappf.ApexStarterActivator; +import org.onap.policy.apex.services.onappf.ApexStarterConstants; +import org.onap.policy.apex.services.onappf.ApexStarterMain; +import org.onap.policy.apex.services.onappf.exception.ApexStarterException; +import org.onap.policy.apex.services.onappf.parameters.CommonTestData; import org.onap.policy.common.utils.services.Registry; /** diff --git a/services/services-onappf/src/test/java/org/onap/policy/apex/starter/comm/TestPdpStateChangeListener.java b/services/services-onappf/src/test/java/org/onap/policy/apex/services/onappf/comm/TestPdpStateChangeListener.java similarity index 91% rename from services/services-onappf/src/test/java/org/onap/policy/apex/starter/comm/TestPdpStateChangeListener.java rename to services/services-onappf/src/test/java/org/onap/policy/apex/services/onappf/comm/TestPdpStateChangeListener.java index d0a85f9f2..34025a1ad 100644 --- a/services/services-onappf/src/test/java/org/onap/policy/apex/starter/comm/TestPdpStateChangeListener.java +++ b/services/services-onappf/src/test/java/org/onap/policy/apex/services/onappf/comm/TestPdpStateChangeListener.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.policy.apex.starter.comm; +package org.onap.policy.apex.services.onappf.comm; import static org.junit.Assert.assertEquals; @@ -37,12 +37,14 @@ import java.util.Properties; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.onap.policy.apex.starter.ApexStarterActivator; -import org.onap.policy.apex.starter.ApexStarterCommandLineArguments; -import org.onap.policy.apex.starter.ApexStarterConstants; -import org.onap.policy.apex.starter.exception.ApexStarterException; -import org.onap.policy.apex.starter.parameters.ApexStarterParameterGroup; -import org.onap.policy.apex.starter.parameters.ApexStarterParameterHandler; +import org.onap.policy.apex.services.onappf.ApexStarterActivator; +import org.onap.policy.apex.services.onappf.ApexStarterCommandLineArguments; +import org.onap.policy.apex.services.onappf.ApexStarterConstants; +import org.onap.policy.apex.services.onappf.comm.PdpStateChangeListener; +import org.onap.policy.apex.services.onappf.comm.PdpUpdateListener; +import org.onap.policy.apex.services.onappf.exception.ApexStarterException; +import org.onap.policy.apex.services.onappf.parameters.ApexStarterParameterGroup; +import org.onap.policy.apex.services.onappf.parameters.ApexStarterParameterHandler; import org.onap.policy.common.endpoints.event.comm.Topic.CommInfrastructure; import org.onap.policy.common.utils.services.Registry; import org.onap.policy.models.pdp.concepts.PdpStateChange; diff --git a/services/services-onappf/src/test/java/org/onap/policy/apex/starter/comm/TestPdpUpdateListener.java b/services/services-onappf/src/test/java/org/onap/policy/apex/services/onappf/comm/TestPdpUpdateListener.java similarity index 89% rename from services/services-onappf/src/test/java/org/onap/policy/apex/starter/comm/TestPdpUpdateListener.java rename to services/services-onappf/src/test/java/org/onap/policy/apex/services/onappf/comm/TestPdpUpdateListener.java index 2ffed2cb6..921cfd283 100644 --- a/services/services-onappf/src/test/java/org/onap/policy/apex/starter/comm/TestPdpUpdateListener.java +++ b/services/services-onappf/src/test/java/org/onap/policy/apex/services/onappf/comm/TestPdpUpdateListener.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.policy.apex.starter.comm; +package org.onap.policy.apex.services.onappf.comm; import static org.junit.Assert.assertEquals; @@ -37,13 +37,14 @@ import java.util.Properties; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.onap.policy.apex.starter.ApexStarterActivator; -import org.onap.policy.apex.starter.ApexStarterCommandLineArguments; -import org.onap.policy.apex.starter.ApexStarterConstants; -import org.onap.policy.apex.starter.exception.ApexStarterException; -import org.onap.policy.apex.starter.handler.PdpMessageHandler; -import org.onap.policy.apex.starter.parameters.ApexStarterParameterGroup; -import org.onap.policy.apex.starter.parameters.ApexStarterParameterHandler; +import org.onap.policy.apex.services.onappf.ApexStarterActivator; +import org.onap.policy.apex.services.onappf.ApexStarterCommandLineArguments; +import org.onap.policy.apex.services.onappf.ApexStarterConstants; +import org.onap.policy.apex.services.onappf.comm.PdpUpdateListener; +import org.onap.policy.apex.services.onappf.exception.ApexStarterException; +import org.onap.policy.apex.services.onappf.handler.PdpMessageHandler; +import org.onap.policy.apex.services.onappf.parameters.ApexStarterParameterGroup; +import org.onap.policy.apex.services.onappf.parameters.ApexStarterParameterHandler; import org.onap.policy.common.endpoints.event.comm.Topic.CommInfrastructure; import org.onap.policy.common.utils.services.Registry; import org.onap.policy.models.pdp.concepts.PdpStatus; diff --git a/services/services-onappf/src/test/java/org/onap/policy/apex/starter/exception/TestExceptions.java b/services/services-onappf/src/test/java/org/onap/policy/apex/services/onappf/exception/TestExceptions.java similarity index 86% rename from services/services-onappf/src/test/java/org/onap/policy/apex/starter/exception/TestExceptions.java rename to services/services-onappf/src/test/java/org/onap/policy/apex/services/onappf/exception/TestExceptions.java index 63ebeb608..3a05e72b1 100644 --- a/services/services-onappf/src/test/java/org/onap/policy/apex/starter/exception/TestExceptions.java +++ b/services/services-onappf/src/test/java/org/onap/policy/apex/services/onappf/exception/TestExceptions.java @@ -18,9 +18,11 @@ * ============LICENSE_END========================================================= */ -package org.onap.policy.apex.starter.exception; +package org.onap.policy.apex.services.onappf.exception; import org.junit.Test; +import org.onap.policy.apex.services.onappf.exception.ApexStarterException; +import org.onap.policy.apex.services.onappf.exception.ApexStarterRunTimeException; import org.onap.policy.common.utils.test.ExceptionsTester; /** diff --git a/services/services-onappf/src/test/java/org/onap/policy/apex/starter/parameters/CommonTestData.java b/services/services-onappf/src/test/java/org/onap/policy/apex/services/onappf/parameters/CommonTestData.java similarity index 96% rename from services/services-onappf/src/test/java/org/onap/policy/apex/starter/parameters/CommonTestData.java rename to services/services-onappf/src/test/java/org/onap/policy/apex/services/onappf/parameters/CommonTestData.java index d329d1f22..e4946dd2b 100644 --- a/services/services-onappf/src/test/java/org/onap/policy/apex/starter/parameters/CommonTestData.java +++ b/services/services-onappf/src/test/java/org/onap/policy/apex/services/onappf/parameters/CommonTestData.java @@ -18,13 +18,14 @@ * ============LICENSE_END========================================================= */ -package org.onap.policy.apex.starter.parameters; +package org.onap.policy.apex.services.onappf.parameters; import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.TreeMap; +import org.onap.policy.apex.services.onappf.parameters.ToscaPolicyTypeIdentifierParameters; import org.onap.policy.common.parameters.ParameterGroup; import org.onap.policy.common.utils.coder.Coder; import org.onap.policy.common.utils.coder.CoderException; diff --git a/services/services-onappf/src/test/java/org/onap/policy/apex/starter/parameters/TestApexStarterParameterGroup.java b/services/services-onappf/src/test/java/org/onap/policy/apex/services/onappf/parameters/TestApexStarterParameterGroup.java similarity index 96% rename from services/services-onappf/src/test/java/org/onap/policy/apex/starter/parameters/TestApexStarterParameterGroup.java rename to services/services-onappf/src/test/java/org/onap/policy/apex/services/onappf/parameters/TestApexStarterParameterGroup.java index 8d5f1cef9..c843c6787 100644 --- a/services/services-onappf/src/test/java/org/onap/policy/apex/starter/parameters/TestApexStarterParameterGroup.java +++ b/services/services-onappf/src/test/java/org/onap/policy/apex/services/onappf/parameters/TestApexStarterParameterGroup.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.policy.apex.starter.parameters; +package org.onap.policy.apex.services.onappf.parameters; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -100,7 +100,7 @@ public class TestApexStarterParameterGroup { final GroupValidationResult validationResult = apexStarterParameters.validate(); assertFalse(validationResult.isValid()); assertTrue(validationResult.getResult() - .contains("\"org.onap.policy.apex.starter.parameters.ApexStarterParameterGroup\" INVALID, " + .contains("\"org.onap.policy.apex.services.onappf.parameters.ApexStarterParameterGroup\" INVALID, " + "parameter group has status INVALID")); } } diff --git a/services/services-onappf/src/test/java/org/onap/policy/apex/starter/parameters/TestApexStarterParameterHandler.java b/services/services-onappf/src/test/java/org/onap/policy/apex/services/onappf/parameters/TestApexStarterParameterHandler.java similarity index 94% rename from services/services-onappf/src/test/java/org/onap/policy/apex/starter/parameters/TestApexStarterParameterHandler.java rename to services/services-onappf/src/test/java/org/onap/policy/apex/services/onappf/parameters/TestApexStarterParameterHandler.java index baa91d23a..f91baeb45 100644 --- a/services/services-onappf/src/test/java/org/onap/policy/apex/starter/parameters/TestApexStarterParameterHandler.java +++ b/services/services-onappf/src/test/java/org/onap/policy/apex/services/onappf/parameters/TestApexStarterParameterHandler.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.policy.apex.starter.parameters; +package org.onap.policy.apex.services.onappf.parameters; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -27,8 +27,10 @@ import static org.junit.Assert.fail; import java.io.FileNotFoundException; import org.junit.Test; -import org.onap.policy.apex.starter.ApexStarterCommandLineArguments; -import org.onap.policy.apex.starter.exception.ApexStarterException; +import org.onap.policy.apex.services.onappf.ApexStarterCommandLineArguments; +import org.onap.policy.apex.services.onappf.exception.ApexStarterException; +import org.onap.policy.apex.services.onappf.parameters.ApexStarterParameterGroup; +import org.onap.policy.apex.services.onappf.parameters.ApexStarterParameterHandler; import org.onap.policy.common.utils.coder.CoderException; /** diff --git a/services/services-onappf/src/test/java/org/onap/policy/apex/starter/parameters/TestPdpStatusParameters.java b/services/services-onappf/src/test/java/org/onap/policy/apex/services/onappf/parameters/TestPdpStatusParameters.java similarity index 94% rename from services/services-onappf/src/test/java/org/onap/policy/apex/starter/parameters/TestPdpStatusParameters.java rename to services/services-onappf/src/test/java/org/onap/policy/apex/services/onappf/parameters/TestPdpStatusParameters.java index 37cbbe021..e8a3f7ee0 100644 --- a/services/services-onappf/src/test/java/org/onap/policy/apex/starter/parameters/TestPdpStatusParameters.java +++ b/services/services-onappf/src/test/java/org/onap/policy/apex/services/onappf/parameters/TestPdpStatusParameters.java @@ -18,13 +18,14 @@ * ============LICENSE_END========================================================= */ -package org.onap.policy.apex.starter.parameters; +package org.onap.policy.apex.services.onappf.parameters; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import org.junit.Test; +import org.onap.policy.apex.services.onappf.parameters.PdpStatusParameters; import org.onap.policy.common.parameters.GroupValidationResult; /** diff --git a/services/services-onappf/src/test/resources/ApexStarterConfigParameters.json b/services/services-onappf/src/test/resources/ApexStarterConfigParameters.json index 6b9df6014..b1ea14de7 100644 --- a/services/services-onappf/src/test/resources/ApexStarterConfigParameters.json +++ b/services/services-onappf/src/test/resources/ApexStarterConfigParameters.json @@ -1,10 +1,9 @@ { "name":"ApexStarterParameterGroup", "pdpStatusParameters":{ - "timeIntervalMs": 2000, - "pdpName":"apex-pdp", + "timeIntervalMs": 120000, "pdpType":"apex", "description":"Pdp status for HealthCheck", - "supportedPolicyTypes":[{"name":"policy1","version":"1.0"},{"name":"policy2","version":"1.0"}] + "supportedPolicyTypes":[{"name":"onap.policies.controlloop.Operational","version":"1.0.0"}] } -} +} \ No newline at end of file diff --git a/services/services-onappf/src/test/resources/topic.properties b/services/services-onappf/src/test/resources/topic.properties index 87c6ebd54..9f3c21dff 100644 --- a/services/services-onappf/src/test/resources/topic.properties +++ b/services/services-onappf/src/test/resources/topic.properties @@ -1,3 +1,21 @@ +# ============LICENSE_START======================================================= +# Copyright (C) 2019 Nordix Foundation. +# ================================================================================ +# 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. +# +# SPDX-License-Identifier: Apache-2.0 +# ============LICENSE_END========================================================= + noop.sink.topics=POLICY-PDP-PAP noop.sink.topics.POLICY-PDP-PAP.servers=anyserver noop.source.topics=POLICY-PDP-PAP -- 2.16.6