From: mukesh.paliwal Date: Fri, 26 Feb 2021 15:46:00 +0000 (+0530) Subject: mso-cnf-adapter changes for docker tag name X-Git-Tag: 1.8.2~11 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=b5aa8147d8181948a20e2f8d6dde242c95629b7f;p=so%2Fadapters%2Fso-cnf-adapter.git mso-cnf-adapter changes for docker tag name Issue-ID: SO-3518 Signed-off-by: mukesh.paliwal Change-Id: I7a89e5b5f22cf7562b6a47dc41d4efdd1f2d647c --- 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 @@ + + 4.0.0 + + org.onap.so.adapters.so-cnf-adapter + so-cnf-adapter + 1.8.0-SNAPSHOT + + org.onap.so.adapters.so-cnf-adapter.packages + pom + docker + SO CNF Adapter Docker Packaging + + + ${project.version} + false + false + false + nexus3.onap.org:10001 + nexus3.onap.org:10003 + onap/so + deploy + + + + ${project.artifactId}-${project.version} + + + org.codehaus.groovy.maven + gmaven-plugin + 1.0 + + + validate + + execute + + + + 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']; + + + + + + + + io.fabric8 + docker-maven-plugin + + true + 1.23 + ${docker.pull.registry} + ${docker.push.registry} + + + ${docker.image.prefix}/base-image:1.0 + + try + docker-files/Dockerfile.so-base-image + + + + so-cnf-adapter + + try + docker-files/Dockerfile.so-app + + ${project.version} + ${project.version}-${maven.build.timestamp} + ${project.docker.latesttag.version} + + + + + + + + org.onap.so.adapters.so-cnf-adapter:so-cnf-adapter-application + + + app.jar + + + + + + + + + + + + + clean-images + pre-clean + + remove + + + true + + + + + generate-images + generate-sources + + build + + + + + push-images + ${docker.push.phase} + + build + push + + + so-cnf-adapter + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + + + + + org.onap.so.adapters.so-cnf-adapter + so-cnf-adapter-application + ${project.version} + + + \ No newline at end of file diff --git a/Dockerfile b/packages/docker/src/main/docker/docker-files/Dockerfile.so-app old mode 100755 new mode 100644 similarity index 77% rename from Dockerfile rename to packages/docker/src/main/docker/docker-files/Dockerfile.so-app index 483c219..dc86ff8 --- 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 similarity index 100% rename from ca-certificates/onap-ca.crt rename to 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 similarity index 94% rename from configs/logging/logback-spring.xml rename to 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 @@ + --> @@ -173,15 +173,11 @@ - - - - - + - + 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 similarity index 100% rename from scripts/wait-for.sh rename to 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 @@ + + 4.0.0 + + org.onap.so.adapters.so-cnf-adapter + so-cnf-adapter + 1.8.0-SNAPSHOT + + packages + pom + SO CNF Adapter Packages + + + + + + default + + true + + + + + + docker + + docker + + + false + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index c1250f4..7d7848e 100644 --- a/pom.xml +++ b/pom.xml @@ -1,234 +1,105 @@ - - - 4.0.0 - - org.onap.so - so + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + org.onap.so + so + 1.8.0-SNAPSHOT + + org.onap.so.adapters.so-cnf-adapter + so-cnf-adapter 1.8.0-SNAPSHOT - - - so-cnf-adapter - jar - so-cnf-adapter - Web service endpoint for cnf operations - - - - org.springframework.boot - spring-boot-dependencies - ${springboot.version} - pom - import - - - - - ${project.artifactId}-${project.version} - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - org.springframework.boot - spring-boot-maven-plugin - - org.onap.so.adapters.cnf.MSOCnfApplication - - - - - repackage - - - - - - org.jacoco - jacoco-maven-plugin - - - net.revelc.code.formatter - formatter-maven-plugin - 2.9.0 - - - format-java - - format - - process-sources - - ${format.skipExecute} - ${project.basedir}/onap-eclipse-format.xml - - - - format-xml - - format - - process-sources - - ${format.skipExecute} - ${project.basedir} - ${project.basedir}/pom-format.properties - - pom.xml - - - - - validate-java - - validate - - - ${format.skipValidate} - ${project.basedir}/onap-eclipse-format.xml - - - - validate-poms - - validate - - - ${format.skipValidate} - ${project.basedir}/pom-format.properties - - pom.xml - - - - - - - com.fasterxml.jackson.core - jackson-annotations - 2.9.8 - - - - - org.codehaus.mojo - exec-maven-plugin - - - docker-build - install - - exec - - - Dockerfile - docker - ${project.basedir} - - build - -t - ${project.artifactId}:${project.version} - . - - - ${project.artifactId}-${project.version}.jar - ${project.artifactId} - - - - - - - - - - org.springframework.boot - spring-boot-starter-actuator - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-jdbc - - - org.apache.tomcat - tomcat-jdbc - - - - - org.apache.cxf - cxf-spring-boot-starter-jaxws - - - org.apache.cxf - cxf-spring-boot-starter-jaxrs - - - org.apache.httpcomponents - httpmime - - - org.springframework.boot - spring-boot-starter-data-jpa - - - org.springframework.boot - spring-boot-starter-test - test - - - org.apache.httpcomponents - httpclient - - - org.apache.httpcomponents - httpcore - - - org.springframework.cloud - spring-cloud-contract-wiremock - 1.2.4.RELEASE - - - org.onap.so - aai-client - ${project.version} - - - com.sun.xml.ws - jaxws-ri - 2.3.0 - pom - - - + SO CNF Adapter + pom + + + 11 + 11 + UTF-8 + UTF-8 + 2.3.1 + 1.8.2 + 2.7.2 + 1.3.5 + 1.0.1 + 1.5.21 + 3.14.0 + 2.7.5 + 1.13.0 + 2.3.6.RELEASE + 2.3.0 + 0.11 + 2.2 + 3.4.1 + 1.8.0-SNAPSHOT + + + + + org.apache.maven.plugins + maven-compiler-plugin + + ${version.java.compiler} + ${version.java.compiler} + + + + net.revelc.code.formatter + formatter-maven-plugin + 2.9.0 + + + format-java + + format + + process-sources + + true + + + + format-xml + + format + + process-sources + + true + + pom.xml + + + + + validate-java + + validate + + + true + + + + validate-poms + + validate + + + true + + pom.xml + + + + + + + + + + so-cnf-adapter-application + packages + + 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 @@ + + + + 4.0.0 + + org.onap.so.adapters.so-cnf-adapter + so-cnf-adapter + 1.8.0-SNAPSHOT + + so-cnf-adapter-application + so-cnf-adapter + jar + Web service endpoint for cnf operations + + + + org.springframework.boot + spring-boot-dependencies + ${springboot.version} + pom + import + + + + + ${project.artifactId}-${project.version} + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + org.springframework.boot + spring-boot-maven-plugin + + org.onap.so.adapters.cnf.MSOCnfApplication + + + + + repackage + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + original + + + + + org.jacoco + jacoco-maven-plugin + + + org.apache.maven.plugins + maven-surefire-plugin + + + DEBUG + + 2 + suites + false + 1 + + + + + + src/main/resources + true + + **/*.p12 + **/*.jks + + + + src/main/resources + false + + **/*.p12 + **/*.jks + + + + + + + org.springframework.boot + spring-boot-starter-actuator + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-jdbc + + + org.apache.tomcat + tomcat-jdbc + + + + + org.apache.cxf + cxf-spring-boot-starter-jaxws + + + org.apache.cxf + cxf-spring-boot-starter-jaxrs + + + org.apache.httpcomponents + httpmime + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.springframework.boot + spring-boot-starter-test + test + + + org.apache.httpcomponents + httpclient + + + org.apache.httpcomponents + httpcore + + + org.springframework.cloud + spring-cloud-contract-wiremock + 1.2.4.RELEASE + + + org.onap.so + aai-client + ${project.version} + + + com.sun.xml.ws + jaxws-ri + 2.3.0 + pom + + + + 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 similarity index 100% rename from src/main/java/org/onap/so/adapters/cnf/MSOCnfApplication.java rename to 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 similarity index 100% rename from src/main/java/org/onap/so/adapters/cnf/WebSecurityConfig.java rename to 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 similarity index 100% rename from src/main/java/org/onap/so/adapters/cnf/exceptions/ApplicationException.java rename to 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 similarity index 100% rename from src/main/java/org/onap/so/adapters/cnf/model/BpmnInstanceRequest.java rename to 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 similarity index 100% rename from src/main/java/org/onap/so/adapters/cnf/model/Config.java rename to 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 similarity index 100% rename from src/main/java/org/onap/so/adapters/cnf/model/ConfigTemplateEntity.java rename to 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 similarity index 100% rename from src/main/java/org/onap/so/adapters/cnf/model/ConfigurationEntity.java rename to 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 similarity index 100% rename from src/main/java/org/onap/so/adapters/cnf/model/ConfigurationRollbackEntity.java rename to 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 similarity index 100% rename from src/main/java/org/onap/so/adapters/cnf/model/ConnectivityInfo.java rename to 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 similarity index 100% rename from src/main/java/org/onap/so/adapters/cnf/model/ConnectivityRecords.java rename to 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 similarity index 100% rename from src/main/java/org/onap/so/adapters/cnf/model/ErrorResponse.java rename to 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 similarity index 100% rename from src/main/java/org/onap/so/adapters/cnf/model/GroupVersionKind.java rename to 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 similarity index 100% rename from src/main/java/org/onap/so/adapters/cnf/model/InstanceMiniResponse.java rename to 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 similarity index 100% rename from src/main/java/org/onap/so/adapters/cnf/model/InstanceMiniResponseList.java rename to 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 similarity index 100% rename from src/main/java/org/onap/so/adapters/cnf/model/InstanceResponse.java rename to 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 similarity index 100% rename from src/main/java/org/onap/so/adapters/cnf/model/InstanceStatusResponse.java rename to 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 similarity index 100% rename from src/main/java/org/onap/so/adapters/cnf/model/MulticloudInstanceRequest.java rename to 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 similarity index 100% rename from src/main/java/org/onap/so/adapters/cnf/model/OtherConnectivityListEntity.java rename to 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 similarity index 100% rename from src/main/java/org/onap/so/adapters/cnf/model/PodStatus.java rename to 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 similarity index 100% rename from src/main/java/org/onap/so/adapters/cnf/model/ProfileEntity.java rename to 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 similarity index 100% rename from src/main/java/org/onap/so/adapters/cnf/model/Resource.java rename to 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 similarity index 100% rename from src/main/java/org/onap/so/adapters/cnf/model/ResourceBundleEntity.java rename to 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 similarity index 100% rename from src/main/java/org/onap/so/adapters/cnf/model/Response.java rename to 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 similarity index 100% rename from src/main/java/org/onap/so/adapters/cnf/model/Tag.java rename to 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 similarity index 100% rename from src/main/java/org/onap/so/adapters/cnf/rest/CnfAdapterRest.java rename to 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 similarity index 100% rename from src/main/java/org/onap/so/adapters/cnf/service/CnfAdapterService.java rename to 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 similarity index 100% rename from src/main/java/org/onap/so/adapters/cnf/util/CNfAdapterUtil.java rename to 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 similarity index 100% rename from src/main/resources/META-INF/services/org.onap.so.client.RestProperties rename to 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 similarity index 100% rename from src/main/resources/application.yaml rename to 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 similarity index 100% rename from src/test/java/org/onap/so/adapters/cnf/CnfAdapterRestTest.java rename to 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 similarity index 100% rename from src/test/java/org/onap/so/adapters/cnf/rest/CnfAdapterRestTest.java rename to 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 similarity index 100% rename from src/test/java/org/onap/so/adapters/cnf/service/CnfAdapterServiceTest.java rename to so-cnf-adapter-application/src/test/java/org/onap/so/adapters/cnf/service/CnfAdapterServiceTest.java