diff options
| author |   mukesh.paliwal <mukesh.paliwal1@huawei.com> | 2021-02-26 21:16:00 +0530 |
|---|---|---|
| committer | mukesh.paliwal <mukesh.paliwal1@huawei.com> | 2021-02-26 21:16:00 +0530 |
| commit | b5aa8147d8181948a20e2f8d6dde242c95629b7f (patch) | |
| tree | b9c96c1e220e3f6741e8c4a3007ad77c07f8f496 | |
| parent | 5e25f850cb0d1ae5f8f32088048eae148986daf2 (diff) | |
mso-cnf-adapter changes for docker tag name
Issue-ID: SO-3518
Signed-off-by: mukesh.paliwal <mukesh.paliwal1@huawei.com>
Change-Id: I7a89e5b5f22cf7562b6a47dc41d4efdd1f2d647c
44 files changed, 604 insertions, 344 deletions
diff --git a/packages/docker/pom.xml b/packages/docker/pom.xml new file mode 100755 index 0000000..bf91ebf --- /dev/null +++ b/packages/docker/pom.xml @@ -0,0 +1,156 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.onap.so.adapters.so-cnf-adapter</groupId> + <artifactId>so-cnf-adapter</artifactId> + <version>1.8.0-SNAPSHOT</version> + </parent> + <groupId>org.onap.so.adapters.so-cnf-adapter.packages</groupId> + <packaging>pom</packaging> + <artifactId>docker</artifactId> + <name>SO CNF Adapter Docker Packaging</name> + + <properties> + <cnf-adapter-project-version>${project.version}</cnf-adapter-project-version> + <docker.skip>false</docker.skip> + <docker.skip.build>false</docker.skip.build> + <docker.skip.push>false</docker.skip.push> + <docker.pull.registry>nexus3.onap.org:10001</docker.pull.registry> + <docker.push.registry>nexus3.onap.org:10003</docker.push.registry> + <docker.image.prefix>onap/so</docker.image.prefix> + <docker.push.phase>deploy</docker.push.phase> + </properties> + + <build> + <finalName>${project.artifactId}-${project.version}</finalName> + <plugins> + <plugin> + <groupId>org.codehaus.groovy.maven</groupId> + <artifactId>gmaven-plugin</artifactId> + <version>1.0</version> + <executions> + <execution> + <phase>validate</phase> + <goals> + <goal>execute</goal> + </goals> + <configuration> + <source> + println 'Project version: ' + project.properties['cnf-adapter-project-version']; + def versionArray; + if (project.properties['cnf-adapter-project-version'] != null) { + versionArray = project.properties['cnf-adapter-project-version'].split('-'); + } + + if (project.properties['cnf-adapter-project-version'].endsWith("-SNAPSHOT")) { + project.properties['project.docker.latesttag.version'] = versionArray[0] + "-SNAPSHOT-latest"; + } else { + project.properties['project.docker.latesttag.version'] = versionArray[0] + "-STAGING-latest"; + } + + println 'New tag for docker: ' + project.properties['project.docker.latesttag.version']; + </source> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>io.fabric8</groupId> + <artifactId>docker-maven-plugin</artifactId> + <configuration combine.self="override"> + <verbose>true</verbose> + <apiVersion>1.23</apiVersion> + <pullRegistry>${docker.pull.registry}</pullRegistry> + <pushRegistry>${docker.push.registry}</pushRegistry> + <images> + <image> + <name>${docker.image.prefix}/base-image:1.0</name> + <build> + <cleanup>try</cleanup> + <dockerFile>docker-files/Dockerfile.so-base-image</dockerFile> + </build> + </image> + <image> + <name>so-cnf-adapter</name> + <build> + <cleanup>try</cleanup> + <dockerFile>docker-files/Dockerfile.so-app</dockerFile> + <tags> + <tag>${project.version}</tag> + <tag>${project.version}-${maven.build.timestamp}</tag> + <tag>${project.docker.latesttag.version}</tag> + </tags> + <assembly> + <inline> + <dependencySets> + <dependencySet> + <includes> + <include> + org.onap.so.adapters.so-cnf-adapter:so-cnf-adapter-application + </include> + </includes> + <outputFileNameMapping>app.jar</outputFileNameMapping> + </dependencySet> + </dependencySets> + </inline> + </assembly> + </build> + </image> + + </images> + </configuration> + + <executions> + <execution> + <id>clean-images</id> + <phase>pre-clean</phase> + <goals> + <goal>remove</goal> + </goals> + <configuration> + <removeAll>true</removeAll> + </configuration> + </execution> + + <execution> + <id>generate-images</id> + <phase>generate-sources</phase> + <goals> + <goal>build</goal> + </goals> + </execution> + + <execution> + <id>push-images</id> + <phase>${docker.push.phase}</phase> + <goals> + <goal>build</goal> + <goal>push</goal> + </goals> + <configuration> + <image>so-cnf-adapter</image> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + </plugins> + </build> + + <dependencies> + <dependency> + <groupId>org.onap.so.adapters.so-cnf-adapter</groupId> + <artifactId>so-cnf-adapter-application</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> +</project>
\ No newline at end of file diff --git a/Dockerfile b/packages/docker/src/main/docker/docker-files/Dockerfile.so-app index 483c219..dc86ff8 100755..100644 --- a/Dockerfile +++ b/packages/docker/src/main/docker/docker-files/Dockerfile.so-app @@ -1,30 +1,31 @@ -FROM adoptopenjdk/openjdk11:jre-11.0.8_10-alpine +FROM onap/so/base-image:1.0 -ARG JAR_FILE=*.jar ARG http_proxy ENV HTTP_PROXY=$http_proxy ENV http_proxy=$HTTP_PROXY ARG https_proxy ENV HTTPS_PROXY=$https_proxy ENV https_proxy=$HTTPS_PROXY + USER root RUN mkdir -p /app/config RUN mkdir -p /app/certificates RUN mkdir -p /app/logs RUN mkdir -p /app/ca-certificates -RUN apk update && apk add apache2-utils -COPY target/${JAR_FILE} /app/app.jar +COPY maven/app.jar /app COPY configs/logging/logback-spring.xml /app COPY scripts/start-app.sh /app COPY scripts/wait-for.sh /app COPY ca-certificates/onap-ca.crt /app/ca-certificates/onap-ca.crt -#RUN chown -R so:so /app -#USER so +RUN chown -R so:so /app + +USER so # Springboot configuration (required) VOLUME /app/config + # Root certificates (optional) VOLUME /app/ca-certificates + WORKDIR /app ENTRYPOINT ["/app/start-app.sh"] - diff --git a/packages/docker/src/main/docker/docker-files/Dockerfile.so-base-image b/packages/docker/src/main/docker/docker-files/Dockerfile.so-base-image new file mode 100644 index 0000000..a1f4fc1 --- /dev/null +++ b/packages/docker/src/main/docker/docker-files/Dockerfile.so-base-image @@ -0,0 +1,19 @@ +FROM adoptopenjdk/openjdk11:jre-11.0.8_10-alpine + +ARG http_proxy +ARG https_proxy +ENV HTTP_PROXY=$http_proxy +ENV HTTPS_PROXY=$https_proxy +ENV http_proxy=$HTTP_PROXY +ENV https_proxy=$HTTPS_PROXY + +# Install commonly needed tools +RUN apk --no-cache add curl netcat-openbsd nss apache2-utils java-cacerts + +# Create symlink for default Java truststore +RUN set -eux; \ + rm -rf "$JAVA_HOME/lib/security/cacerts"; \ + ln -sT /etc/ssl/certs/java/cacerts "$JAVA_HOME/lib/security/cacerts" + +# Create 'so' user +RUN addgroup -g 1000 so && adduser -S -u 1000 -G so -s /bin/sh so diff --git a/ca-certificates/onap-ca.crt b/packages/docker/src/main/docker/docker-files/ca-certificates/onap-ca.crt index e9a50d7..e9a50d7 100644 --- a/ca-certificates/onap-ca.crt +++ b/packages/docker/src/main/docker/docker-files/ca-certificates/onap-ca.crt diff --git a/configs/logging/logback-spring.xml b/packages/docker/src/main/docker/docker-files/configs/logging/logback-spring.xml index e4be709..ad5fe30 100644 --- a/configs/logging/logback-spring.xml +++ b/packages/docker/src/main/docker/docker-files/configs/logging/logback-spring.xml @@ -1,22 +1,22 @@ <!-- ============LICENSE_START======================================================= - ONAP - SO - ================================================================================ - Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + Copyright (C) 2021 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========================================================= ---> + --> <configuration scan="true" debug="false"> <contextListener class="org.onap.so.logger.LoggerStartupListener" /> <include resource="org/springframework/boot/logging/logback/defaults.xml" /> @@ -173,15 +173,11 @@ <logger name="org.springframework" level="WARN" /> <logger name="org.springframework.security.authentication.dao.DaoAuthenticationProvider" level="DEBUG" /> - <!-- Camunda related loggers --> - <logger name="org.camunda.bpm.engine.jobexecutor.level" level="WARN" /> - <logger name="org.camunda.bpm.engine.impl.persistence.entity.JobEntity.level" level="WARN" /> - <logger name="org.apache.wire" level="DEBUG" /> <logger name="org.onap" level="DEBUG" /> - <logger name="com.att.ecomp" level="DEBUG" /> + <logger name="org.apache.cxf.interceptor" level="DEBUG" /> - <logger name="com.att.commons" level="DEBUG" /> + <logger name="org.reflections" level="ERROR" /> <logger name="AUDIT" level="INFO" additivity="false"> diff --git a/packages/docker/src/main/docker/docker-files/scripts/start-app.sh b/packages/docker/src/main/docker/docker-files/scripts/start-app.sh new file mode 100755 index 0000000..618d55f --- /dev/null +++ b/packages/docker/src/main/docker/docker-files/scripts/start-app.sh @@ -0,0 +1,95 @@ +#!/bin/sh + +if [ `id -u` = 0 ] +then + # Install certificates found in the /app/ca-certificates volume, if any. + + needUpdate=FALSE + + for certificate in `ls -1 /app/ca-certificates`; do + echo "Installing $certificate in /usr/local/share/ca-certificates" + cp /app/ca-certificates/$certificate /usr/local/share/ca-certificates/$certificate + needUpdate=TRUE + done + + if [ $needUpdate = TRUE ]; then + update-ca-certificates --fresh + fi + + # Re-exec this script as the 'onap' user. + this=`readlink -f $0` + exec su so -c "$this" +fi + +touch /app/app.jar + +if [ ! -z "$DB_HOST" -a -z "$DB_PORT" ]; then + export DB_PORT=3306 +fi + +if [ -z "${CONFIG_PATH}" ]; then + export CONFIG_PATH=/app/config/override.yaml +fi + +if [ -z "${LOG_PATH}" ]; then + export LOG_PATH="logs/${APP}" +fi + +if [ "${SSL_DEBUG}" = "log" ]; then + export SSL_DEBUG="-Djavax.net.debug=all" +else + export SSL_DEBUG= +fi + +# Set java keystore and truststore options, if specified in the environment. + +jksargs= + +if [ ! -z "${KEYSTORE}" ]; then + jksargs="$jksargs -Dmso.load.ssl.client.keystore=true" + jksargs="$jksargs -Djavax.net.ssl.keyStore=$KEYSTORE" + jksargs="$jksargs -Djavax.net.ssl.keyStorePassword=${KEYSTORE_PASSWORD}" +fi + +if [ ! -z "${TRUSTSTORE}" ]; then + jksargs="$jksargs -Djavax.net.ssl.trustStore=${TRUSTSTORE}" + jksargs="$jksargs -Djavax.net.ssl.trustStorePassword=${TRUSTSTORE_PASSWORD}" +fi + +if [ -z "${ACTIVE_PROFILE}" ]; then + export ACTIVE_PROFILE="basic" +fi + +jvmargs="${JVM_ARGS} -Dspring.profiles.active=${ACTIVE_PROFILE} -Djava.security.egd=file:/dev/./urandom -Dlogs_dir=${LOG_PATH} -Dlogging.config=/app/logback-spring.xml $jksargs -Dspring.config.additional-location=$CONFIG_PATH ${SSL_DEBUG} ${DISABLE_SNI}" + + +read_properties(){ + while IFS="=" read -r key value; do + case "${key}" in + '#'*) ;; + *) + eKey=$(echo $key | tr '[:lower:]' '[:upper:]') + export "$eKey"="$value" + esac + done <<-EOF + $1 + EOF +} + +if [ -n "${AAF_SSL_CERTS_ENABLED}" ]; then +read_properties "$(head -n 4 /app/certs/.passphrases)" +fi + +echo "JVM Arguments: ${jvmargs}" + +java ${jvmargs} -jar app.jar +rc=$? + +echo "Application exiting with status code $rc" + +if [ ! -z "${EXIT_DELAY}" -a "${EXIT_DELAY}" != 0 ]; then + echo "Delaying $APP exit for $EXIT_DELAY seconds" + sleep $EXIT_DELAY +fi + +exit $rc
\ No newline at end of file diff --git a/scripts/wait-for.sh b/packages/docker/src/main/docker/docker-files/scripts/wait-for.sh index 2525821..2525821 100755 --- a/scripts/wait-for.sh +++ b/packages/docker/src/main/docker/docker-files/scripts/wait-for.sh diff --git a/packages/pom.xml b/packages/pom.xml new file mode 100644 index 0000000..5c94fcf --- /dev/null +++ b/packages/pom.xml @@ -0,0 +1,34 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.onap.so.adapters.so-cnf-adapter</groupId> + <artifactId>so-cnf-adapter</artifactId> + <version>1.8.0-SNAPSHOT</version> + </parent> + <artifactId>packages</artifactId> + <packaging>pom</packaging> + <name>SO CNF Adapter Packages</name> + + <profiles> + <!-- DO NOT CHANGE THE *ORDER* IN WHICH THESE PROFILES ARE DEFINED! --> + + <profile> + <id>default</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + </profile> + + <!-- Those profile are exclusive, choose docker or with-integration-tests --> + <profile> + <id>docker</id> + <modules> + <module>docker</module> + </modules> + <properties> + <docker.skip.push>false</docker.skip.push> + </properties> + </profile> + </profiles> +</project>
\ No newline at end of file @@ -1,234 +1,105 @@ -<!-- - ~* - ~============LICENSE_START======================================================= - ~* ONAP - SO - ~*================================================================================ - ~* Copyright (C) 2020 Huawei Technologies Co., Ltd. All rights reserved. - ~*================================================================================ - ~* 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. - ~* ============LICENSE_END========================================================= - ~*/ - --> - <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.onap.so</groupId> - <artifactId>so</artifactId> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.onap.so</groupId> + <artifactId>so</artifactId> + <version>1.8.0-SNAPSHOT</version> + </parent> + <groupId>org.onap.so.adapters.so-cnf-adapter</groupId> + <artifactId>so-cnf-adapter</artifactId> <version>1.8.0-SNAPSHOT</version> - </parent> - <!-- <groupId>org.onap.so.adapters</groupId --> - <artifactId>so-cnf-adapter</artifactId> - <packaging>jar</packaging> - <name>so-cnf-adapter</name> - <description>Web service endpoint for cnf operations</description> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-dependencies</artifactId> - <version>${springboot.version}</version> - <type>pom</type> - <scope>import</scope> - </dependency> - </dependencies> - </dependencyManagement> - <build> - <finalName>${project.artifactId}-${project.version}</finalName> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-deploy-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - <plugin> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-maven-plugin</artifactId> - <configuration> - <mainClass>org.onap.so.adapters.cnf.MSOCnfApplication</mainClass> - </configuration> - <executions> - <execution> - <goals> - <goal>repackage</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.jacoco</groupId> - <artifactId>jacoco-maven-plugin</artifactId> - </plugin> - <plugin> - <groupId>net.revelc.code.formatter</groupId> - <artifactId>formatter-maven-plugin</artifactId> - <version>2.9.0</version> - <executions> - <execution> - <id>format-java</id> - <goals> - <goal>format</goal> - </goals> - <phase>process-sources</phase> - <configuration> - <skip>${format.skipExecute}</skip> - <configFile>${project.basedir}/onap-eclipse-format.xml</configFile> - </configuration> - </execution> - <execution> - <id>format-xml</id> - <goals> - <goal>format</goal> - </goals> - <phase>process-sources</phase> - <configuration> - <skip>${format.skipExecute}</skip> - <sourceDirectory>${project.basedir}</sourceDirectory> - <configXmlFile>${project.basedir}/pom-format.properties</configXmlFile> - <includes> - <include>pom.xml</include> - </includes> - </configuration> - </execution> - <execution> - <id>validate-java</id> - <goals> - <goal>validate</goal> - </goals> - <configuration> - <skip>${format.skipValidate}</skip> - <configFile>${project.basedir}/onap-eclipse-format.xml</configFile> - </configuration> - </execution> - <execution> - <id>validate-poms</id> - <goals> - <goal>validate</goal> - </goals> - <configuration> - <skip>${format.skipValidate}</skip> - <configFile>${project.basedir}/pom-format.properties</configFile> - <includes> - <include>pom.xml</include> - </includes> - </configuration> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-annotations</artifactId> - <version>2.9.8</version> - </dependency> - </dependencies> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <executions> - <execution> - <id>docker-build</id> - <phase>install</phase> - <goals> - <goal>exec</goal> - </goals> - <configuration> - <dockerFile>Dockerfile</dockerFile> - <executable>docker</executable> - <workingDirectory>${project.basedir}</workingDirectory> - <arguments> - <argument>build</argument> - <argument>-t</argument> - <argument>${project.artifactId}:${project.version}</argument> - <argument>.</argument> - </arguments> - <buildArgs> - <JAR_FILE>${project.artifactId}-${project.version}.jar</JAR_FILE> - <ARTIFACT_ID>${project.artifactId}</ARTIFACT_ID> - </buildArgs> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - <dependencies> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-actuator</artifactId> - </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-web</artifactId> - </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-jdbc</artifactId> - <exclusions> - <exclusion> - <groupId>org.apache.tomcat</groupId> - <artifactId>tomcat-jdbc</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-spring-boot-starter-jaxws</artifactId> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-spring-boot-starter-jaxrs</artifactId> - </dependency> - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpmime</artifactId> - </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-data-jpa</artifactId> - </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-test</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - </dependency> - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpcore</artifactId> - </dependency> - <dependency> - <groupId>org.springframework.cloud</groupId> - <artifactId>spring-cloud-contract-wiremock</artifactId> - <version>1.2.4.RELEASE</version> - </dependency> - <dependency> - <groupId>org.onap.so</groupId> - <artifactId>aai-client</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>com.sun.xml.ws</groupId> - <artifactId>jaxws-ri</artifactId> - <version>2.3.0</version> - <type>pom</type> - </dependency> - </dependencies> -</project> + <name>SO CNF Adapter</name> + <packaging>pom</packaging> + + <properties> + <java.version>11</java.version> + <version.java.compiler>11</version.java.compiler> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> + <version-swagger-codegen>2.3.1</version-swagger-codegen> + <gson-fire-version>1.8.2</gson-fire-version> + <retrofit-version>2.7.2</retrofit-version> + <threetenbp-version>1.3.5</threetenbp-version> + <oltu-version>1.0.1</oltu-version> + <swagger-core-version>1.5.21</swagger-core-version> + <okhttp3-version>3.14.0</okhttp3-version> + <okhttp-version>2.7.5</okhttp-version> + <okio-version>1.13.0</okio-version> + <spring-security-oauth2-version>2.3.6.RELEASE</spring-security-oauth2-version> + <jaxb-api>2.3.0</jaxb-api> + <snakeyaml-version>0.11</snakeyaml-version> + <hamcrest-version>2.2</hamcrest-version> + <equalsverifier-version>3.4.1</equalsverifier-version> + <so-core-version>1.8.0-SNAPSHOT</so-core-version> + </properties> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>${version.java.compiler}</source> + <target>${version.java.compiler}</target> + </configuration> + </plugin> + <plugin> + <groupId>net.revelc.code.formatter</groupId> + <artifactId>formatter-maven-plugin</artifactId> + <version>2.9.0</version> + <executions> + <execution> + <id>format-java</id> + <goals> + <goal>format</goal> + </goals> + <phase>process-sources</phase> + <configuration> + <skip>true</skip> + </configuration> + </execution> + <execution> + <id>format-xml</id> + <goals> + <goal>format</goal> + </goals> + <phase>process-sources</phase> + <configuration> + <skip>true</skip> + <includes> + <include>pom.xml</include> + </includes> + </configuration> + </execution> + <execution> + <id>validate-java</id> + <goals> + <goal>validate</goal> + </goals> + <configuration> + <skip>true</skip> + </configuration> + </execution> + <execution> + <id>validate-poms</id> + <goals> + <goal>validate</goal> + </goals> + <configuration> + <skip>true</skip> + <includes> + <include>pom.xml</include> + </includes> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <modules> + <module>so-cnf-adapter-application</module> + <module>packages</module> + </modules> +</project> diff --git a/scripts/.gitattributes b/scripts/.gitattributes deleted file mode 100644 index b905d1d..0000000 --- a/scripts/.gitattributes +++ /dev/null @@ -1,5 +0,0 @@ -# Default behavior -* text=auto - -# Files to have unix style line endings on checkout -*.sh text eol=lf
\ No newline at end of file diff --git a/scripts/start-app.sh b/scripts/start-app.sh deleted file mode 100755 index 54ed9ed..0000000 --- a/scripts/start-app.sh +++ /dev/null @@ -1,89 +0,0 @@ -#!/bin/sh -#temprary condition -if [ `id -u` = 0 ] -then - # Install certificates found in the /app/ca-certificates volume, if any. - - needUpdate=FALSE - - for certificate in `ls -1 /app/ca-certificates`; do - echo "Installing $certificate in /usr/local/share/ca-certificates" - # cp /app/ca-certificates/$certificate /usr/local/share/ca-certificates/$certificate - needUpdate=FALSE - done - - # Re-exec this script as the 'onap' user. - this=`readlink -f $0` - # exec su so -c "$this" -fi - -touch /app/app.jar - -if [ ! -z "$DB_HOST" -a -z "$DB_PORT" ]; then - export DB_PORT=3306 -fi - -if [ -z "${CONFIG_PATH}" ]; then - export CONFIG_PATH=/app/config/override.yaml -fi - -if [ "${SSL_DEBUG}" = "log" ]; then - export SSL_DEBUG="-Djavax.net.debug=all" -else - export SSL_DEBUG= -fi - -# Set java keystore and truststore options, if specified in the environment. - -jksargs= - -if [ ! -z "${KEYSTORE}" ]; then - jksargs="$jksargs -Dmso.load.ssl.client.keystore=true" - jksargs="$jksargs -Djavax.net.ssl.keyStore=$KEYSTORE" - jksargs="$jksargs -Djavax.net.ssl.keyStorePassword=${KEYSTORE_PASSWORD}" -fi - -if [ ! -z "${TRUSTSTORE}" ]; then - jksargs="$jksargs -Djavax.net.ssl.trustStore=${TRUSTSTORE}" - jksargs="$jksargs -Djavax.net.ssl.trustStorePassword=${TRUSTSTORE_PASSWORD}" -fi - -if [ -z "${ACTIVE_PROFILE}" ]; then - export ACTIVE_PROFILE="basic" -fi - -jvmargs="${JVM_ARGS} -Dspring.profiles.active=${ACTIVE_PROFILE} -Djava.security.egd=file:/dev/./urandom -Dlogs_dir=${LOG_PATH} -Dlogging.config=/app/logback-spring.xml $jksargs -Dspring.config.additional-location=$CONFIG_PATH ${SSL_DEBUG} ${DISABLE_SNI}" - - -read_properties(){ - while IFS="=" read -r key value; do - case "${key}" in - '#'*) ;; - *) - eKey=$(echo $key | tr '[:lower:]' '[:upper:]') - export "$eKey"="$value" - esac - done <<-EOF - $1 - EOF -} - - - -if [ -n "${AAF_SSL_CERTS_ENABLED}" ]; then -read_properties "$(head -n 4 /app/certs/.passphrases)" -fi - -echo "JVM Arguments: ${jvmargs}" - -java ${jvmargs} -jar app.jar -rc=$? - -echo "Application exiting with status code $rc" - -if [ ! -z "${EXIT_DELAY}" -a "${EXIT_DELAY}" != 0 ]; then - echo "Delaying $APP exit for $EXIT_DELAY seconds" - sleep $EXIT_DELAY -fi - -exit $rc diff --git a/so-cnf-adapter-application/pom.xml b/so-cnf-adapter-application/pom.xml new file mode 100755 index 0000000..ae6cf96 --- /dev/null +++ b/so-cnf-adapter-application/pom.xml @@ -0,0 +1,182 @@ +<!-- + ~* + ~============LICENSE_START======================================================= + ~* ONAP - SO + ~*================================================================================ + ~* Copyright (C) 2020 Huawei Technologies Co., Ltd. All rights reserved. + ~*================================================================================ + ~* 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. + ~* ============LICENSE_END========================================================= + ~*/ + --> + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.onap.so.adapters.so-cnf-adapter</groupId> + <artifactId>so-cnf-adapter</artifactId> + <version>1.8.0-SNAPSHOT</version> + </parent> + <artifactId>so-cnf-adapter-application</artifactId> + <name>so-cnf-adapter</name> + <packaging>jar</packaging> + <description>Web service endpoint for cnf operations</description> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-dependencies</artifactId> + <version>${springboot.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> + </dependencies> + </dependencyManagement> + <build> + <finalName>${project.artifactId}-${project.version}</finalName> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + <plugin> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-maven-plugin</artifactId> + <configuration> + <mainClass>org.onap.so.adapters.cnf.MSOCnfApplication</mainClass> + </configuration> + <executions> + <execution> + <goals> + <goal>repackage</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <id>original</id> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.jacoco</groupId> + <artifactId>jacoco-maven-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <systemPropertyVariables> + <so.log.level>DEBUG</so.log.level> + </systemPropertyVariables> + <rerunFailingTestsCount>2</rerunFailingTestsCount> + <parallel>suites</parallel> + <useUnlimitedThreads>false</useUnlimitedThreads> + <threadCount>1</threadCount> + </configuration> + </plugin> + </plugins> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + <excludes> + <exclude>**/*.p12</exclude> + <exclude>**/*.jks</exclude> + </excludes> + </resource> + <resource> + <directory>src/main/resources</directory> + <filtering>false</filtering> + <includes> + <include>**/*.p12</include> + <include>**/*.jks</include> + </includes> + </resource> + </resources> + </build> + <dependencies> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-actuator</artifactId> + </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-web</artifactId> + </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-jdbc</artifactId> + <exclusions> + <exclusion> + <groupId>org.apache.tomcat</groupId> + <artifactId>tomcat-jdbc</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-spring-boot-starter-jaxws</artifactId> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-spring-boot-starter-jaxrs</artifactId> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpmime</artifactId> + </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-data-jpa</artifactId> + </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-test</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpcore</artifactId> + </dependency> + <dependency> + <groupId>org.springframework.cloud</groupId> + <artifactId>spring-cloud-contract-wiremock</artifactId> + <version>1.2.4.RELEASE</version> + </dependency> + <dependency> + <groupId>org.onap.so</groupId> + <artifactId>aai-client</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>com.sun.xml.ws</groupId> + <artifactId>jaxws-ri</artifactId> + <version>2.3.0</version> + <type>pom</type> + </dependency> + </dependencies> +</project> + diff --git a/src/main/java/org/onap/so/adapters/cnf/MSOCnfApplication.java b/so-cnf-adapter-application/src/main/java/org/onap/so/adapters/cnf/MSOCnfApplication.java index 0ba40e2..0ba40e2 100644 --- a/src/main/java/org/onap/so/adapters/cnf/MSOCnfApplication.java +++ b/so-cnf-adapter-application/src/main/java/org/onap/so/adapters/cnf/MSOCnfApplication.java diff --git a/src/main/java/org/onap/so/adapters/cnf/WebSecurityConfig.java b/so-cnf-adapter-application/src/main/java/org/onap/so/adapters/cnf/WebSecurityConfig.java index 03bfd54..03bfd54 100644 --- a/src/main/java/org/onap/so/adapters/cnf/WebSecurityConfig.java +++ b/so-cnf-adapter-application/src/main/java/org/onap/so/adapters/cnf/WebSecurityConfig.java diff --git a/src/main/java/org/onap/so/adapters/cnf/exceptions/ApplicationException.java b/so-cnf-adapter-application/src/main/java/org/onap/so/adapters/cnf/exceptions/ApplicationException.java index c950cf6..c950cf6 100644 --- a/src/main/java/org/onap/so/adapters/cnf/exceptions/ApplicationException.java +++ b/so-cnf-adapter-application/src/main/java/org/onap/so/adapters/cnf/exceptions/ApplicationException.java diff --git a/src/main/java/org/onap/so/adapters/cnf/model/BpmnInstanceRequest.java b/so-cnf-adapter-application/src/main/java/org/onap/so/adapters/cnf/model/BpmnInstanceRequest.java index 2e76d51..2e76d51 100644 --- a/src/main/java/org/onap/so/adapters/cnf/model/BpmnInstanceRequest.java +++ b/so-cnf-adapter-application/src/main/java/org/onap/so/adapters/cnf/model/BpmnInstanceRequest.java diff --git a/src/main/java/org/onap/so/adapters/cnf/model/Config.java b/so-cnf-adapter-application/src/main/java/org/onap/so/adapters/cnf/model/Config.java index b901a39..b901a39 100644 --- a/src/main/java/org/onap/so/adapters/cnf/model/Config.java +++ b/so-cnf-adapter-application/src/main/java/org/onap/so/adapters/cnf/model/Config.java diff --git a/src/main/java/org/onap/so/adapters/cnf/model/ConfigTemplateEntity.java b/so-cnf-adapter-application/src/main/java/org/onap/so/adapters/cnf/model/ConfigTemplateEntity.java index 2ed35b8..2ed35b8 100644 --- a/src/main/java/org/onap/so/adapters/cnf/model/ConfigTemplateEntity.java +++ b/so-cnf-adapter-application/src/main/java/org/onap/so/adapters/cnf/model/ConfigTemplateEntity.java diff --git a/src/main/java/org/onap/so/adapters/cnf/model/ConfigurationEntity.java b/so-cnf-adapter-application/src/main/java/org/onap/so/adapters/cnf/model/ConfigurationEntity.java index 7f6ae86..7f6ae86 100644 --- a/src/main/java/org/onap/so/adapters/cnf/model/ConfigurationEntity.java +++ b/so-cnf-adapter-application/src/main/java/org/onap/so/adapters/cnf/model/ConfigurationEntity.java diff --git a/src/main/java/org/onap/so/adapters/cnf/model/ConfigurationRollbackEntity.java b/so-cnf-adapter-application/src/main/java/org/onap/so/adapters/cnf/model/ConfigurationRollbackEntity.java index bf78d9c..bf78d9c 100644 --- a/src/main/java/org/onap/so/adapters/cnf/model/ConfigurationRollbackEntity.java +++ b/so-cnf-adapter-application/src/main/java/org/onap/so/adapters/cnf/model/ConfigurationRollbackEntity.java diff --git a/src/main/java/org/onap/so/adapters/cnf/model/ConnectivityInfo.java b/so-cnf-adapter-application/src/main/java/org/onap/so/adapters/cnf/model/ConnectivityInfo.java index a2554d1..a2554d1 100644 --- a/src/main/java/org/onap/so/adapters/cnf/model/ConnectivityInfo.java +++ b/so-cnf-adapter-application/src/main/java/org/onap/so/adapters/cnf/model/ConnectivityInfo.java diff --git a/src/main/java/org/onap/so/adapters/cnf/model/ConnectivityRecords.java b/so-cnf-adapter-application/src/main/java/org/onap/so/adapters/cnf/model/ConnectivityRecords.java index 06cfdf1..06cfdf1 100644 --- a/src/main/java/org/onap/so/adapters/cnf/model/ConnectivityRecords.java +++ b/so-cnf-adapter-application/src/main/java/org/onap/so/adapters/cnf/model/ConnectivityRecords.java diff --git a/src/main/java/org/onap/so/adapters/cnf/model/ErrorResponse.java b/so-cnf-adapter-application/src/main/java/org/onap/so/adapters/cnf/model/ErrorResponse.java index 135adcc..135adcc 100644 --- a/src/main/java/org/onap/so/adapters/cnf/model/ErrorResponse.java +++ b/so-cnf-adapter-application/src/main/java/org/onap/so/adapters/cnf/model/ErrorResponse.java diff --git a/src/main/java/org/onap/so/adapters/cnf/model/GroupVersionKind.java b/so-cnf-adapter-application/src/main/java/org/onap/so/adapters/cnf/model/GroupVersionKind.java index bfa5505..bfa5505 100644 --- a/src/main/java/org/onap/so/adapters/cnf/model/GroupVersionKind.java +++ b/so-cnf-adapter-application/src/main/java/org/onap/so/adapters/cnf/model/GroupVersionKind.java diff --git a/src/main/java/org/onap/so/adapters/cnf/model/InstanceMiniResponse.java b/so-cnf-adapter-application/src/main/java/org/onap/so/adapters/cnf/model/InstanceMiniResponse.java index 5804082..5804082 100644 --- a/src/main/java/org/onap/so/adapters/cnf/model/InstanceMiniResponse.java +++ b/so-cnf-adapter-application/src/main/java/org/onap/so/adapters/cnf/model/InstanceMiniResponse.java diff --git a/src/main/java/org/onap/so/adapters/cnf/model/InstanceMiniResponseList.java b/so-cnf-adapter-application/src/main/java/org/onap/so/adapters/cnf/model/InstanceMiniResponseList.java index ad70fbb..ad70fbb 100644 --- a/src/main/java/org/onap/so/adapters/cnf/model/InstanceMiniResponseList.java +++ b/so-cnf-adapter-application/src/main/java/org/onap/so/adapters/cnf/model/InstanceMiniResponseList.java diff --git a/src/main/java/org/onap/so/adapters/cnf/model/InstanceResponse.java b/so-cnf-adapter-application/src/main/java/org/onap/so/adapters/cnf/model/InstanceResponse.java index ae63f86..ae63f86 100644 --- a/src/main/java/org/onap/so/adapters/cnf/model/InstanceResponse.java +++ b/so-cnf-adapter-application/src/main/java/org/onap/so/adapters/cnf/model/InstanceResponse.java diff --git a/src/main/java/org/onap/so/adapters/cnf/model/InstanceStatusResponse.java b/so-cnf-adapter-application/src/main/java/org/onap/so/adapters/cnf/model/InstanceStatusResponse.java index 2472684..2472684 100644 --- a/src/main/java/org/onap/so/adapters/cnf/model/InstanceStatusResponse.java +++ b/so-cnf-adapter-application/src/main/java/org/onap/so/adapters/cnf/model/InstanceStatusResponse.java diff --git a/src/main/java/org/onap/so/adapters/cnf/model/MulticloudInstanceRequest.java b/so-cnf-adapter-application/src/main/java/org/onap/so/adapters/cnf/model/MulticloudInstanceRequest.java index b1719cb..b1719cb 100644 --- a/src/main/java/org/onap/so/adapters/cnf/model/MulticloudInstanceRequest.java +++ b/so-cnf-adapter-application/src/main/java/org/onap/so/adapters/cnf/model/MulticloudInstanceRequest.java diff --git a/src/main/java/org/onap/so/adapters/cnf/model/OtherConnectivityListEntity.java b/so-cnf-adapter-application/src/main/java/org/onap/so/adapters/cnf/model/OtherConnectivityListEntity.java index dd10252..dd10252 100644 --- a/src/main/java/org/onap/so/adapters/cnf/model/OtherConnectivityListEntity.java +++ b/so-cnf-adapter-application/src/main/java/org/onap/so/adapters/cnf/model/OtherConnectivityListEntity.java diff --git a/src/main/java/org/onap/so/adapters/cnf/model/PodStatus.java b/so-cnf-adapter-application/src/main/java/org/onap/so/adapters/cnf/model/PodStatus.java index ed04601..ed04601 100644 --- a/src/main/java/org/onap/so/adapters/cnf/model/PodStatus.java +++ b/so-cnf-adapter-application/src/main/java/org/onap/so/adapters/cnf/model/PodStatus.java diff --git a/src/main/java/org/onap/so/adapters/cnf/model/ProfileEntity.java b/so-cnf-adapter-application/src/main/java/org/onap/so/adapters/cnf/model/ProfileEntity.java index 875ef0d..875ef0d 100644 --- a/src/main/java/org/onap/so/adapters/cnf/model/ProfileEntity.java +++ b/so-cnf-adapter-application/src/main/java/org/onap/so/adapters/cnf/model/ProfileEntity.java diff --git a/src/main/java/org/onap/so/adapters/cnf/model/Resource.java b/so-cnf-adapter-application/src/main/java/org/onap/so/adapters/cnf/model/Resource.java index d18cd76..d18cd76 100644 --- a/src/main/java/org/onap/so/adapters/cnf/model/Resource.java +++ b/so-cnf-adapter-application/src/main/java/org/onap/so/adapters/cnf/model/Resource.java diff --git a/src/main/java/org/onap/so/adapters/cnf/model/ResourceBundleEntity.java b/so-cnf-adapter-application/src/main/java/org/onap/so/adapters/cnf/model/ResourceBundleEntity.java index bc3a8ad..bc3a8ad 100644 --- a/src/main/java/org/onap/so/adapters/cnf/model/ResourceBundleEntity.java +++ b/so-cnf-adapter-application/src/main/java/org/onap/so/adapters/cnf/model/ResourceBundleEntity.java diff --git a/src/main/java/org/onap/so/adapters/cnf/model/Response.java b/so-cnf-adapter-application/src/main/java/org/onap/so/adapters/cnf/model/Response.java index 4230223..4230223 100644 --- a/src/main/java/org/onap/so/adapters/cnf/model/Response.java +++ b/so-cnf-adapter-application/src/main/java/org/onap/so/adapters/cnf/model/Response.java diff --git a/src/main/java/org/onap/so/adapters/cnf/model/Tag.java b/so-cnf-adapter-application/src/main/java/org/onap/so/adapters/cnf/model/Tag.java index 70faefa..70faefa 100644 --- a/src/main/java/org/onap/so/adapters/cnf/model/Tag.java +++ b/so-cnf-adapter-application/src/main/java/org/onap/so/adapters/cnf/model/Tag.java diff --git a/src/main/java/org/onap/so/adapters/cnf/rest/CnfAdapterRest.java b/so-cnf-adapter-application/src/main/java/org/onap/so/adapters/cnf/rest/CnfAdapterRest.java index c69b63f..c69b63f 100644 --- a/src/main/java/org/onap/so/adapters/cnf/rest/CnfAdapterRest.java +++ b/so-cnf-adapter-application/src/main/java/org/onap/so/adapters/cnf/rest/CnfAdapterRest.java diff --git a/src/main/java/org/onap/so/adapters/cnf/service/CnfAdapterService.java b/so-cnf-adapter-application/src/main/java/org/onap/so/adapters/cnf/service/CnfAdapterService.java index a134bac..a134bac 100644 --- a/src/main/java/org/onap/so/adapters/cnf/service/CnfAdapterService.java +++ b/so-cnf-adapter-application/src/main/java/org/onap/so/adapters/cnf/service/CnfAdapterService.java diff --git a/src/main/java/org/onap/so/adapters/cnf/util/CNfAdapterUtil.java b/so-cnf-adapter-application/src/main/java/org/onap/so/adapters/cnf/util/CNfAdapterUtil.java index 25e506c..25e506c 100644 --- a/src/main/java/org/onap/so/adapters/cnf/util/CNfAdapterUtil.java +++ b/so-cnf-adapter-application/src/main/java/org/onap/so/adapters/cnf/util/CNfAdapterUtil.java diff --git a/src/main/resources/META-INF/services/org.onap.so.client.RestProperties b/so-cnf-adapter-application/src/main/resources/META-INF/services/org.onap.so.client.RestProperties index bccd43a..bccd43a 100644 --- a/src/main/resources/META-INF/services/org.onap.so.client.RestProperties +++ b/so-cnf-adapter-application/src/main/resources/META-INF/services/org.onap.so.client.RestProperties diff --git a/src/main/resources/application.yaml b/so-cnf-adapter-application/src/main/resources/application.yaml index 5a9adbf..5a9adbf 100644 --- a/src/main/resources/application.yaml +++ b/so-cnf-adapter-application/src/main/resources/application.yaml diff --git a/src/test/java/org/onap/so/adapters/cnf/CnfAdapterRestTest.java b/so-cnf-adapter-application/src/test/java/org/onap/so/adapters/cnf/CnfAdapterRestTest.java index ee7a771..ee7a771 100644 --- a/src/test/java/org/onap/so/adapters/cnf/CnfAdapterRestTest.java +++ b/so-cnf-adapter-application/src/test/java/org/onap/so/adapters/cnf/CnfAdapterRestTest.java diff --git a/src/test/java/org/onap/so/adapters/cnf/rest/CnfAdapterRestTest.java b/so-cnf-adapter-application/src/test/java/org/onap/so/adapters/cnf/rest/CnfAdapterRestTest.java index 30197bc..30197bc 100644 --- a/src/test/java/org/onap/so/adapters/cnf/rest/CnfAdapterRestTest.java +++ b/so-cnf-adapter-application/src/test/java/org/onap/so/adapters/cnf/rest/CnfAdapterRestTest.java diff --git a/src/test/java/org/onap/so/adapters/cnf/service/CnfAdapterServiceTest.java b/so-cnf-adapter-application/src/test/java/org/onap/so/adapters/cnf/service/CnfAdapterServiceTest.java index e114f44..e114f44 100644 --- a/src/test/java/org/onap/so/adapters/cnf/service/CnfAdapterServiceTest.java +++ b/so-cnf-adapter-application/src/test/java/org/onap/so/adapters/cnf/service/CnfAdapterServiceTest.java |