diff options
Diffstat (limited to 'packages')
11 files changed, 43 insertions, 47 deletions
diff --git a/packages/policy-clamp-docker/pom.xml b/packages/policy-clamp-docker/pom.xml index 08511e03f..6415d2d79 100644 --- a/packages/policy-clamp-docker/pom.xml +++ b/packages/policy-clamp-docker/pom.xml @@ -92,10 +92,10 @@ <images> <image> - <name>onap/policy-clamp-cl-runtime</name> + <name>onap/policy-clamp-runtime-acm</name> <build> <cleanup>try</cleanup> - <dockerFile>ClRuntimeDockerfile</dockerFile> + <dockerFile>AcmRuntimeDockerfile</dockerFile> <tags> <tag>${project.version}</tag> <tag>${project.version}-${maven.build.timestamp}</tag> @@ -109,11 +109,11 @@ <include>org.onap.policy.clamp:policy-clamp-tarball</include> </includes> <outputDirectory>/lib</outputDirectory> - <outputFileNameMapping>policy-controlloop-runtime.tar.gz</outputFileNameMapping> + <outputFileNameMapping>policy-clamp-runtime-acm.tar.gz</outputFileNameMapping> </dependencySet> <dependencySet> <includes> - <include>org.onap.policy.clamp:policy-clamp-runtime-controlloop</include> + <include>org.onap.policy.clamp:policy-clamp-runtime-acm</include> </includes> <outputFileNameMapping>app.jar</outputFileNameMapping> </dependencySet> @@ -123,8 +123,8 @@ </build> </image> <image> - <name>onap/policy-clamp-cl-pf-ppnt</name> - <alias>onap-policy-clamp-cl-pf-ppnt</alias> + <name>onap/policy-clamp-ac-pf-ppnt</name> + <alias>onap-policy-clamp-ac-pf-ppnt</alias> <build> <cleanup>try</cleanup> <dockerFile>PolicyParticipantDockerfile</dockerFile> @@ -155,8 +155,8 @@ </build> </image> <image> - <name>onap/policy-clamp-cl-k8s-ppnt</name> - <alias>onap-policy-clamp-cl-k8s-ppnt</alias> + <name>onap/policy-clamp-ac-k8s-ppnt</name> + <alias>onap-policy-clamp-ac-k8s-ppnt</alias> <build> <cleanup>try</cleanup> <dockerFile>KubernetesParticipantDockerfile</dockerFile> @@ -187,8 +187,8 @@ </build> </image> <image> - <name>onap/policy-clamp-cl-http-ppnt</name> - <alias>onap-policy-clamp-cl-http-ppnt</alias> + <name>onap/policy-clamp-ac-http-ppnt</name> + <alias>onap-policy-clamp-ac-http-ppnt</alias> <build> <cleanup>try</cleanup> <dockerFile>HttpParticipantDockerfile</dockerFile> @@ -248,9 +248,6 @@ <goal>build</goal> <goal>push</goal> </goals> - <configuration> - <image>onap/policy-clamp</image> - </configuration> </execution> </executions> </plugin> diff --git a/packages/policy-clamp-docker/src/main/docker/ClRuntimeDockerfile b/packages/policy-clamp-docker/src/main/docker/AcmRuntimeDockerfile index b66fddcc4..021a58676 100644 --- a/packages/policy-clamp-docker/src/main/docker/ClRuntimeDockerfile +++ b/packages/policy-clamp-docker/src/main/docker/AcmRuntimeDockerfile @@ -19,7 +19,7 @@ #------------------------------------------------------------------------------- # -# Docker file to build an image that runs CLAMP on Java 11 or better in alpine +# Docker file to build an image that runs the CLAMP ACM runtime on Java 11 or better in alpine # FROM onap/policy-jre-alpine:2.4.0 @@ -33,13 +33,13 @@ ENV POLICY_HOME=$POLICY_HOME/clamp RUN mkdir -p $POLICY_LOGS $POLICY_HOME $POLICY_HOME/bin && \ chown -R policy:policy $POLICY_HOME $POLICY_LOGS && \ mkdir /packages -COPY /maven/lib/policy-controlloop-runtime.tar.gz /packages +COPY /maven/lib/policy-clamp-runtime-acm.tar.gz /packages -RUN tar xvfz /packages/policy-controlloop-runtime.tar.gz --directory $POLICY_HOME && \ - rm /packages/policy-controlloop-runtime.tar.gz +RUN tar xvfz /packages/policy-clamp-runtime-acm.tar.gz --directory $POLICY_HOME && \ + rm /packages/policy-clamp-runtime-acm.tar.gz WORKDIR $POLICY_HOME -COPY controlloop-runtime.sh bin/. +COPY acm-runtime.sh bin/. COPY /maven/app.jar /app RUN chown -R policy:policy * && \ @@ -50,4 +50,4 @@ EXPOSE 6969 USER policy WORKDIR $POLICY_HOME/bin -ENTRYPOINT [ "./controlloop-runtime.sh" ] +ENTRYPOINT [ "./acm-runtime.sh" ] diff --git a/packages/policy-clamp-docker/src/main/docker/HttpParticipantDockerfile b/packages/policy-clamp-docker/src/main/docker/HttpParticipantDockerfile index 2497f5d3b..b6f2c44eb 100644 --- a/packages/policy-clamp-docker/src/main/docker/HttpParticipantDockerfile +++ b/packages/policy-clamp-docker/src/main/docker/HttpParticipantDockerfile @@ -19,7 +19,7 @@ #------------------------------------------------------------------------------- # -# Docker file to build an image that runs CLAMP on Java 11 or better in alpine +# Docker file to build an image that runs the CLAMP ACM HTTP Participant on Java 11 or better in alpine # FROM onap/policy-jre-alpine:2.4.0 diff --git a/packages/policy-clamp-docker/src/main/docker/KubernetesParticipantDockerfile b/packages/policy-clamp-docker/src/main/docker/KubernetesParticipantDockerfile index e7fc89021..688e68d09 100644 --- a/packages/policy-clamp-docker/src/main/docker/KubernetesParticipantDockerfile +++ b/packages/policy-clamp-docker/src/main/docker/KubernetesParticipantDockerfile @@ -19,7 +19,7 @@ #------------------------------------------------------------------------------- # -# Docker file to build an image that runs CLAMP on Java 11 or better in alpine +# Docker file to build an image that runs the CLAMP ACM K8S Participant on Java 11 or better in alpine # FROM onap/policy-jre-alpine:2.4.0 diff --git a/packages/policy-clamp-docker/src/main/docker/PolicyParticipantDockerfile b/packages/policy-clamp-docker/src/main/docker/PolicyParticipantDockerfile index a0d003292..50d4210bf 100644 --- a/packages/policy-clamp-docker/src/main/docker/PolicyParticipantDockerfile +++ b/packages/policy-clamp-docker/src/main/docker/PolicyParticipantDockerfile @@ -19,7 +19,7 @@ #------------------------------------------------------------------------------- # -# Docker file to build an image that runs CLAMP on Java 11 or better in alpine +# Docker file to build an image that runs the CLAMP ACM Policy Framework Participant on Java 11 or better in alpine # FROM onap/policy-jre-alpine:2.4.0 diff --git a/packages/policy-clamp-docker/src/main/docker/controlloop-runtime.sh b/packages/policy-clamp-docker/src/main/docker/acm-runtime.sh index c428fd553..84550de82 100644 --- a/packages/policy-clamp-docker/src/main/docker/controlloop-runtime.sh +++ b/packages/policy-clamp-docker/src/main/docker/acm-runtime.sh @@ -32,7 +32,7 @@ else fi if [ -z "$CONFIG_FILE" ]; then - CONFIG_FILE="${POLICY_HOME}/etc/ClRuntimeParameters.yaml" + CONFIG_FILE="${POLICY_HOME}/etc/AcRuntimeParameters.yaml" fi echo "Policy clamp config file: $CONFIG_FILE" @@ -54,7 +54,7 @@ fi touch /app/app.jar mkdir -p "${POLICY_HOME}"/config/ -cp -f "${CONFIG_FILE}" "${POLICY_HOME}"/config/ClRuntimeParameters.yaml +cp -f "${CONFIG_FILE}" "${POLICY_HOME}"/config/AcRuntimeParameters.yaml $JAVA_HOME/bin/java -Dserver.ssl.enabled="true" \ -Dserver.ssl.keyStore="${KEYSTORE}" \ @@ -68,4 +68,4 @@ $JAVA_HOME/bin/java -Dserver.ssl.enabled="true" \ -Dcom.sun.management.jmxremote.authenticate=false \ -Dcom.sun.management.jmxremote.local.only=false \ -jar /app/app.jar \ - --spring.config.location="${POLICY_HOME}/config/ClRuntimeParameters.yaml" + --spring.config.location="${POLICY_HOME}/config/AcRuntimeParameters.yaml" diff --git a/packages/policy-clamp-tarball/pom.xml b/packages/policy-clamp-tarball/pom.xml index 6b4a370fc..36aab6b92 100644 --- a/packages/policy-clamp-tarball/pom.xml +++ b/packages/policy-clamp-tarball/pom.xml @@ -34,7 +34,7 @@ <dependencies> <dependency> <groupId>org.onap.policy.clamp</groupId> - <artifactId>policy-clamp-runtime-controlloop</artifactId> + <artifactId>policy-clamp-runtime-acm</artifactId> <version>${project.version}</version> </dependency> <dependency> diff --git a/packages/policy-clamp-tarball/src/main/resources/etc/ClRuntimeParameters.yaml b/packages/policy-clamp-tarball/src/main/resources/etc/AcRuntimeParameters.yaml index 462448921..f17d3eb6e 100644 --- a/packages/policy-clamp-tarball/src/main/resources/etc/ClRuntimeParameters.yaml +++ b/packages/policy-clamp-tarball/src/main/resources/etc/AcRuntimeParameters.yaml @@ -7,7 +7,7 @@ spring: converters: preferred-json-mapper: gson datasource: - url: jdbc:mariadb://${mariadb.host:mariadb}:${mariadb.port:3306}/controlloop + url: jdbc:mariadb://${mariadb.host:mariadb}:${mariadb.port:3306}/clamp-acm driverClassName: org.mariadb.jdbc.Driver username: policy_user password: policy_user @@ -33,11 +33,10 @@ security: server: port: 6969 servlet: - context-path: /onap/controlloop + context-path: /onap/policy/clamp/acm error: path: /error - runtime: participantParameters: heartBeatMs: 20000 @@ -48,7 +47,7 @@ runtime: topicParameterGroup: topicSources: - - topic: POLICY-CLRUNTIME-PARTICIPANT + topic: POLICY-ACRUNTIME-PARTICIPANT servers: - ${topicServer:message-router} topicCommInfrastructure: dmaap @@ -56,7 +55,7 @@ runtime: useHttps: true topicSinks: - - topic: POLICY-CLRUNTIME-PARTICIPANT + topic: POLICY-ACRUNTIME-PARTICIPANT servers: - ${topicServer:message-router} topicCommInfrastructure: dmaap diff --git a/packages/policy-clamp-tarball/src/main/resources/etc/HttpParticipantParameters.yaml b/packages/policy-clamp-tarball/src/main/resources/etc/HttpParticipantParameters.yaml index b13059a69..529b095a1 100644 --- a/packages/policy-clamp-tarball/src/main/resources/etc/HttpParticipantParameters.yaml +++ b/packages/policy-clamp-tarball/src/main/resources/etc/HttpParticipantParameters.yaml @@ -13,18 +13,18 @@ participant: name: HttpParticipant0 version: 1.0.0 participantType: - name: org.onap.k8s.controlloop.HttpControlLoopParticipant + name: org.onap.policy.clamp.acm.HttpParticipant version: 2.3.4 - clampControlLoopTopics: + clampAutomationCompositionTopics: topicSources: - - topic: POLICY-CLRUNTIME-PARTICIPANT + - topic: POLICY-ACRUNTIME-PARTICIPANT servers: - ${topicServer:message-router} topicCommInfrastructure: dmaap fetchTimeout: 15000 useHttps: true topicSinks: - - topic: POLICY-CLRUNTIME-PARTICIPANT + - topic: POLICY-ACRUNTIME-PARTICIPANT servers: - ${topicServer:message-router} topicCommInfrastructure: dmaap @@ -37,4 +37,4 @@ management: server: port: 8084 servlet: - context-path: /onap/httpparticipant + context-path: /onap/policy/clamp/acm/httpparticipant diff --git a/packages/policy-clamp-tarball/src/main/resources/etc/KubernetesParticipantParameters.yaml b/packages/policy-clamp-tarball/src/main/resources/etc/KubernetesParticipantParameters.yaml index 0d94e2e94..c6acf4052 100644 --- a/packages/policy-clamp-tarball/src/main/resources/etc/KubernetesParticipantParameters.yaml +++ b/packages/policy-clamp-tarball/src/main/resources/etc/KubernetesParticipantParameters.yaml @@ -16,12 +16,12 @@ participant: name: K8sParticipant0 version: 1.0.0 participantType: - name: org.onap.k8s.controlloop.K8SControlLoopParticipant + name: org.onap.policy.clamp.acm.KubernetesParticipant version: 2.3.4 - clampControlLoopTopics: + clampAutomationCompositionTopics: topicSources: - - topic: POLICY-CLRUNTIME-PARTICIPANT + topic: POLICY-ACRUNTIME-PARTICIPANT servers: - ${topicServer:message-router} topicCommInfrastructure: dmaap @@ -29,7 +29,7 @@ participant: useHttps: true topicSinks: - - topic: POLICY-CLRUNTIME-PARTICIPANT + topic: POLICY-ACRUNTIME-PARTICIPANT servers: - ${topicServer:message-router} topicCommInfrastructure: dmaap @@ -43,7 +43,7 @@ management: server: port: 8083 servlet: - context-path: /onap/k8sparticipant + context-path: /onap/policy/clamp/acm/k8sparticipant logging: # Configuration of logging @@ -52,7 +52,7 @@ logging: org.springframework: ERROR org.springframework.data: ERROR org.springframework.web.reactive.function.client.ExchangeFunctions: ERROR - org.onap.policy.clamp.controlloop.participant.kubernetes: INFO + org.onap.policy.clamp.acm.participant.kubernetes: INFO file: name: /var/log/onap/policy/clamp/application.log diff --git a/packages/policy-clamp-tarball/src/main/resources/etc/PolicyParticipantParameters.yaml b/packages/policy-clamp-tarball/src/main/resources/etc/PolicyParticipantParameters.yaml index 14660a9ff..1cb4e6dc7 100644 --- a/packages/policy-clamp-tarball/src/main/resources/etc/PolicyParticipantParameters.yaml +++ b/packages/policy-clamp-tarball/src/main/resources/etc/PolicyParticipantParameters.yaml @@ -30,12 +30,12 @@ participant: name: org.onap.PM_Policy version: 1.0.0 participantType: - name: org.onap.policy.controlloop.PolicyControlLoopParticipant + name: org.onap.policy.clamp.acm.PolicyParticipant version: 2.3.1 - clampControlLoopTopics: + clampAutomationCompositionTopics: topicSources: - - topic: POLICY-CLRUNTIME-PARTICIPANT + topic: POLICY-ACRUNTIME-PARTICIPANT servers: - ${topicServer:message-router} topicCommInfrastructure: dmaap @@ -43,7 +43,7 @@ participant: useHttps: true topicSinks: - - topic: POLICY-CLRUNTIME-PARTICIPANT + topic: POLICY-ACRUNTIME-PARTICIPANT servers: - ${topicServer:message-router} topicCommInfrastructure: dmaap @@ -56,4 +56,4 @@ management: server: port: 8085 servlet: - context-path: /onap/policyparticipant + context-path: /onap/policy/clamp/acm/policyparticipant |