From d5339481d3c3f24dd5faccb44dccd4addfd58499 Mon Sep 17 00:00:00 2001 From: Oleg Mitsura Date: Mon, 22 Apr 2019 17:47:33 -0400 Subject: [PATCH] SDC Listner Docker touchup 1.Reworked Dockerization of SDC Listener to follow application/distribution+parent style; 2.Renamed CDS-SDClistener to just SDCListener Issue-ID: CCSDK-1145 Change-Id: I007373d3a48fb8eb7042150bdbb37fc7fec346b3 Signed-off-by: Oleg Mitsura --- ms/cds-sdc-listener/application/pom.xml | 215 ------------------ .../application/src/main/docker/Dockerfile | 13 -- .../application/src/main/docker/start.sh | 6 - ms/pom.xml | 2 +- ms/sdclistener/application/pom.xml | 89 ++++++++ .../cds/sdclistener/SdcListenerApplication.java} | 8 +- .../cds/sdclistener/SdcListenerConfiguration.java} | 4 +- .../SdcListenerNotificationCallback.java} | 28 +-- .../client/SdcListenerAuthClientInterceptor.java} | 4 +- .../cds/sdclistener/client/SdcListenerClient.java} | 34 +-- .../cds/sdclistener}/controller/HealthCheck.java | 2 +- .../ccsdk/cds/sdclistener/dto/SdcListenerDto.java} | 10 +- .../exceptions/SdcListenerException.java} | 8 +- .../handler/BluePrintProcesssorHandler.java | 2 +- .../cds/sdclistener}/service/ListenerService.java | 2 +- .../sdclistener}/service/ListenerServiceImpl.java | 22 +- .../status/DistributionStatusMessage.java | 2 +- .../cds/sdclistener/status/SdcListenerStatus.java} | 15 +- .../ccsdk/cds/sdclistener}/util/BuilderUtil.java | 2 +- .../onap/ccsdk/cds/sdclistener}/util/FileUtil.java | 2 +- .../application/src/main/resources/application.yml | 0 .../application/src/main/resources/logback.xml | 0 .../cds/sdclistener/SdcListenerClientTest.java} | 20 +- .../sdclistener/SdcListenerConfigurationTest.java} | 10 +- .../handler/BluePrintProcessorHandlerTest.java | 8 +- .../service/ListenerServiceImplTest.java | 18 +- .../src/test/resources/service-Testsvc140.csar | Bin .../application/src/test/resources/testcba.zip | Bin ms/sdclistener/distribution/pom.xml | 183 +++++++++++++++ .../distribution/src/main/dc}/docker-compose.yaml | 2 +- .../distribution/src/main/docker/Dockerfile | 16 ++ .../distribution/src/main/docker/distribution.xml | 47 ++++ .../distribution/src/main/docker/startService.sh | 12 + ms/sdclistener/parent/pom.xml | 246 +++++++++++++++++++++ ms/{cds-sdc-listener => sdclistener}/pom.xml | 26 ++- 35 files changed, 712 insertions(+), 346 deletions(-) delete mode 100644 ms/cds-sdc-listener/application/pom.xml delete mode 100644 ms/cds-sdc-listener/application/src/main/docker/Dockerfile delete mode 100755 ms/cds-sdc-listener/application/src/main/docker/start.sh create mode 100644 ms/sdclistener/application/pom.xml rename ms/{cds-sdc-listener/application/src/main/java/org/onap/ccsdk/cds/cdssdclistener/CdsSdcListenerApplication.java => sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener/SdcListenerApplication.java} (79%) rename ms/{cds-sdc-listener/application/src/main/java/org/onap/ccsdk/cds/cdssdclistener/CdsSdcListenerConfiguration.java => sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener/SdcListenerConfiguration.java} (96%) rename ms/{cds-sdc-listener/application/src/main/java/org/onap/ccsdk/cds/cdssdclistener/CdsSdcListenerNotificationCallback.java => sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener/SdcListenerNotificationCallback.java} (83%) rename ms/{cds-sdc-listener/application/src/main/java/org/onap/ccsdk/cds/cdssdclistener/client/CdsSdcListenerAuthClientInterceptor.java => sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener/client/SdcListenerAuthClientInterceptor.java} (93%) rename ms/{cds-sdc-listener/application/src/main/java/org/onap/ccsdk/cds/cdssdclistener/client/CdsSdcListenerClient.java => sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener/client/SdcListenerClient.java} (73%) rename ms/{cds-sdc-listener/application/src/main/java/org/onap/ccsdk/cds/cdssdclistener => sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener}/controller/HealthCheck.java (95%) rename ms/{cds-sdc-listener/application/src/main/java/org/onap/ccsdk/cds/cdssdclistener/dto/CdsSdcListenerDto.java => sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener/dto/SdcListenerDto.java} (86%) rename ms/{cds-sdc-listener/application/src/main/java/org/onap/ccsdk/cds/cdssdclistener/exceptions/CdsSdcListenerException.java => sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener/exceptions/SdcListenerException.java} (76%) rename ms/{cds-sdc-listener/application/src/main/java/org/onap/ccsdk/cds/cdssdclistener => sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener}/handler/BluePrintProcesssorHandler.java (98%) rename ms/{cds-sdc-listener/application/src/main/java/org/onap/ccsdk/cds/cdssdclistener => sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener}/service/ListenerService.java (97%) rename ms/{cds-sdc-listener/application/src/main/java/org/onap/ccsdk/cds/cdssdclistener => sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener}/service/ListenerServiceImpl.java (91%) rename ms/{cds-sdc-listener/application/src/main/java/org/onap/ccsdk/cds/cdssdclistener => sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener}/status/DistributionStatusMessage.java (96%) rename ms/{cds-sdc-listener/application/src/main/java/org/onap/ccsdk/cds/cdssdclistener/status/CdsSdcListenerStatus.java => sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener/status/SdcListenerStatus.java} (87%) rename ms/{cds-sdc-listener/application/src/main/java/org/onap/ccsdk/cds/cdssdclistener => sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener}/util/BuilderUtil.java (93%) rename ms/{cds-sdc-listener/application/src/main/java/org/onap/ccsdk/cds/cdssdclistener => sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener}/util/FileUtil.java (97%) rename ms/{cds-sdc-listener => sdclistener}/application/src/main/resources/application.yml (100%) rename ms/{cds-sdc-listener => sdclistener}/application/src/main/resources/logback.xml (100%) rename ms/{cds-sdc-listener/application/src/test/java/org/onap/ccsdk/cds/cdssdclistener/CdsSdcListenerClientTest.java => sdclistener/application/src/test/java/org/onap/ccsdk/cds/sdclistener/SdcListenerClientTest.java} (77%) rename ms/{cds-sdc-listener/application/src/test/java/org/onap/ccsdk/cds/cdssdclistener/CdsSdcListenerConfigurationTest.java => sdclistener/application/src/test/java/org/onap/ccsdk/cds/sdclistener/SdcListenerConfigurationTest.java} (87%) rename ms/{cds-sdc-listener/application/src/test/java/org/onap/ccsdk/cds/cdssdclistener => sdclistener/application/src/test/java/org/onap/ccsdk/cds/sdclistener}/handler/BluePrintProcessorHandlerTest.java (94%) rename ms/{cds-sdc-listener/application/src/test/java/org/onap/ccsdk/cds/cdssdclistener => sdclistener/application/src/test/java/org/onap/ccsdk/cds/sdclistener}/service/ListenerServiceImplTest.java (85%) rename ms/{cds-sdc-listener => sdclistener}/application/src/test/resources/service-Testsvc140.csar (100%) rename ms/{cds-sdc-listener => sdclistener}/application/src/test/resources/testcba.zip (100%) create mode 100755 ms/sdclistener/distribution/pom.xml rename ms/{cds-sdc-listener/application/src/main/docker => sdclistener/distribution/src/main/dc}/docker-compose.yaml (95%) mode change 100644 => 100755 create mode 100755 ms/sdclistener/distribution/src/main/docker/Dockerfile create mode 100755 ms/sdclistener/distribution/src/main/docker/distribution.xml create mode 100644 ms/sdclistener/distribution/src/main/docker/startService.sh create mode 100755 ms/sdclistener/parent/pom.xml rename ms/{cds-sdc-listener => sdclistener}/pom.xml (53%) diff --git a/ms/cds-sdc-listener/application/pom.xml b/ms/cds-sdc-listener/application/pom.xml deleted file mode 100644 index 3f8e1a319..000000000 --- a/ms/cds-sdc-listener/application/pom.xml +++ /dev/null @@ -1,215 +0,0 @@ - - - - - - org.onap.ccsdk.parent - spring-boot-starter-parent - 1.2.2-SNAPSHOT - - - org.onap.ccsdk.cds - 4.0.0 - cds-sdc-listener-application - 0.4.2-SNAPSHOT - CDS-SDC Listener Application - - - 1.17.1 - 3.6.1 - onap/ccsdk-cds-sdc-listener - deploy - ${parent.version} - - 0.26.1 - ${project.version} - - - - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-test - test - - - - - org.onap.sdc.sdc-distribution-client - sdc-distribution-client - 1.3.0 - - - - org.jmockit - jmockit - 1.19 - test - - - - - io.grpc - grpc-netty - ${grpc.version} - - - io.grpc - grpc-protobuf - ${grpc.version} - - - io.grpc - grpc-stub - ${grpc.version} - - - com.google.protobuf - protobuf-java - ${protobuf.version} - - - io.grpc - grpc-testing - ${grpc.version} - test - - - org.onap.ccsdk.cds.components - proto-definition - ${project.version} - - - - io.projectreactor - reactor-core - 3.2.6.RELEASE - compile - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - repackage - - repackage - - - - - - maven-antrun-plugin - 1.8 - - - copy - package - - - ANT TASK - copying Docker files - - - - - - - - - - - - - - - - run - - - - - - org.codehaus.groovy.maven - gmaven-plugin - 1.0 - - - validate - - execute - - - ${basedir}/../../../TagVersion.groovy - - - - - - - - - - docker - - - - io.fabric8 - docker-maven-plugin - ${docker.fabric.version} - false - - - - ${image.name} - - try - ${basedir}/target/docker-stage - - ${project.docker.latestminortag.version} - ${project.docker.latestfulltag.version} - ${project.docker.latesttagtimestamp.version} - - - - - true - - - - generate-images - package - - build - - - - push-images - ${docker.push.phase} - - build - push - - - - - - - - - - diff --git a/ms/cds-sdc-listener/application/src/main/docker/Dockerfile b/ms/cds-sdc-listener/application/src/main/docker/Dockerfile deleted file mode 100644 index 062f65767..000000000 --- a/ms/cds-sdc-listener/application/src/main/docker/Dockerfile +++ /dev/null @@ -1,13 +0,0 @@ -FROM openjdk:8-jdk-alpine - -ENV HTTP_PROXY ${HTTP_PROXY} -ENV HTTPS_PROXY ${HTTPS_PROXY} - -RUN mkdir -p /opt/app/onap/ /opt/app/onap/config -WORKDIR /opt/app/onap/ -COPY start.sh /opt/app/onap/ -COPY application.yml /opt/app/onap/config -RUN chmod 751 /opt/app/onap/start.sh -COPY cds-sdc-listener-application-0.4.2-SNAPSHOT.jar /opt/app/onap/cds-sdc-listener-distribution.jar -EXPOSE 9000 -ENTRYPOINT /opt/app/onap/start.sh diff --git a/ms/cds-sdc-listener/application/src/main/docker/start.sh b/ms/cds-sdc-listener/application/src/main/docker/start.sh deleted file mode 100755 index f24d15618..000000000 --- a/ms/cds-sdc-listener/application/src/main/docker/start.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -extraArgs=$@ -java -jar /opt/app/onap/cds-sdc-listener-distribution.jar \ --Dspring.config=/opt/app/onap/config/application.yml \ --Djava.security.egd=file:/dev/./urandom \ -${extraArgs} diff --git a/ms/pom.xml b/ms/pom.xml index d1c87c995..b97ebc03f 100644 --- a/ms/pom.xml +++ b/ms/pom.xml @@ -36,6 +36,6 @@ controllerblueprints blueprintsprocessor command-executor - cds-sdc-listener + sdclistener diff --git a/ms/sdclistener/application/pom.xml b/ms/sdclistener/application/pom.xml new file mode 100644 index 000000000..5513279cc --- /dev/null +++ b/ms/sdclistener/application/pom.xml @@ -0,0 +1,89 @@ + + + + 4.0.0 + + org.onap.ccsdk.cds.sdclistener + parent + 0.4.2-SNAPSHOT + ../parent + + + application + jar + 0.4.2-SNAPSHOT + SDC Listener Application + + + 3.6.1 + ${parent.version} + + + + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-test + test + + + + + org.onap.sdc.sdc-distribution-client + sdc-distribution-client + 1.3.0 + + + + org.jmockit + jmockit + test + + + + + io.grpc + grpc-netty + ${grpc.version} + + + io.grpc + grpc-protobuf + ${grpc.version} + + + io.grpc + grpc-stub + ${grpc.version} + + + com.google.protobuf + protobuf-java + + + io.grpc + grpc-testing + test + + + org.onap.ccsdk.cds.components + proto-definition + + + + io.projectreactor + reactor-core + compile + + + diff --git a/ms/cds-sdc-listener/application/src/main/java/org/onap/ccsdk/cds/cdssdclistener/CdsSdcListenerApplication.java b/ms/sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener/SdcListenerApplication.java similarity index 79% rename from ms/cds-sdc-listener/application/src/main/java/org/onap/ccsdk/cds/cdssdclistener/CdsSdcListenerApplication.java rename to ms/sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener/SdcListenerApplication.java index 6f0f65323..253b576d2 100644 --- a/ms/cds-sdc-listener/application/src/main/java/org/onap/ccsdk/cds/cdssdclistener/CdsSdcListenerApplication.java +++ b/ms/sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener/SdcListenerApplication.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.onap.ccsdk.cds.cdssdclistener; +package org.onap.ccsdk.cds.sdclistener; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.context.properties.EnableConfigurationProperties; @SpringBootApplication -@EnableConfigurationProperties(CdsSdcListenerConfiguration.class) -public class CdsSdcListenerApplication { +@EnableConfigurationProperties(SdcListenerConfiguration.class) +public class SdcListenerApplication { public static void main(String[] args) { - SpringApplication.run(CdsSdcListenerApplication.class, args); + SpringApplication.run(SdcListenerApplication.class, args); } } diff --git a/ms/cds-sdc-listener/application/src/main/java/org/onap/ccsdk/cds/cdssdclistener/CdsSdcListenerConfiguration.java b/ms/sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener/SdcListenerConfiguration.java similarity index 96% rename from ms/cds-sdc-listener/application/src/main/java/org/onap/ccsdk/cds/cdssdclistener/CdsSdcListenerConfiguration.java rename to ms/sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener/SdcListenerConfiguration.java index 3dfb07eb8..06e2a0342 100644 --- a/ms/cds-sdc-listener/application/src/main/java/org/onap/ccsdk/cds/cdssdclistener/CdsSdcListenerConfiguration.java +++ b/ms/sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener/SdcListenerConfiguration.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.onap.ccsdk.cds.cdssdclistener; +package org.onap.ccsdk.cds.sdclistener; import java.util.List; import org.onap.sdc.api.consumer.IConfiguration; @@ -25,7 +25,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; * distribution client needs. */ @ConfigurationProperties("listenerservice") -public class CdsSdcListenerConfiguration implements IConfiguration { +public class SdcListenerConfiguration implements IConfiguration { public static final String TOSCA_CSAR = "TOSCA_CSAR"; diff --git a/ms/cds-sdc-listener/application/src/main/java/org/onap/ccsdk/cds/cdssdclistener/CdsSdcListenerNotificationCallback.java b/ms/sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener/SdcListenerNotificationCallback.java similarity index 83% rename from ms/cds-sdc-listener/application/src/main/java/org/onap/ccsdk/cds/cdssdclistener/CdsSdcListenerNotificationCallback.java rename to ms/sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener/SdcListenerNotificationCallback.java index 58c667c26..eb339aef7 100644 --- a/ms/cds-sdc-listener/application/src/main/java/org/onap/ccsdk/cds/cdssdclistener/CdsSdcListenerNotificationCallback.java +++ b/ms/sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener/SdcListenerNotificationCallback.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.onap.ccsdk.cds.cdssdclistener; +package org.onap.ccsdk.cds.sdclistener; import static org.onap.sdc.utils.DistributionActionResultEnum.SUCCESS; import java.io.File; @@ -22,10 +22,10 @@ import java.nio.file.Paths; import java.util.List; import java.util.Objects; import java.util.Optional; -import org.onap.ccsdk.cds.cdssdclistener.dto.CdsSdcListenerDto; -import org.onap.ccsdk.cds.cdssdclistener.service.ListenerService; -import org.onap.ccsdk.cds.cdssdclistener.status.CdsSdcListenerStatus; -import org.onap.ccsdk.cds.cdssdclistener.util.FileUtil; +import org.onap.ccsdk.cds.sdclistener.dto.SdcListenerDto; +import org.onap.ccsdk.cds.sdclistener.service.ListenerService; +import org.onap.ccsdk.cds.sdclistener.status.SdcListenerStatus; +import org.onap.ccsdk.cds.sdclistener.util.FileUtil; import org.onap.sdc.api.IDistributionClient; import org.onap.sdc.api.consumer.INotificationCallback; import org.onap.sdc.api.notification.IArtifactInfo; @@ -43,10 +43,10 @@ import org.springframework.stereotype.Component; @ConfigurationProperties("listenerservice") @Component @ComponentScan("org.onap.ccsdk.cds.cdssdclistener.dto") -public class CdsSdcListenerNotificationCallback implements INotificationCallback { +public class SdcListenerNotificationCallback implements INotificationCallback { @Autowired - private CdsSdcListenerDto cdsSdcListenerDto; + private SdcListenerDto sdcListenerDto; @Autowired private ListenerService listenerService; @@ -55,20 +55,20 @@ public class CdsSdcListenerNotificationCallback implements INotificationCallback private String pathToStoreArchives; @Autowired - private CdsSdcListenerStatus listenerStatus; + private SdcListenerStatus listenerStatus; - private static final Logger LOGGER = LoggerFactory.getLogger(CdsSdcListenerNotificationCallback.class); + private static final Logger LOGGER = LoggerFactory.getLogger(SdcListenerNotificationCallback.class); @Override public void activateCallback(INotificationData notificationData) { final String distributionId = notificationData.getDistributionID(); - cdsSdcListenerDto.setDistributionId(distributionId); + sdcListenerDto.setDistributionId(distributionId); LOGGER.info("Received service distribution from SDC with the id {}", distributionId); processNotification(notificationData); } private void processNotification(INotificationData notificationData) { - final IDistributionClient distributionClient = cdsSdcListenerDto.getDistributionClient(); + final IDistributionClient distributionClient = sdcListenerDto.getDistributionClient(); notificationData.getServiceArtifacts() .forEach(artifactInfo -> downloadCsarArtifacts(artifactInfo, distributionClient)); } @@ -83,7 +83,7 @@ public class CdsSdcListenerNotificationCallback implements INotificationCallback final String url = info.getArtifactURL(); final String id = info.getArtifactUUID(); - if (Objects.equals(info.getArtifactType(), CdsSdcListenerConfiguration.TOSCA_CSAR)) { + if (Objects.equals(info.getArtifactType(), SdcListenerConfiguration.TOSCA_CSAR)) { LOGGER.info("Trying to download the artifact from : {} and UUID is {} ", url, id); // Download the artifact @@ -92,7 +92,7 @@ public class CdsSdcListenerNotificationCallback implements INotificationCallback if (!Objects.equals(result.getDistributionActionResult(), SUCCESS)) { String errorMessage = String.format("Failed to download the artifact from : %s due to %s ", url, result.getDistributionActionResult()); - listenerStatus.sendResponseStatusBackToSDC(cdsSdcListenerDto.getDistributionId(), + listenerStatus.sendResponseStatusBackToSDC(sdcListenerDto.getDistributionId(), DistributionStatusEnum.COMPONENT_DONE_ERROR, errorMessage); LOGGER.error(errorMessage); } else { @@ -124,6 +124,6 @@ public class CdsSdcListenerNotificationCallback implements INotificationCallback } } - listenerService.saveBluePrintToCdsDatabase(cbaArchivePath, cdsSdcListenerDto.getManagedChannelForGrpc()); + listenerService.saveBluePrintToCdsDatabase(cbaArchivePath, sdcListenerDto.getManagedChannelForGrpc()); } } diff --git a/ms/cds-sdc-listener/application/src/main/java/org/onap/ccsdk/cds/cdssdclistener/client/CdsSdcListenerAuthClientInterceptor.java b/ms/sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener/client/SdcListenerAuthClientInterceptor.java similarity index 93% rename from ms/cds-sdc-listener/application/src/main/java/org/onap/ccsdk/cds/cdssdclistener/client/CdsSdcListenerAuthClientInterceptor.java rename to ms/sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener/client/SdcListenerAuthClientInterceptor.java index bae4a3754..6f782d10a 100644 --- a/ms/cds-sdc-listener/application/src/main/java/org/onap/ccsdk/cds/cdssdclistener/client/CdsSdcListenerAuthClientInterceptor.java +++ b/ms/sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener/client/SdcListenerAuthClientInterceptor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.onap.ccsdk.cds.cdssdclistener.client; +package org.onap.ccsdk.cds.sdclistener.client; import io.grpc.CallOptions; import io.grpc.Channel; @@ -33,7 +33,7 @@ import org.springframework.stereotype.Component; */ @ConfigurationProperties("listenerservice") @Component -public class CdsSdcListenerAuthClientInterceptor implements ClientInterceptor { +public class SdcListenerAuthClientInterceptor implements ClientInterceptor { @Value("${listenerservice.config.authHeader}") private String basicAuth; diff --git a/ms/cds-sdc-listener/application/src/main/java/org/onap/ccsdk/cds/cdssdclistener/client/CdsSdcListenerClient.java b/ms/sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener/client/SdcListenerClient.java similarity index 73% rename from ms/cds-sdc-listener/application/src/main/java/org/onap/ccsdk/cds/cdssdclistener/client/CdsSdcListenerClient.java rename to ms/sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener/client/SdcListenerClient.java index 8d6aca5cd..973f950bc 100644 --- a/ms/cds-sdc-listener/application/src/main/java/org/onap/ccsdk/cds/cdssdclistener/client/CdsSdcListenerClient.java +++ b/ms/sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener/client/SdcListenerClient.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.onap.ccsdk.cds.cdssdclistener.client; +package org.onap.ccsdk.cds.sdclistener.client; import java.util.Optional; -import org.onap.ccsdk.cds.cdssdclistener.CdsSdcListenerConfiguration; -import org.onap.ccsdk.cds.cdssdclistener.dto.CdsSdcListenerDto; -import org.onap.ccsdk.cds.cdssdclistener.CdsSdcListenerNotificationCallback; -import org.onap.ccsdk.cds.cdssdclistener.exceptions.CdsSdcListenerException; +import org.onap.ccsdk.cds.sdclistener.SdcListenerConfiguration; +import org.onap.ccsdk.cds.sdclistener.dto.SdcListenerDto; +import org.onap.ccsdk.cds.sdclistener.SdcListenerNotificationCallback; +import org.onap.ccsdk.cds.sdclistener.exceptions.SdcListenerException; import org.onap.sdc.api.IDistributionClient; import org.onap.sdc.api.results.IDistributionClientResult; import org.onap.sdc.impl.DistributionClientFactory; @@ -34,18 +34,18 @@ import org.springframework.stereotype.Component; @Component @ComponentScan("org.onap.ccsdk.cds.cdssdclistener.dto") -public class CdsSdcListenerClient { +public class SdcListenerClient { - private static Logger LOG = LoggerFactory.getLogger(CdsSdcListenerClient.class); + private static Logger LOG = LoggerFactory.getLogger(SdcListenerClient.class); @Autowired - private CdsSdcListenerConfiguration configuration; + private SdcListenerConfiguration configuration; @Autowired - private CdsSdcListenerNotificationCallback notification; + private SdcListenerNotificationCallback notification; @Autowired - private CdsSdcListenerDto listenerDto; + private SdcListenerDto listenerDto; private IDistributionClient distributionClient; @@ -53,11 +53,11 @@ public class CdsSdcListenerClient { * This method initializes the SDC Distribution client. */ @EventListener(ApplicationReadyEvent.class) - public void initSdcClient() throws CdsSdcListenerException { + public void initSdcClient() throws SdcListenerException { LOG.info("Initialize the SDC distribution client"); distributionClient = Optional.of(DistributionClientFactory.createDistributionClient()) - .orElseThrow(() -> new CdsSdcListenerException("Could not able to create SDC Distribution client")); + .orElseThrow(() -> new SdcListenerException("Could not able to create SDC Distribution client")); listenerDto.setManagedChannelForGrpc(); @@ -67,9 +67,9 @@ public class CdsSdcListenerClient { startSdcClientBasedOnTheResult(result); } - private void startSdcClientBasedOnTheResult(IDistributionClientResult result) throws CdsSdcListenerException { + private void startSdcClientBasedOnTheResult(IDistributionClientResult result) throws SdcListenerException { if (!result.getDistributionActionResult().equals(DistributionActionResultEnum.SUCCESS)) { - throw new CdsSdcListenerException( + throw new SdcListenerException( "SDC distribution client init failed with reason:" + result.getDistributionMessageResult()); } @@ -79,16 +79,16 @@ public class CdsSdcListenerClient { result = this.distributionClient.start(); if (!result.getDistributionActionResult().equals(DistributionActionResultEnum.SUCCESS)) { - throw new CdsSdcListenerException( + throw new SdcListenerException( "Startup of the SDC distribution client failed with reason: " + result.getDistributionMessageResult()); } } - private void closeSdcDistributionclient() throws CdsSdcListenerException { + private void closeSdcDistributionclient() throws SdcListenerException { LOG.info("Closing SDC distribution client"); IDistributionClientResult status = this.distributionClient.stop(); if (status.getDistributionActionResult().equals(DistributionActionResultEnum.SUCCESS)) { - throw new CdsSdcListenerException( + throw new SdcListenerException( "Failed to close the SDC distribution client due to : " + status.getDistributionMessageResult()); } } diff --git a/ms/cds-sdc-listener/application/src/main/java/org/onap/ccsdk/cds/cdssdclistener/controller/HealthCheck.java b/ms/sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener/controller/HealthCheck.java similarity index 95% rename from ms/cds-sdc-listener/application/src/main/java/org/onap/ccsdk/cds/cdssdclistener/controller/HealthCheck.java rename to ms/sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener/controller/HealthCheck.java index a1bb116bf..a9e51ac12 100644 --- a/ms/cds-sdc-listener/application/src/main/java/org/onap/ccsdk/cds/cdssdclistener/controller/HealthCheck.java +++ b/ms/sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener/controller/HealthCheck.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.onap.ccsdk.cds.cdssdclistener.controller; +package org.onap.ccsdk.cds.sdclistener.controller; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/ms/cds-sdc-listener/application/src/main/java/org/onap/ccsdk/cds/cdssdclistener/dto/CdsSdcListenerDto.java b/ms/sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener/dto/SdcListenerDto.java similarity index 86% rename from ms/cds-sdc-listener/application/src/main/java/org/onap/ccsdk/cds/cdssdclistener/dto/CdsSdcListenerDto.java rename to ms/sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener/dto/SdcListenerDto.java index 68669307e..c7c3d4829 100644 --- a/ms/cds-sdc-listener/application/src/main/java/org/onap/ccsdk/cds/cdssdclistener/dto/CdsSdcListenerDto.java +++ b/ms/sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener/dto/SdcListenerDto.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.onap.ccsdk.cds.cdssdclistener.dto; +package org.onap.ccsdk.cds.sdclistener.dto; import io.grpc.ManagedChannel; import io.grpc.ManagedChannelBuilder; -import org.onap.ccsdk.cds.cdssdclistener.client.CdsSdcListenerAuthClientInterceptor; +import org.onap.ccsdk.cds.sdclistener.client.SdcListenerAuthClientInterceptor; import org.onap.sdc.api.IDistributionClient; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -26,7 +26,7 @@ import org.springframework.stereotype.Component; @Component @ConfigurationProperties("listenerservice") -public class CdsSdcListenerDto { +public class SdcListenerDto { @Value("${listenerservice.config.grpcAddress}") private String grpcAddress; @@ -35,7 +35,7 @@ public class CdsSdcListenerDto { private int grpcPort; @Autowired - private CdsSdcListenerAuthClientInterceptor cdsSdcListenerAuthClientInterceptor; + private SdcListenerAuthClientInterceptor sdcListenerAuthClientInterceptor; private IDistributionClient distributionClient; private ManagedChannel managedChannel; @@ -60,7 +60,7 @@ public class CdsSdcListenerDto { public void setManagedChannelForGrpc() { managedChannel = ManagedChannelBuilder.forAddress(grpcAddress, grpcPort) .usePlaintext() - .intercept(cdsSdcListenerAuthClientInterceptor) + .intercept(sdcListenerAuthClientInterceptor) .build(); } diff --git a/ms/cds-sdc-listener/application/src/main/java/org/onap/ccsdk/cds/cdssdclistener/exceptions/CdsSdcListenerException.java b/ms/sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener/exceptions/SdcListenerException.java similarity index 76% rename from ms/cds-sdc-listener/application/src/main/java/org/onap/ccsdk/cds/cdssdclistener/exceptions/CdsSdcListenerException.java rename to ms/sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener/exceptions/SdcListenerException.java index eff5ef050..23f669f1e 100644 --- a/ms/cds-sdc-listener/application/src/main/java/org/onap/ccsdk/cds/cdssdclistener/exceptions/CdsSdcListenerException.java +++ b/ms/sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener/exceptions/SdcListenerException.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.onap.ccsdk.cds.cdssdclistener.exceptions; +package org.onap.ccsdk.cds.sdclistener.exceptions; -public class CdsSdcListenerException extends Exception { +public class SdcListenerException extends Exception { /** * @param message The message to dump */ - public CdsSdcListenerException(final String message) { + public SdcListenerException(final String message) { super(message); } @@ -28,7 +28,7 @@ public class CdsSdcListenerException extends Exception { * @param message The message to dump * @param cause The Throwable cause object */ - public CdsSdcListenerException(final String message, final Throwable cause) { + public SdcListenerException(final String message, final Throwable cause) { super(message, cause); } } diff --git a/ms/cds-sdc-listener/application/src/main/java/org/onap/ccsdk/cds/cdssdclistener/handler/BluePrintProcesssorHandler.java b/ms/sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener/handler/BluePrintProcesssorHandler.java similarity index 98% rename from ms/cds-sdc-listener/application/src/main/java/org/onap/ccsdk/cds/cdssdclistener/handler/BluePrintProcesssorHandler.java rename to ms/sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener/handler/BluePrintProcesssorHandler.java index b05245392..96b2ff081 100644 --- a/ms/cds-sdc-listener/application/src/main/java/org/onap/ccsdk/cds/cdssdclistener/handler/BluePrintProcesssorHandler.java +++ b/ms/sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener/handler/BluePrintProcesssorHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.onap.ccsdk.cds.cdssdclistener.handler; +package org.onap.ccsdk.cds.sdclistener.handler; import io.grpc.ManagedChannel; import org.onap.ccsdk.cds.controllerblueprints.common.api.Status; diff --git a/ms/cds-sdc-listener/application/src/main/java/org/onap/ccsdk/cds/cdssdclistener/service/ListenerService.java b/ms/sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener/service/ListenerService.java similarity index 97% rename from ms/cds-sdc-listener/application/src/main/java/org/onap/ccsdk/cds/cdssdclistener/service/ListenerService.java rename to ms/sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener/service/ListenerService.java index e55aeb134..446c3e621 100644 --- a/ms/cds-sdc-listener/application/src/main/java/org/onap/ccsdk/cds/cdssdclistener/service/ListenerService.java +++ b/ms/sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener/service/ListenerService.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.onap.ccsdk.cds.cdssdclistener.service; +package org.onap.ccsdk.cds.sdclistener.service; import io.grpc.ManagedChannel; import java.nio.file.Path; diff --git a/ms/cds-sdc-listener/application/src/main/java/org/onap/ccsdk/cds/cdssdclistener/service/ListenerServiceImpl.java b/ms/sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener/service/ListenerServiceImpl.java similarity index 91% rename from ms/cds-sdc-listener/application/src/main/java/org/onap/ccsdk/cds/cdssdclistener/service/ListenerServiceImpl.java rename to ms/sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener/service/ListenerServiceImpl.java index 1cf1a1bae..9a6ae8779 100644 --- a/ms/cds-sdc-listener/application/src/main/java/org/onap/ccsdk/cds/cdssdclistener/service/ListenerServiceImpl.java +++ b/ms/sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener/service/ListenerServiceImpl.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.onap.ccsdk.cds.cdssdclistener.service; +package org.onap.ccsdk.cds.sdclistener.service; import static java.nio.file.Files.walk; import static org.onap.sdc.utils.DistributionStatusEnum.COMPONENT_DONE_ERROR; @@ -33,17 +33,15 @@ import java.util.Enumeration; import java.util.List; import java.util.Optional; import java.util.regex.Pattern; -import java.util.stream.Collectors; -import java.util.stream.Stream; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; import org.apache.commons.io.FileUtils; import org.apache.tomcat.util.http.fileupload.IOUtils; -import org.onap.ccsdk.cds.cdssdclistener.client.CdsSdcListenerAuthClientInterceptor; -import org.onap.ccsdk.cds.cdssdclistener.dto.CdsSdcListenerDto; -import org.onap.ccsdk.cds.cdssdclistener.handler.BluePrintProcesssorHandler; -import org.onap.ccsdk.cds.cdssdclistener.status.CdsSdcListenerStatus; -import org.onap.ccsdk.cds.cdssdclistener.util.FileUtil; +import org.onap.ccsdk.cds.sdclistener.client.SdcListenerAuthClientInterceptor; +import org.onap.ccsdk.cds.sdclistener.dto.SdcListenerDto; +import org.onap.ccsdk.cds.sdclistener.handler.BluePrintProcesssorHandler; +import org.onap.ccsdk.cds.sdclistener.status.SdcListenerStatus; +import org.onap.ccsdk.cds.sdclistener.util.FileUtil; import org.onap.ccsdk.cds.controllerblueprints.common.api.Status; import org.onap.ccsdk.cds.controllerblueprints.management.api.BluePrintUploadInput; import org.onap.ccsdk.cds.controllerblueprints.management.api.FileChunk; @@ -63,13 +61,13 @@ public class ListenerServiceImpl implements ListenerService { private BluePrintProcesssorHandler bluePrintProcesssorHandler; @Autowired - private CdsSdcListenerAuthClientInterceptor cdsSdcListenerAuthClientInterceptor; + private SdcListenerAuthClientInterceptor sdcListenerAuthClientInterceptor; @Autowired - private CdsSdcListenerStatus listenerStatus; + private SdcListenerStatus listenerStatus; @Autowired - private CdsSdcListenerDto cdsSdcListenerDto; + private SdcListenerDto sdcListenerDto; @Value("${listenerservice.config.grpcAddress}") private String grpcAddress; @@ -161,7 +159,7 @@ public class ListenerServiceImpl implements ListenerService { } private void prepareRequestForCdsBackend(List files, ManagedChannel managedChannel, String path) { - final String distributionId = cdsSdcListenerDto.getDistributionId(); + final String distributionId = sdcListenerDto.getDistributionId(); files.forEach(zipFile -> { try { diff --git a/ms/cds-sdc-listener/application/src/main/java/org/onap/ccsdk/cds/cdssdclistener/status/DistributionStatusMessage.java b/ms/sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener/status/DistributionStatusMessage.java similarity index 96% rename from ms/cds-sdc-listener/application/src/main/java/org/onap/ccsdk/cds/cdssdclistener/status/DistributionStatusMessage.java rename to ms/sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener/status/DistributionStatusMessage.java index 676c85c98..60463762b 100644 --- a/ms/cds-sdc-listener/application/src/main/java/org/onap/ccsdk/cds/cdssdclistener/status/DistributionStatusMessage.java +++ b/ms/sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener/status/DistributionStatusMessage.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.onap.ccsdk.cds.cdssdclistener.status; +package org.onap.ccsdk.cds.sdclistener.status; import org.onap.sdc.api.consumer.IFinalDistrStatusMessage; import org.onap.sdc.utils.DistributionStatusEnum; diff --git a/ms/cds-sdc-listener/application/src/main/java/org/onap/ccsdk/cds/cdssdclistener/status/CdsSdcListenerStatus.java b/ms/sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener/status/SdcListenerStatus.java similarity index 87% rename from ms/cds-sdc-listener/application/src/main/java/org/onap/ccsdk/cds/cdssdclistener/status/CdsSdcListenerStatus.java rename to ms/sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener/status/SdcListenerStatus.java index 60d3127f9..ff64c0d0c 100644 --- a/ms/cds-sdc-listener/application/src/main/java/org/onap/ccsdk/cds/cdssdclistener/status/CdsSdcListenerStatus.java +++ b/ms/sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener/status/SdcListenerStatus.java @@ -13,16 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.onap.ccsdk.cds.cdssdclistener.status; +package org.onap.ccsdk.cds.sdclistener.status; import static org.onap.sdc.utils.DistributionActionResultEnum.SUCCESS; import java.util.Objects; -import org.onap.ccsdk.cds.cdssdclistener.dto.CdsSdcListenerDto; -import org.onap.ccsdk.cds.cdssdclistener.util.BuilderUtil; +import org.onap.ccsdk.cds.sdclistener.dto.SdcListenerDto; +import org.onap.ccsdk.cds.sdclistener.util.BuilderUtil; import org.onap.sdc.api.IDistributionClient; import org.onap.sdc.api.consumer.IFinalDistrStatusMessage; import org.onap.sdc.api.results.IDistributionClientResult; -import org.onap.sdc.impl.DistributionClientImpl; import org.onap.sdc.utils.DistributionStatusEnum; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -35,16 +34,16 @@ import org.springframework.stereotype.Component; @Component @ConfigurationProperties("listenerservice") @ComponentScan("org.onap.ccsdk.cds.cdssdclistener.dto") -public class CdsSdcListenerStatus { +public class SdcListenerStatus { - private static final Logger LOGGER = LoggerFactory.getLogger(CdsSdcListenerStatus.class); + private static final Logger LOGGER = LoggerFactory.getLogger(SdcListenerStatus.class); private static final String COMPONENT_NAME = "cds"; @Value("${listenerservice.config.consumerId}") private String consumerId; @Autowired - private CdsSdcListenerDto cdsSdcListenerDto; + private SdcListenerDto sdcListenerDto; /** * Send the response back to SDC. @@ -55,7 +54,7 @@ public class CdsSdcListenerStatus { */ public void sendResponseStatusBackToSDC(String distributionID, DistributionStatusEnum status, String errorReason) { - final IDistributionClient distributionClient = cdsSdcListenerDto.getDistributionClient(); + final IDistributionClient distributionClient = sdcListenerDto.getDistributionClient(); IFinalDistrStatusMessage finalDistribution = new BuilderUtil<>(new DistributionStatusMessage()) .build(builder -> { diff --git a/ms/cds-sdc-listener/application/src/main/java/org/onap/ccsdk/cds/cdssdclistener/util/BuilderUtil.java b/ms/sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener/util/BuilderUtil.java similarity index 93% rename from ms/cds-sdc-listener/application/src/main/java/org/onap/ccsdk/cds/cdssdclistener/util/BuilderUtil.java rename to ms/sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener/util/BuilderUtil.java index 4df545c82..1f546d107 100644 --- a/ms/cds-sdc-listener/application/src/main/java/org/onap/ccsdk/cds/cdssdclistener/util/BuilderUtil.java +++ b/ms/sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener/util/BuilderUtil.java @@ -5,7 +5,7 @@ * proprietary to Bell Canada and are protected by trade secret or copyright law. * Unauthorized copying of this file, via any medium is strictly prohibited. */ -package org.onap.ccsdk.cds.cdssdclistener.util; +package org.onap.ccsdk.cds.sdclistener.util; import java.util.function.Consumer; diff --git a/ms/cds-sdc-listener/application/src/main/java/org/onap/ccsdk/cds/cdssdclistener/util/FileUtil.java b/ms/sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener/util/FileUtil.java similarity index 97% rename from ms/cds-sdc-listener/application/src/main/java/org/onap/ccsdk/cds/cdssdclistener/util/FileUtil.java rename to ms/sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener/util/FileUtil.java index 11f4eade1..967e854d7 100644 --- a/ms/cds-sdc-listener/application/src/main/java/org/onap/ccsdk/cds/cdssdclistener/util/FileUtil.java +++ b/ms/sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener/util/FileUtil.java @@ -6,7 +6,7 @@ * Unauthorized copying of this file, via any medium is strictly prohibited. */ -package org.onap.ccsdk.cds.cdssdclistener.util; +package org.onap.ccsdk.cds.sdclistener.util; import static java.nio.file.Files.walk; import java.io.File; diff --git a/ms/cds-sdc-listener/application/src/main/resources/application.yml b/ms/sdclistener/application/src/main/resources/application.yml similarity index 100% rename from ms/cds-sdc-listener/application/src/main/resources/application.yml rename to ms/sdclistener/application/src/main/resources/application.yml diff --git a/ms/cds-sdc-listener/application/src/main/resources/logback.xml b/ms/sdclistener/application/src/main/resources/logback.xml similarity index 100% rename from ms/cds-sdc-listener/application/src/main/resources/logback.xml rename to ms/sdclistener/application/src/main/resources/logback.xml diff --git a/ms/cds-sdc-listener/application/src/test/java/org/onap/ccsdk/cds/cdssdclistener/CdsSdcListenerClientTest.java b/ms/sdclistener/application/src/test/java/org/onap/ccsdk/cds/sdclistener/SdcListenerClientTest.java similarity index 77% rename from ms/cds-sdc-listener/application/src/test/java/org/onap/ccsdk/cds/cdssdclistener/CdsSdcListenerClientTest.java rename to ms/sdclistener/application/src/test/java/org/onap/ccsdk/cds/sdclistener/SdcListenerClientTest.java index e980c24c6..c9f2c5a39 100644 --- a/ms/cds-sdc-listener/application/src/test/java/org/onap/ccsdk/cds/cdssdclistener/CdsSdcListenerClientTest.java +++ b/ms/sdclistener/application/src/test/java/org/onap/ccsdk/cds/sdclistener/SdcListenerClientTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.onap.ccsdk.cds.cdssdclistener; +package org.onap.ccsdk.cds.sdclistener; import mockit.Expectations; import mockit.Injectable; @@ -24,9 +24,9 @@ import mockit.VerificationsInOrder; import mockit.integration.junit4.JMockit; import org.junit.Test; import org.junit.runner.RunWith; -import org.onap.ccsdk.cds.cdssdclistener.client.CdsSdcListenerClient; -import org.onap.ccsdk.cds.cdssdclistener.dto.CdsSdcListenerDto; -import org.onap.ccsdk.cds.cdssdclistener.exceptions.CdsSdcListenerException; +import org.onap.ccsdk.cds.sdclistener.client.SdcListenerClient; +import org.onap.ccsdk.cds.sdclistener.dto.SdcListenerDto; +import org.onap.ccsdk.cds.sdclistener.exceptions.SdcListenerException; import org.onap.sdc.api.IDistributionClient; import org.onap.sdc.api.results.IDistributionClientResult; import org.onap.sdc.impl.DistributionClientFactory; @@ -34,16 +34,16 @@ import org.onap.sdc.impl.DistributionClientResultImpl; import org.onap.sdc.utils.DistributionActionResultEnum; @RunWith(JMockit.class) -public class CdsSdcListenerClientTest { +public class SdcListenerClientTest { @Tested - private CdsSdcListenerClient cdsSdcListenerClient; + private SdcListenerClient sdcListenerClient; @Test public void testInitCdsClientSuccesfully(@Injectable IDistributionClient distributionClient, - @Injectable CdsSdcListenerConfiguration configuration, - @Injectable CdsSdcListenerNotificationCallback notification, - @Injectable CdsSdcListenerDto cdsSdcListenerDto) throws CdsSdcListenerException { + @Injectable SdcListenerConfiguration configuration, + @Injectable SdcListenerNotificationCallback notification, + @Injectable SdcListenerDto sdcListenerDto) throws SdcListenerException { //Arrange new MockUp() { @@ -64,7 +64,7 @@ public class CdsSdcListenerClientTest { }}; // Act - cdsSdcListenerClient.initSdcClient(); + sdcListenerClient.initSdcClient(); // Verify new VerificationsInOrder() {{ diff --git a/ms/cds-sdc-listener/application/src/test/java/org/onap/ccsdk/cds/cdssdclistener/CdsSdcListenerConfigurationTest.java b/ms/sdclistener/application/src/test/java/org/onap/ccsdk/cds/sdclistener/SdcListenerConfigurationTest.java similarity index 87% rename from ms/cds-sdc-listener/application/src/test/java/org/onap/ccsdk/cds/cdssdclistener/CdsSdcListenerConfigurationTest.java rename to ms/sdclistener/application/src/test/java/org/onap/ccsdk/cds/sdclistener/SdcListenerConfigurationTest.java index f940db2aa..01ffe1ba9 100644 --- a/ms/cds-sdc-listener/application/src/test/java/org/onap/ccsdk/cds/cdssdclistener/CdsSdcListenerConfigurationTest.java +++ b/ms/sdclistener/application/src/test/java/org/onap/ccsdk/cds/sdclistener/SdcListenerConfigurationTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.onap.ccsdk.cds.cdssdclistener; +package org.onap.ccsdk.cds.sdclistener; import static org.junit.Assert.assertEquals; import org.junit.Test; @@ -24,12 +24,12 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; @RunWith(SpringRunner.class) -@EnableConfigurationProperties(CdsSdcListenerConfiguration.class) -@SpringBootTest(classes = {CdsSdcListenerConfigurationTest.class}) -public class CdsSdcListenerConfigurationTest { +@EnableConfigurationProperties(SdcListenerConfiguration.class) +@SpringBootTest(classes = {SdcListenerConfigurationTest.class}) +public class SdcListenerConfigurationTest { @Autowired - private CdsSdcListenerConfiguration listenerConfiguration; + private SdcListenerConfiguration listenerConfiguration; @Test public void testCdsSdcListenerConfiguration() { diff --git a/ms/cds-sdc-listener/application/src/test/java/org/onap/ccsdk/cds/cdssdclistener/handler/BluePrintProcessorHandlerTest.java b/ms/sdclistener/application/src/test/java/org/onap/ccsdk/cds/sdclistener/handler/BluePrintProcessorHandlerTest.java similarity index 94% rename from ms/cds-sdc-listener/application/src/test/java/org/onap/ccsdk/cds/cdssdclistener/handler/BluePrintProcessorHandlerTest.java rename to ms/sdclistener/application/src/test/java/org/onap/ccsdk/cds/sdclistener/handler/BluePrintProcessorHandlerTest.java index f700a7dd2..ee20f8771 100644 --- a/ms/cds-sdc-listener/application/src/test/java/org/onap/ccsdk/cds/cdssdclistener/handler/BluePrintProcessorHandlerTest.java +++ b/ms/sdclistener/application/src/test/java/org/onap/ccsdk/cds/sdclistener/handler/BluePrintProcessorHandlerTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.onap.ccsdk.cds.cdssdclistener.handler; +package org.onap.ccsdk.cds.sdclistener.handler; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -31,7 +31,7 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; -import org.onap.ccsdk.cds.cdssdclistener.client.CdsSdcListenerAuthClientInterceptor; +import org.onap.ccsdk.cds.sdclistener.client.SdcListenerAuthClientInterceptor; import org.onap.ccsdk.cds.controllerblueprints.common.api.Status; import org.onap.ccsdk.cds.controllerblueprints.management.api.BluePrintManagementOutput; import org.onap.ccsdk.cds.controllerblueprints.management.api.BluePrintManagementServiceGrpc.BluePrintManagementServiceImplBase; @@ -43,7 +43,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; @RunWith(SpringRunner.class) -@EnableConfigurationProperties({BluePrintProcesssorHandler.class, CdsSdcListenerAuthClientInterceptor.class}) +@EnableConfigurationProperties({BluePrintProcesssorHandler.class, SdcListenerAuthClientInterceptor.class}) @SpringBootTest(classes = {BluePrintProcessorHandlerTest.class}) public class BluePrintProcessorHandlerTest { @@ -51,7 +51,7 @@ public class BluePrintProcessorHandlerTest { private BluePrintProcesssorHandler bluePrintProcesssorHandler; @Autowired - private CdsSdcListenerAuthClientInterceptor cdsSdcListenerAuthClientInterceptor; + private SdcListenerAuthClientInterceptor sdcListenerAuthClientInterceptor; @Rule public GrpcCleanupRule grpcCleanup = new GrpcCleanupRule(); diff --git a/ms/cds-sdc-listener/application/src/test/java/org/onap/ccsdk/cds/cdssdclistener/service/ListenerServiceImplTest.java b/ms/sdclistener/application/src/test/java/org/onap/ccsdk/cds/sdclistener/service/ListenerServiceImplTest.java similarity index 85% rename from ms/cds-sdc-listener/application/src/test/java/org/onap/ccsdk/cds/cdssdclistener/service/ListenerServiceImplTest.java rename to ms/sdclistener/application/src/test/java/org/onap/ccsdk/cds/sdclistener/service/ListenerServiceImplTest.java index 359ee6cc4..f5ff2bdb8 100644 --- a/ms/cds-sdc-listener/application/src/test/java/org/onap/ccsdk/cds/cdssdclistener/service/ListenerServiceImplTest.java +++ b/ms/sdclistener/application/src/test/java/org/onap/ccsdk/cds/sdclistener/service/ListenerServiceImplTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.onap.ccsdk.cds.cdssdclistener.service; +package org.onap.ccsdk.cds.sdclistener.service; import static junit.framework.TestCase.assertTrue; import java.io.File; @@ -27,11 +27,11 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; import org.junit.runner.RunWith; -import org.onap.ccsdk.cds.cdssdclistener.CdsSdcListenerConfiguration; -import org.onap.ccsdk.cds.cdssdclistener.client.CdsSdcListenerAuthClientInterceptor; -import org.onap.ccsdk.cds.cdssdclistener.dto.CdsSdcListenerDto; -import org.onap.ccsdk.cds.cdssdclistener.handler.BluePrintProcesssorHandler; -import org.onap.ccsdk.cds.cdssdclistener.status.CdsSdcListenerStatus; +import org.onap.ccsdk.cds.sdclistener.SdcListenerConfiguration; +import org.onap.ccsdk.cds.sdclistener.client.SdcListenerAuthClientInterceptor; +import org.onap.ccsdk.cds.sdclistener.dto.SdcListenerDto; +import org.onap.ccsdk.cds.sdclistener.handler.BluePrintProcesssorHandler; +import org.onap.ccsdk.cds.sdclistener.status.SdcListenerStatus; import org.onap.sdc.api.results.IDistributionClientDownloadResult; import org.onap.sdc.impl.mock.DistributionClientResultStubImpl; import org.springframework.beans.factory.annotation.Autowired; @@ -40,9 +40,9 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; @RunWith(SpringRunner.class) -@EnableConfigurationProperties({CdsSdcListenerAuthClientInterceptor.class, - BluePrintProcesssorHandler.class, CdsSdcListenerDto.class, ListenerServiceImpl.class, CdsSdcListenerStatus.class, - CdsSdcListenerConfiguration.class}) +@EnableConfigurationProperties({SdcListenerAuthClientInterceptor.class, + BluePrintProcesssorHandler.class, SdcListenerDto.class, ListenerServiceImpl.class, SdcListenerStatus.class, + SdcListenerConfiguration.class}) @SpringBootTest(classes = {ListenerServiceImplTest.class}) public class ListenerServiceImplTest { diff --git a/ms/cds-sdc-listener/application/src/test/resources/service-Testsvc140.csar b/ms/sdclistener/application/src/test/resources/service-Testsvc140.csar similarity index 100% rename from ms/cds-sdc-listener/application/src/test/resources/service-Testsvc140.csar rename to ms/sdclistener/application/src/test/resources/service-Testsvc140.csar diff --git a/ms/cds-sdc-listener/application/src/test/resources/testcba.zip b/ms/sdclistener/application/src/test/resources/testcba.zip similarity index 100% rename from ms/cds-sdc-listener/application/src/test/resources/testcba.zip rename to ms/sdclistener/application/src/test/resources/testcba.zip diff --git a/ms/sdclistener/distribution/pom.xml b/ms/sdclistener/distribution/pom.xml new file mode 100755 index 000000000..a79a14c52 --- /dev/null +++ b/ms/sdclistener/distribution/pom.xml @@ -0,0 +1,183 @@ + + + + 4.0.0 + + org.onap.ccsdk.cds.sdclistener + parent + 0.4.2-SNAPSHOT + ../parent + + distribution + pom + SDC Listener Distribution + + maven + org.onap.ccsdk.cds + sdclistener + onap/ccsdk-sdclistener + + + deploy + true + ${project.version} + ${maven.build.timestamp} + + + + + org.onap.ccsdk.cds.sdclistener + application + + + + + + maven-resources-plugin + 2.6 + + + copy-dockerfile + + copy-resources + + validate + + ${basedir}/target/docker-stage + + + src/main/docker + + * + + true + + + + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + ant-test + package + + + + + + + run + + + + + + + maven-assembly-plugin + 3.1.0 + + + ${basedir}/target/docker-stage + + src/main/docker/distribution.xml + + posix + + + + ${assembly.id} + package + + single + + + + + + org.codehaus.groovy.maven + gmaven-plugin + 1.0 + + + validate + + execute + + + ${basedir}/../../../TagVersion.groovy + + + + + + + + + + + docker + + + + io.fabric8 + docker-maven-plugin + 0.26.1 + false + + + + ${image.name} + + try + ${basedir}/target/docker-stage + + ${project.docker.latestminortag.version} + ${project.docker.latestfulltag.version} + ${project.docker.latesttagtimestamp.version} + + + + + true + + + + generate-images + package + + build + + + + push-images + ${docker.push.phase} + + build + push + + + + + + + + + diff --git a/ms/cds-sdc-listener/application/src/main/docker/docker-compose.yaml b/ms/sdclistener/distribution/src/main/dc/docker-compose.yaml old mode 100644 new mode 100755 similarity index 95% rename from ms/cds-sdc-listener/application/src/main/docker/docker-compose.yaml rename to ms/sdclistener/distribution/src/main/dc/docker-compose.yaml index 1e7384744..1c68f6cf3 --- a/ms/cds-sdc-listener/application/src/main/docker/docker-compose.yaml +++ b/ms/sdclistener/distribution/src/main/dc/docker-compose.yaml @@ -2,7 +2,7 @@ version: '3.3' services: cds-sdc-listener: - image: onap/cdssdclistener:latest + image: onap/ccsdk-sdclistener:latest container_name: cdssdclistener restart: always environment: diff --git a/ms/sdclistener/distribution/src/main/docker/Dockerfile b/ms/sdclistener/distribution/src/main/docker/Dockerfile new file mode 100755 index 000000000..e945188a8 --- /dev/null +++ b/ms/sdclistener/distribution/src/main/docker/Dockerfile @@ -0,0 +1,16 @@ +FROM openjdk:8-jdk-alpine + +ENV HTTP_PROXY ${HTTP_PROXY} +ENV HTTPS_PROXY ${HTTPS_PROXY} + +# add entrypoint +COPY startService.sh /startService.sh +RUN chmod 751 /startService.sh +# add application +COPY @project.build.finalName@-@assembly.id@.tar.gz /source.tar.gz +RUN tar -xzf /source.tar.gz -C /tmp \ + && cp -rf /tmp/@project.build.finalName@/opt / \ + && rm -rf /source.tar.gz \ + && rm -rf /tmp/@project.build.finalName@ + +ENTRYPOINT /startService.sh diff --git a/ms/sdclistener/distribution/src/main/docker/distribution.xml b/ms/sdclistener/distribution/src/main/docker/distribution.xml new file mode 100755 index 000000000..e9e8eefa5 --- /dev/null +++ b/ms/sdclistener/distribution/src/main/docker/distribution.xml @@ -0,0 +1,47 @@ + + + + + + ${assembly.id} + + tar.gz + + + + /opt/app/onap/lib + ${artifact.groupId}-${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension} + + org.slf4j:slf4j-simple + + + + + + ${project.basedir}/../application/src/main/resources + + application.properties + application.yml + logback.xml + + /opt/app/onap/config + true + + + diff --git a/ms/sdclistener/distribution/src/main/docker/startService.sh b/ms/sdclistener/distribution/src/main/docker/startService.sh new file mode 100644 index 000000000..7ad6171b8 --- /dev/null +++ b/ms/sdclistener/distribution/src/main/docker/startService.sh @@ -0,0 +1,12 @@ +#!/bin/sh +echo "Starting SDC Listener" + +export APP_HOME=/opt/app/onap +export APP_CONFIG_HOME=${APP_HOME}/config +echo "APP Config HOME : ${APP_CONFIG_HOME}" + +java -classpath "/etc:${APP_HOME}/lib/*:/lib/*:/src:/schema:/generated-sources:${APP_CONFIG_HOME}:${APP_HOME}" \ +-Dlogging.config=${APP_CONFIG_HOME}/logback.xml \ +-Djava.security.egd=file:/dev/./urandom \ +-Dspring.config.location=${APP_CONFIG_HOME}/ \ +org.onap.ccsdk.cds.sdclistener.SdcListenerApplication diff --git a/ms/sdclistener/parent/pom.xml b/ms/sdclistener/parent/pom.xml new file mode 100755 index 000000000..fabdc2530 --- /dev/null +++ b/ms/sdclistener/parent/pom.xml @@ -0,0 +1,246 @@ + + + + 4.0.0 + + org.onap.ccsdk.cds + sdclistener + 0.4.2-SNAPSHOT + + org.onap.ccsdk.cds.sdclistener + parent + pom + SDC Listener Parent + SDC Listener Parent + + 2.1.3.RELEASE + 5.1.5.RELEASE + 1.18.0 + 3.6.1 + 1.0.0 + 0.4.2-SNAPSHOT + 27.0.1-jre + 1.2.2 + 1.7.4 + 1.9 + 1.1.5 + 5.5.1 + 1.3.0 + 1.19 + 3.2.6.RELEASE + + + + + + org.springframework.boot + spring-boot-starter-parent + ${spring.boot.version} + pom + import + + + + + org.apache.commons + commons-lang3 + 3.2.1 + + + commons-collections + commons-collections + 3.2.2 + + + commons-io + commons-io + 2.6 + + + org.apache.commons + commons-compress + 1.15 + + + + com.google.guava + guava + ${guava.version} + + + + + io.grpc + grpc-core + ${grpc.version} + + + io.grpc + grpc-netty + ${grpc.version} + + + io.grpc + grpc-protobuf + ${grpc.version} + + + io.grpc + grpc-stub + ${grpc.version} + + + com.google.protobuf + protobuf-java + ${protobuff.java.utils.version} + + + org.onap.ccsdk.cds.components + proto-definition + ${project.version} + + + io.projectreactor + reactor-core + ${reactorcore.version} + + + + + org.onap.ccsdk.cds.blueprintsprocessor + processor-core + ${project.version} + + + org.onap.ccsdk.cds.blueprintsprocessor + db-lib + ${project.version} + + + org.onap.ccsdk.cds.blueprintsprocessor + rest-lib + ${project.version} + + + org.onap.ccsdk.cds.blueprintsprocessor + dmaap-lib + ${project.version} + + + org.onap.ccsdk.cds.blueprintsprocessor + grpc-lib + ${project.version} + + + org.onap.ccsdk.cds.blueprintsprocessor + execution-service + ${project.version} + + + org.onap.ccsdk.cds.blueprintsprocessor + workflow-service + ${project.version} + + + org.onap.ccsdk.cds.blueprintsprocessor + resource-api + ${project.version} + + + org.onap.ccsdk.cds.blueprintsprocessor + selfservice-api + ${project.version} + + + org.onap.ccsdk.cds.blueprintsprocessor + application + ${project.version} + + + + + + org.onap.ccsdk.cds.controllerblueprints + resource-dict + ${project.version} + + + org.onap.ccsdk.cds.controllerblueprints + blueprint-core + ${project.version} + + + org.onap.ccsdk.cds.controllerblueprints + blueprint-scripts + ${project.version} + + + org.onap.ccsdk.cds.controllerblueprints + db-resources + ${project.version} + + + org.onap.ccsdk.cds.controllerblueprints + blueprint-validation + ${project.version} + + + + + io.grpc + grpc-testing + ${grpc.version} + test + + + org.jmockit + jmockit + ${jmockit.version} + test + + + + + org.onap.ccsdk.cds.sdclistener + application + ${project.version} + + + org.onap.sdc.sdc-distribution-client + sdc-distribution-client + ${sdc-distribution-client.version} + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.5.1 + + ${maven.compiler.source} + ${maven.compiler.target} + + + + + diff --git a/ms/cds-sdc-listener/pom.xml b/ms/sdclistener/pom.xml similarity index 53% rename from ms/cds-sdc-listener/pom.xml rename to ms/sdclistener/pom.xml index 6c533e16b..70e8529f6 100644 --- a/ms/cds-sdc-listener/pom.xml +++ b/ms/sdclistener/pom.xml @@ -14,8 +14,8 @@ * See the License for the specific language governing permissions and * limitations under the License. --> - + + 4.0.0 org.onap.ccsdk.cds ms @@ -23,17 +23,27 @@ .. - 4.0.0 - cds-sdc-listener - CDS-SDC Listener Root - A microservice to get the cba file from SDC and store it into database at runtime + sdclistener + SDC Listener Root + SDC Listener Root pom + + sdclistener + UTF-8 + UTF-8 + yyyyMMdd'T'HHmmss'Z' + ${maven.build.timestamp} + 1.8 + 1.8 + 1.8 + ${project.version} + + + parent application - -- 2.16.6