diff options
| author |   Abhishek Bajaj <abhishek.kumar.bajaj@huawei.com> | 2021-03-12 13:05:34 +0530 |
|---|---|---|
| committer | Abhishek Bajaj <abhishek.kumar.bajaj@huawei.com> | 2021-03-12 13:42:33 +0530 |
| commit | 3279b96ba8e6f356633016418ecba22d815c0e06 (patch) | |
| tree | ceaf96ff98bb229746119933984ee4be1667915f | |
| parent | 9b069ec9cee455210f0adf542998932b80c2182a (diff) | |
so-etsi-sol005-adapter build failed issues
Issue-ID: SO-3520
Signed-off-by: Abhishek Bajaj <abhishek.kumar.bajaj@huawei.com>
Change-Id: Id339297e27d217dde2d8a2e72337b4398bffa047
Signed-off-by: Abhishek Bajaj <abhishek.kumar.bajaj@huawei.com>
164 files changed, 921 insertions, 175 deletions
diff --git a/packages/docker/pom.xml b/packages/docker/pom.xml new file mode 100644 index 0000000..59a47d8 --- /dev/null +++ b/packages/docker/pom.xml @@ -0,0 +1,157 @@ +<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-sol005-adapter</groupId> + <artifactId>packages</artifactId> + <version>1.8.0-SNAPSHOT</version> + </parent> + <groupId>org.onap.so.adapters.so-sol005-adapter.packages</groupId> + <version>1.8.0-SNAPSHOT</version> + <packaging>pom</packaging> + <artifactId>docker</artifactId> + <name>SO SOL005 Adapter Docker Packaging</name> + + <properties> + <sol005-adapter-project-version>${project.version}</sol005-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['sol005-adapter-project-version']; + def versionArray; + if (project.properties['sol005-adapter-project-version'] != null) { + versionArray = project.properties['sol005-adapter-project-version'].split('-'); + } + + if (project.properties['sol005-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>${docker.image.prefix}/so-sol005-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-sol005-adapter:so-sol005-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>${docker.image.prefix}/so-sol005-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-sol005-adapter</groupId> + <artifactId>so-sol005-adapter-application</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> +</project>
\ No newline at end of file diff --git a/packages/docker/src/main/docker/docker-files/Dockerfile.so-app b/packages/docker/src/main/docker/docker-files/Dockerfile.so-app new file mode 100644 index 0000000..dc86ff8 --- /dev/null +++ b/packages/docker/src/main/docker/docker-files/Dockerfile.so-app @@ -0,0 +1,31 @@ +FROM onap/so/base-image:1.0 + +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 + +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 +# 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/packages/docker/src/main/docker/docker-files/ca-certificates/onap-ca.crt b/packages/docker/src/main/docker/docker-files/ca-certificates/onap-ca.crt new file mode 100644 index 0000000..e9a50d7 --- /dev/null +++ b/packages/docker/src/main/docker/docker-files/ca-certificates/onap-ca.crt @@ -0,0 +1,31 @@ +-----BEGIN CERTIFICATE----- +MIIFPjCCAyagAwIBAgIJAJ6u7cCnzrWdMA0GCSqGSIb3DQEBCwUAMCwxDjAMBgNV +BAsMBU9TQUFGMQ0wCwYDVQQKDARPTkFQMQswCQYDVQQGEwJVUzAeFw0xODA0MDUx +NDE1MjhaFw0zODAzMzExNDE1MjhaMCwxDjAMBgNVBAsMBU9TQUFGMQ0wCwYDVQQK +DARPTkFQMQswCQYDVQQGEwJVUzCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoC +ggIBAMA5pkgRs7NhGG4ew5JouhyYakgYUyFaG121+/h8qbSdt0hVQv56+EA41Yq7 +XGie7RYDQK9NmAFF3gruE+6X7wvJiChp+Cyd7sFMnb65uWhxEdxWTM2BJFrgfzUn +H8ZCxgaCo3XH4PzlKRy2LQQJEJECwl/RZmRCXijMt5e9h8XoZY/fKkKcZZUsWNCM +pTo266wjvA9MXLmdgReRj0+vrCjrNqy+htwJDztoiHWiYPqT6o8EvGcgjNqjlZx7 +NUNf8MfLDByqKF6+wRbHv1GKjn3/Vijd45Fv8riyRYROiFanvbV6jIfBkv8PZbXg +2VDWsYsgp8NAvMxK+iV8cO+Ck3lBI2GOPZbCEqpPVTYbLUz6sczAlCXwQoPzDIZY +wYa3eR/gYLY1gP2iEVHORag3bLPap9ZX5E8DZkzTNTjovvLk8KaCmfcaUMJsBtDd +ApcUitz10cnRyZc1sX3gE1f3DpzQM6t9C5sOVyRhDcSrKqqwb9m0Ss04XAS9FsqM +P3UWYQyqDXSxlUAYaX892u8mV1hxnt2gjb22RloXMM6TovM3sSrJS0wH+l1nznd6 +aFXftS/G4ZVIVZ/LfT1is4StoyPWZCwwwly1z8qJQ/zhip5NgZTxQw4mi7ww35DY +PdAQOCoajfSvFjqslQ/cPRi/MRCu079heVb5fQnnzVtnpFQRAgMBAAGjYzBhMB0G +A1UdDgQWBBRTVTPyS+vQUbHBeJrBKDF77+rtSTAfBgNVHSMEGDAWgBRTVTPyS+vQ +UbHBeJrBKDF77+rtSTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAN +BgkqhkiG9w0BAQsFAAOCAgEAPx/IaK94n02wPxpnYTy+LVLIxwdq/kawNd6IbiMz +L87zmNMDmHcGbfoRCj8OkhuggX9Lx1/CkhpXimuYsZOFQi5blr/u+v4mIbsgbmi9 +7j+cUHDP0zLycvSvxKHty51LwmaX9a4wkJl5zBU4O1sd/H9tWcEmwJ39ltKoBKBx +c94Zc3iMm5ytRWGj+0rKzLDAXEWpoZ5bE5PLJauA6UDCxDLfs3FwhbS7uDggxYvf +jySF5FCNET94oJ+m8s7VeHvoa8iPGKvXrIqdd7XDHnqJJlVKr7m9S0fMbyEB8ci2 +RtOXDt93ifY1uhoEtEykn4dqBSp8ezvNMnwoXdYPDvTd9uCAFeWFLVreBAWxd25h +PsBTkZA5hpa/rA+mKv6Af4VBViYr8cz4dZCsFChuioVebe9ighrfjB//qKepFjPF +CyjzKN1u0JKm/2x/ORqxkTONG8p3uDwoIOyimUcTtTMv42bfYD88RKakqSFXE9G+ +Z0LlaKABqfjK49o/tsAp+c5LoNlYllKhnetO3QAdraHwdmC36BhoghzR1jpX751A +cZn2VH3Q4XKyp01cJNCJIrua+A+bx6zh3RyW6zIIkbRCbET+UD+4mr8WIcSE3mtR +ZVlnhUDO4z9//WKMVzwS9Rh8/kuszrGFI1KQozXCHLrce3YP6RYZfOed79LXaRwX +dYY= +-----END CERTIFICATE----- diff --git a/packages/docker/src/main/docker/docker-files/configs/logging/logback-spring.xml b/packages/docker/src/main/docker/docker-files/configs/logging/logback-spring.xml new file mode 100644 index 0000000..e4be709 --- /dev/null +++ b/packages/docker/src/main/docker/docker-files/configs/logging/logback-spring.xml @@ -0,0 +1,203 @@ +<!-- + ============LICENSE_START======================================================= + ONAP - SO + ================================================================================ + Copyright (C) 2017 AT&T Intellectual Property. 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========================================================= +--> +<configuration scan="true" debug="false"> + <contextListener class="org.onap.so.logger.LoggerStartupListener" /> + <include resource="org/springframework/boot/logging/logback/defaults.xml" /> + + <property name="queueSize" value="256" /> + <property name="maxFileSize" value="200MB" /> + <property name="maxHistory" value="30" /> + <property name="totalSizeCap" value="10GB" /> + + <!-- log file names --> + <property name="errorLogName" value="error" /> + <property name="metricsLogName" value="metrics" /> + <property name="auditLogName" value="audit" /> + <property name="debugLogName" value="debug" /> + + <property name="currentTimeStamp" value="%d{"yyyy-MM-dd'T'HH:mm:ss.SSSXXX",UTC}" /> + + <property name="errorPattern" + value="%d{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%X{RequestID}|%thread|%X{ServiceName}|%X{PartnerName}|%X{TargetEntity}|%X{TargetServiceName}|%.-5level|%X{ErrorCode:-500}|%X{ErrorDesc}|%msg%n" /> + + <property name="debugPattern" value="%d{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%X{RequestID}|%logger{50} - %msg%n" /> + + <property name="auditPattern" + value="%X{EntryTimestamp}|%date{yyyy-MM-dd'T'HH:mm:ss.SSSXXX,UTC}|%X{RequestID}|%X{ServiceInstanceId}|%thread||%X{ServiceName}|%X{PartnerName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDesc}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ElapsedTime}|%X{ServerFQDN}|%X{RemoteHost}||||%marker|%mdc|||%msg%n" /> + + <property name="metricPattern" + value="%X{InvokeTimestamp}|%date{yyyy-MM-dd'T'HH:mm:ss.SSSXXX,UTC}|%X{RequestID}|%X{ServiceInstanceId}|%thread||%X{ServiceName}|%X{PartnerName}|%X{TargetEntity}|%X{TargetServiceName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDesc}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ElapsedTime}|%X{ServerFQDN}|%X{RemoteHost}||||%X{TargetVirtualEntity}|%marker|%mdc|||%msg%n" /> + + <property name="defaultPattern" + value="%nopexception%logger + \t%date{yyyy-MM-dd'T'HH:mm:ss.SSSXXX,UTC} + \t%level + \t%replace(%replace(%message){'\t','\\\\t'}){'\n','\\\\n'} + \t%replace(%replace(%mdc){'\t','\\\\t'}){'\n','\\\\n'} + \t%replace(%replace(%rootException){'\t','\\\\t'}){'\n','\\\\n'} + \t%replace(%replace(%marker){'\t','\\\\t'}){'\n','\\\\n'} + \t%thread + \t%n" /> + + <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> + <encoder> + <pattern>${errorPattern}</pattern> + </encoder> + </appender> + + <appender name="Audit" class="ch.qos.logback.core.rolling.RollingFileAppender"> + <filter class="ch.qos.logback.core.filter.EvaluatorFilter"> + <evaluator class="ch.qos.logback.classic.boolex.OnMarkerEvaluator"> + <marker>EXIT</marker> + </evaluator> + <onMismatch>DENY</onMismatch> + <onMatch>ACCEPT</onMatch> + </filter> + <file>${logs_dir:-.}/${auditLogName}.log</file> + <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy"> + <fileNamePattern>${logs_dir:-.}/${auditLogName}.%d{yyyy-MM-dd}.%i.log.zip + </fileNamePattern> + <maxFileSize>${maxFileSize}</maxFileSize> + <maxHistory>${maxHistory}</maxHistory> + <totalSizeCap>${totalSizeCap}</totalSizeCap> + </rollingPolicy> + <encoder> + <pattern>${auditPattern}</pattern> + </encoder> + </appender> + + <appender name="asyncAudit" class="ch.qos.logback.classic.AsyncAppender"> + <queueSize>256</queueSize> + <appender-ref ref="Audit" /> + </appender> + + <appender name="Metric" class="ch.qos.logback.core.rolling.RollingFileAppender"> + <filter class="ch.qos.logback.core.filter.EvaluatorFilter"> + <evaluator class="ch.qos.logback.classic.boolex.OnMarkerEvaluator"> + <marker>INVOKE-RETURN</marker> + </evaluator> + <onMismatch>DENY</onMismatch> + <onMatch>ACCEPT</onMatch> + </filter> + <file>${logs_dir:-.}/${metricsLogName}.log</file> + <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy"> + <fileNamePattern>${logs_dir:-.}/${metricsLogName}.%d{yyyy-MM-dd}.%i.log.zip + </fileNamePattern> + <maxFileSize>${maxFileSize}</maxFileSize> + <maxHistory>${maxHistory}</maxHistory> + <totalSizeCap>${totalSizeCap}</totalSizeCap> + </rollingPolicy> + <encoder> + <pattern>${metricPattern}</pattern> + </encoder> + </appender> + + + <appender name="asyncMetric" class="ch.qos.logback.classic.AsyncAppender"> + <queueSize>256</queueSize> + <appender-ref ref="Metric" /> + </appender> + + <appender name="Error" class="ch.qos.logback.core.rolling.RollingFileAppender"> + <filter class="ch.qos.logback.classic.filter.LevelFilter"> + <level>ERROR</level> + <onMatch>ACCEPT</onMatch> + <onMismatch>DENY</onMismatch> + </filter> + <file>${logs_dir:-.}/${errorLogName}.log</file> + <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy"> + <fileNamePattern>${logs_dir:-.}/${errorLogName}.%d{yyyy-MM-dd}.%i.log.zip + </fileNamePattern> + <maxFileSize>${maxFileSize}</maxFileSize> + <maxHistory>${maxHistory}</maxHistory> + <totalSizeCap>${totalSizeCap}</totalSizeCap> + </rollingPolicy> + <encoder> + <pattern>${errorPattern}</pattern> + </encoder> + </appender> + + <appender name="asyncError" class="ch.qos.logback.classic.AsyncAppender"> + <queueSize>256</queueSize> + <appender-ref ref="Error" /> + </appender> + + <appender name="Debug" class="ch.qos.logback.core.rolling.RollingFileAppender"> + <filter class="ch.qos.logback.core.filter.EvaluatorFilter"> + <evaluator class="ch.qos.logback.classic.boolex.OnMarkerEvaluator"> + <marker>INVOKE</marker> + <marker>INVOKE-RETURN</marker> + <marker>ENTRY</marker> + <marker>EXIT</marker> + </evaluator> + <onMismatch>ACCEPT</onMismatch> + <onMatch>DENY</onMatch> + </filter> + <file>${logs_dir:-.}/${debugLogName}.log</file> + <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy"> + <fileNamePattern>${logs_dir:-.}/${debugLogName}.%d{yyyy-MM-dd}.%i.log.zip + </fileNamePattern> + <maxFileSize>${maxFileSize}</maxFileSize> + <maxHistory>${maxHistory}</maxHistory> + <totalSizeCap>${totalSizeCap}</totalSizeCap> + </rollingPolicy> + <encoder> + <pattern>${debugPattern}</pattern> + </encoder> + </appender> + + <appender name="asyncDebug" class="ch.qos.logback.classic.AsyncAppender"> + <queueSize>256</queueSize> + <appender-ref ref="Debug" /> + <includeCallerData>true</includeCallerData> + </appender> + + <!-- Spring related loggers --> + <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"> + <appender-ref ref="asyncAudit" /> + </logger> + + <logger name="METRIC" level="INFO" additivity="false"> + <appender-ref ref="asyncMetric" /> + </logger> + + <root level="INFO"> + <appender-ref ref="asyncDebug" /> + <appender-ref ref="asyncError" /> + <appender-ref ref="asyncAudit" /> + <appender-ref ref="asyncMetric" /> + <appender-ref ref="STDOUT" /> + </root> + +</configuration>
\ No newline at end of file diff --git a/packages/docker/src/main/docker/docker-files/scripts/.gitattributes b/packages/docker/src/main/docker/docker-files/scripts/.gitattributes new file mode 100644 index 0000000..b905d1d --- /dev/null +++ b/packages/docker/src/main/docker/docker-files/scripts/.gitattributes @@ -0,0 +1,5 @@ +# 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/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 100644 index 0000000..54ed9ed --- /dev/null +++ b/packages/docker/src/main/docker/docker-files/scripts/start-app.sh @@ -0,0 +1,89 @@ +#!/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/packages/docker/src/main/docker/docker-files/scripts/wait-for.sh b/packages/docker/src/main/docker/docker-files/scripts/wait-for.sh new file mode 100644 index 0000000..2525821 --- /dev/null +++ b/packages/docker/src/main/docker/docker-files/scripts/wait-for.sh @@ -0,0 +1,85 @@ +#!/bin/sh +# https://github.com/Eficode/wait-for.git +# MIT License + +TIMEOUT=15 +QUIET=0 + +echoerr() { + if [ "$QUIET" -ne 1 ]; then printf "%s\n" "$*" 1>&2; fi +} + +usage() { + exitcode="$1" + cat << USAGE >&2 +Usage: + $cmdname host:port [-t timeout] [-- command args] + -q | --quiet Do not output any status messages + -t TIMEOUT | --timeout=timeout Timeout in seconds, zero for no timeout + -- COMMAND ARGS Execute command with args after the test finishes +USAGE + exit "$exitcode" +} + +wait_for() { + command="$*" + if [ "$QUIET" -ne 1 ]; then echo "$0: probing host $HOST port $PORT"; fi + for i in `seq $TIMEOUT` ; do + nc -z "$HOST" "$PORT" > /dev/null 2>&1 + result=$? + if [ $result -eq 0 ] ; then + if [ "$QUIET" -ne 1 ]; then echo "$0: operation succeeded on try $i"; fi + if [ -n "$command" ] ; then + if [ "$QUIET" -ne 1 ]; then echo "$0: exec-ing command $command"; fi + exec $command + fi + exit 0 + fi + if [ "$QUIET" -ne 1 ]; then echo "$0: sleeping after try $i"; fi + sleep 1 + done + echo "$0: Operation timed out" >&2 + exit 1 +} + +while [ $# -gt 0 ] +do + case "$1" in + *:* ) + HOST=$(printf "%s\n" "$1"| cut -d : -f 1) + PORT=$(printf "%s\n" "$1"| cut -d : -f 2) + shift 1 + ;; + -q | --quiet) + QUIET=1 + shift 1 + ;; + -t) + TIMEOUT="$2" + if [ "$TIMEOUT" = "" ]; then break; fi + shift 2 + ;; + --timeout=*) + TIMEOUT="${1#*=}" + shift 1 + ;; + --) + shift + break + ;; + --help) + usage 0 + ;; + *) + echoerr "Unknown argument: $1" + usage 1 + ;; + esac +done + +if [ "$HOST" = "" -o "$PORT" = "" ]; then + echoerr "Error: you need to provide a host and port to test." + usage 2 +fi + +wait_for "$@" diff --git a/packages/pom.xml b/packages/pom.xml new file mode 100644 index 0000000..f79e000 --- /dev/null +++ b/packages/pom.xml @@ -0,0 +1,35 @@ +<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-sol005-adapter</groupId> + <artifactId>so-sol005-adapter</artifactId> + <version>1.8.0-SNAPSHOT</version> + </parent> + <artifactId>packages</artifactId> + <packaging>pom</packaging> + <version>1.8.0-SNAPSHOT</version> + <name>SO SOL005 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,176 +1,112 @@ <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>adapters</artifactId> - <version>1.7.1-SNAPSHOT</version> - </parent> - <groupId>org.onap.so.adapters</groupId> - <artifactId>so-vfc-adapter</artifactId> - <name>so-vfc-adapter</name> - <description>Web service endpoint for vfc 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.springframework.boot</groupId> - <artifactId>spring-boot-maven-plugin</artifactId> - <configuration> - <mainClass>org.onap.so.adapters.vfc.MSOVfcApplication</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> - </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.cxf</groupId> - <artifactId>cxf-rt-rs-service-description-swagger</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.onap.so</groupId> - <artifactId>mso-requests-db</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.onap.so</groupId> - <artifactId>mso-requests-db-repositories</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.mariadb.jdbc</groupId> - <artifactId>mariadb-java-client</artifactId> - </dependency> - <dependency> - <groupId>ch.vorburger.mariaDB4j</groupId> - <artifactId>mariaDB4j</artifactId> - <version>2.2.3</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-configuration-processor</artifactId> - <optional>true</optional> - </dependency> - </dependencies> + 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-sol005-adapter</groupId> + <artifactId>so-sol005-adapter</artifactId> + <version>1.8.0-SNAPSHOT</version> + <name>SO SOL005 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>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> + <configuration> + <skip>true</skip> + </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-etsi-sol005-adapter-application</module> + <module>packages</module> + </modules> </project> diff --git a/so-etsi-sol005-adapter-application/pom.xml b/so-etsi-sol005-adapter-application/pom.xml new file mode 100644 index 0000000..5b8a855 --- /dev/null +++ b/so-etsi-sol005-adapter-application/pom.xml @@ -0,0 +1,155 @@ +<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-sol005-adapter</groupId> + <artifactId>so-sol005-adapter</artifactId> + <version>1.8.0-SNAPSHOT</version> + </parent> + + <artifactId>so-etsi-sol005-adapter-application</artifactId> + <version>1.8.0-SNAPSHOT</version> + <name>so-vfc-adapter</name> + + <description>Web service endpoint for vfc 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.springframework.boot</groupId> + <artifactId>spring-boot-maven-plugin</artifactId> + <configuration> + <mainClass>org.onap.so.adapters.vfc.MSOVfcApplication</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> + </executions> + <dependencies> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-annotations</artifactId> + <version>2.9.8</version> + </dependency> + </dependencies> + </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.cxf</groupId> + <artifactId>cxf-rt-rs-service-description-swagger</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.onap.so</groupId> + <artifactId>mso-requests-db</artifactId> + <version>1.8.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.onap.so</groupId> + <artifactId>mso-requests-db-repositories</artifactId> + <version>1.8.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.mariadb.jdbc</groupId> + <artifactId>mariadb-java-client</artifactId> + </dependency> + <dependency> + <groupId>ch.vorburger.mariaDB4j</groupId> + <artifactId>mariaDB4j</artifactId> + <version>2.2.3</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-configuration-processor</artifactId> + <optional>true</optional> + </dependency> + </dependencies> +</project> diff --git a/src/main/java/org/onap/so/adapters/vfc/CXFConfiguration.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/CXFConfiguration.java index dd875c5..dd875c5 100644 --- a/src/main/java/org/onap/so/adapters/vfc/CXFConfiguration.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/CXFConfiguration.java diff --git a/src/main/java/org/onap/so/adapters/vfc/MSOVfcApplication.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/MSOVfcApplication.java index 62234f9..62234f9 100644 --- a/src/main/java/org/onap/so/adapters/vfc/MSOVfcApplication.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/MSOVfcApplication.java diff --git a/src/main/java/org/onap/so/adapters/vfc/RequestDBConfig.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/RequestDBConfig.java index d7397c8..d7397c8 100644 --- a/src/main/java/org/onap/so/adapters/vfc/RequestDBConfig.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/RequestDBConfig.java diff --git a/src/main/java/org/onap/so/adapters/vfc/constant/CommonConstant.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/constant/CommonConstant.java index 51a0fc0..51a0fc0 100644 --- a/src/main/java/org/onap/so/adapters/vfc/constant/CommonConstant.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/constant/CommonConstant.java diff --git a/src/main/java/org/onap/so/adapters/vfc/constant/DriverExceptionID.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/constant/DriverExceptionID.java index 6133002..6133002 100644 --- a/src/main/java/org/onap/so/adapters/vfc/constant/DriverExceptionID.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/constant/DriverExceptionID.java diff --git a/src/main/java/org/onap/so/adapters/vfc/constant/HttpCode.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/constant/HttpCode.java index e08c157..e08c157 100644 --- a/src/main/java/org/onap/so/adapters/vfc/constant/HttpCode.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/constant/HttpCode.java diff --git a/src/main/java/org/onap/so/adapters/vfc/exceptions/ApplicationException.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/exceptions/ApplicationException.java index 88260a7..88260a7 100644 --- a/src/main/java/org/onap/so/adapters/vfc/exceptions/ApplicationException.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/exceptions/ApplicationException.java diff --git a/src/main/java/org/onap/so/adapters/vfc/model/AddPnfData.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/AddPnfData.java index d312501..d312501 100644 --- a/src/main/java/org/onap/so/adapters/vfc/model/AddPnfData.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/AddPnfData.java diff --git a/src/main/java/org/onap/so/adapters/vfc/model/AddressRange.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/AddressRange.java index 9f357a5..9f357a5 100644 --- a/src/main/java/org/onap/so/adapters/vfc/model/AddressRange.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/AddressRange.java diff --git a/src/main/java/org/onap/so/adapters/vfc/model/AffectedNs.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/AffectedNs.java index fa502f3..fa502f3 100644 --- a/src/main/java/org/onap/so/adapters/vfc/model/AffectedNs.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/AffectedNs.java diff --git a/src/main/java/org/onap/so/adapters/vfc/model/AffectedPnf.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/AffectedPnf.java index 9d98e1c..9d98e1c 100644 --- a/src/main/java/org/onap/so/adapters/vfc/model/AffectedPnf.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/AffectedPnf.java diff --git a/src/main/java/org/onap/so/adapters/vfc/model/AffectedSap.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/AffectedSap.java index 62f4f92..62f4f92 100644 --- a/src/main/java/org/onap/so/adapters/vfc/model/AffectedSap.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/AffectedSap.java diff --git a/src/main/java/org/onap/so/adapters/vfc/model/AffectedVirtualLink.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/AffectedVirtualLink.java index ecaa1c5..ecaa1c5 100644 --- a/src/main/java/org/onap/so/adapters/vfc/model/AffectedVirtualLink.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/AffectedVirtualLink.java diff --git a/src/main/java/org/onap/so/adapters/vfc/model/AffectedVnf.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/AffectedVnf.java index 6463c7a..6463c7a 100644 --- a/src/main/java/org/onap/so/adapters/vfc/model/AffectedVnf.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/AffectedVnf.java diff --git a/src/main/java/org/onap/so/adapters/vfc/model/AffectedVnffg.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/AffectedVnffg.java index 04e9481..04e9481 100644 --- a/src/main/java/org/onap/so/adapters/vfc/model/AffectedVnffg.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/AffectedVnffg.java diff --git a/src/main/java/org/onap/so/adapters/vfc/model/AffinityOrAntiAffinityRule.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/AffinityOrAntiAffinityRule.java index 7f019bc..7f019bc 100644 --- a/src/main/java/org/onap/so/adapters/vfc/model/AffinityOrAntiAffinityRule.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/AffinityOrAntiAffinityRule.java diff --git a/src/main/java/org/onap/so/adapters/vfc/model/ChangedInfo.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/ChangedInfo.java index 5de6cbf..5de6cbf 100644 --- a/src/main/java/org/onap/so/adapters/vfc/model/ChangedInfo.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/ChangedInfo.java diff --git a/src/main/java/org/onap/so/adapters/vfc/model/CivicAddressElement.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/CivicAddressElement.java index 2a63d39..2a63d39 100644 --- a/src/main/java/org/onap/so/adapters/vfc/model/CivicAddressElement.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/CivicAddressElement.java diff --git a/src/main/java/org/onap/so/adapters/vfc/model/CpProtocolData.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/CpProtocolData.java index 27272ea..27272ea 100644 --- a/src/main/java/org/onap/so/adapters/vfc/model/CpProtocolData.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/CpProtocolData.java diff --git a/src/main/java/org/onap/so/adapters/vfc/model/CpProtocolInfo.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/CpProtocolInfo.java index 5f1191e..5f1191e 100644 --- a/src/main/java/org/onap/so/adapters/vfc/model/CpProtocolInfo.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/CpProtocolInfo.java diff --git a/src/main/java/org/onap/so/adapters/vfc/model/CreateNsRequest.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/CreateNsRequest.java index 878ce60..878ce60 100644 --- a/src/main/java/org/onap/so/adapters/vfc/model/CreateNsRequest.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/CreateNsRequest.java diff --git a/src/main/java/org/onap/so/adapters/vfc/model/CustomerModel.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/CustomerModel.java index e54f0df..e54f0df 100644 --- a/src/main/java/org/onap/so/adapters/vfc/model/CustomerModel.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/CustomerModel.java diff --git a/src/main/java/org/onap/so/adapters/vfc/model/ExtCpInfo.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/ExtCpInfo.java index 63ca66b..63ca66b 100644 --- a/src/main/java/org/onap/so/adapters/vfc/model/ExtCpInfo.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/ExtCpInfo.java diff --git a/src/main/java/org/onap/so/adapters/vfc/model/ExtLinkPortInfo.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/ExtLinkPortInfo.java index a1ab3fd..a1ab3fd 100644 --- a/src/main/java/org/onap/so/adapters/vfc/model/ExtLinkPortInfo.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/ExtLinkPortInfo.java diff --git a/src/main/java/org/onap/so/adapters/vfc/model/ExtManagedVirtualLinkInfo.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/ExtManagedVirtualLinkInfo.java index 3f643a8..3f643a8 100644 --- a/src/main/java/org/onap/so/adapters/vfc/model/ExtManagedVirtualLinkInfo.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/ExtManagedVirtualLinkInfo.java diff --git a/src/main/java/org/onap/so/adapters/vfc/model/ExtVirtualLinkInfo.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/ExtVirtualLinkInfo.java index ce7d1cf..ce7d1cf 100644 --- a/src/main/java/org/onap/so/adapters/vfc/model/ExtVirtualLinkInfo.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/ExtVirtualLinkInfo.java diff --git a/src/main/java/org/onap/so/adapters/vfc/model/InstantiateNsRequest.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/InstantiateNsRequest.java index ff0730a..ff0730a 100644 --- a/src/main/java/org/onap/so/adapters/vfc/model/InstantiateNsRequest.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/InstantiateNsRequest.java diff --git a/src/main/java/org/onap/so/adapters/vfc/model/InstantiatedVnfInfo.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/InstantiatedVnfInfo.java index e66bb90..e66bb90 100644 --- a/src/main/java/org/onap/so/adapters/vfc/model/InstantiatedVnfInfo.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/InstantiatedVnfInfo.java diff --git a/src/main/java/org/onap/so/adapters/vfc/model/IpAddresses.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/IpAddresses.java index 32c5571..32c5571 100644 --- a/src/main/java/org/onap/so/adapters/vfc/model/IpAddresses.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/IpAddresses.java diff --git a/src/main/java/org/onap/so/adapters/vfc/model/IpOverEthernetAddressData.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/IpOverEthernetAddressData.java index 48529e5..48529e5 100644 --- a/src/main/java/org/onap/so/adapters/vfc/model/IpOverEthernetAddressData.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/IpOverEthernetAddressData.java diff --git a/src/main/java/org/onap/so/adapters/vfc/model/Link.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/Link.java index 2459346..2459346 100644 --- a/src/main/java/org/onap/so/adapters/vfc/model/Link.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/Link.java diff --git a/src/main/java/org/onap/so/adapters/vfc/model/Links.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/Links.java index 8ad8f00..8ad8f00 100644 --- a/src/main/java/org/onap/so/adapters/vfc/model/Links.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/Links.java diff --git a/src/main/java/org/onap/so/adapters/vfc/model/LocationConstraint.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/LocationConstraint.java index b79565d..b79565d 100644 --- a/src/main/java/org/onap/so/adapters/vfc/model/LocationConstraint.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/LocationConstraint.java diff --git a/src/main/java/org/onap/so/adapters/vfc/model/LocationConstraints.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/LocationConstraints.java index b636d49..b636d49 100644 --- a/src/main/java/org/onap/so/adapters/vfc/model/LocationConstraints.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/LocationConstraints.java diff --git a/src/main/java/org/onap/so/adapters/vfc/model/Mask.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/Mask.java index 352f47e..352f47e 100644 --- a/src/main/java/org/onap/so/adapters/vfc/model/Mask.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/Mask.java diff --git a/src/main/java/org/onap/so/adapters/vfc/model/ModifyVnfInfoData.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/ModifyVnfInfoData.java index 55ab21e..55ab21e 100644 --- a/src/main/java/org/onap/so/adapters/vfc/model/ModifyVnfInfoData.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/ModifyVnfInfoData.java diff --git a/src/main/java/org/onap/so/adapters/vfc/model/NSResourceInputParameter.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/NSResourceInputParameter.java index 266e5ee..266e5ee 100644 --- a/src/main/java/org/onap/so/adapters/vfc/model/NSResourceInputParameter.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/NSResourceInputParameter.java diff --git a/src/main/java/org/onap/so/adapters/vfc/model/NfpInfo.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/NfpInfo.java index a6e3963..a6e3963 100644 --- a/src/main/java/org/onap/so/adapters/vfc/model/NfpInfo.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/NfpInfo.java diff --git a/src/main/java/org/onap/so/adapters/vfc/model/NfpRule.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/NfpRule.java index b4f684a..b4f684a 100644 --- a/src/main/java/org/onap/so/adapters/vfc/model/NfpRule.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/NfpRule.java diff --git a/src/main/java/org/onap/so/adapters/vfc/model/NsCpHandle.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/NsCpHandle.java index 326488f..326488f 100644 --- a/src/main/java/org/onap/so/adapters/vfc/model/NsCpHandle.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/NsCpHandle.java diff --git a/src/main/java/org/onap/so/adapters/vfc/model/NsCreateReq.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/NsCreateReq.java index 63358cb..63358cb 100644 --- a/src/main/java/org/onap/so/adapters/vfc/model/NsCreateReq.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/NsCreateReq.java diff --git a/src/main/java/org/onap/so/adapters/vfc/model/NsInstance.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/NsInstance.java index d2d4b4e..d2d4b4e 100644 --- a/src/main/java/org/onap/so/adapters/vfc/model/NsInstance.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/NsInstance.java diff --git a/src/main/java/org/onap/so/adapters/vfc/model/NsInstanceLinks.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/NsInstanceLinks.java index 08b3c63..08b3c63 100644 --- a/src/main/java/org/onap/so/adapters/vfc/model/NsInstanceLinks.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/NsInstanceLinks.java diff --git a/src/main/java/org/onap/so/adapters/vfc/model/NsInstantiateReq.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/NsInstantiateReq.java index 4281026..4281026 100644 --- a/src/main/java/org/onap/so/adapters/vfc/model/NsInstantiateReq.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/NsInstantiateReq.java diff --git a/src/main/java/org/onap/so/adapters/vfc/model/NsLcmOpOcc.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/NsLcmOpOcc.java index 559b1f7..559b1f7 100644 --- a/src/main/java/org/onap/so/adapters/vfc/model/NsLcmOpOcc.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/NsLcmOpOcc.java diff --git a/src/main/java/org/onap/so/adapters/vfc/model/NsLinkPortInfo.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/NsLinkPortInfo.java index 2dff432..2dff432 100644 --- a/src/main/java/org/onap/so/adapters/vfc/model/NsLinkPortInfo.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/NsLinkPortInfo.java diff --git a/src/main/java/org/onap/so/adapters/vfc/model/NsOperationKey.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/NsOperationKey.java index 2088d68..2088d68 100644 --- a/src/main/java/org/onap/so/adapters/vfc/model/NsOperationKey.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/NsOperationKey.java diff --git a/src/main/java/org/onap/so/adapters/vfc/model/NsParameters.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/NsParameters.java index e82ee2a..e82ee2a 100644 --- a/src/main/java/org/onap/so/adapters/vfc/model/NsParameters.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/NsParameters.java diff --git a/src/main/java/org/onap/so/adapters/vfc/model/NsProgressStatus.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/NsProgressStatus.java index a7e72ef..a7e72ef 100644 --- a/src/main/java/org/onap/so/adapters/vfc/model/NsProgressStatus.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/NsProgressStatus.java diff --git a/src/main/java/org/onap/so/adapters/vfc/model/NsScaleInfo.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/NsScaleInfo.java index 59acf56..59acf56 100644 --- a/src/main/java/org/onap/so/adapters/vfc/model/NsScaleInfo.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/NsScaleInfo.java diff --git a/src/main/java/org/onap/so/adapters/vfc/model/NsScaleParameters.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/NsScaleParameters.java index 6d089c0..6d089c0 100644 --- a/src/main/java/org/onap/so/adapters/vfc/model/NsScaleParameters.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/NsScaleParameters.java diff --git a/src/main/java/org/onap/so/adapters/vfc/model/NsScaleReq.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/NsScaleReq.java index 79ed02c..79ed02c 100644 --- a/src/main/java/org/onap/so/adapters/vfc/model/NsScaleReq.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/NsScaleReq.java diff --git a/src/main/java/org/onap/so/adapters/vfc/model/NsVirtualLinkInfo.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/NsVirtualLinkInfo.java index ed2debd..ed2debd 100644 --- a/src/main/java/org/onap/so/adapters/vfc/model/NsVirtualLinkInfo.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/NsVirtualLinkInfo.java diff --git a/src/main/java/org/onap/so/adapters/vfc/model/ParamsForVnf.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/ParamsForVnf.java index b7324e5..b7324e5 100644 --- a/src/main/java/org/onap/so/adapters/vfc/model/ParamsForVnf.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/ParamsForVnf.java diff --git a/src/main/java/org/onap/so/adapters/vfc/model/PnfExtCpData.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/PnfExtCpData.java index d5d091f..d5d091f 100644 --- a/src/main/java/org/onap/so/adapters/vfc/model/PnfExtCpData.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/PnfExtCpData.java diff --git a/src/main/java/org/onap/so/adapters/vfc/model/PnfExtCpInfo.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/PnfExtCpInfo.java index 402cb83..402cb83 100644 --- a/src/main/java/org/onap/so/adapters/vfc/model/PnfExtCpInfo.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/PnfExtCpInfo.java diff --git a/src/main/java/org/onap/so/adapters/vfc/model/PnfInfo.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/PnfInfo.java index a1cc11b..a1cc11b 100644 --- a/src/main/java/org/onap/so/adapters/vfc/model/PnfInfo.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/PnfInfo.java diff --git a/src/main/java/org/onap/so/adapters/vfc/model/PortRange.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/PortRange.java index 8318a8c..8318a8c 100644 --- a/src/main/java/org/onap/so/adapters/vfc/model/PortRange.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/PortRange.java diff --git a/src/main/java/org/onap/so/adapters/vfc/model/ProblemDetails.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/ProblemDetails.java index efaa5de..efaa5de 100644 --- a/src/main/java/org/onap/so/adapters/vfc/model/ProblemDetails.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/ProblemDetails.java diff --git a/src/main/java/org/onap/so/adapters/vfc/model/ResourceChanges.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/ResourceChanges.java index 062a6aa..062a6aa 100644 --- a/src/main/java/org/onap/so/adapters/vfc/model/ResourceChanges.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/ResourceChanges.java diff --git a/src/main/java/org/onap/so/adapters/vfc/model/ResourceHandle.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/ResourceHandle.java index fbfecaa..fbfecaa 100644 --- a/src/main/java/org/onap/so/adapters/vfc/model/ResourceHandle.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/ResourceHandle.java diff --git a/src/main/java/org/onap/so/adapters/vfc/model/ResponseDescriptor.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/ResponseDescriptor.java index 3ea51c1..3ea51c1 100644 --- a/src/main/java/org/onap/so/adapters/vfc/model/ResponseDescriptor.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/ResponseDescriptor.java diff --git a/src/main/java/org/onap/so/adapters/vfc/model/RestfulResponse.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/RestfulResponse.java index 27c9a89..27c9a89 100644 --- a/src/main/java/org/onap/so/adapters/vfc/model/RestfulResponse.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/RestfulResponse.java diff --git a/src/main/java/org/onap/so/adapters/vfc/model/SapData.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/SapData.java index d8e96e2..d8e96e2 100644 --- a/src/main/java/org/onap/so/adapters/vfc/model/SapData.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/SapData.java diff --git a/src/main/java/org/onap/so/adapters/vfc/model/SapInfo.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/SapInfo.java index 182aceb..182aceb 100644 --- a/src/main/java/org/onap/so/adapters/vfc/model/SapInfo.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/SapInfo.java diff --git a/src/main/java/org/onap/so/adapters/vfc/model/ScaleNsByStepsData.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/ScaleNsByStepsData.java index f9d6274..f9d6274 100644 --- a/src/main/java/org/onap/so/adapters/vfc/model/ScaleNsByStepsData.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/ScaleNsByStepsData.java diff --git a/src/main/java/org/onap/so/adapters/vfc/model/ScaleNsData.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/ScaleNsData.java index bd50827..bd50827 100644 --- a/src/main/java/org/onap/so/adapters/vfc/model/ScaleNsData.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/ScaleNsData.java diff --git a/src/main/java/org/onap/so/adapters/vfc/model/VFCScaleData.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/VFCScaleData.java index 1939fa4..1939fa4 100644 --- a/src/main/java/org/onap/so/adapters/vfc/model/VFCScaleData.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/VFCScaleData.java diff --git a/src/main/java/org/onap/so/adapters/vfc/model/VimLocation.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/VimLocation.java index 456835b..456835b 100644 --- a/src/main/java/org/onap/so/adapters/vfc/model/VimLocation.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/VimLocation.java diff --git a/src/main/java/org/onap/so/adapters/vfc/model/VnfInstance.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/VnfInstance.java index ccd6532..ccd6532 100644 --- a/src/main/java/org/onap/so/adapters/vfc/model/VnfInstance.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/VnfInstance.java diff --git a/src/main/java/org/onap/so/adapters/vfc/model/VnfInstanceData.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/VnfInstanceData.java index 83345fc..83345fc 100644 --- a/src/main/java/org/onap/so/adapters/vfc/model/VnfInstanceData.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/VnfInstanceData.java diff --git a/src/main/java/org/onap/so/adapters/vfc/model/VnfLinkPortInfo.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/VnfLinkPortInfo.java index 0b09d06..0b09d06 100644 --- a/src/main/java/org/onap/so/adapters/vfc/model/VnfLinkPortInfo.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/VnfLinkPortInfo.java diff --git a/src/main/java/org/onap/so/adapters/vfc/model/VnfLocationConstraint.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/VnfLocationConstraint.java index 5db3060..5db3060 100644 --- a/src/main/java/org/onap/so/adapters/vfc/model/VnfLocationConstraint.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/VnfLocationConstraint.java diff --git a/src/main/java/org/onap/so/adapters/vfc/model/VnfScaleInfo.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/VnfScaleInfo.java index e702edc..e702edc 100644 --- a/src/main/java/org/onap/so/adapters/vfc/model/VnfScaleInfo.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/VnfScaleInfo.java diff --git a/src/main/java/org/onap/so/adapters/vfc/model/VnfVirtualLinkResourceInfo.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/VnfVirtualLinkResourceInfo.java index 9f41a38..9f41a38 100644 --- a/src/main/java/org/onap/so/adapters/vfc/model/VnfVirtualLinkResourceInfo.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/VnfVirtualLinkResourceInfo.java diff --git a/src/main/java/org/onap/so/adapters/vfc/model/VnfcCpInfo.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/VnfcCpInfo.java index ec629ef..ec629ef 100644 --- a/src/main/java/org/onap/so/adapters/vfc/model/VnfcCpInfo.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/VnfcCpInfo.java diff --git a/src/main/java/org/onap/so/adapters/vfc/model/VnfcResourceInfo.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/VnfcResourceInfo.java index 1f7aa67..1f7aa67 100644 --- a/src/main/java/org/onap/so/adapters/vfc/model/VnfcResourceInfo.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/VnfcResourceInfo.java diff --git a/src/main/java/org/onap/so/adapters/vfc/model/VnffgInfo.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/VnffgInfo.java index c02d517..c02d517 100644 --- a/src/main/java/org/onap/so/adapters/vfc/model/VnffgInfo.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/model/VnffgInfo.java diff --git a/src/main/java/org/onap/so/adapters/vfc/rest/AaiUtil.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/rest/AaiUtil.java index 7f81dfb..7f81dfb 100644 --- a/src/main/java/org/onap/so/adapters/vfc/rest/AaiUtil.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/rest/AaiUtil.java diff --git a/src/main/java/org/onap/so/adapters/vfc/rest/HealthCheckHandler.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/rest/HealthCheckHandler.java index 2dcdf11..2dcdf11 100644 --- a/src/main/java/org/onap/so/adapters/vfc/rest/HealthCheckHandler.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/rest/HealthCheckHandler.java diff --git a/src/main/java/org/onap/so/adapters/vfc/rest/VfcAdapterRest.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/rest/VfcAdapterRest.java index 5a89c04..5a89c04 100644 --- a/src/main/java/org/onap/so/adapters/vfc/rest/VfcAdapterRest.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/rest/VfcAdapterRest.java diff --git a/src/main/java/org/onap/so/adapters/vfc/rest/VfcManager.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/rest/VfcManager.java index b817b5b..b817b5b 100644 --- a/src/main/java/org/onap/so/adapters/vfc/rest/VfcManager.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/rest/VfcManager.java diff --git a/src/main/java/org/onap/so/adapters/vfc/rest/VfcManagerSol005.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/rest/VfcManagerSol005.java index 9033bec..9033bec 100644 --- a/src/main/java/org/onap/so/adapters/vfc/rest/VfcManagerSol005.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/rest/VfcManagerSol005.java diff --git a/src/main/java/org/onap/so/adapters/vfc/util/JsonUtil.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/util/JsonUtil.java index 04109bd..04109bd 100644 --- a/src/main/java/org/onap/so/adapters/vfc/util/JsonUtil.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/util/JsonUtil.java diff --git a/src/main/java/org/onap/so/adapters/vfc/util/RestfulUtil.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/util/RestfulUtil.java index 54a2a98..54a2a98 100644 --- a/src/main/java/org/onap/so/adapters/vfc/util/RestfulUtil.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/util/RestfulUtil.java diff --git a/src/main/java/org/onap/so/adapters/vfc/util/ValidateUtil.java b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/util/ValidateUtil.java index f56f5af..f56f5af 100644 --- a/src/main/java/org/onap/so/adapters/vfc/util/ValidateUtil.java +++ b/so-etsi-sol005-adapter-application/src/main/java/org/onap/so/adapters/vfc/util/ValidateUtil.java diff --git a/src/main/resources/application-aaf.yaml b/so-etsi-sol005-adapter-application/src/main/resources/application-aaf.yaml index e69de29..e69de29 100644 --- a/src/main/resources/application-aaf.yaml +++ b/so-etsi-sol005-adapter-application/src/main/resources/application-aaf.yaml diff --git a/src/main/resources/application-basic.yaml b/so-etsi-sol005-adapter-application/src/main/resources/application-basic.yaml index e69de29..e69de29 100644 --- a/src/main/resources/application-basic.yaml +++ b/so-etsi-sol005-adapter-application/src/main/resources/application-basic.yaml diff --git a/src/main/resources/application.yaml b/so-etsi-sol005-adapter-application/src/main/resources/application.yaml index 4a500b3..4a500b3 100644 --- a/src/main/resources/application.yaml +++ b/so-etsi-sol005-adapter-application/src/main/resources/application.yaml diff --git a/src/test/java/org/onap/so/adapters/vfc/exceptions/ApplicationExceptionTest.java b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/exceptions/ApplicationExceptionTest.java index c0305f1..c0305f1 100644 --- a/src/test/java/org/onap/so/adapters/vfc/exceptions/ApplicationExceptionTest.java +++ b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/exceptions/ApplicationExceptionTest.java diff --git a/src/test/java/org/onap/so/adapters/vfc/model/AddPnfDataTest.java b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/model/AddPnfDataTest.java index 1fedac9..1fedac9 100644 --- a/src/test/java/org/onap/so/adapters/vfc/model/AddPnfDataTest.java +++ b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/model/AddPnfDataTest.java diff --git a/src/test/java/org/onap/so/adapters/vfc/model/AddressRangeTest.java b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/model/AddressRangeTest.java index 9444efd..9444efd 100644 --- a/src/test/java/org/onap/so/adapters/vfc/model/AddressRangeTest.java +++ b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/model/AddressRangeTest.java diff --git a/src/test/java/org/onap/so/adapters/vfc/model/AffectedNsTest.java b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/model/AffectedNsTest.java index 06c52e2..06c52e2 100644 --- a/src/test/java/org/onap/so/adapters/vfc/model/AffectedNsTest.java +++ b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/model/AffectedNsTest.java diff --git a/src/test/java/org/onap/so/adapters/vfc/model/AffectedPnfTest.java b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/model/AffectedPnfTest.java index beecbe0..beecbe0 100644 --- a/src/test/java/org/onap/so/adapters/vfc/model/AffectedPnfTest.java +++ b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/model/AffectedPnfTest.java diff --git a/src/test/java/org/onap/so/adapters/vfc/model/AffectedSapTest.java b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/model/AffectedSapTest.java index b96fe32..b96fe32 100644 --- a/src/test/java/org/onap/so/adapters/vfc/model/AffectedSapTest.java +++ b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/model/AffectedSapTest.java diff --git a/src/test/java/org/onap/so/adapters/vfc/model/AffectedVirtualLinkTest.java b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/model/AffectedVirtualLinkTest.java index dbc6d08..dbc6d08 100644 --- a/src/test/java/org/onap/so/adapters/vfc/model/AffectedVirtualLinkTest.java +++ b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/model/AffectedVirtualLinkTest.java diff --git a/src/test/java/org/onap/so/adapters/vfc/model/AffectedVnfTest.java b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/model/AffectedVnfTest.java index 810f32d..810f32d 100644 --- a/src/test/java/org/onap/so/adapters/vfc/model/AffectedVnfTest.java +++ b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/model/AffectedVnfTest.java diff --git a/src/test/java/org/onap/so/adapters/vfc/model/AffectedVnffgTest.java b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/model/AffectedVnffgTest.java index 0d56701..0d56701 100644 --- a/src/test/java/org/onap/so/adapters/vfc/model/AffectedVnffgTest.java +++ b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/model/AffectedVnffgTest.java diff --git a/src/test/java/org/onap/so/adapters/vfc/model/AffinityOrAntiAffinityRuleTest.java b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/model/AffinityOrAntiAffinityRuleTest.java index 99a40e4..99a40e4 100644 --- a/src/test/java/org/onap/so/adapters/vfc/model/AffinityOrAntiAffinityRuleTest.java +++ b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/model/AffinityOrAntiAffinityRuleTest.java diff --git a/src/test/java/org/onap/so/adapters/vfc/model/ChangedInfoTest.java b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/model/ChangedInfoTest.java index 41077fb..41077fb 100644 --- a/src/test/java/org/onap/so/adapters/vfc/model/ChangedInfoTest.java +++ b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/model/ChangedInfoTest.java diff --git a/src/test/java/org/onap/so/adapters/vfc/model/CivicAddressElementTest.java b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/model/CivicAddressElementTest.java index e9c011b..e9c011b 100644 --- a/src/test/java/org/onap/so/adapters/vfc/model/CivicAddressElementTest.java +++ b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/model/CivicAddressElementTest.java diff --git a/src/test/java/org/onap/so/adapters/vfc/model/CpProtocolDataTest.java b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/model/CpProtocolDataTest.java index e47d02c..e47d02c 100644 --- a/src/test/java/org/onap/so/adapters/vfc/model/CpProtocolDataTest.java +++ b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/model/CpProtocolDataTest.java diff --git a/src/test/java/org/onap/so/adapters/vfc/model/CreateNsRequestTest.java b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/model/CreateNsRequestTest.java index a2a6ae4..a2a6ae4 100644 --- a/src/test/java/org/onap/so/adapters/vfc/model/CreateNsRequestTest.java +++ b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/model/CreateNsRequestTest.java diff --git a/src/test/java/org/onap/so/adapters/vfc/model/CustomerModelTest.java b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/model/CustomerModelTest.java index 548d8b3..548d8b3 100644 --- a/src/test/java/org/onap/so/adapters/vfc/model/CustomerModelTest.java +++ b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/model/CustomerModelTest.java diff --git a/src/test/java/org/onap/so/adapters/vfc/model/ExtLinkPortInfoTest.java b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/model/ExtLinkPortInfoTest.java index 92cec88..92cec88 100644 --- a/src/test/java/org/onap/so/adapters/vfc/model/ExtLinkPortInfoTest.java +++ b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/model/ExtLinkPortInfoTest.java diff --git a/src/test/java/org/onap/so/adapters/vfc/model/ExtVirtualLinkInfoTest.java b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/model/ExtVirtualLinkInfoTest.java index c455b36..c455b36 100644 --- a/src/test/java/org/onap/so/adapters/vfc/model/ExtVirtualLinkInfoTest.java +++ b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/model/ExtVirtualLinkInfoTest.java diff --git a/src/test/java/org/onap/so/adapters/vfc/model/InstantiateNsRequestTest.java b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/model/InstantiateNsRequestTest.java index f27b041..f27b041 100644 --- a/src/test/java/org/onap/so/adapters/vfc/model/InstantiateNsRequestTest.java +++ b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/model/InstantiateNsRequestTest.java diff --git a/src/test/java/org/onap/so/adapters/vfc/model/IpAddressesTest.java b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/model/IpAddressesTest.java index edf6346..edf6346 100644 --- a/src/test/java/org/onap/so/adapters/vfc/model/IpAddressesTest.java +++ b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/model/IpAddressesTest.java diff --git a/src/test/java/org/onap/so/adapters/vfc/model/IpOverEthernetAddressDataTest.java b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/model/IpOverEthernetAddressDataTest.java index 0088cdc..0088cdc 100644 --- a/src/test/java/org/onap/so/adapters/vfc/model/IpOverEthernetAddressDataTest.java +++ b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/model/IpOverEthernetAddressDataTest.java diff --git a/src/test/java/org/onap/so/adapters/vfc/model/LinkTest.java b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/model/LinkTest.java index e447c85..e447c85 100644 --- a/src/test/java/org/onap/so/adapters/vfc/model/LinkTest.java +++ b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/model/LinkTest.java diff --git a/src/test/java/org/onap/so/adapters/vfc/model/LinksTest.java b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/model/LinksTest.java index aef87c4..aef87c4 100644 --- a/src/test/java/org/onap/so/adapters/vfc/model/LinksTest.java +++ b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/model/LinksTest.java diff --git a/src/test/java/org/onap/so/adapters/vfc/model/LocationConstraintTest.java b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/model/LocationConstraintTest.java index 2b21746..2b21746 100644 --- a/src/test/java/org/onap/so/adapters/vfc/model/LocationConstraintTest.java +++ b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/model/LocationConstraintTest.java diff --git a/src/test/java/org/onap/so/adapters/vfc/model/LocationConstraintsTest.java b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/model/LocationConstraintsTest.java index e68b12a..e68b12a 100644 --- a/src/test/java/org/onap/so/adapters/vfc/model/LocationConstraintsTest.java +++ b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/model/LocationConstraintsTest.java diff --git a/src/test/java/org/onap/so/adapters/vfc/model/ModifyVnfInfoDataTest.java b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/model/ModifyVnfInfoDataTest.java index c300923..c300923 100644 --- a/src/test/java/org/onap/so/adapters/vfc/model/ModifyVnfInfoDataTest.java +++ b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/model/ModifyVnfInfoDataTest.java diff --git a/src/test/java/org/onap/so/adapters/vfc/model/NSResourceInputParameterTest.java b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/model/NSResourceInputParameterTest.java index 082d4e6..082d4e6 100644 --- a/src/test/java/org/onap/so/adapters/vfc/model/NSResourceInputParameterTest.java +++ b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/model/NSResourceInputParameterTest.java diff --git a/src/test/java/org/onap/so/adapters/vfc/model/NsCreateReqTest.java b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/model/NsCreateReqTest.java index c2e6b58..c2e6b58 100644 --- a/src/test/java/org/onap/so/adapters/vfc/model/NsCreateReqTest.java +++ b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/model/NsCreateReqTest.java diff --git a/src/test/java/org/onap/so/adapters/vfc/model/NsInstantiateReqTest.java b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/model/NsInstantiateReqTest.java index 70e54a1..70e54a1 100644 --- a/src/test/java/org/onap/so/adapters/vfc/model/NsInstantiateReqTest.java +++ b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/model/NsInstantiateReqTest.java diff --git a/src/test/java/org/onap/so/adapters/vfc/model/NsLcmOpOccTest.java b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/model/NsLcmOpOccTest.java index f5d485a..f5d485a 100644 --- a/src/test/java/org/onap/so/adapters/vfc/model/NsLcmOpOccTest.java +++ b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/model/NsLcmOpOccTest.java diff --git a/src/test/java/org/onap/so/adapters/vfc/model/NsOperationKeyTest.java b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/model/NsOperationKeyTest.java index a8939f8..a8939f8 100644 --- a/src/test/java/org/onap/so/adapters/vfc/model/NsOperationKeyTest.java +++ b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/model/NsOperationKeyTest.java diff --git a/src/test/java/org/onap/so/adapters/vfc/model/NsParametersTest.java b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/model/NsParametersTest.java index 45c46ed..45c46ed 100644 --- a/src/test/java/org/onap/so/adapters/vfc/model/NsParametersTest.java +++ b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/model/NsParametersTest.java diff --git a/src/test/java/org/onap/so/adapters/vfc/model/NsProgressStatusTest.java b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/model/NsProgressStatusTest.java index b1040ef..b1040ef 100644 --- a/src/test/java/org/onap/so/adapters/vfc/model/NsProgressStatusTest.java +++ b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/model/NsProgressStatusTest.java diff --git a/src/test/java/org/onap/so/adapters/vfc/model/ParamsForVnfTest.java b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/model/ParamsForVnfTest.java index e0455b0..e0455b0 100644 --- a/src/test/java/org/onap/so/adapters/vfc/model/ParamsForVnfTest.java +++ b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/model/ParamsForVnfTest.java diff --git a/src/test/java/org/onap/so/adapters/vfc/model/PnfExtCpDataTest.java b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/model/PnfExtCpDataTest.java index c586c7e..c586c7e 100644 --- a/src/test/java/org/onap/so/adapters/vfc/model/PnfExtCpDataTest.java +++ b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/model/PnfExtCpDataTest.java diff --git a/src/test/java/org/onap/so/adapters/vfc/model/ProblemDetailsTest.java b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/model/ProblemDetailsTest.java index ddea6cc..ddea6cc 100644 --- a/src/test/java/org/onap/so/adapters/vfc/model/ProblemDetailsTest.java +++ b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/model/ProblemDetailsTest.java diff --git a/src/test/java/org/onap/so/adapters/vfc/model/ResourceChangesTest.java b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/model/ResourceChangesTest.java index 9c4a029..9c4a029 100644 --- a/src/test/java/org/onap/so/adapters/vfc/model/ResourceChangesTest.java +++ b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/model/ResourceChangesTest.java diff --git a/src/test/java/org/onap/so/adapters/vfc/model/ResourceHandleTest.java b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/model/ResourceHandleTest.java index 6390c5a..6390c5a 100644 --- a/src/test/java/org/onap/so/adapters/vfc/model/ResourceHandleTest.java +++ b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/model/ResourceHandleTest.java diff --git a/src/test/java/org/onap/so/adapters/vfc/model/ResponseDescriptorTest.java b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/model/ResponseDescriptorTest.java index 3f2f735..3f2f735 100644 --- a/src/test/java/org/onap/so/adapters/vfc/model/ResponseDescriptorTest.java +++ b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/model/ResponseDescriptorTest.java diff --git a/src/test/java/org/onap/so/adapters/vfc/model/RestfulResponseTest.java b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/model/RestfulResponseTest.java index 64f8da6..64f8da6 100644 --- a/src/test/java/org/onap/so/adapters/vfc/model/RestfulResponseTest.java +++ b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/model/RestfulResponseTest.java diff --git a/src/test/java/org/onap/so/adapters/vfc/model/SapDataTest.java b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/model/SapDataTest.java index 2a45599..2a45599 100644 --- a/src/test/java/org/onap/so/adapters/vfc/model/SapDataTest.java +++ b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/model/SapDataTest.java diff --git a/src/test/java/org/onap/so/adapters/vfc/model/VimLocationTest.java b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/model/VimLocationTest.java index 85d3a13..85d3a13 100644 --- a/src/test/java/org/onap/so/adapters/vfc/model/VimLocationTest.java +++ b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/model/VimLocationTest.java diff --git a/src/test/java/org/onap/so/adapters/vfc/model/VnfInstanceDataTest.java b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/model/VnfInstanceDataTest.java index b9bdfe3..b9bdfe3 100644 --- a/src/test/java/org/onap/so/adapters/vfc/model/VnfInstanceDataTest.java +++ b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/model/VnfInstanceDataTest.java diff --git a/src/test/java/org/onap/so/adapters/vfc/model/VnfLocationConstraintTest.java b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/model/VnfLocationConstraintTest.java index b8f9b8e..b8f9b8e 100644 --- a/src/test/java/org/onap/so/adapters/vfc/model/VnfLocationConstraintTest.java +++ b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/model/VnfLocationConstraintTest.java diff --git a/src/test/java/org/onap/so/adapters/vfc/rest/EmbeddedMariaDbConfig.java b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/rest/EmbeddedMariaDbConfig.java index feb40f7..feb40f7 100644 --- a/src/test/java/org/onap/so/adapters/vfc/rest/EmbeddedMariaDbConfig.java +++ b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/rest/EmbeddedMariaDbConfig.java diff --git a/src/test/java/org/onap/so/adapters/vfc/rest/HealthCheckHandlerTest.java b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/rest/HealthCheckHandlerTest.java index fe2bd0b..fe2bd0b 100644 --- a/src/test/java/org/onap/so/adapters/vfc/rest/HealthCheckHandlerTest.java +++ b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/rest/HealthCheckHandlerTest.java diff --git a/src/test/java/org/onap/so/adapters/vfc/rest/VfcManagerSol005Test.java b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/rest/VfcManagerSol005Test.java index 15dc744..15dc744 100644 --- a/src/test/java/org/onap/so/adapters/vfc/rest/VfcManagerSol005Test.java +++ b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/rest/VfcManagerSol005Test.java diff --git a/src/test/java/org/onap/so/adapters/vfc/rest/VfcManagerTest.java b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/rest/VfcManagerTest.java index 08fe618..08fe618 100644 --- a/src/test/java/org/onap/so/adapters/vfc/rest/VfcManagerTest.java +++ b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/rest/VfcManagerTest.java diff --git a/src/test/java/org/onap/so/adapters/vfc/util/RestfulUtilTest.java b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/util/RestfulUtilTest.java index a3a3fd2..a3a3fd2 100644 --- a/src/test/java/org/onap/so/adapters/vfc/util/RestfulUtilTest.java +++ b/so-etsi-sol005-adapter-application/src/test/java/org/onap/so/adapters/vfc/util/RestfulUtilTest.java diff --git a/src/test/resources/application-test.yaml b/so-etsi-sol005-adapter-application/src/test/resources/application-test.yaml index b43d382..b43d382 100644 --- a/src/test/resources/application-test.yaml +++ b/so-etsi-sol005-adapter-application/src/test/resources/application-test.yaml diff --git a/src/test/resources/json/LICENSE.txt b/so-etsi-sol005-adapter-application/src/test/resources/json/LICENSE.txt index bc40e66..bc40e66 100644 --- a/src/test/resources/json/LICENSE.txt +++ b/so-etsi-sol005-adapter-application/src/test/resources/json/LICENSE.txt diff --git a/src/test/resources/json/aainfvoResponse.json b/so-etsi-sol005-adapter-application/src/test/resources/json/aainfvoResponse.json index 35047a9..35047a9 100644 --- a/src/test/resources/json/aainfvoResponse.json +++ b/so-etsi-sol005-adapter-application/src/test/resources/json/aainfvoResponse.json diff --git a/src/test/resources/json/createNsReq.json b/so-etsi-sol005-adapter-application/src/test/resources/json/createNsReq.json index aec8ae8..aec8ae8 100644 --- a/src/test/resources/json/createNsReq.json +++ b/so-etsi-sol005-adapter-application/src/test/resources/json/createNsReq.json diff --git a/src/test/resources/json/createNsRsp.json b/so-etsi-sol005-adapter-application/src/test/resources/json/createNsRsp.json index ccd1d66..ccd1d66 100644 --- a/src/test/resources/json/createNsRsp.json +++ b/so-etsi-sol005-adapter-application/src/test/resources/json/createNsRsp.json diff --git a/src/test/resources/json/createNsSol005Response.json b/so-etsi-sol005-adapter-application/src/test/resources/json/createNsSol005Response.json index 938969a..938969a 100644 --- a/src/test/resources/json/createNsSol005Response.json +++ b/so-etsi-sol005-adapter-application/src/test/resources/json/createNsSol005Response.json diff --git a/src/test/resources/json/deleteNsReq.json b/so-etsi-sol005-adapter-application/src/test/resources/json/deleteNsReq.json index ac095e6..ac095e6 100644 --- a/src/test/resources/json/deleteNsReq.json +++ b/so-etsi-sol005-adapter-application/src/test/resources/json/deleteNsReq.json diff --git a/src/test/resources/json/instantiateNsReq.json b/so-etsi-sol005-adapter-application/src/test/resources/json/instantiateNsReq.json index 047c810..047c810 100644 --- a/src/test/resources/json/instantiateNsReq.json +++ b/so-etsi-sol005-adapter-application/src/test/resources/json/instantiateNsReq.json diff --git a/src/test/resources/json/instantiateNsRsp.json b/so-etsi-sol005-adapter-application/src/test/resources/json/instantiateNsRsp.json index 51e4d01..51e4d01 100644 --- a/src/test/resources/json/instantiateNsRsp.json +++ b/so-etsi-sol005-adapter-application/src/test/resources/json/instantiateNsRsp.json diff --git a/src/test/resources/json/lcmOperRsp.json b/so-etsi-sol005-adapter-application/src/test/resources/json/lcmOperRsp.json index 111afc1..111afc1 100644 --- a/src/test/resources/json/lcmOperRsp.json +++ b/so-etsi-sol005-adapter-application/src/test/resources/json/lcmOperRsp.json diff --git a/src/test/resources/json/queryJobReq.json b/so-etsi-sol005-adapter-application/src/test/resources/json/queryJobReq.json index ac095e6..ac095e6 100644 --- a/src/test/resources/json/queryJobReq.json +++ b/so-etsi-sol005-adapter-application/src/test/resources/json/queryJobReq.json diff --git a/src/test/resources/json/queryJobRsp.json b/so-etsi-sol005-adapter-application/src/test/resources/json/queryJobRsp.json index 9238b47..9238b47 100644 --- a/src/test/resources/json/queryJobRsp.json +++ b/so-etsi-sol005-adapter-application/src/test/resources/json/queryJobRsp.json diff --git a/src/test/resources/json/terminateNsReq.json b/so-etsi-sol005-adapter-application/src/test/resources/json/terminateNsReq.json index ac095e6..ac095e6 100644 --- a/src/test/resources/json/terminateNsReq.json +++ b/so-etsi-sol005-adapter-application/src/test/resources/json/terminateNsReq.json diff --git a/src/test/resources/json/terminateNsRsp.json b/so-etsi-sol005-adapter-application/src/test/resources/json/terminateNsRsp.json index 51e4d01..51e4d01 100644 --- a/src/test/resources/json/terminateNsRsp.json +++ b/so-etsi-sol005-adapter-application/src/test/resources/json/terminateNsRsp.json diff --git a/src/test/resources/logback-test.xml b/so-etsi-sol005-adapter-application/src/test/resources/logback-test.xml index c2e0098..c2e0098 100644 --- a/src/test/resources/logback-test.xml +++ b/so-etsi-sol005-adapter-application/src/test/resources/logback-test.xml diff --git a/version.properties b/version.properties index 013f1ac..0ac1b46 100644 --- a/version.properties +++ b/version.properties @@ -4,7 +4,7 @@ major=1
minor=8
-patch=1
+patch=0
base_version=${major}.${minor}.${patch}
|