From: Steve Smokowski Date: Thu, 11 Apr 2019 21:17:40 +0000 (+0000) Subject: Merge "Fix GR_API Homing" X-Git-Tag: 1.4.1~45 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=a76c0e09e17423d282ecaa976e52f60f098498ff;hp=5bffd3ec2455a9c67206102873e3a6a321bfec5d;p=so.git Merge "Fix GR_API Homing" --- diff --git a/adapters/mso-adapter-utils/pom.xml b/adapters/mso-adapter-utils/pom.xml index ed76354792..7918072323 100644 --- a/adapters/mso-adapter-utils/pom.xml +++ b/adapters/mso-adapter-utils/pom.xml @@ -1,151 +1,151 @@ - 4.0.0 - - org.onap.so - adapters - 1.4.0-SNAPSHOT - - org.onap.so.adapters - mso-adapter-utils - mso-adapter-utils - Common MSO utilities, including Openstack client wrappers. + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + org.onap.so + adapters + 1.4.0-SNAPSHOT + + org.onap.so.adapters + mso-adapter-utils + mso-adapter-utils + Common MSO utilities, including Openstack client wrappers. - - - - - org.springframework.boot - spring-boot-dependencies - ${springboot.version} - pom - import - - - - - ${project.artifactId} - src/main/java - + + + + + org.springframework.boot + spring-boot-dependencies + ${springboot.version} + pom + import + + + + + ${project.artifactId} + src/main/java + - - org.apache.maven.plugins - maven-resources-plugin - 2.6 - - - copy-resources - validate - - copy-resources - - - - - ./src/main/resources/META-INF - false - - - ${project.build.directory}/${project.build.finalName}/META-INF/ - - - - - - org.jacoco - jacoco-maven-plugin - - - org.apache.maven.plugins - maven-surefire-plugin - - - default-test - - test - - - - **/AllTestsTestSuite.java - - suites - - - - - - + + org.apache.maven.plugins + maven-resources-plugin + 2.6 + + + copy-resources + validate + + copy-resources + + + + + ./src/main/resources/META-INF + false + + + ${project.build.directory}/${project.build.finalName}/META-INF/ + + + + + + org.jacoco + jacoco-maven-plugin + + + org.apache.maven.plugins + maven-surefire-plugin + + + default-test + + test + + + + **/AllTestsTestSuite.java + + suites + + + + + + - - - org.glassfish.jersey.core - jersey-client - - - ch.vorburger.mariaDB4j - mariaDB4j - 2.2.3 - test - - - org.onap.so.adapters - mso-adapters-rest-interface - ${project.version} - - - org.springframework.boot - spring-boot-starter-data-jpa - true - - - org.onap.so - mso-catalog-db - ${project.version} - - - org.onap.so - cloudify-client - ${project.version} - - - javax.servlet - javax.servlet-api - provided - - - org.jmockit - jmockit - 1.8 - test - - - org.yaml - snakeyaml - - - org.springframework.boot - spring-boot-starter-test - test - - - com.h2database - h2 - test - - - org.apache.cxf - cxf-rt-rs-client - ${cxf.version} - - - org.apache.cxf - cxf-rt-bindings-soap - ${cxf.version} - - - org.apache.cxf - cxf-rt-transports-http - ${cxf.version} - - + + + org.glassfish.jersey.core + jersey-client + + + ch.vorburger.mariaDB4j + mariaDB4j + 2.2.3 + test + + + org.onap.so.adapters + mso-adapters-rest-interface + ${project.version} + + + org.springframework.boot + spring-boot-starter-data-jpa + true + + + org.onap.so + mso-catalog-db + ${project.version} + + + org.onap.so + cloudify-client + ${project.version} + + + javax.servlet + javax.servlet-api + provided + + + org.jmockit + jmockit + 1.8 + test + + + org.yaml + snakeyaml + + + org.springframework.boot + spring-boot-starter-test + test + + + com.h2database + h2 + test + + + org.apache.cxf + cxf-rt-rs-client + ${cxf.version} + + + org.apache.cxf + cxf-rt-bindings-soap + ${cxf.version} + + + org.apache.cxf + cxf-rt-transports-http + ${cxf.version} + + diff --git a/adapters/mso-adapters-rest-interface/pom.xml b/adapters/mso-adapters-rest-interface/pom.xml index a23cb62e1e..17d4bc1e35 100644 --- a/adapters/mso-adapters-rest-interface/pom.xml +++ b/adapters/mso-adapters-rest-interface/pom.xml @@ -1,64 +1,64 @@ - 4.0.0 - - org.onap.so - adapters - 1.4.0-SNAPSHOT - - org.onap.so.adapters - mso-adapters-rest-interface - jar - mso-adapters-rest-interface - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + org.onap.so + adapters + 1.4.0-SNAPSHOT + + org.onap.so.adapters + mso-adapters-rest-interface + jar + mso-adapters-rest-interface + Java Beans (Requests and Responses) for Network/Tenant/VNF/SDNC REST Operations - - ${project.artifactId}-${project.version} - - - maven-jar-plugin - 2.6 - - target/classes - - - - org.jacoco - jacoco-maven-plugin - - - - - - org.javatuples - javatuples - 1.2 - - - org.onap.so.libs.openstack-java-sdk - keystone-client - ${openstack.version} - - - org.onap.so.libs.openstack-java-sdk - heat-client - ${openstack.version} - - - org.onap.so.libs.openstack-java-sdk - quantum-client - ${openstack.version} - - - org.onap.so.libs.openstack-java-sdk.client-connectors - http-connector - ${openstack.version} - - - org.onap.so - common - ${project.version} - - + + ${project.artifactId}-${project.version} + + + maven-jar-plugin + 2.6 + + target/classes + + + + org.jacoco + jacoco-maven-plugin + + + + + + org.javatuples + javatuples + 1.2 + + + org.onap.so.libs.openstack-java-sdk + keystone-client + ${openstack.version} + + + org.onap.so.libs.openstack-java-sdk + heat-client + ${openstack.version} + + + org.onap.so.libs.openstack-java-sdk + quantum-client + ${openstack.version} + + + org.onap.so.libs.openstack-java-sdk.client-connectors + http-connector + ${openstack.version} + + + org.onap.so + common + ${project.version} + + diff --git a/adapters/mso-catalog-db-adapter/pom.xml b/adapters/mso-catalog-db-adapter/pom.xml index 1f6ea413ec..9ec98cf96c 100644 --- a/adapters/mso-catalog-db-adapter/pom.xml +++ b/adapters/mso-catalog-db-adapter/pom.xml @@ -1,206 +1,207 @@ - 4.0.0 - - org.onap.so - adapters - 1.4.0-SNAPSHOT - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + org.onap.so + adapters + 1.4.0-SNAPSHOT + - org.onap.so.adapters - mso-catalog-db-adapter - jar - - UTF-8 - UTF-8 - 1.8 - - - - - org.springframework.boot - spring-boot-maven-plugin - ${springboot.version} - - org.onap.so.adapters.catalogdb.CatalogDBApplication - - - - - repackage - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - extract-docker-file - - - - - io.fabric8 - fabric8-maven-plugin - - - start - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.3 - - 1.8 - 1.8 - true - - -parameters - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - default-test - - test - - - - **/AllTestsTestSuite.java - - suites - - - - - - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + org.jvnet.jax-ws-commons - + jaxws-maven-plugin - + [2.3,) - - wsgen - - - - - - - - - - + + wsgen + + + + + + + + + + + - - org.jacoco - jacoco-maven-plugin - - - - ${project.artifactId}-${project.version} - - - - - - org.springframework.boot - spring-boot-dependencies - ${springboot.version} - pom - import - - - - - - org.springframework.boot - spring-boot-starter-web - - - io.swagger - swagger-jersey2-jaxrs - 1.5.16 - - - org.mariadb.jdbc - mariadb-java-client - - - org.springframework.boot - spring-boot-starter-actuator - - - org.springframework.boot - spring-boot-starter-jersey - - - org.springframework.boot - spring-boot-starter-data-jpa - - - org.apache.tomcat - tomcat-jdbc - - - - - org.springframework.boot - spring-boot-starter-test - test - - - org.onap.so - mso-catalog-db - ${project.version} - - - uk.co.blackpepper.bowman - bowman-client - 0.3.0 - - - ch.vorburger.mariaDB4j - mariaDB4j - 2.2.3 - test - - - org.flywaydb - flyway-core - - - io.micrometer - micrometer-core - - - io.micrometer - micrometer-registry-prometheus - - + + org.jacoco + jacoco-maven-plugin + + + + ${project.artifactId}-${project.version} + + + + + + org.springframework.boot + spring-boot-dependencies + ${springboot.version} + pom + import + + + + + + org.springframework.boot + spring-boot-starter-web + + + io.swagger + swagger-jersey2-jaxrs + 1.5.16 + + + org.mariadb.jdbc + mariadb-java-client + + + org.springframework.boot + spring-boot-starter-actuator + + + org.springframework.boot + spring-boot-starter-jersey + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.apache.tomcat + tomcat-jdbc + + + + + org.springframework.boot + spring-boot-starter-test + test + + + org.onap.so + mso-catalog-db + ${project.version} + + + uk.co.blackpepper.bowman + bowman-client + 0.3.0 + + + ch.vorburger.mariaDB4j + mariaDB4j + 2.2.3 + test + + + org.flywaydb + flyway-core + + + io.micrometer + micrometer-core + + + io.micrometer + micrometer-registry-prometheus + + diff --git a/adapters/mso-openstack-adapters/pom.xml b/adapters/mso-openstack-adapters/pom.xml index 9c3ef2578f..088f9499ce 100644 --- a/adapters/mso-openstack-adapters/pom.xml +++ b/adapters/mso-openstack-adapters/pom.xml @@ -1,62 +1,62 @@ - 4.0.0 - - org.onap.so - adapters - 1.4.0-SNAPSHOT - - mso-openstack-adapters - jar - mso-openstack-adapters - Consolidate openstack adapters into one Spring Boot project - - 10.1.0 - - - ${project.artifactId}-${project.version} + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + org.onap.so + adapters + 1.4.0-SNAPSHOT + + mso-openstack-adapters + jar + mso-openstack-adapters + Consolidate openstack adapters into one Spring Boot project + + 10.1.0 + + + ${project.artifactId}-${project.version} - - - org.apache.maven.plugins - maven-dependency-plugin - - - org.springframework.boot - spring-boot-maven-plugin - - org.onap.so.adapters.openstack.MsoOpenstackAdaptersApplication - - - - - + + + org.apache.maven.plugins + maven-dependency-plugin + + + org.springframework.boot + spring-boot-maven-plugin + + org.onap.so.adapters.openstack.MsoOpenstackAdaptersApplication + + + + + repackage - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - default-test - - test - - - - **/AllTestsTestSuite.java - - suites - - - - + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + default-test + + test + + + + **/AllTestsTestSuite.java + + suites + + + + - - org.jacoco - jacoco-maven-plugin - - - org.apache.maven.plugins - maven-dependency-plugin - - - extract-docker-file - - - - - io.fabric8 - fabric8-maven-plugin - - - start - - - - - - - - - + + org.jacoco + jacoco-maven-plugin + + + org.apache.maven.plugins + maven-dependency-plugin + + + extract-docker-file + + + + + io.fabric8 + fabric8-maven-plugin + + + start + + + + + + + + + - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + org.jvnet.jax-ws-commons - + jaxws-maven-plugin - + [2.3,) - - wsgen - - - - - - - - - - - - - + + wsgen + + + + + + + + + + + + + + + + + + + org.springframework.boot + spring-boot-starter-actuator + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.apache.cxf + cxf-spring-boot-starter-jaxws + ${cxf.version} + + + org.apache.cxf + cxf-spring-boot-starter-jaxrs + ${cxf.version} + + + org.apache.cxf + cxf-rt-rs-service-description-swagger + ${cxf.version} + + + org.webjars + swagger-ui + 3.5.0 + + + org.springframework.boot + spring-boot-starter-test + test + + + janino + janino + 2.5.15 + - - - - org.springframework.boot - spring-boot-starter-actuator - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-data-jpa - - - org.apache.cxf - cxf-spring-boot-starter-jaxws - ${cxf.version} - - - org.apache.cxf - cxf-spring-boot-starter-jaxrs - ${cxf.version} - - - org.apache.cxf - cxf-rt-rs-service-description-swagger - ${cxf.version} - - - org.webjars - swagger-ui - 3.5.0 - - - org.springframework.boot - spring-boot-starter-test - test - - - janino - janino - 2.5.15 - + - + + org.pacesys + openstack4j-core + 3.1.0 + + + org.pacesys.openstack4j.connectors + openstack4j-httpclient + 3.1.0 + - - org.pacesys - openstack4j-core - 3.1.0 - - - org.pacesys.openstack4j.connectors - openstack4j-httpclient - 3.1.0 - + + commons-collections + commons-collections + 3.2.1 + - - commons-collections - commons-collections - 3.2.1 - + + com.typesafe + config + 1.3.2 + + + com.google.code.findbugs + jsr305 + 1.3.9 + - - com.typesafe - config - 1.3.2 - - - com.google.code.findbugs - jsr305 - 1.3.9 - - - - commons-validator - commons-validator - 1.4.0 - + + commons-validator + commons-validator + 1.4.0 + - - - org.onap.so.adapters - mso-adapter-utils - ${project.version} - - - org.onap.so.adapters - mso-adapters-rest-interface - ${project.version} - - - javax.servlet - javax.servlet-api - test - - - org.mariadb.jdbc - mariadb-java-client - - - org.onap.so - common - ${project.version} - - - ch.vorburger.mariaDB4j - mariaDB4j - 2.2.3 - test - - - org.springframework.cloud - spring-cloud-contract-wiremock - 1.2.4.RELEASE - test - - - org.onap.so - cxf-logging - ${project.version} - - - org.onap.so.libs.openstack-java-sdk - nova-model - ${openstack.version} - - - org.camunda.bpm - camunda-external-task-client - 1.1.1 - - + + + org.onap.so.adapters + mso-adapter-utils + ${project.version} + + + org.onap.so.adapters + mso-adapters-rest-interface + ${project.version} + + + javax.servlet + javax.servlet-api + test + + + org.mariadb.jdbc + mariadb-java-client + + + org.onap.so + common + ${project.version} + + + ch.vorburger.mariaDB4j + mariaDB4j + 2.2.3 + test + + + org.springframework.cloud + spring-cloud-contract-wiremock + 1.2.4.RELEASE + test + + + org.onap.so + cxf-logging + ${project.version} + + + org.onap.so.libs.openstack-java-sdk + nova-model + ${openstack.version} + + + org.camunda.bpm + camunda-external-task-client + 1.1.1 + + diff --git a/adapters/mso-requests-db-adapter/pom.xml b/adapters/mso-requests-db-adapter/pom.xml index 4be3935cf4..a02ebbe75d 100644 --- a/adapters/mso-requests-db-adapter/pom.xml +++ b/adapters/mso-requests-db-adapter/pom.xml @@ -1,249 +1,250 @@ - 4.0.0 - - org.onap.so - adapters - 1.4.0-SNAPSHOT - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + org.onap.so + adapters + 1.4.0-SNAPSHOT + - org.onap.so.adapters - mso-requests-db-adapter - - - org.springframework.boot - spring-boot-starter-actuator - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-jdbc - - - org.apache.cxf - cxf-spring-boot-starter-jaxws - ${cxf.version} - - - org.apache.cxf - cxf-spring-boot-starter-jaxrs - ${cxf.version} - - - org.apache.cxf - cxf-rt-rs-service-description-swagger - ${cxf.version} - - - org.springframework.boot - spring-boot-starter-test - test - - - org.mariadb.jdbc - mariadb-java-client - - - org.onap.so - mso-requests-db - ${project.version} - - - org.onap.so - mso-requests-db-repositories - ${project.version} - - - org.springframework.boot - spring-boot-starter-data-jpa - - - org.apache.tomcat - tomcat-jdbc - - - true - - - ch.vorburger.mariaDB4j - mariaDB4j - 2.2.3 - test - - - org.springframework.boot - spring-boot-configuration-processor - true - - - org.flywaydb - flyway-core - true - - - net.javacrumbs.shedlock - shedlock-spring - - - net.javacrumbs.shedlock - shedlock-provider-jdbc-template - - - io.micrometer - micrometer-core - - - io.micrometer - micrometer-registry-prometheus - - - org.springframework.boot - spring-boot-starter-data-rest - - - org.onap.so - cxf-logging - ${project.version} - - + org.onap.so.adapters + mso-requests-db-adapter + + + org.springframework.boot + spring-boot-starter-actuator + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-jdbc + + + org.apache.cxf + cxf-spring-boot-starter-jaxws + ${cxf.version} + + + org.apache.cxf + cxf-spring-boot-starter-jaxrs + ${cxf.version} + + + org.apache.cxf + cxf-rt-rs-service-description-swagger + ${cxf.version} + + + org.springframework.boot + spring-boot-starter-test + test + + + org.mariadb.jdbc + mariadb-java-client + + + org.onap.so + mso-requests-db + ${project.version} + + + org.onap.so + mso-requests-db-repositories + ${project.version} + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.apache.tomcat + tomcat-jdbc + + + true + + + ch.vorburger.mariaDB4j + mariaDB4j + 2.2.3 + test + + + org.springframework.boot + spring-boot-configuration-processor + true + + + org.flywaydb + flyway-core + true + + + net.javacrumbs.shedlock + shedlock-spring + + + net.javacrumbs.shedlock + shedlock-provider-jdbc-template + + + io.micrometer + micrometer-core + + + io.micrometer + micrometer-registry-prometheus + + + org.springframework.boot + spring-boot-starter-data-rest + + + org.onap.so + cxf-logging + ${project.version} + + - - ${project.artifactId}-${project.version} - - - org.apache.cxf - cxf-java2ws-plugin - ${cxf.version} - - - org.apache.cxf - cxf-rt-frontend-jaxws - ${cxf.version} - - - org.apache.cxf - cxf-rt-frontend-simple - ${cxf.version} - - - - - process-classes - process-classes - - org.onap.so.adapters.requestsdb.MsoRequestsDbAdapter - true - true - - - java2ws - - - - - - org.jacoco - jacoco-maven-plugin - - - org.springframework.boot - spring-boot-maven-plugin - ${springboot.version} - - org.onap.so.adapters.requestsdb.application.MSORequestDBApplication - - - - - repackage - - - - - - org.apache.maven.plugins - maven-jar-plugin - - - original - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - extract-docker-file - - - - - io.fabric8 - fabric8-maven-plugin - - - start - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - default-test - - test - - - - **/AllTestsTestSuite.java - - suites - - - - - - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + org.apache.cxf - + cxf-java2ws-plugin - + [3.2.5,) - - java2ws - - - - - - - - - - - - - + + java2ws + + + + + + + + + + + + + + diff --git a/adapters/mso-sdnc-adapter/pom.xml b/adapters/mso-sdnc-adapter/pom.xml index 7f03879507..fc577a52e3 100644 --- a/adapters/mso-sdnc-adapter/pom.xml +++ b/adapters/mso-sdnc-adapter/pom.xml @@ -1,172 +1,172 @@ - 4.0.0 - - org.onap.so - adapters - 1.4.0-SNAPSHOT - - mso-sdnc-adapter - - UTF-8 - UTF-8 - - mso-sdnc-adapter - mso sdnc adapter + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + org.onap.so + adapters + 1.4.0-SNAPSHOT + + mso-sdnc-adapter + + UTF-8 + UTF-8 + + mso-sdnc-adapter + mso sdnc adapter - - ${project.artifactId}-${project.version} - - - org.apache.cxf - cxf-codegen-plugin - 2.5.2 - - - org.springframework.boot - spring-boot-maven-plugin - - org.onap.so.adapters.sdnc.SDNCAdapterApplication - - - - - repackage - - - - - - org.apache.maven.plugins - maven-jar-plugin - - - original - - - - - org.jacoco - jacoco-maven-plugin - - - org.apache.maven.plugins - maven-dependency-plugin - - - extract-docker-file - - - - - io.fabric8 - fabric8-maven-plugin - - - start - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - default-test - - test - - - - **/AllTestsTestSuite.java - - suites - - - - - - - - - - - org.springframework.boot - spring-boot-dependencies - ${springboot.version} - pom - import - - - + + ${project.artifactId}-${project.version} + + + org.apache.cxf + cxf-codegen-plugin + 2.5.2 + + + org.springframework.boot + spring-boot-maven-plugin + + org.onap.so.adapters.sdnc.SDNCAdapterApplication + + + + + repackage + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + original + + + + + org.jacoco + jacoco-maven-plugin + + + org.apache.maven.plugins + maven-dependency-plugin + + + extract-docker-file + + + + + io.fabric8 + fabric8-maven-plugin + + + start + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + default-test + + test + + + + **/AllTestsTestSuite.java + + suites + + + + + + + + + + + org.springframework.boot + spring-boot-dependencies + ${springboot.version} + pom + import + + + - - - org.springframework.boot - spring-boot-starter-web - - - io.swagger - swagger-jersey2-jaxrs - 1.5.16 - - - org.springframework.boot - spring-boot-starter-actuator - - - org.springframework.boot - spring-boot-starter-test - test - - - org.onap.so.adapters - mso-adapter-utils - ${project.version} - - - org.apache.cxf - cxf-spring-boot-starter-jaxws - ${cxf.version} - - - org.apache.cxf - cxf-spring-boot-starter-jaxrs - ${cxf.version} - - - org.apache.cxf - cxf-rt-rs-service-description-swagger - ${cxf.version} - - - org.springframework.boot - spring-boot-configuration-processor - true - - - org.onap.so.adapters - mso-adapters-rest-interface - ${project.version} - - - org.glassfish - javax.json - 1.0.4 - test - - - io.micrometer - micrometer-core - - - io.micrometer - micrometer-registry-prometheus - - - org.onap.so - cxf-logging - ${project.version} - - + + + org.springframework.boot + spring-boot-starter-web + + + io.swagger + swagger-jersey2-jaxrs + 1.5.16 + + + org.springframework.boot + spring-boot-starter-actuator + + + org.springframework.boot + spring-boot-starter-test + test + + + org.onap.so.adapters + mso-adapter-utils + ${project.version} + + + org.apache.cxf + cxf-spring-boot-starter-jaxws + ${cxf.version} + + + org.apache.cxf + cxf-spring-boot-starter-jaxrs + ${cxf.version} + + + org.apache.cxf + cxf-rt-rs-service-description-swagger + ${cxf.version} + + + org.springframework.boot + spring-boot-configuration-processor + true + + + org.onap.so.adapters + mso-adapters-rest-interface + ${project.version} + + + org.glassfish + javax.json + 1.0.4 + test + + + io.micrometer + micrometer-core + + + io.micrometer + micrometer-registry-prometheus + + + org.onap.so + cxf-logging + ${project.version} + + diff --git a/adapters/mso-vfc-adapter/pom.xml b/adapters/mso-vfc-adapter/pom.xml index 5408bf9112..09dd512629 100644 --- a/adapters/mso-vfc-adapter/pom.xml +++ b/adapters/mso-vfc-adapter/pom.xml @@ -1,116 +1,116 @@ - 4.0.0 - - org.onap.so - adapters - 1.4.0-SNAPSHOT - - org.onap.so.adapters - mso-vfc-adapter - mso-vfc-adapter - Web service endpoint for vfc operations - - - - org.springframework.boot - spring-boot-dependencies - ${springboot.version} - pom - import - - - - - ${project.artifactId}-${project.version} - - - org.springframework.boot - spring-boot-maven-plugin - - org.onap.so.adapters.vfc.MSOVfcApplication - - - - - repackage - - - - - - org.jacoco - jacoco-maven-plugin - - - - - - org.springframework.boot - spring-boot-starter-actuator - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-jdbc - - - org.apache.tomcat - tomcat-jdbc - - - - - org.apache.cxf - cxf-spring-boot-starter-jaxws - ${cxf.version} - - - org.apache.cxf - cxf-spring-boot-starter-jaxrs - ${cxf.version} - - - org.apache.cxf - cxf-rt-rs-service-description-swagger - ${cxf.version} - - - org.springframework.boot - spring-boot-starter-data-jpa - - - org.springframework.boot - spring-boot-starter-test - test - - - org.onap.so - mso-requests-db - ${project.version} - - - org.onap.so - mso-requests-db-repositories - ${project.version} - - - org.mariadb.jdbc - mariadb-java-client - - - ch.vorburger.mariaDB4j - mariaDB4j - 2.2.3 - test - - - org.springframework.boot - spring-boot-configuration-processor - true - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + org.onap.so + adapters + 1.4.0-SNAPSHOT + + org.onap.so.adapters + mso-vfc-adapter + mso-vfc-adapter + Web service endpoint for vfc operations + + + + org.springframework.boot + spring-boot-dependencies + ${springboot.version} + pom + import + + + + + ${project.artifactId}-${project.version} + + + org.springframework.boot + spring-boot-maven-plugin + + org.onap.so.adapters.vfc.MSOVfcApplication + + + + + repackage + + + + + + org.jacoco + jacoco-maven-plugin + + + + + + org.springframework.boot + spring-boot-starter-actuator + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-jdbc + + + org.apache.tomcat + tomcat-jdbc + + + + + org.apache.cxf + cxf-spring-boot-starter-jaxws + ${cxf.version} + + + org.apache.cxf + cxf-spring-boot-starter-jaxrs + ${cxf.version} + + + org.apache.cxf + cxf-rt-rs-service-description-swagger + ${cxf.version} + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.springframework.boot + spring-boot-starter-test + test + + + org.onap.so + mso-requests-db + ${project.version} + + + org.onap.so + mso-requests-db-repositories + ${project.version} + + + org.mariadb.jdbc + mariadb-java-client + + + ch.vorburger.mariaDB4j + mariaDB4j + 2.2.3 + test + + + org.springframework.boot + spring-boot-configuration-processor + true + + diff --git a/adapters/mso-vnfm-adapter/mso-vnfm-adapter-api/pom.xml b/adapters/mso-vnfm-adapter/mso-vnfm-adapter-api/pom.xml index 7e866f9008..66a1cb1ca7 100644 --- a/adapters/mso-vnfm-adapter/mso-vnfm-adapter-api/pom.xml +++ b/adapters/mso-vnfm-adapter/mso-vnfm-adapter-api/pom.xml @@ -1,105 +1,104 @@ - - 4.0.0 - - org.onap.so.adapters - mso-vnfm-adapter - 1.4.0-SNAPSHOT - - mso-vnfm-adapter-api - - UTF-8 - UTF-8 - 1.8.2 - 2.3.0 - 1.3.5 - 1.0.1 - 1.5.15 - - mso-vnfm-adapter-api - MSO VNFM adapter API + + 4.0.0 + + org.onap.so.adapters + mso-vnfm-adapter + 1.4.0-SNAPSHOT + + mso-vnfm-adapter-api + + UTF-8 + UTF-8 + 1.8.2 + 2.3.0 + 1.3.5 + 1.0.1 + 1.5.15 + + mso-vnfm-adapter-api + MSO VNFM adapter API - - - - io.swagger - swagger-codegen-maven-plugin - 2.3.1 - - - vnfmadapter - - generate - - - ${basedir}/src/main/resources/vnfmadapter.yaml - java - retrofit2 - ${project.build.directory}/generated-sources/vnfmadapter - org.onap.vnfmadapter.v1.api - org.onap.vnfmadapter.v1.model - - true - src/gen/java/main - true - true - true - - - - - - - - - - io.swagger - swagger-annotations - ${swagger-core-version} - - - com.squareup.retrofit2 - converter-gson - ${retrofit-version} - - - com.squareup.retrofit2 - retrofit - ${retrofit-version} - - - com.squareup.retrofit2 - converter-scalars - ${retrofit-version} - - - org.apache.oltu.oauth2 - org.apache.oltu.oauth2.client - ${oltu-version} - - - io.gsonfire - gson-fire - ${gson-fire-version} - - - org.threeten - threetenbp - ${threetenbp-version} - - - io.reactivex.rxjava2 - rxjava - - - com.squareup.retrofit2 - adapter-rxjava2 - ${retrofit-version} - - - com.google.code.gson - gson - - + + + + io.swagger + swagger-codegen-maven-plugin + 2.3.1 + + + vnfmadapter + + generate + + + ${basedir}/src/main/resources/vnfmadapter.yaml + java + retrofit2 + ${project.build.directory}/generated-sources/vnfmadapter + org.onap.vnfmadapter.v1.api + org.onap.vnfmadapter.v1.model + + true + src/gen/java/main + true + true + true + + + + + + + + + + io.swagger + swagger-annotations + ${swagger-core-version} + + + com.squareup.retrofit2 + converter-gson + ${retrofit-version} + + + com.squareup.retrofit2 + retrofit + ${retrofit-version} + + + com.squareup.retrofit2 + converter-scalars + ${retrofit-version} + + + org.apache.oltu.oauth2 + org.apache.oltu.oauth2.client + ${oltu-version} + + + io.gsonfire + gson-fire + ${gson-fire-version} + + + org.threeten + threetenbp + ${threetenbp-version} + + + io.reactivex.rxjava2 + rxjava + + + com.squareup.retrofit2 + adapter-rxjava2 + ${retrofit-version} + + + com.google.code.gson + gson + + diff --git a/adapters/mso-vnfm-adapter/mso-vnfm-adapter-ext-clients/pom.xml b/adapters/mso-vnfm-adapter/mso-vnfm-adapter-ext-clients/pom.xml index c161bc2cd4..da778d286e 100644 --- a/adapters/mso-vnfm-adapter/mso-vnfm-adapter-ext-clients/pom.xml +++ b/adapters/mso-vnfm-adapter/mso-vnfm-adapter-ext-clients/pom.xml @@ -1,234 +1,233 @@ - - 4.0.0 - - org.onap.so.adapters - mso-vnfm-adapter - 1.4.0-SNAPSHOT - - mso-vnfm-adapter-ext-clients - - UTF-8 - UTF-8 - 1.5.15 - 2.7.5 - 1.8.2 - 1.3.5 - 2.4.0 - 3.14.0 - 1.0.1 - - mso-vnfm-adapter-ext-clients - Clients for the vnfm adpater to use towards REST endpoints which are external to the VNFM adapter/ + + 4.0.0 + + org.onap.so.adapters + mso-vnfm-adapter + 1.4.0-SNAPSHOT + + mso-vnfm-adapter-ext-clients + + UTF-8 + UTF-8 + 1.5.15 + 2.7.5 + 1.8.2 + 1.3.5 + 2.4.0 + 3.14.0 + 1.0.1 + + mso-vnfm-adapter-ext-clients + Clients for the vnfm adpater to use towards REST endpoints which are external to the VNFM adapter/ - - - - io.swagger - swagger-codegen-maven-plugin - 2.3.1 - - - sol003-vnf-lcm-api - - generate - - - ${basedir}/src/main/resources/SOL003-VNFLifecycleManagement-API.json - java - okhttp-gson - ${project.build.directory}/generated-sources/sol003-vnf-lcm - org.onap.so.adapters.vnfmadapter.extclients.vnfm.api - org.onap.so.adapters.vnfmadapter.extclients.vnfm.model - - true - src/gen/java/main - true - true - true - - - - - sol003-vnf-lcn-api - - generate - - - ${basedir}/src/main/resources/SOL003-VNFLifecycleManagementNotification-API.json - java - okhttp-gson - ${project.build.directory}/generated-sources/sol003-vnf-lcn - org.onap.so.adapters.vnfmadapter.extclients.vnfm.lcn.api - org.onap.so.adapters.vnfmadapter.extclients.vnfm.lcn.model - - true - src/gen/java/main - true - true - true - - - - - sol003-vnf-grant-api - - generate - - - ${basedir}/src/main/resources/SOL003-VNFLifecycleOperationGranting-API.json + + + + io.swagger + swagger-codegen-maven-plugin + 2.3.1 + + + sol003-vnf-lcm-api + + generate + + + ${basedir}/src/main/resources/SOL003-VNFLifecycleManagement-API.json + java + okhttp-gson + ${project.build.directory}/generated-sources/sol003-vnf-lcm + org.onap.so.adapters.vnfmadapter.extclients.vnfm.api + org.onap.so.adapters.vnfmadapter.extclients.vnfm.model + + true + src/gen/java/main + true + true + true + + + + + sol003-vnf-lcn-api + + generate + + + ${basedir}/src/main/resources/SOL003-VNFLifecycleManagementNotification-API.json + java + okhttp-gson + ${project.build.directory}/generated-sources/sol003-vnf-lcn + org.onap.so.adapters.vnfmadapter.extclients.vnfm.lcn.api + org.onap.so.adapters.vnfmadapter.extclients.vnfm.lcn.model + + true + src/gen/java/main + true + true + true + + + + + sol003-vnf-grant-api + + generate + + + ${basedir}/src/main/resources/SOL003-VNFLifecycleOperationGranting-API.json - java - retrofit2 - ${project.build.directory}/generated-sources/sol003-vnf-grant - false - org.onap.so.adapters.vnfmadapter.extclients.vnfm.grant.model - - false - src/gen/java/main - true - true - - - - - - - + java + retrofit2 + ${project.build.directory}/generated-sources/sol003-vnf-grant + false + org.onap.so.adapters.vnfmadapter.extclients.vnfm.grant.model + + false + src/gen/java/main + true + true + + + + + + + - - - io.swagger - swagger-annotations - ${swagger-core-version} - - - com.squareup.okhttp - okhttp - ${okhttp-version} - - - com.squareup.okhttp - logging-interceptor - ${okhttp-version} - - - com.google.code.gson - gson - - - io.gsonfire - gson-fire - ${gson-fire-version} - - - org.threeten - threetenbp - ${threetenbp-version} - - - junit - junit - 4.12 - - provided - - - com.squareup.retrofit2 - converter-gson - ${retrofit2-version} - - - com.squareup.retrofit2 - retrofit - ${retrofit2-version} - - - com.squareup.retrofit2 - converter-scalars - ${retrofit2-version} - - - com.squareup.retrofit2 - adapter-rxjava2 - ${retrofit2-version} - - - com.squareup.okhttp3 - okhttp - ${okhttp3-version} - - - com.squareup.okhttp3 - logging-interceptor - ${okhttp3-version} - - - com.squareup.okhttp - logging-interceptor - ${okhttp-version} - + + + io.swagger + swagger-annotations + ${swagger-core-version} + + + com.squareup.okhttp + okhttp + ${okhttp-version} + + + com.squareup.okhttp + logging-interceptor + ${okhttp-version} + + + com.google.code.gson + gson + + + io.gsonfire + gson-fire + ${gson-fire-version} + + + org.threeten + threetenbp + ${threetenbp-version} + + + junit + junit + 4.12 + + provided + + + com.squareup.retrofit2 + converter-gson + ${retrofit2-version} + + + com.squareup.retrofit2 + retrofit + ${retrofit2-version} + + + com.squareup.retrofit2 + converter-scalars + ${retrofit2-version} + + + com.squareup.retrofit2 + adapter-rxjava2 + ${retrofit2-version} + + + com.squareup.okhttp3 + okhttp + ${okhttp3-version} + + + com.squareup.okhttp3 + logging-interceptor + ${okhttp3-version} + + + com.squareup.okhttp + logging-interceptor + ${okhttp-version} + - - - org.apache.oltu.oauth2 - org.apache.oltu.oauth2.client - ${oltu-version} - - - org.apache.oltu.oauth2 - org.apache.oltu.oauth2.common - ${oltu-version} - - - org.apache.oltu.oauth2 - org.apache.oltu.oauth2.client - ${oltu-version} - - - org.apache.oltu.oauth2 - org.apache.oltu.oauth2.httpclient4 - ${oltu-version} - - - org.apache.oltu.oauth2 - org.apache.oltu.oauth2.dynamicreg.client - ${oltu-version} - - - org.apache.oltu.oauth2 - org.apache.oltu.oauth2.dynamicreg.common - ${oltu-version} - - - org.apache.oltu.oauth2 - org.apache.oltu.oauth2.authzserver - ${oltu-version} - - - org.apache.oltu.oauth2 - org.apache.oltu.oauth2.resourceserver - ${oltu-version} - - - org.apache.oltu.oauth2 - org.apache.oltu.oauth2.resourceserver-filter - ${oltu-version} - - - org.apache.oltu.oauth2 - org.apache.oltu.oauth2.dynamicreg.server - ${oltu-version} - - - org.apache.oltu.oauth2 - org.apache.oltu.oauth2.jwt - ${oltu-version} - - + + + org.apache.oltu.oauth2 + org.apache.oltu.oauth2.client + ${oltu-version} + + + org.apache.oltu.oauth2 + org.apache.oltu.oauth2.common + ${oltu-version} + + + org.apache.oltu.oauth2 + org.apache.oltu.oauth2.client + ${oltu-version} + + + org.apache.oltu.oauth2 + org.apache.oltu.oauth2.httpclient4 + ${oltu-version} + + + org.apache.oltu.oauth2 + org.apache.oltu.oauth2.dynamicreg.client + ${oltu-version} + + + org.apache.oltu.oauth2 + org.apache.oltu.oauth2.dynamicreg.common + ${oltu-version} + + + org.apache.oltu.oauth2 + org.apache.oltu.oauth2.authzserver + ${oltu-version} + + + org.apache.oltu.oauth2 + org.apache.oltu.oauth2.resourceserver + ${oltu-version} + + + org.apache.oltu.oauth2 + org.apache.oltu.oauth2.resourceserver-filter + ${oltu-version} + + + org.apache.oltu.oauth2 + org.apache.oltu.oauth2.dynamicreg.server + ${oltu-version} + + + org.apache.oltu.oauth2 + org.apache.oltu.oauth2.jwt + ${oltu-version} + + - + diff --git a/adapters/mso-vnfm-adapter/mso-vnfm-etsi-adapter/pom.xml b/adapters/mso-vnfm-adapter/mso-vnfm-etsi-adapter/pom.xml index fdbc76dea7..c561721b3e 100644 --- a/adapters/mso-vnfm-adapter/mso-vnfm-etsi-adapter/pom.xml +++ b/adapters/mso-vnfm-adapter/mso-vnfm-etsi-adapter/pom.xml @@ -1,129 +1,128 @@ - - 4.0.0 - - org.onap.so.adapters - mso-vnfm-adapter - 1.4.0-SNAPSHOT - - mso-vnfm-etsi-adapter - - UTF-8 - UTF-8 - - mso-vnfm-etsi-adapter - MSO ETSI compliant VNFM Adapter + + 4.0.0 + + org.onap.so.adapters + mso-vnfm-adapter + 1.4.0-SNAPSHOT + + mso-vnfm-etsi-adapter + + UTF-8 + UTF-8 + + mso-vnfm-etsi-adapter + MSO ETSI compliant VNFM Adapter - - ${project.artifactId}-${project.version} - - - org.springframework.boot - spring-boot-maven-plugin - - org.onap.so.adapters.vnfmadapter.VnfmAdapterApplication - - - - - repackage - - - - - - org.apache.maven.plugins - maven-jar-plugin - - - original - - - - - org.jacoco - jacoco-maven-plugin - - - org.apache.maven.plugins - maven-surefire-plugin - - - DEBUG - - 2 - suites - false - 1 - - - - - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-security - - - org.springframework.boot - spring-boot-starter-tomcat - - - - - org.springframework.boot - spring-boot-starter-actuator - - - org.springframework.boot - spring-boot-starter-test - test - - - org.onap.so.adapters - mso-adapters-rest-interface - ${project.version} - - - org.onap.so.adapters - mso-vnfm-adapter-api - ${project.version} - - - org.onap.so.adapters - mso-vnfm-adapter-ext-clients - ${project.version} - - - org.glassfish.jersey.core - jersey-client - - - org.glassfish.jersey.core - jersey-common - - - org.glassfish.jersey.core - jersey-client - - - org.glassfish.jersey.inject - jersey-hk2 - 2.26 - - - org.glassfish.jersey.media - jersey-media-json-jackson - - - org.yaml - snakeyaml - 1.23 - - + + ${project.artifactId}-${project.version} + + + org.springframework.boot + spring-boot-maven-plugin + + org.onap.so.adapters.vnfmadapter.VnfmAdapterApplication + + + + + repackage + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + original + + + + + org.jacoco + jacoco-maven-plugin + + + org.apache.maven.plugins + maven-surefire-plugin + + + DEBUG + + 2 + suites + false + 1 + + + + + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-security + + + org.springframework.boot + spring-boot-starter-tomcat + + + + + org.springframework.boot + spring-boot-starter-actuator + + + org.springframework.boot + spring-boot-starter-test + test + + + org.onap.so.adapters + mso-adapters-rest-interface + ${project.version} + + + org.onap.so.adapters + mso-vnfm-adapter-api + ${project.version} + + + org.onap.so.adapters + mso-vnfm-adapter-ext-clients + ${project.version} + + + org.glassfish.jersey.core + jersey-client + + + org.glassfish.jersey.core + jersey-common + + + org.glassfish.jersey.core + jersey-client + + + org.glassfish.jersey.inject + jersey-hk2 + 2.26 + + + org.glassfish.jersey.media + jersey-media-json-jackson + + + org.yaml + snakeyaml + 1.23 + + diff --git a/adapters/mso-vnfm-adapter/pom.xml b/adapters/mso-vnfm-adapter/pom.xml index 9cc17056c2..962b3b4fb7 100644 --- a/adapters/mso-vnfm-adapter/pom.xml +++ b/adapters/mso-vnfm-adapter/pom.xml @@ -1,22 +1,21 @@ - - 4.0.0 - - org.onap.so - adapters - 1.4.0-SNAPSHOT - - org.onap.so.adapters - mso-vnfm-adapter - MSO VNFM Adapter - MSO Adapter for VNFM - pom + + 4.0.0 + + org.onap.so + adapters + 1.4.0-SNAPSHOT + + org.onap.so.adapters + mso-vnfm-adapter + MSO VNFM Adapter + MSO Adapter for VNFM + pom - - mso-vnfm-adapter-api - mso-vnfm-adapter-ext-clients - mso-vnfm-etsi-adapter - + + mso-vnfm-adapter-api + mso-vnfm-adapter-ext-clients + mso-vnfm-etsi-adapter + diff --git a/adapters/pom.xml b/adapters/pom.xml index d00304b837..bd7bebafa0 100644 --- a/adapters/pom.xml +++ b/adapters/pom.xml @@ -1,41 +1,42 @@ - - 4.0.0 - - org.onap.so - so - 1.4.0-SNAPSHOT - + + 4.0.0 + + org.onap.so + so + 1.4.0-SNAPSHOT + - adapters - MSO Adapters - Adapters for MSO - pom + adapters + MSO Adapters + Adapters for MSO + pom - - mso-adapter-utils - mso-adapters-rest-interface - mso-sdnc-adapter - mso-requests-db-adapter - mso-catalog-db-adapter - mso-vfc-adapter - mso-openstack-adapters - mso-vnfm-adapter + + mso-adapter-utils + mso-adapters-rest-interface + mso-sdnc-adapter + mso-requests-db-adapter + mso-catalog-db-adapter + mso-vfc-adapter + mso-openstack-adapters + mso-vnfm-adapter - - - org.apache.httpcomponents - httpclient - - - org.apache.httpcomponents - httpcore - - - org.springframework.cloud - spring-cloud-contract-wiremock - 1.2.4.RELEASE - - + + + org.apache.httpcomponents + httpclient + + + org.apache.httpcomponents + httpcore + + + org.springframework.cloud + spring-cloud-contract-wiremock + 1.2.4.RELEASE + + diff --git a/asdc-controller/pom.xml b/asdc-controller/pom.xml index 35fbf9108c..8317b660a6 100644 --- a/asdc-controller/pom.xml +++ b/asdc-controller/pom.xml @@ -1,5 +1,4 @@ - 4.0.0 diff --git a/asdc-controller/src/main/java/org/onap/so/asdc/client/ASDCController.java b/asdc-controller/src/main/java/org/onap/so/asdc/client/ASDCController.java index 57e9c173b9..f2e875fc0c 100644 --- a/asdc-controller/src/main/java/org/onap/so/asdc/client/ASDCController.java +++ b/asdc-controller/src/main/java/org/onap/so/asdc/client/ASDCController.java @@ -655,6 +655,7 @@ public class ASDCController { // For each artifact, create a structure describing the VFModule in a ordered flat level ResourceStructure resourceStructure = null; String msoConfigPath = getMsoConfigPath(); + boolean hasVFResource = false; ToscaResourceStructure toscaResourceStructure = new ToscaResourceStructure(msoConfigPath); boolean deploySuccessful = true; String errorMessage = null; @@ -697,7 +698,7 @@ public class ASDCController { + resourceStructure.getResourceInstance().getResourceUUID()); if ("VF".equals(resourceType) && !"Allotted Resource".equalsIgnoreCase(category)) { - + hasVFResource = true; for (IArtifactInfo artifact : resource.getArtifacts()) { IDistributionClientDownloadResult resultArtifact = this.downloadTheArtifact(artifact, iNotif.getDistributionID()); @@ -730,16 +731,19 @@ public class ASDCController { logger.error("Exception occurred", e); } - // Deploy VF resource and artifacts - logger.debug("Preparing to deploy Service: {}", iNotif.getServiceUUID()); - try { - this.deployResourceStructure(resourceStructure, toscaResourceStructure); - } catch (ArtifactInstallerException e) { - deploySuccessful = false; - errorMessage = e.getMessage(); - logger.error("Exception occurred", e); - } + if (!hasVFResource) { + + logger.debug("No resources found for Service: " + iNotif.getServiceUUID()); + logger.debug("Preparing to deploy Service: {}", iNotif.getServiceUUID()); + try { + this.deployResourceStructure(resourceStructure, toscaResourceStructure); + } catch (ArtifactInstallerException e) { + deploySuccessful = false; + errorMessage = e.getMessage(); + logger.error("Exception occurred", e); + } + } this.sendCsarDeployNotification(iNotif, resourceStructure, toscaResourceStructure, deploySuccessful, errorMessage); } diff --git a/asdc-controller/src/main/java/org/onap/so/asdc/client/test/emulators/ArtifactInfoImpl.java b/asdc-controller/src/main/java/org/onap/so/asdc/client/test/emulators/ArtifactInfoImpl.java index b3618a8095..f4cfb1361f 100644 --- a/asdc-controller/src/main/java/org/onap/so/asdc/client/test/emulators/ArtifactInfoImpl.java +++ b/asdc-controller/src/main/java/org/onap/so/asdc/client/test/emulators/ArtifactInfoImpl.java @@ -23,9 +23,11 @@ package org.onap.so.asdc.client.test.emulators; import java.util.ArrayList; import java.util.List; import org.onap.sdc.api.notification.IArtifactInfo; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import org.apache.commons.lang3.builder.HashCodeBuilder; import org.apache.commons.lang3.builder.EqualsBuilder; +@JsonIgnoreProperties(ignoreUnknown = true) public class ArtifactInfoImpl implements IArtifactInfo { private String artifactName; diff --git a/asdc-controller/src/main/java/org/onap/so/asdc/client/test/emulators/NotificationDataImpl.java b/asdc-controller/src/main/java/org/onap/so/asdc/client/test/emulators/NotificationDataImpl.java index f8d7bb09f5..c61306fb77 100644 --- a/asdc-controller/src/main/java/org/onap/so/asdc/client/test/emulators/NotificationDataImpl.java +++ b/asdc-controller/src/main/java/org/onap/so/asdc/client/test/emulators/NotificationDataImpl.java @@ -29,12 +29,14 @@ import org.onap.sdc.api.notification.INotificationData; import org.onap.sdc.api.notification.IResourceInstance; import org.springframework.stereotype.Component; import com.fasterxml.jackson.annotation.JsonAutoDetect; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility; @Component @JsonAutoDetect(fieldVisibility = Visibility.ANY, getterVisibility = Visibility.NONE, setterVisibility = Visibility.NONE) +@JsonIgnoreProperties(ignoreUnknown = true) public class NotificationDataImpl implements INotificationData { @JsonProperty("distributionID") diff --git a/asdc-controller/src/main/java/org/onap/so/asdc/client/test/emulators/ResourceInfoImpl.java b/asdc-controller/src/main/java/org/onap/so/asdc/client/test/emulators/ResourceInfoImpl.java index 91597611fd..62d11ffec9 100644 --- a/asdc-controller/src/main/java/org/onap/so/asdc/client/test/emulators/ResourceInfoImpl.java +++ b/asdc-controller/src/main/java/org/onap/so/asdc/client/test/emulators/ResourceInfoImpl.java @@ -27,7 +27,9 @@ import org.apache.commons.lang3.builder.HashCodeBuilder; import org.onap.sdc.api.notification.IArtifactInfo; import org.onap.sdc.api.notification.IResourceInstance; import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +@JsonIgnoreProperties(ignoreUnknown = true) public class ResourceInfoImpl implements IResourceInstance { public ResourceInfoImpl() {} diff --git a/asdc-controller/src/main/java/org/onap/so/asdc/installer/heat/ToscaResourceInstaller.java b/asdc-controller/src/main/java/org/onap/so/asdc/installer/heat/ToscaResourceInstaller.java index e61aafac2e..f3a495825c 100644 --- a/asdc-controller/src/main/java/org/onap/so/asdc/installer/heat/ToscaResourceInstaller.java +++ b/asdc-controller/src/main/java/org/onap/so/asdc/installer/heat/ToscaResourceInstaller.java @@ -261,7 +261,7 @@ public class ToscaResourceInstaller { try { Service existingService = serviceRepo.findOneByModelUUID(vfResourceStructure.getNotification().getServiceUUID()); - if (existingService != null && serviceDeployed == false) + if (existingService != null && !serviceDeployed) status = true; if (status) { logger.info(vfResourceStructure.getResourceInstance().getResourceInstanceName(), @@ -387,12 +387,11 @@ public class ToscaResourceInstaller { List artifactListForLogging = new ArrayList<>(); try { createToscaCsar(toscaResourceStruct); - Service service = createService(toscaResourceStruct, vfResourceStruct); + createService(toscaResourceStruct, vfResourceStruct); + Service service = toscaResourceStruct.getCatalogService(); List vfNodeTemplatesList = toscaResourceStruct.getSdcCsarHelper().getServiceVfList(); - for (NodeTemplate nodeTemplate : vfNodeTemplatesList) { - Metadata metadata = nodeTemplate.getMetaData(); String serviceType = toscaResourceStruct.getCatalogService().getServiceType(); String vfCustomizationCategory = toscaResourceStruct.getSdcCsarHelper() @@ -402,7 +401,6 @@ public class ToscaResourceInstaller { } processResourceSequence(toscaResourceStruct, service); - processVFResources(toscaResourceStruct, service, vfResourceStructure); List allottedResourceList = toscaResourceStruct.getSdcCsarHelper().getAllottedResources(); processAllottedResources(toscaResourceStruct, service, allottedResourceList); processNetworks(toscaResourceStruct, service); @@ -410,7 +408,7 @@ public class ToscaResourceInstaller { processNetworkCollections(toscaResourceStruct, service); // Process Service Proxy & Configuration processServiceProxyAndConfiguration(toscaResourceStruct, service); - + logger.info("Saving Service: {} ", service.getModelName()); serviceRepo.save(service); WatchdogComponentDistributionStatus status = new WatchdogComponentDistributionStatus( @@ -763,48 +761,6 @@ public class ToscaResourceInstaller { } - protected void processVFResources(ToscaResourceStructure toscaResourceStruct, Service service, - VfResourceStructure vfResourceStructure) throws Exception { - logger.debug("processVFResources"); - - List vfNodeTemplatesList = toscaResourceStruct.getSdcCsarHelper().getServiceVfList(); - // String servicecategory = toscaResourceStruct.getCatalogService().getCategory(); - // String serviceType = toscaResourceStruct.getCatalogService().getServiceType(); - - for (NodeTemplate nodeTemplate : vfNodeTemplatesList) { - Metadata metadata = nodeTemplate.getMetaData(); - String vfCustomizationCategory = metadata.getValue(SdcPropertyNames.PROPERTY_NAME_CATEGORY); - logger.debug("VF Category is : " + vfCustomizationCategory); - - // Do not treat Allotted Resources as VNF resources - if (ALLOTTED_RESOURCE.equalsIgnoreCase(vfCustomizationCategory)) { - continue; - } - - String vfCustomizationUUID = metadata.getValue(SdcPropertyNames.PROPERTY_NAME_CUSTOMIZATIONUUID); - logger.debug("VFCustomizationUUID=" + vfCustomizationUUID); - - IResourceInstance vfNotificationResource = vfResourceStructure.getResourceInstance(); - - // Make sure the VF ResourceCustomizationUUID from the notification and tosca - // customizations match before comparing their VF Modules UUID's - logger.debug("Checking if Notification VF ResourceCustomizationUUID: " - + vfNotificationResource.getResourceCustomizationUUID() + " matches Tosca VF Customization UUID: " - + vfCustomizationUUID); - - if (vfCustomizationUUID.equals(vfNotificationResource.getResourceCustomizationUUID())) { - logger.debug("vfCustomizationUUID: " + vfCustomizationUUID - + " matches vfNotificationResource CustomizationUUID"); - - processVfModules(toscaResourceStruct, vfResourceStructure, service, nodeTemplate, metadata, - vfCustomizationCategory); - } else { - logger.debug("Notification VF ResourceCustomizationUUID: " - + vfNotificationResource.getResourceCustomizationUUID() + " doesn't match " - + "Tosca VF Customization UUID: " + vfCustomizationUUID); - } - } - } /** * This is used to process the PNF specific resource, including resource and resource_customization. diff --git a/asdc-controller/src/test/java/org/onap/so/asdc/client/test/rest/ASDCRestInterfaceTest.java b/asdc-controller/src/test/java/org/onap/so/asdc/client/test/rest/ASDCRestInterfaceTest.java index 815f419c40..2e5ad13c21 100644 --- a/asdc-controller/src/test/java/org/onap/so/asdc/client/test/rest/ASDCRestInterfaceTest.java +++ b/asdc-controller/src/test/java/org/onap/so/asdc/client/test/rest/ASDCRestInterfaceTest.java @@ -42,6 +42,7 @@ import org.onap.so.asdc.client.test.emulators.DistributionClientEmulator; import org.onap.so.asdc.client.test.emulators.NotificationDataImpl; import org.onap.so.db.catalog.beans.AllottedResource; import org.onap.so.db.catalog.beans.AllottedResourceCustomization; +import org.onap.so.db.catalog.beans.Service; import org.onap.so.db.catalog.data.repository.AllottedResourceRepository; import org.onap.so.db.catalog.data.repository.NetworkResourceRepository; import org.onap.so.db.catalog.data.repository.ServiceRepository; @@ -138,6 +139,42 @@ public class ASDCRestInterfaceTest extends BaseTest { .ignoring("0x1.allotedResourceCustomization.created")); } + @Test + @Transactional + public void test_VFW_Distrobution() throws Exception { + + wireMockServer.stubFor(post(urlPathMatching("/aai/.*")) + .willReturn(aResponse().withStatus(200).withHeader("Content-Type", "application/json"))); + + ObjectMapper mapper = new ObjectMapper(); + NotificationDataImpl request = mapper.readValue( + new File("src/test/resources/resource-examples/vFW/notification.json"), NotificationDataImpl.class); + headers.add("resource-location", "src/test/resources/resource-examples/vFW/"); + HttpEntity entity = new HttpEntity(request, headers); + + ResponseEntity response = restTemplate.exchange(createURLWithPort("test/treatNotification/v1"), + HttpMethod.POST, entity, String.class); + + assertEquals(Response.Status.OK.getStatusCode(), response.getStatusCode().value()); + + Service expectedService = new Service(); + expectedService.setDescription("catalog service description"); + expectedService.setModelInvariantUUID("3164f9ff-d7e7-4813-ab32-6be7e1cacb18"); + expectedService.setModelName("vFW 2019-04-10 21:53:05"); + expectedService.setModelUUID("e16e4ed9-3429-423a-bc3c-1389ae91491c"); + expectedService.setModelVersion("1.0"); + + + + Service actualService = serviceRepo.findOneByModelUUID("e16e4ed9-3429-423a-bc3c-1389ae91491c"); + + + if (actualService == null) + throw new Exception("No Allotted Resource Written to database"); + + assertEquals(expectedService.getModelName(), actualService.getModelName()); + } + @Test public void invokeASDCStatusDataNullTest() { String request = ""; diff --git a/asdc-controller/src/test/resources/resource-examples/vFW/base_vfw.env b/asdc-controller/src/test/resources/resource-examples/vFW/base_vfw.env new file mode 100644 index 0000000000..f490db5249 --- /dev/null +++ b/asdc-controller/src/test/resources/resource-examples/vFW/base_vfw.env @@ -0,0 +1,38 @@ +parameters: + cloud_env: "openstack" + dcae_collector_ip: "10.0.4.1" + dcae_collector_port: "30235" + demo_artifacts_version: "1.4.0-SNAPSHOT" + install_script_version: "1.4.0-SNAPSHOT" + key_name: "vfw_key" + nexus_artifact_repo: "https://nexus.onap.org" + onap_private_net_cidr: "10.0.0.0/16" + onap_private_net_id: "PUT THE ONAP PRIVATE NETWORK NAME HERE" + onap_private_subnet_id: "PUT THE ONAP PRIVATE NETWORK NAME HERE" + protected_private_net_cidr: "192.168.20.0/24" + protected_private_net_id: "zdfw1fwl01_protected" + pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN" + public_net_id: "PUT THE PUBLIC NETWORK ID HERE" + sec_group: "PUT THE ONAP SECURITY GROUP HERE" + unprotected_private_net_cidr: "192.168.10.0/24" + unprotected_private_net_id: "zdfw1fwl01_unprotected" + vf_module_id: "vFirewall" + vfw_flavor_name: "PUT THE VM FLAVOR NAME HERE (m1.medium suggested)" + vfw_image_name: "PUT THE VM IMAGE NAME HERE (UBUNTU 1404 required)" + vfw_int_protected_private_floating_ip: "192.168.10.200" + vfw_int_protected_private_ip_0: "192.168.20.100" + vfw_int_unprotected_private_ip_0: "192.168.10.100" + vfw_name_0: "zdfw1fwl01fwl01" + vfw_onap_private_ip_0: "10.0.100.1" + vnf_id: "vFirewall_demo_app" + vnf_name: "vFW" + vpg_flavor_name: "PUT THE VM FLAVOR NAME HERE (m1.medium suggested)" + vpg_image_name: "PUT THE VM IMAGE NAME HERE (UBUNTU 1404 required)" + vpg_int_unprotected_private_ip_0: "192.168.10.200" + vpg_name_0: "zdfw1fwl01pgn01" + vpg_onap_private_ip_0: "10.0.100.2" + vsn_flavor_name: "PUT THE VM FLAVOR NAME HERE (m1.medium suggested)" + vsn_image_name: "PUT THE VM IMAGE NAME HERE (UBUNTU 1404 required)" + vsn_int_protected_private_ip_0: "192.168.20.250" + vsn_name_0: "zdfw1fwl01snk01" + vsn_onap_private_ip_0: "10.0.100.3" diff --git a/asdc-controller/src/test/resources/resource-examples/vFW/base_vfw.yaml b/asdc-controller/src/test/resources/resource-examples/vFW/base_vfw.yaml new file mode 100644 index 0000000000..6137e8ab8b --- /dev/null +++ b/asdc-controller/src/test/resources/resource-examples/vFW/base_vfw.yaml @@ -0,0 +1,491 @@ +########################################################################## +# +#==================LICENSE_START========================================== +# +# +# 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============================================ +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. +# +########################################################################## + +heat_template_version: 2013-05-23 + +description: Heat template that deploys vFirewall demo app for ONAP + +############## +# # +# PARAMETERS # +# # +############## + +parameters: + vfw_image_name: + type: string + label: Image name or ID + description: Image to be used for compute instance + vfw_flavor_name: + type: string + label: Flavor + description: Type of instance (flavor) to be used + vpg_image_name: + type: string + label: Image name or ID + description: Image to be used for compute instance + vpg_flavor_name: + type: string + label: Flavor + description: Type of instance (flavor) to be used + vsn_image_name: + type: string + label: Image name or ID + description: Image to be used for compute instance + vsn_flavor_name: + type: string + label: Flavor + description: Type of instance (flavor) to be used + public_net_id: + type: string + label: Public network name or ID + description: Public network that enables remote connection to VNF + unprotected_private_net_id: + type: string + label: Unprotected private network name or ID + description: Private network that connects vPacketGenerator with vFirewall + protected_private_net_id: + type: string + label: Protected private network name or ID + description: Private network that connects vFirewall with vSink + onap_private_net_id: + type: string + label: ONAP management network name or ID + description: Private network that connects ONAP components and the VNF + onap_private_subnet_id: + type: string + label: ONAP management sub-network name or ID + description: Private sub-network that connects ONAP components and the VNF + unprotected_private_net_cidr: + type: string + label: Unprotected private network CIDR + description: The CIDR of the unprotected private network + protected_private_net_cidr: + type: string + label: Protected private network CIDR + description: The CIDR of the protected private network + onap_private_net_cidr: + type: string + label: ONAP private network CIDR + description: The CIDR of the protected private network + vfw_int_unprotected_private_ip_0: + type: string + label: vFirewall private IP address towards the unprotected network + description: Private IP address that is assigned to the vFirewall to communicate with the vPacketGenerator + vfw_int_protected_private_ip_0: + type: string + label: vFirewall private IP address towards the protected network + description: Private IP address that is assigned to the vFirewall to communicate with the vSink + vfw_onap_private_ip_0: + type: string + label: vFirewall private IP address towards the ONAP management network + description: Private IP address that is assigned to the vFirewall to communicate with ONAP components + vfw_int_protected_private_floating_ip: + type: string + label: same value as vpg_int_unprotected_private_ip_0 + description: IP to inform OpenStack to enable vfw protected private port to allow packets coming from the packet generator + vpg_int_unprotected_private_ip_0: + type: string + label: vPacketGenerator private IP address towards the unprotected network + description: Private IP address that is assigned to the vPacketGenerator to communicate with the vFirewall + vpg_onap_private_ip_0: + type: string + label: vPacketGenerator private IP address towards the ONAP management network + description: Private IP address that is assigned to the vPacketGenerator to communicate with ONAP components + vsn_int_protected_private_ip_0: + type: string + label: vSink private IP address towards the protected network + description: Private IP address that is assigned to the vSink to communicate with the vFirewall + vsn_onap_private_ip_0: + type: string + label: vSink private IP address towards the ONAP management network + description: Private IP address that is assigned to the vSink to communicate with ONAP components + vfw_name_0: + type: string + label: vFirewall name + description: Name of the vFirewall + vpg_name_0: + type: string + label: vPacketGenerator name + description: Name of the vPacketGenerator + vsn_name_0: + type: string + label: vSink name + description: Name of the vSink + vnf_id: + type: string + label: VNF ID + description: The VNF ID is provided by ONAP + vnf_name: + type: string + label: VNF NAME + description: The VNF NAME is provided by ONAP + vf_module_id: + type: string + label: vFirewall module ID + description: The vFirewall Module ID is provided by ONAP + dcae_collector_ip: + type: string + label: DCAE collector IP address + description: IP address of the DCAE collector + dcae_collector_port: + type: string + label: DCAE collector port + description: Port of the DCAE collector + key_name: + type: string + label: Key pair name + description: Public/Private key pair name + pub_key: + type: string + label: Public key + description: Public key to be installed on the compute instance + install_script_version: + type: string + label: Installation script version number + description: Version number of the scripts that install the vFW demo app + demo_artifacts_version: + type: string + label: Artifacts version used in demo vnfs + description: Artifacts (jar, tar.gz) version used in demo vnfs + nexus_artifact_repo: + type: string + description: Root URL for the Nexus repository for Maven artifacts. + cloud_env: + type: string + label: Cloud environment + description: Cloud environment (e.g., openstack, rackspace) + sec_group: + type: string + description: ONAP Security Group + +############# +# # +# RESOURCES # +# # +############# + +resources: + random-str: + type: OS::Heat::RandomString + properties: + length: 4 + + my_keypair: + type: OS::Nova::KeyPair + properties: + name: + str_replace: + template: vnfname_base_rand + params: + base: { get_param: key_name } + rand: { get_resource: random-str } + vnfname: { get_param: vnf_name } + public_key: { get_param: pub_key } + save_private_key: false + + # NETWORK_ROLE: unprotected_private + # NETWORK_TYPE: internal + int_unprotected_private_network: + type: OS::Neutron::Net + properties: + name: + str_replace: + template: vnfname_netid + params: + netid: { get_param: unprotected_private_net_id } + vnfname: { get_param: vnf_name } + + # NETWORK_ROLE: protected_private + # NETWORK_TYPE: internal + int_protected_private_network: + type: OS::Neutron::Net + properties: + name: + str_replace: + template: vnfname_netid + params: + netid: { get_param: protected_private_net_id } + vnfname: { get_param: vnf_name } + + # NETWORK_ROLE: unprotected_private + # NETWORK_TYPE: internal + int_unprotected_private_subnet: + type: OS::Neutron::Subnet + properties: + network: { get_resource: int_unprotected_private_network } + cidr: { get_param: unprotected_private_net_cidr } + + # NETWORK_ROLE: protected_private + # NETWORK_TYPE: internal + int_protected_private_subnet: + type: OS::Neutron::Subnet + properties: + network: { get_resource: int_protected_private_network } + cidr: { get_param: protected_private_net_cidr } + + ### Virtual Firewall instantiation ### + + # VM_TYPE: vfw + # NETWORK_ROLE: protected_private + # NETWORK_TYPE: internal + vfw_0_int_unprotected_private_port_0: + type: OS::Neutron::Port + properties: + network: { get_resource: int_unprotected_private_network } + fixed_ips: [{"subnet": { get_resource: int_unprotected_private_subnet }, "ip_address": { get_param: vfw_int_unprotected_private_ip_0 }}] + security_groups: + - { get_param: sec_group } + + # VM_TYPE: vfw + # NETWORK_ROLE: protected_private + # NETWORK_TYPE: internal + vfw_0_int_protected_private_port_0: + type: OS::Neutron::Port + properties: + allowed_address_pairs: [{ "ip_address": { get_param: vfw_int_protected_private_floating_ip }}] + network: { get_resource: int_protected_private_network } + fixed_ips: [{"subnet": { get_resource: int_protected_private_subnet }, "ip_address": { get_param: vfw_int_protected_private_ip_0 }}] + security_groups: + - { get_param: sec_group } + + # VM_TYPE: vfw + # NETWORK_ROLE: onap_private + # NETWORK_TYPE: external + vfw_0_onap_private_port_0: + type: OS::Neutron::Port + properties: + network: { get_param: onap_private_net_id } + fixed_ips: [{"subnet": { get_param: onap_private_subnet_id }, "ip_address": { get_param: vfw_onap_private_ip_0 }}] + security_groups: + - { get_param: sec_group } + + # VM_TYPE: vfw + vfw_server_0: + type: OS::Nova::Server + properties: + image: { get_param: vfw_image_name } + flavor: { get_param: vfw_flavor_name } + name: { get_param: vfw_name_0 } + key_name: { get_resource: my_keypair } + networks: + - network: { get_param: public_net_id } + - port: { get_resource: vfw_0_int_unprotected_private_port_0 } + - port: { get_resource: vfw_0_int_protected_private_port_0 } + - port: { get_resource: vfw_0_onap_private_port_0 } + metadata: + vnf_id: { get_param: vnf_id } + vf_module_id: { get_param: vf_module_id } + vnf_name: { get_param: vnf_name } + user_data_format: RAW + user_data: + str_replace: + params: + __dcae_collector_ip__ : { get_param: dcae_collector_ip } + __dcae_collector_port__ : { get_param: dcae_collector_port } + __demo_artifacts_version__ : { get_param: demo_artifacts_version } + __install_script_version__ : { get_param: install_script_version } + __vfw_private_ip_0__ : { get_param: vfw_int_unprotected_private_ip_0 } + __vfw_private_ip_1__ : { get_param: vfw_int_protected_private_ip_0 } + __vfw_private_ip_2__ : { get_param: vfw_onap_private_ip_0 } + __unprotected_private_net_cidr__ : { get_param: unprotected_private_net_cidr } + __protected_private_net_cidr__ : { get_param: protected_private_net_cidr } + __onap_private_net_cidr__ : { get_param: onap_private_net_cidr } + __cloud_env__ : { get_param: cloud_env } + __nexus_artifact_repo__: { get_param: nexus_artifact_repo } + template: | + #!/bin/bash + + # Create configuration files + mkdir /opt/config + echo "__dcae_collector_ip__" > /opt/config/dcae_collector_ip.txt + echo "__dcae_collector_port__" > /opt/config/dcae_collector_port.txt + echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt + echo "__install_script_version__" > /opt/config/install_script_version.txt + echo "__vfw_private_ip_0__" > /opt/config/vfw_private_ip_0.txt + echo "__vfw_private_ip_1__" > /opt/config/vfw_private_ip_1.txt + echo "__vfw_private_ip_2__" > /opt/config/vfw_private_ip_2.txt + echo "__unprotected_private_net_cidr__" > /opt/config/unprotected_private_net_cidr.txt + echo "__protected_private_net_cidr__" > /opt/config/protected_private_net_cidr.txt + echo "__onap_private_net_cidr__" > /opt/config/onap_private_net_cidr.txt + echo "__cloud_env__" > /opt/config/cloud_env.txt + echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt + + # Download and run install script + apt-get update + apt-get -y install unzip + if [[ "__install_script_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi + curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo.vnf.vfw&a=vfw-scripts&e=zip&v=__install_script_version__" -o /opt/vfw-scripts-__install_script_version__.zip + unzip -j /opt/vfw-scripts-__install_script_version__.zip -d /opt v_firewall_install.sh + cd /opt + chmod +x v_firewall_install.sh + ./v_firewall_install.sh + + + ### Virtual Packet Generator instantiation ### + + vpg_0_int_unprotected_private_port_0: + type: OS::Neutron::Port + properties: + network: { get_resource: int_unprotected_private_network } + fixed_ips: [{"subnet": { get_resource: int_unprotected_private_subnet }, "ip_address": { get_param: vpg_int_unprotected_private_ip_0 }}] + security_groups: + - { get_param: sec_group } + + vpg_0_onap_private_port_0: + type: OS::Neutron::Port + properties: + network: { get_param: onap_private_net_id } + fixed_ips: [{"subnet": { get_param: onap_private_subnet_id }, "ip_address": { get_param: vpg_onap_private_ip_0 }}] + security_groups: + - { get_param: sec_group } + + vpg_server_0: + type: OS::Nova::Server + properties: + image: { get_param: vpg_image_name } + flavor: { get_param: vpg_flavor_name } + name: { get_param: vpg_name_0 } + key_name: { get_resource: my_keypair } + networks: + - network: { get_param: public_net_id } + - port: { get_resource: vpg_0_int_unprotected_private_port_0 } + - port: { get_resource: vpg_0_onap_private_port_0 } + metadata: + vnf_id: { get_param: vnf_id } + vf_module_id: { get_param: vf_module_id } + vnf_name: { get_param: vnf_name } + user_data_format: RAW + user_data: + str_replace: + params: + __fw_ipaddr__: { get_param: vfw_int_unprotected_private_ip_0 } + __protected_net_cidr__: { get_param: protected_private_net_cidr } + __sink_ipaddr__: { get_param: vsn_int_protected_private_ip_0 } + __demo_artifacts_version__ : { get_param: demo_artifacts_version } + __install_script_version__ : { get_param: install_script_version } + __vpg_private_ip_0__ : { get_param: vpg_int_unprotected_private_ip_0 } + __vpg_private_ip_1__ : { get_param: vpg_onap_private_ip_0 } + __unprotected_private_net_cidr__ : { get_param: unprotected_private_net_cidr } + __onap_private_net_cidr__ : { get_param: onap_private_net_cidr } + __cloud_env__ : { get_param: cloud_env } + __nexus_artifact_repo__: { get_param: nexus_artifact_repo } + template: | + #!/bin/bash + + # Create configuration files + mkdir /opt/config + echo "__fw_ipaddr__" > /opt/config/fw_ipaddr.txt + echo "__protected_net_cidr__" > /opt/config/protected_net_cidr.txt + echo "__sink_ipaddr__" > /opt/config/sink_ipaddr.txt + echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt + echo "__install_script_version__" > /opt/config/install_script_version.txt + echo "__vpg_private_ip_0__" > /opt/config/vpg_private_ip_0.txt + echo "__vpg_private_ip_1__" > /opt/config/vpg_private_ip_1.txt + echo "__unprotected_private_net_cidr__" > /opt/config/unprotected_private_net_cidr.txt + echo "__onap_private_net_cidr__" > /opt/config/onap_private_net_cidr.txt + echo "__cloud_env__" > /opt/config/cloud_env.txt + echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt + + # Download and run install script + apt-get update + apt-get -y install unzip + if [[ "__install_script_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi + curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo.vnf.vfw&a=vfw-scripts&e=zip&v=__install_script_version__" -o /opt/vfw-scripts-__install_script_version__.zip + unzip -j /opt/vfw-scripts-__install_script_version__.zip -d /opt v_packetgen_install.sh + cd /opt + chmod +x v_packetgen_install.sh + ./v_packetgen_install.sh + + + ### Virtual Sink instantiation ### + + vsn_0_int_protected_private_port_0: + type: OS::Neutron::Port + properties: + network: { get_resource: int_protected_private_network } + fixed_ips: [{"subnet": { get_resource: int_protected_private_subnet }, "ip_address": { get_param: vsn_int_protected_private_ip_0 }}] + security_groups: + - { get_param: sec_group } + + vsn_0_onap_private_port_0: + type: OS::Neutron::Port + properties: + network: { get_param: onap_private_net_id } + fixed_ips: [{"subnet": { get_param: onap_private_subnet_id }, "ip_address": { get_param: vsn_onap_private_ip_0 }}] + security_groups: + - { get_param: sec_group } + + vsn_server_0: + type: OS::Nova::Server + properties: + image: { get_param: vsn_image_name } + flavor: { get_param: vsn_flavor_name } + name: { get_param: vsn_name_0 } + key_name: { get_resource: my_keypair } + networks: + - network: { get_param: public_net_id } + - port: { get_resource: vsn_0_int_protected_private_port_0 } + - port: { get_resource: vsn_0_onap_private_port_0 } + metadata: + vnf_id: { get_param: vnf_id } + vf_module_id: { get_param: vf_module_id } + vnf_name: { get_param: vnf_name } + user_data_format: RAW + user_data: + str_replace: + params: + __protected_net_gw__: { get_param: vfw_int_protected_private_ip_0 } + __unprotected_net__: { get_param: unprotected_private_net_cidr } + __install_script_version__ : { get_param: install_script_version } + __vsn_private_ip_0__ : { get_param: vsn_int_protected_private_ip_0 } + __vsn_private_ip_1__ : { get_param: vsn_onap_private_ip_0 } + __protected_private_net_cidr__ : { get_param: protected_private_net_cidr } + __onap_private_net_cidr__ : { get_param: onap_private_net_cidr } + __cloud_env__ : { get_param: cloud_env } + __nexus_artifact_repo__: { get_param: nexus_artifact_repo } + template: | + #!/bin/bash + + # Create configuration files + mkdir /opt/config + echo "__protected_net_gw__" > /opt/config/protected_net_gw.txt + echo "__unprotected_net__" > /opt/config/unprotected_net.txt + echo "__install_script_version__" > /opt/config/install_script_version.txt + echo "__vsn_private_ip_0__" > /opt/config/vsn_private_ip_0.txt + echo "__vsn_private_ip_1__" > /opt/config/vsn_private_ip_1.txt + echo "__protected_private_net_cidr__" > /opt/config/protected_private_net_cidr.txt + echo "__onap_private_net_cidr__" > /opt/config/onap_private_net_cidr.txt + echo "__cloud_env__" > /opt/config/cloud_env.txt + echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt + + # Download and run install script + apt-get update + apt-get -y install unzip + if [[ "__install_script_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi + curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo.vnf.vfw&a=vfw-scripts&e=zip&v=__install_script_version__" -o /opt/vfw-scripts-__install_script_version__.zip + unzip -j /opt/vfw-scripts-__install_script_version__.zip -d /opt v_sink_install.sh + cd /opt + chmod +x v_sink_install.sh + ./v_sink_install.sh diff --git a/asdc-controller/src/test/resources/resource-examples/vFW/notification.json b/asdc-controller/src/test/resources/resource-examples/vFW/notification.json new file mode 100644 index 0000000000..4e93df510b --- /dev/null +++ b/asdc-controller/src/test/resources/resource-examples/vFW/notification.json @@ -0,0 +1,80 @@ +{ + "distributionID": "3d1c9f3c-550e-41c3-bfb6-800f8274a40c", + "resources": [ + { + "artifacts": [ + { + "artifactChecksum": "NDg0ZDJjYTIzNDhlZmFkZjRjMzM5MTkzOGFhZTU5ZjI=", + "artifactDescription": "Auto-generated VF Modules information artifact", + "artifactName": "vfw1f52feb055020_modules.json", + "artifactTimeout": 120, + "artifactType": "VF_MODULES_METADATA", + "artifactURL": "vfw1f52feb055020_modules.json", + "artifactUUID": "7ff1c5cb-8ca1-43b1-8f97-05c0d8c879ec", + "artifactVersion": "1", + "relatedArtifactsInfo": [] + }, + { + "artifactChecksum": "MDQyYTIxMTlhZDdlMzdiNjBjNjdjZTFhMWE0NThmMzc=", + "artifactDescription": "created from csar", + "artifactName": "base_vfw.yaml", + "artifactTimeout": 120, + "artifactType": "HEAT", + "artifactURL": "base_vfw.yaml", + "artifactUUID": "4f0b1b88-09ab-43b9-9506-57de3c69433a", + "artifactVersion": "2", + "generatedArtifact": { + "artifactChecksum": "MjQ2YWIxOTY2M2E0ZjAzMTI4NjVkNWZkZGRmM2VmMGI=", + "artifactDescription": "Auto-generated HEAT Environment deployment artifact", + "artifactName": "base_vfw.env", + "artifactTimeout": 120, + "artifactType": "HEAT_ENV", + "artifactURL": "base_vfw.env", + "artifactUUID": "005bc362-b40f-4c54-82bc-2716147f9c3a", + "artifactVersion": "2", + "generatedFromUUID": "4f0b1b88-09ab-43b9-9506-57de3c69433a" + }, + "relatedArtifactsInfo": [] + }, + { + "artifactChecksum": "MjQ2YWIxOTY2M2E0ZjAzMTI4NjVkNWZkZGRmM2VmMGI=", + "artifactDescription": "Auto-generated HEAT Environment deployment artifact", + "artifactName": "base_vfw.env", + "artifactTimeout": 120, + "artifactType": "HEAT_ENV", + "artifactURL": "base_vfw.env", + "artifactUUID": "005bc362-b40f-4c54-82bc-2716147f9c3a", + "artifactVersion": "2", + "relatedArtifactsInfo": [] + } + ], + "category": "Generic", + "resourceType": "VF", + "resourceCustomizationUUID": "0451bf8d-49e1-4f7f-960f-2e24f27c9f42", + "resourceInstanceName": "vFW 1f52feb0-5502 0", + "resourceInvariantUUID": "459f18ec-aaee-40d1-8fae-60fec2aae37f", + "resourceName": "vFW 1f52feb0-5502", + "resourceUUID": "1b1346cb-bf0b-4097-9d1b-5a041c536897", + "resourceVersion": "1.0", + "subcategory": "Abstract" + } + ], + "serviceArtifacts": [ + { + "artifactChecksum": "YWNkZTJmYmVmYTg0NTdjMzg0MjVjZTliOTRiYTQ5YjM=", + "artifactDescription": "TOSCA definition package of the asset", + "artifactName": "service-Vfw20190410215305-csar.csar", + "artifactTimeout": 0, + "artifactType": "TOSCA_CSAR", + "artifactURL": "service-Vfw.csar", + "artifactUUID": "f4fcb0ba-40d3-46d2-819e-3b69eda88fcf", + "artifactVersion": "1" + } + ], + "serviceDescription": "catalog service description", + "serviceInvariantUUID": "3164f9ff-d7e7-4813-ab32-6be7e1cacb18", + "serviceName": "vFW 2019-04-10 21:53:05", + "serviceUUID": "e16e4ed9-3429-423a-bc3c-1389ae91491c", + "serviceVersion": "1.0", + "workloadContext": "Production" +} diff --git a/asdc-controller/src/test/resources/resource-examples/vFW/service-Vfw.csar b/asdc-controller/src/test/resources/resource-examples/vFW/service-Vfw.csar new file mode 100644 index 0000000000..fe0b9f3131 Binary files /dev/null and b/asdc-controller/src/test/resources/resource-examples/vFW/service-Vfw.csar differ diff --git a/asdc-controller/src/test/resources/resource-examples/vFW/vfw1f52feb055020_modules.json b/asdc-controller/src/test/resources/resource-examples/vFW/vfw1f52feb055020_modules.json new file mode 100644 index 0000000000..944adbd0d2 --- /dev/null +++ b/asdc-controller/src/test/resources/resource-examples/vFW/vfw1f52feb055020_modules.json @@ -0,0 +1,25 @@ +[ + { + "vfModuleModelName": "Vfw1f52feb05502..base_vfw..module-0", + "vfModuleModelInvariantUUID": "062e75f9-ccbd-4946-8d31-92118efac741", + "vfModuleModelVersion": "1", + "vfModuleModelUUID": "3f99a421-abd0-4e5e-a9e4-3b9b8464ddb6", + "vfModuleModelCustomizationUUID": "12c7bf93-9021-41cf-8c65-86856cfab11d", + "isBase": true, + "artifacts": [ + "4f0b1b88-09ab-43b9-9506-57de3c69433a", + "005bc362-b40f-4c54-82bc-2716147f9c3a" + ], + "properties": { + "min_vf_module_instances": "1", + "vf_module_label": "base_vfw", + "max_vf_module_instances": "1", + "vfc_list": "", + "vf_module_description": "", + "vf_module_type": "Base", + "availability_zone_count": "", + "volume_group": "false", + "initial_count": "1" + } + } +] \ No newline at end of file diff --git a/asdc-controller/src/test/resources/schema.sql b/asdc-controller/src/test/resources/schema.sql index 2db2dfb5bf..0b48b2e35f 100644 --- a/asdc-controller/src/test/resources/schema.sql +++ b/asdc-controller/src/test/resources/schema.sql @@ -1,7 +1,6 @@ --------START Catalog DB SCHEMA -------- use catalogdb; - set foreign_key_checks=0; DROP TABLE IF EXISTS `allotted_resource`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -1170,7 +1169,7 @@ CREATE TABLE `vnfc_instance_group_customization` ( set foreign_key_checks=1; CREATE TABLE IF NOT EXISTS `pnf_resource` ( - `ORCHESTRATION_MODE` varchar(20) NOT NULL DEFAULT 'HEAT', + `ORCHESTRATION_MODE` varchar(20) DEFAULT NULL, `DESCRIPTION` varchar(1200) DEFAULT NULL, `CREATION_TIMESTAMP` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, `MODEL_UUID` varchar(200) NOT NULL, @@ -1208,6 +1207,170 @@ CREATE TABLE IF NOT EXISTS `pnf_resource_customization_to_service` ( PRIMARY KEY (`SERVICE_MODEL_UUID`,`RESOURCE_MODEL_CUSTOMIZATION_UUID`) )ENGINE=InnoDB DEFAULT CHARSET=latin1; +CREATE TABLE IF NOT EXISTS `workflow` ( + `ID` int(11) NOT NULL AUTO_INCREMENT, + `ARTIFACT_UUID` varchar(200) NOT NULL, + `ARTIFACT_NAME` varchar(200) NOT NULL, + `NAME` varchar(200) NOT NULL, + `OPERATION_NAME` varchar(200) DEFAULT NULL, + `VERSION` double NOT NULL, + `DESCRIPTION` varchar(1200) DEFAULT NULL, + `BODY` longtext DEFAULT NULL, + `RESOURCE_TARGET` varchar(200) NOT NULL, + `SOURCE` varchar(200) NOT NULL, + `TIMEOUT_MINUTES` int(11) DEFAULT NULL, + `ARTIFACT_CHECKSUM` varchar(200) DEFAULT 'MANUAL RECORD', + `CREATION_TIMESTAMP` datetime NOT NULL DEFAULT current_timestamp(), + PRIMARY KEY (`ID`), + UNIQUE KEY `UK_workflow` (`ARTIFACT_UUID`,`NAME`,`VERSION`,`SOURCE`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1; + +CREATE TABLE IF NOT EXISTS `vnf_resource_to_workflow` ( + `ID` int(11) NOT NULL AUTO_INCREMENT, + `VNF_RESOURCE_MODEL_UUID` varchar(200) NOT NULL, + `WORKFLOW_ID` int(11) NOT NULL, + PRIMARY KEY (`ID`), + UNIQUE KEY `UK_vnf_resource_to_workflow` (`VNF_RESOURCE_MODEL_UUID`,`WORKFLOW_ID`), + KEY `fk_vnf_resource_to_workflow__workflow1_idx` (`WORKFLOW_ID`), + KEY `fk_vnf_resource_to_workflow__vnf_res_mod_uuid_idx` (`VNF_RESOURCE_MODEL_UUID`), + CONSTRAINT `fk_vnf_resource_to_workflow__vnf_resource1` FOREIGN KEY (`VNF_RESOURCE_MODEL_UUID`) REFERENCES `vnf_resource` (`MODEL_UUID`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `fk_vnf_resource_to_workflow__workflow1` FOREIGN KEY (`WORKFLOW_ID`) REFERENCES `workflow` (`ID`) ON DELETE CASCADE ON UPDATE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=latin1; + +CREATE TABLE IF NOT EXISTS `activity_spec` ( + `ID` INT(11) NOT NULL AUTO_INCREMENT, + `NAME` VARCHAR(200) NOT NULL, + `DESCRIPTION` VARCHAR(1200) NOT NULL, + `VERSION` DOUBLE NOT NULL, + `CREATION_TIMESTAMP` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, + PRIMARY KEY (`ID`), + UNIQUE INDEX `UK_activity_spec` (`NAME` ASC, `VERSION` ASC)) +ENGINE = InnoDB +DEFAULT CHARACTER SET = latin1; + +CREATE TABLE IF NOT EXISTS `user_parameters` ( + `ID` INT(11) NOT NULL AUTO_INCREMENT, + `NAME` VARCHAR(200) NOT NULL, + `PAYLOAD_LOCATION` VARCHAR(500) NULL, + `LABEL` VARCHAR(200) NOT NULL, + `TYPE` VARCHAR(200) NOT NULL, + `DESCRIPTION` VARCHAR(1200) NULL, + `IS_REQUIRED` TINYINT(1) NOT NULL, + `MAX_LENGTH` INT(11) NULL, + `ALLOWABLE_CHARS` VARCHAR(200) NULL, + `CREATION_TIMESTAMP` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, + PRIMARY KEY (`ID`), + UNIQUE INDEX `UK_user_parameters` (`NAME` ASC)) +ENGINE = InnoDB +DEFAULT CHARACTER SET = latin1; + +CREATE TABLE IF NOT EXISTS `workflow_activity_spec_sequence` ( + `ID` INT(11) NOT NULL AUTO_INCREMENT, + `WORKFLOW_ID` INT(11) NOT NULL, + `ACTIVITY_SPEC_ID` INT(11) NOT NULL, + `SEQ_NO` INT(11) NOT NULL, + PRIMARY KEY (`ID`), + UNIQUE INDEX `UK_workflow_activity_spec_sequence` (`WORKFLOW_ID` ASC, `ACTIVITY_SPEC_ID` ASC, `SEQ_NO` ASC), + INDEX `fk_workflow_activity_spec_sequence__activity_spec_idx` (`ACTIVITY_SPEC_ID` ASC), + INDEX `fk_workflow_activity_spec_sequence__workflow_actifact_uuid_idx` (`WORKFLOW_ID` ASC), + CONSTRAINT `fk_workflow_activity_spec_sequence__activity_spec1` + FOREIGN KEY (`ACTIVITY_SPEC_ID`) + REFERENCES `activity_spec` (`ID`) + ON DELETE CASCADE + ON UPDATE CASCADE, + CONSTRAINT `fk_workflow_activity_spec_sequence__workflow1` + FOREIGN KEY (`WORKFLOW_ID`) + REFERENCES `workflow` (`ID`) + ON DELETE CASCADE + ON UPDATE CASCADE) +ENGINE = InnoDB +DEFAULT CHARACTER SET = latin1; + +CREATE TABLE IF NOT EXISTS `activity_spec_parameters` ( + `ID` INT(11) NOT NULL AUTO_INCREMENT, + `NAME` VARCHAR(200) NOT NULL, + `TYPE` VARCHAR(200) NOT NULL, + `DIRECTION` VARCHAR(200) NULL, + `DESCRIPTION` VARCHAR(1200) NULL, + `CREATION_TIMESTAMP` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, + PRIMARY KEY (`ID`), + UNIQUE INDEX `UK_activity_spec_parameters` (`NAME` ASC, `DIRECTION` ASC)) +ENGINE = InnoDB +DEFAULT CHARACTER SET = latin1; + +CREATE TABLE IF NOT EXISTS `activity_spec_categories` ( + `ID` INT(11) NOT NULL AUTO_INCREMENT, + `NAME` VARCHAR(200) NOT NULL, + PRIMARY KEY (`ID`), + UNIQUE INDEX `UK_activity_spec_categories` (`NAME` ASC)) +ENGINE = InnoDB +DEFAULT CHARACTER SET = latin1; + +CREATE TABLE IF NOT EXISTS `activity_spec_to_activity_spec_categories` ( + `ID` INT(11) NOT NULL AUTO_INCREMENT, + `ACTIVITY_SPEC_ID` INT(11) NOT NULL, + `ACTIVITY_SPEC_CATEGORIES_ID` INT(11) NOT NULL, + PRIMARY KEY (`ID`), + UNIQUE INDEX `UK_activity_spec_to_activity_spec_categories` (`ACTIVITY_SPEC_ID` ASC, `ACTIVITY_SPEC_CATEGORIES_ID` ASC), + INDEX `fk_activity_spec_to_activity_spec_categories__activity_spec_idx` (`ACTIVITY_SPEC_CATEGORIES_ID` ASC), + INDEX `fk_activity_spec_to_activity_spec_categories__activity_spec_idx1` (`ACTIVITY_SPEC_ID` ASC), + CONSTRAINT `fk_activity_spec_to_activity_spec_categories__activity_spec1` + FOREIGN KEY (`ACTIVITY_SPEC_ID`) + REFERENCES `activity_spec` (`ID`) + ON DELETE CASCADE + ON UPDATE CASCADE, + CONSTRAINT `fk_activity_spec_to_activity_spec_categories__activity_spec_c1` + FOREIGN KEY (`ACTIVITY_SPEC_CATEGORIES_ID`) + REFERENCES `activity_spec_categories` (`ID`) + ON DELETE CASCADE + ON UPDATE CASCADE) +ENGINE = InnoDB +DEFAULT CHARACTER SET = latin1; + +CREATE TABLE IF NOT EXISTS `activity_spec_to_activity_spec_parameters` ( + `ID` INT(11) NOT NULL AUTO_INCREMENT, + `ACTIVITY_SPEC_ID` INT(11) NOT NULL, + `ACTIVITY_SPEC_PARAMETERS_ID` INT(11) NOT NULL, + PRIMARY KEY (`ID`), + INDEX `fk_activity_spec_to_activity_spec_params__act_sp_param_id_idx` (`ACTIVITY_SPEC_PARAMETERS_ID` ASC), + UNIQUE INDEX `UK_activity_spec_to_activity_spec_parameters` (`ACTIVITY_SPEC_ID` ASC, `ACTIVITY_SPEC_PARAMETERS_ID` ASC), + INDEX `fk_activity_spec_to_activity_spec_parameters__act_spec_id_idx` (`ACTIVITY_SPEC_ID` ASC), + CONSTRAINT `fk_activity_spec_to_activity_spec_parameters__activity_spec_1` + FOREIGN KEY (`ACTIVITY_SPEC_ID`) + REFERENCES `activity_spec` (`ID`) + ON DELETE CASCADE + ON UPDATE CASCADE, + CONSTRAINT `fk_activity_spec_to_activity_spec_parameters__activ_spec_param1` + FOREIGN KEY (`ACTIVITY_SPEC_PARAMETERS_ID`) + REFERENCES `activity_spec_parameters` (`ID`) + ON DELETE CASCADE + ON UPDATE CASCADE) +ENGINE = InnoDB +DEFAULT CHARACTER SET = latin1; + +CREATE TABLE IF NOT EXISTS `activity_spec_to_user_parameters` ( + `ID` INT(11) NOT NULL AUTO_INCREMENT, + `ACTIVITY_SPEC_ID` INT(11) NOT NULL, + `USER_PARAMETERS_ID` INT(11) NOT NULL, + PRIMARY KEY (`ID`), + UNIQUE INDEX `UK_activity_spec_to_user_parameters` (`ACTIVITY_SPEC_ID` ASC, `USER_PARAMETERS_ID` ASC), + INDEX `fk_activity_spec_to_user_parameters__user_parameters1_idx` (`USER_PARAMETERS_ID` ASC), + INDEX `fk_activity_spec_to_user_parameters__activity_spec1_idx` (`ACTIVITY_SPEC_ID` ASC), + CONSTRAINT `fk_activity_spec_to_user_parameters__activity_spec1` + FOREIGN KEY (`ACTIVITY_SPEC_ID`) + REFERENCES `activity_spec` (`ID`) + ON DELETE CASCADE + ON UPDATE CASCADE, + CONSTRAINT `fk_activity_spec_to_user_parameters__user_parameters1` + FOREIGN KEY (`USER_PARAMETERS_ID`) + REFERENCES `user_parameters` (`ID`) + ON DELETE CASCADE + ON UPDATE CASCADE) +ENGINE = InnoDB +DEFAULT CHARACTER SET = latin1; + + + --------START Request DB SCHEMA -------- CREATE DATABASE requestdb; USE requestdb; @@ -1477,3 +1640,7 @@ create table if not exists model ( CONSTRAINT uk1_model UNIQUE (`MODEL_TYPE`, `MODEL_VERSION_ID`), FOREIGN KEY (`RECIPE`) REFERENCES `model_recipe` (`MODEL_ID`) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=latin1; + + + + diff --git a/bpmn/MSOCommonBPMN/pom.xml b/bpmn/MSOCommonBPMN/pom.xml index bd0e86496a..891a57d0f2 100644 --- a/bpmn/MSOCommonBPMN/pom.xml +++ b/bpmn/MSOCommonBPMN/pom.xml @@ -1,410 +1,410 @@ - - 4.0.0 - - org.onap.so - bpmn - 1.4.0-SNAPSHOT - - MSOCommonBPMN - MSOCommonBPMN - jar + + 4.0.0 + + org.onap.so + bpmn + 1.4.0-SNAPSHOT + + MSOCommonBPMN + MSOCommonBPMN + jar - - 1.8 - 1.8 - + + 1.8 + 1.8 + - - - - org.apache.maven.plugins - maven-compiler-plugin - - - test-compile - compile - - testCompile - - - false - - - - + + + + org.apache.maven.plugins + maven-compiler-plugin + + + test-compile + compile + + testCompile + + + false + + + + - - org.apache.maven.plugins - maven-jar-plugin - 3.0.2 - - - - test-jar - - - false - - **/validation/* - - - - - - - org.apache.cxf - cxf-codegen-plugin - 2.5.2 - - - org.apache.maven.plugins - maven-eclipse-plugin - 2.8 - - - org.eclipse.jdt.groovy.core.groovyNature - - - **/*.groovy - - - - - maven-antrun-plugin - - - compile - compile - - - - - - - - - - - - - - run - - - - test-compile - test-compile - - - - - - - - - - - - - - run - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - default-test - - test - - - - **/AllTestSuites.java - - - - - non-spring-tests - - test - - - - **/NonSpringSuite.java - - - - - groovy-tests - - test - - - - **/AllGroovyTestSuites.java - - - - - - suites - - - - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + org.apache.maven.plugins - + maven-antrun-plugin - + [1.3,) - - run - - - - - - - - - - - - - - - - - - org.camunda.bpm - camunda-bom - ${camunda.version} - import - pom - - - - - - org.camunda.bpm.springboot - camunda-bpm-spring-boot-starter - ${camunda.springboot.version} - test - - - org.springframework.cloud - spring-cloud-contract-wiremock - 1.2.4.RELEASE - test - - - org.springframework.boot - spring-boot-starter-test - test - - - org.camunda.bpm.extension.mockito - camunda-bpm-mockito - 3.2.1 - test - - - org.camunda.connect - camunda-connect-connectors-all - - - commons-beanutils - commons-beanutils - 1.9.3 - - - org.springframework.boot - spring-boot-starter-actuator - - - org.springframework.boot - spring-boot-starter-web - - - - com.h2database - h2 - test - - - org.codehaus.groovy - groovy-all - - - org.onap.so - MSOCoreBPMN - ${project.version} - - - org.onap.so - mso-catalog-db - ${project.version} - - - org.onap.so - mso-requests-db - ${project.version} - - - org.onap.so - common - ${project.version} - - - org.onap.so.adapters - mso-adapters-rest-interface - ${project.version} - - - javax.servlet - javax.servlet-api - - - org.apache.httpcomponents - httpclient - - - commons-lang - commons-lang - 2.6 - - - com.jayway.jsonpath - json-path - - - javax.ws.rs - javax.ws.rs-api - ${jax.ws.rs} - + + run + + + + + + + + + + + + + + + + + + + org.camunda.bpm + camunda-bom + ${camunda.version} + import + pom + + + + + + org.camunda.bpm.springboot + camunda-bpm-spring-boot-starter + ${camunda.springboot.version} + test + + + org.springframework.cloud + spring-cloud-contract-wiremock + 1.2.4.RELEASE + test + + + org.springframework.boot + spring-boot-starter-test + test + + + org.camunda.bpm.extension.mockito + camunda-bpm-mockito + 3.2.1 + test + + + org.camunda.connect + camunda-connect-connectors-all + + + commons-beanutils + commons-beanutils + 1.9.3 + + + org.springframework.boot + spring-boot-starter-actuator + + + org.springframework.boot + spring-boot-starter-web + + + + com.h2database + h2 + test + + + org.codehaus.groovy + groovy-all + + + org.onap.so + MSOCoreBPMN + ${project.version} + + + org.onap.so + mso-catalog-db + ${project.version} + + + org.onap.so + mso-requests-db + ${project.version} + + + org.onap.so + common + ${project.version} + + + org.onap.so.adapters + mso-adapters-rest-interface + ${project.version} + + + javax.servlet + javax.servlet-api + + + org.apache.httpcomponents + httpclient + + + commons-lang + commons-lang + 2.6 + + + com.jayway.jsonpath + json-path + + + javax.ws.rs + javax.ws.rs-api + ${jax.ws.rs} + - - org.onap.appc.client - client-lib - 1.5.0-SNAPSHOT - - - org.mockito - mockito-core - - - org.powermock - powermock-module-junit4 - - - org.powermock - powermock-api-mockito - - - - - org.onap.appc.client - client-kit - 1.5.0-SNAPSHOT - - - org.mockito - mockito-core - - - - - org.aspectj - aspectjrt - - - org.json - json - - - org.glassfish.jersey.core - jersey-common - - - org.glassfish.jersey.core - jersey-client - - - org.glassfish.jersey.inject - jersey-hk2 - 2.26 - - - org.glassfish.jersey.media - jersey-media-json-jackson - - - org.onap.sdc.sdc-tosca - sdc-tosca - 1.4.4 - - - org.onap.sdc.jtosca - jtosca - 1.4.4 - - - org.springframework.boot - spring-boot-starter-test - test - - - uk.co.blackpepper.bowman - bowman-client - 0.3.0 - - - pl.pragmatists - JUnitParams - 1.1.0 - - - ch.vorburger.mariaDB4j - mariaDB4j - 2.2.3 - test - - - org.springframework.cloud - spring-cloud-contract-wiremock - 1.2.4.RELEASE - test - - - org.assertj - assertj-core - 3.11.1 - test - - + + org.onap.appc.client + client-lib + 1.5.0-SNAPSHOT + + + org.mockito + mockito-core + + + org.powermock + powermock-module-junit4 + + + org.powermock + powermock-api-mockito + + + + + org.onap.appc.client + client-kit + 1.5.0-SNAPSHOT + + + org.mockito + mockito-core + + + + + org.aspectj + aspectjrt + + + org.json + json + + + org.glassfish.jersey.core + jersey-common + + + org.glassfish.jersey.core + jersey-client + + + org.glassfish.jersey.inject + jersey-hk2 + 2.26 + + + org.glassfish.jersey.media + jersey-media-json-jackson + + + org.onap.sdc.sdc-tosca + sdc-tosca + 1.4.4 + + + org.onap.sdc.jtosca + jtosca + 1.4.4 + + + org.springframework.boot + spring-boot-starter-test + test + + + uk.co.blackpepper.bowman + bowman-client + 0.3.0 + + + pl.pragmatists + JUnitParams + 1.1.0 + + + ch.vorburger.mariaDB4j + mariaDB4j + 2.2.3 + test + + + org.springframework.cloud + spring-cloud-contract-wiremock + 1.2.4.RELEASE + test + + + org.assertj + assertj-core + 3.11.1 + test + + diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetup.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetup.java index de77ca66e7..2d066285a4 100644 --- a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetup.java +++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetup.java @@ -749,7 +749,7 @@ public class BBInputSetup implements JavaDelegate { instanceGroup.setModelInfoInstanceGroup( this.mapperLayer.mapCatalogInstanceGroupToInstanceGroup(null, catalogInstanceGroup)); instanceGroup.getModelInfoInstanceGroup().setFunction(vnfcInstanceGroupCust.getFunction()); - instanceGroup.setDescription(vnfcInstanceGroupCust.getDescription()); + instanceGroup.getModelInfoInstanceGroup().setDescription(vnfcInstanceGroupCust.getDescription()); genericVnf.getInstanceGroups().add(instanceGroup); } } diff --git a/bpmn/MSOCoreBPMN/pom.xml b/bpmn/MSOCoreBPMN/pom.xml index 6fe3168dc7..12bc9980bf 100644 --- a/bpmn/MSOCoreBPMN/pom.xml +++ b/bpmn/MSOCoreBPMN/pom.xml @@ -1,126 +1,126 @@ - - org.onap.so - bpmn - 1.4.0-SNAPSHOT - - 4.0.0 - MSOCoreBPMN - jar + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + org.onap.so + bpmn + 1.4.0-SNAPSHOT + + 4.0.0 + MSOCoreBPMN + jar - - - - org.apache.maven.plugins - maven-compiler-plugin - - - test-compile - compile - - testCompile - - - false - - - - + + + + org.apache.maven.plugins + maven-compiler-plugin + + + test-compile + compile + + testCompile + + + false + + + + - - org.apache.maven.plugins - maven-jar-plugin - 3.0.2 - - - tests-jar - package - - test-jar - - - false - - - - - - + + org.apache.maven.plugins + maven-jar-plugin + 3.0.2 + + + tests-jar + package + + test-jar + + + false + + + + + + - - - - commons-fileupload - commons-fileupload - 1.3.3 - - - javax.servlet - javax.servlet-api - - - org.camunda.connect - camunda-connect-connectors-all - 1.0.5 - - - org.camunda.bpm - camunda-engine-plugin-connect - ${camunda.version} - - - org.camunda.bpm - camunda-engine - ${camunda.version} - - - org.codehaus.groovy - groovy-all - compile - - - com.h2database - h2 - test - - - net.sf.saxon - Saxon-HE - - - org.onap.so - common - ${project.version} - - - org.json - json - 20160212 - - - org.xmlunit - xmlunit-core - test - - - com.github.fge - json-schema-validator - 2.2.6 - - - com.github.fge - json-schema-core - 1.2.4 - - - org.springframework - spring-beans - - - org.yaml - snakeyaml - - + + + + commons-fileupload + commons-fileupload + 1.3.3 + + + javax.servlet + javax.servlet-api + + + org.camunda.connect + camunda-connect-connectors-all + 1.0.5 + + + org.camunda.bpm + camunda-engine-plugin-connect + ${camunda.version} + + + org.camunda.bpm + camunda-engine + ${camunda.version} + + + org.codehaus.groovy + groovy-all + compile + + + com.h2database + h2 + test + + + net.sf.saxon + Saxon-HE + + + org.onap.so + common + ${project.version} + + + org.json + json + 20160212 + + + org.xmlunit + xmlunit-core + test + + + com.github.fge + json-schema-validator + 2.2.6 + + + com.github.fge + json-schema-core + 1.2.4 + + + org.springframework + spring-beans + + + org.yaml + snakeyaml + + diff --git a/bpmn/mso-infrastructure-bpmn/pom.xml b/bpmn/mso-infrastructure-bpmn/pom.xml index 2abea6e31f..4dd7a467ea 100644 --- a/bpmn/mso-infrastructure-bpmn/pom.xml +++ b/bpmn/mso-infrastructure-bpmn/pom.xml @@ -1,276 +1,277 @@ - - org.onap.so - bpmn - 1.4.0-SNAPSHOT - - 4.0.0 - mso-infrastructure-bpmn - jar - - - - org.apache.maven.plugins - maven-dependency-plugin - - - unpack - - unpack - - - true - - - org.onap.so - MSOCommonBPMN - ${project.version} - jar - false - ${project.build.outputDirectory} - **/*.bpmn - - - org.onap.so - so-bpmn-building-blocks - ${project.version} - jar - false - ${project.build.outputDirectory} - **/*.bpmn - - - org.onap.so - so-bpmn-infrastructure-flows - ${project.version} - jar - false - ${project.build.outputDirectory} - **/*.bpmn - - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - integration-test - - test - - - true - - **/IntegrationTestSuite.java - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - - test-compile - compile - - testCompile - - - false - - - - - - org.apache.maven.plugins - maven-jar-plugin - - - tests - - - original - - - - - org.springframework.boot - spring-boot-maven-plugin - ${springboot.version} - - org.onap.so.bpmn.infrastructure.MSOInfrastructureApplication - - - - - repackage - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - extract-docker-file - - - - - io.fabric8 - fabric8-maven-plugin - - - start - - - - - - - - - - org.springframework.boot - spring-boot-dependencies - ${springboot.version} - pom - import - - - - - - org.camunda.bpm.springboot - camunda-bpm-spring-boot-starter - ${camunda.springboot.version} - - - org.camunda.bpm.springboot - camunda-bpm-spring-boot-starter-rest - ${camunda.springboot.version} - - - org.camunda.bpm.springboot - camunda-bpm-spring-boot-starter-webapp - ${camunda.springboot.version} - - - org.camunda.bpmn - camunda-engine-rest-core - - - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-data-jpa - - - org.apache.tomcat - tomcat-jdbc - - - true - - - org.springframework.boot - spring-boot-starter-jdbc - - - org.springframework.boot - spring-boot-starter-test - test - - - org.onap.so - so-bpmn-infrastructure-common - ${project.version} - - - org.onap.so - MSOCommonBPMN - ${project.version} - - - org.onap.so - MSOCommonBPMN - ${project.version} - test-jar - test - - - org.onap.so - so-bpmn-building-blocks - ${project.version} - - - org.onap.so - so-bpmn-infrastructure-flows - ${project.version} - - - com.h2database - h2 - - - org.springframework.cloud - spring-cloud-contract-wiremock - 1.2.4.RELEASE - test - - - ch.vorburger.mariaDB4j - mariaDB4j - 2.2.3 - test - - - io.micrometer - micrometer-core - - - io.micrometer - micrometer-registry-prometheus - - - org.onap.so - so-bpmn-tasks - ${project.version} - - - org.onap.so - cxf-logging - ${project.version} - - - org.camunda.bpm.extension.mockito - camunda-bpm-mockito - 3.2.1 - test - - - org.camunda.bpm.extension - camunda-bpm-assert - 2.0-alpha2 - test - - - org.assertj - assertj-core - 1.7.0 - test - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + org.onap.so + bpmn + 1.4.0-SNAPSHOT + + 4.0.0 + mso-infrastructure-bpmn + jar + + + + org.apache.maven.plugins + maven-dependency-plugin + + + unpack + + unpack + + + true + + + org.onap.so + MSOCommonBPMN + ${project.version} + jar + false + ${project.build.outputDirectory} + **/*.bpmn + + + org.onap.so + so-bpmn-building-blocks + ${project.version} + jar + false + ${project.build.outputDirectory} + **/*.bpmn + + + org.onap.so + so-bpmn-infrastructure-flows + ${project.version} + jar + false + ${project.build.outputDirectory} + **/*.bpmn + + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + integration-test + + test + + + true + + **/IntegrationTestSuite.java + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + + test-compile + compile + + testCompile + + + false + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + tests + + + original + + + + + org.springframework.boot + spring-boot-maven-plugin + ${springboot.version} + + org.onap.so.bpmn.infrastructure.MSOInfrastructureApplication + + + + + repackage + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + extract-docker-file + + + + + io.fabric8 + fabric8-maven-plugin + + + start + + + + + + + + + + org.springframework.boot + spring-boot-dependencies + ${springboot.version} + pom + import + + + + + + org.camunda.bpm.springboot + camunda-bpm-spring-boot-starter-rest + ${camunda.springboot.version} + + + org.camunda.bpmn + camunda-engine-rest-core + + + + + org.camunda.bpm.springboot + camunda-bpm-spring-boot-starter-webapp + ${camunda.springboot.version} + + + org.camunda.bpmn + camunda-engine-rest-core + + + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.apache.tomcat + tomcat-jdbc + + + true + + + org.springframework.boot + spring-boot-starter-jdbc + + + org.springframework.boot + spring-boot-starter-test + test + + + org.onap.so + so-bpmn-infrastructure-common + ${project.version} + + + org.onap.so + MSOCommonBPMN + ${project.version} + + + org.onap.so + MSOCommonBPMN + ${project.version} + test-jar + test + + + org.onap.so + so-bpmn-building-blocks + ${project.version} + + + org.onap.so + so-bpmn-infrastructure-flows + ${project.version} + + + com.h2database + h2 + + + org.springframework.cloud + spring-cloud-contract-wiremock + 1.2.4.RELEASE + test + + + ch.vorburger.mariaDB4j + mariaDB4j + 2.2.3 + test + + + io.micrometer + micrometer-core + + + io.micrometer + micrometer-registry-prometheus + + + org.onap.so + so-bpmn-tasks + ${project.version} + + + org.onap.so + cxf-logging + ${project.version} + + + org.camunda.bpm.extension.mockito + camunda-bpm-mockito + 3.2.1 + test + + + org.camunda.bpm.extension + camunda-bpm-assert + 2.0-alpha2 + test + + + org.assertj + assertj-core + 1.7.0 + test + + diff --git a/bpmn/pom.xml b/bpmn/pom.xml index dc309253d4..9beb02e329 100644 --- a/bpmn/pom.xml +++ b/bpmn/pom.xml @@ -1,96 +1,96 @@ - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - + org.onap.so so 1.4.0-SNAPSHOT - + - bpmn - BPMN Subsystem - BPMN Subsystem for MSO - pom + bpmn + BPMN Subsystem + BPMN Subsystem for MSO + pom - - 7.10.0 - 1.2 - camunda-webapp-jboss-standalone - 1.4.196 - 2.4.8 - 9.5.1-8 - 2.4.0 - UTF-8 - UTF-8 - 1.5.1-SNAPSHOT - + + 7.10.0 + 1.2 + camunda-webapp-jboss-standalone + 1.4.196 + 2.4.8 + 9.5.1-8 + 2.4.0 + UTF-8 + UTF-8 + 1.5.1-SNAPSHOT + - - MSOCoreBPMN + + MSOCoreBPMN - MSOCommonBPMN - so-bpmn-infrastructure-common - so-bpmn-tasks - so-bpmn-building-blocks - so-bpmn-infrastructure-flows - mso-infrastructure-bpmn - + MSOCommonBPMN + so-bpmn-infrastructure-common + so-bpmn-tasks + so-bpmn-building-blocks + so-bpmn-infrastructure-flows + mso-infrastructure-bpmn + - - - - - org.codehaus.groovy - groovy-all - ${groovy.version} - - - net.sf.saxon - Saxon-HE - ${saxon.version} - - - org.xmlunit - xmlunit-core - ${xmlunit.version} - - - javax.activation - activation - 1.1.1 - compile - - - org.assertj - assertj-core - 3.11.1 - test - - - org.camunda.bpm.extension.mockito - camunda-bpm-mockito - 4.0.0 - test - - - + + + + + org.codehaus.groovy + groovy-all + ${groovy.version} + + + net.sf.saxon + Saxon-HE + ${saxon.version} + + + org.xmlunit + xmlunit-core + ${xmlunit.version} + + + javax.activation + activation + 1.1.1 + compile + + + org.assertj + assertj-core + 3.11.1 + test + + + org.camunda.bpm.extension.mockito + camunda-bpm-mockito + 4.0.0 + test + + + - - - org.apache.httpcomponents - httpcore - - - org.apache.httpcomponents - httpclient - - - org.springframework.boot - spring-boot-starter-data-jpa - true - - + + + org.apache.httpcomponents + httpcore + + + org.apache.httpcomponents + httpclient + + + org.springframework.boot + spring-boot-starter-data-jpa + true + + diff --git a/bpmn/so-bpmn-building-blocks/pom.xml b/bpmn/so-bpmn-building-blocks/pom.xml index 09706746af..a867613890 100644 --- a/bpmn/so-bpmn-building-blocks/pom.xml +++ b/bpmn/so-bpmn-building-blocks/pom.xml @@ -1,156 +1,156 @@ - - org.onap.so - bpmn - 1.4.0-SNAPSHOT - - 4.0.0 - so-bpmn-building-blocks - jar - - UTF-8 - UTF-8 - - - - - org.apache.cxf - cxf-codegen-plugin - 2.5.2 - - - org.apache.maven.plugins - maven-surefire-plugin - - - default-test - - test - - - - **/AllTestSuites.java - - - - - - suites - - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + org.onap.so + bpmn + 1.4.0-SNAPSHOT + + 4.0.0 + so-bpmn-building-blocks + jar + + UTF-8 + UTF-8 + + + + + org.apache.cxf + cxf-codegen-plugin + 2.5.2 + + + org.apache.maven.plugins + maven-surefire-plugin + + + default-test + + test + + + + **/AllTestSuites.java + + + + + + suites + + + - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + org.apache.maven.plugins - + maven-antrun-plugin - + [1.3,) - - run - - - - - - - - - - - - - - - - org.camunda.bpm - camunda-engine - ${camunda.version} - - - org.camunda.bpm.springboot - camunda-bpm-spring-boot-starter - ${camunda.springboot.version} - test - - - org.camunda.bpm.springboot - camunda-bpm-spring-boot-starter-webapp - ${camunda.springboot.version} - test - - - org.camunda.bpm.extension.mockito - camunda-bpm-mockito - 3.2.1 - test - - - org.camunda.bpm.extension - camunda-bpm-assert - 2.0-alpha2 - test - - - org.assertj - assertj-core - 1.7.0 - test - - - org.springframework.boot - spring-boot-starter-test - test - - - com.h2database - h2 - test - - - org.onap.so - MSOCommonBPMN - ${project.version} - - - org.onap.so - so-bpmn-tasks - ${project.version} - - - org.onap.so - so-bpmn-infrastructure-common - ${project.version} - - - commons-net - commons-net - 3.6 - - - ch.vorburger.mariaDB4j - mariaDB4j - 2.2.3 - test - + + run + + + + + + + + + + + + + + + + org.camunda.bpm + camunda-engine + ${camunda.version} + + + org.camunda.bpm.springboot + camunda-bpm-spring-boot-starter + ${camunda.springboot.version} + test + + + org.camunda.bpm.springboot + camunda-bpm-spring-boot-starter-webapp + ${camunda.springboot.version} + test + + + org.camunda.bpm.extension.mockito + camunda-bpm-mockito + 3.2.1 + test + + + org.camunda.bpm.extension + camunda-bpm-assert + 2.0-alpha2 + test + + + org.assertj + assertj-core + 1.7.0 + test + + + org.springframework.boot + spring-boot-starter-test + test + + + com.h2database + h2 + test + + + org.onap.so + MSOCommonBPMN + ${project.version} + + + org.onap.so + so-bpmn-tasks + ${project.version} + + + org.onap.so + so-bpmn-infrastructure-common + ${project.version} + + + commons-net + commons-net + 3.6 + + + ch.vorburger.mariaDB4j + mariaDB4j + 2.2.3 + test + - + diff --git a/bpmn/so-bpmn-infrastructure-common/pom.xml b/bpmn/so-bpmn-infrastructure-common/pom.xml index e3ba0284dc..74df3a2c2e 100644 --- a/bpmn/so-bpmn-infrastructure-common/pom.xml +++ b/bpmn/so-bpmn-infrastructure-common/pom.xml @@ -1,324 +1,325 @@ - - - org.onap.so - bpmn - 1.4.0-SNAPSHOT - - 4.0.0 - so-bpmn-infrastructure-common - jar - - - - org.apache.cxf - cxf-codegen-plugin - 2.5.2 - - - org.apache.maven.plugins - maven-eclipse-plugin - 2.8 - - - org.eclipse.jdt.groovy.core.groovyNature - - - **/*.groovy - - - - - org.codehaus.gmaven - gmaven-plugin - 1.5 - - - org.codehaus.gmaven.runtime - gmaven-runtime-2.0 - 1.5 - - - org.codehaus.groovy - groovy - ${groovy.version} - - - - false - true - true - .groovy - 2.0 - - - - - testCompile - compile - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - maven-failsafe-plugin - 2.6 - - - - integration-test - verify - - - - - - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + org.apache.maven.plugins - + maven-antrun-plugin - + [1.3,) - - run - - - - - - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - default-test - - test - - - - **/AllTestsTestSuite.java - - - - - tasks-test - - test - - - - **/AllTasksTestsTestSuite.java - - - - - - suites - - - - - ${project.artifactId}-${project.version} - + + run + + + + + + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + default-test + + test + + + + **/AllTestsTestSuite.java + + + + + tasks-test + + test + + + + **/AllTasksTestsTestSuite.java + + + + + + suites + + + + + ${project.artifactId}-${project.version} + - - - - org.camunda.bpm - camunda-bom - ${camunda.version} - import - pom - - - + + + + org.camunda.bpm + camunda-bom + ${camunda.version} + import + pom + + + - - - org.camunda.bpm.springboot - camunda-bpm-spring-boot-starter - ${camunda.springboot.version} - test - - - org.camunda.bpm.springboot - camunda-bpm-spring-boot-starter-webapp - ${camunda.springboot.version} - test - - - org.apache.cxf - cxf-spring-boot-starter-jaxws - ${cxf.version} - - - org.apache.cxf - cxf-spring-boot-starter-jaxrs - ${cxf.version} - - - org.apache.cxf - cxf-rt-rs-service-description-swagger - ${cxf.version} - - - com.h2database - h2 - test - - - com.google.guava - guava - - - com.fasterxml.uuid - java-uuid-generator - - - org.codehaus.groovy - groovy-all - - - org.apache.commons - commons-lang3 - - - org.onap.so - MSOCoreBPMN - ${project.version} - - - org.onap.so - MSOCommonBPMN - ${project.version} - - - org.onap.so - MSOCoreBPMN - ${project.version} - tests - test - - - javax.ws.rs - javax.ws.rs-api - ${jax.ws.rs} - - - org.camunda.spin - camunda-spin-core - test - - - org.camunda.spin - camunda-spin-dataformat-all - test - - - camunda-spin-dataformat-all - org.camunda.spin - test - - - org.camunda.bpm - camunda-engine-plugin-spin - + + + org.camunda.bpm.springboot + camunda-bpm-spring-boot-starter + ${camunda.springboot.version} + test + + + org.camunda.bpm.springboot + camunda-bpm-spring-boot-starter-webapp + ${camunda.springboot.version} + test + + + org.apache.cxf + cxf-spring-boot-starter-jaxws + ${cxf.version} + + + org.apache.cxf + cxf-spring-boot-starter-jaxrs + ${cxf.version} + + + org.apache.cxf + cxf-rt-rs-service-description-swagger + ${cxf.version} + + + com.h2database + h2 + test + + + com.google.guava + guava + + + com.fasterxml.uuid + java-uuid-generator + + + org.codehaus.groovy + groovy-all + + + org.apache.commons + commons-lang3 + + + org.onap.so + MSOCoreBPMN + ${project.version} + + + org.onap.so + MSOCommonBPMN + ${project.version} + + + org.onap.so + MSOCoreBPMN + ${project.version} + tests + test + + + javax.ws.rs + javax.ws.rs-api + ${jax.ws.rs} + + + org.camunda.spin + camunda-spin-core + test + + + org.camunda.spin + camunda-spin-dataformat-all + test + + + camunda-spin-dataformat-all + org.camunda.spin + test + + + org.camunda.bpm + camunda-engine-plugin-spin + - - org.camunda.bpm - camunda-engine-plugin-connect - test - - - javax.annotation - javax.annotation-api - - - org.onap.msb.java-sdk - msb-java-sdk - 1.1.1 - - - com.eclipsesource.jaxrs - jersey-all - - - + + org.camunda.bpm + camunda-engine-plugin-connect + test + + + javax.annotation + javax.annotation-api + + + org.onap.msb.java-sdk + msb-java-sdk + 1.1.1 + + + com.eclipsesource.jaxrs + jersey-all + + + - - org.springframework.boot - spring-boot-configuration-processor - true - - - ch.qos.logback - logback-classic - - - ch.qos.logback - logback-core - - - org.slf4j - slf4j-api - - - org.mariadb.jdbc - mariadb-java-client - - - ch.vorburger.mariaDB4j - mariaDB4j - 2.2.3 - test - - - org.onap.so - MSOCommonBPMN - ${project.version} - tests - test - - - org.camunda.bpm.springboot - camunda-bpm-spring-boot-starter-test - ${camunda.springboot.version} - test - - - org.assertj - assertj-core - test - - - org.camunda.bpm.extension.mockito - camunda-bpm-mockito - - + + org.springframework.boot + spring-boot-configuration-processor + true + + + ch.qos.logback + logback-classic + + + ch.qos.logback + logback-core + + + org.slf4j + slf4j-api + + + org.mariadb.jdbc + mariadb-java-client + + + ch.vorburger.mariaDB4j + mariaDB4j + 2.2.3 + test + + + org.onap.so + MSOCommonBPMN + ${project.version} + tests + test + + + org.camunda.bpm.springboot + camunda-bpm-spring-boot-starter-test + ${camunda.springboot.version} + test + + + org.assertj + assertj-core + test + + + org.camunda.bpm.extension.mockito + camunda-bpm-mockito + + diff --git a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/HandlePNF.groovy b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/HandlePNF.groovy new file mode 100644 index 0000000000..90c2b923b0 --- /dev/null +++ b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/HandlePNF.groovy @@ -0,0 +1,84 @@ +/*- + * ============LICENSE_START======================================================= + * ONAP - SO + * ================================================================================ + * Copyright (C) 2017 - 2019 Huawei 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========================================================= + */ + +package org.onap.so.bpmn.infrastructure.scripts + +import org.apache.commons.lang3.StringUtils +import org.camunda.bpm.engine.delegate.DelegateExecution +import org.onap.so.bpmn.common.scripts.AbstractServiceTaskProcessor +import org.onap.so.bpmn.common.scripts.CatalogDbUtils +import org.onap.so.bpmn.common.scripts.ExceptionUtil +import org.onap.so.bpmn.core.json.JsonUtils +import org.onap.so.bpmn.infrastructure.pnf.delegate.ExecutionVariableNames +import org.slf4j.Logger +import org.slf4j.LoggerFactory + +public class HandlePNF extends AbstractServiceTaskProcessor{ + private static final Logger logger = LoggerFactory.getLogger( HandlePNF.class); + + ExceptionUtil exceptionUtil = new ExceptionUtil() + JsonUtils jsonUtil = new JsonUtils() + CatalogDbUtils cutils = new CatalogDbUtils() + + @Override + void preProcessRequest(DelegateExecution execution) { + msoLogger.debug("Start preProcess for HandlePNF") + + // set correlation ID + def resourceInput = execution.getVariable("resourceInput") + String serInput = jsonUtil.getJsonValue(resourceInput, "requestsInputs") + String correlationId = jsonUtil.getJsonValue(serInput, "service.parameters.requestInputs.ont_ont_pnf_name") + if (!StringUtils.isEmpty(correlationId)) { + execution.setVariable(ExecutionVariableNames.CORRELATION_ID, correlationId) + msoLogger.debug("Found correlation id : " + correlationId) + } else { + msoLogger.error("== correlation id is empty ==") + exceptionUtil.buildAndThrowWorkflowException(execution, 7000, "correlation id is not provided") + } + + // next task will set the uuid + msoLogger.debug("exit preProcess for HandlePNF") + } + + void postProcessRequest(DelegateExecution execution) { + msoLogger.debug("start postProcess for HandlePNF") + + msoLogger.debug("exit postProcess for HandlePNF") + } + + public void sendSyncResponse (DelegateExecution execution) { + msoLogger.debug(" *** sendSyncResponse *** ") + + try { + String operationStatus = "finished" + // RESTResponse for main flow + String resourceOperationResp = """{"operationStatus":"${operationStatus}"}""".trim() + msoLogger.debug(" sendSyncResponse to APIH:" + "\n" + resourceOperationResp) + sendWorkflowResponse(execution, 202, resourceOperationResp) + execution.setVariable("sentSyncResponse", true) + + } catch (Exception ex) { + String msg = "Exception in sendSyncResponse:" + ex.getMessage() + msoLogger.debug(msg) + exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg) + } + msoLogger.debug(" ***** Exit sendSyncResponse *****") + } +} diff --git a/bpmn/so-bpmn-infrastructure-flows/pom.xml b/bpmn/so-bpmn-infrastructure-flows/pom.xml index ce7f0d9148..d0c16fc1cc 100644 --- a/bpmn/so-bpmn-infrastructure-flows/pom.xml +++ b/bpmn/so-bpmn-infrastructure-flows/pom.xml @@ -1,321 +1,322 @@ - - - org.onap.so - bpmn - 1.4.0-SNAPSHOT - - 4.0.0 - so-bpmn-infrastructure-flows - jar + + + org.onap.so + bpmn + 1.4.0-SNAPSHOT + + 4.0.0 + so-bpmn-infrastructure-flows + jar - - 2.0-alpha2 - 1.7.0 - 1.17.1 - 3.2.1 - + + 2.0-alpha2 + 1.7.0 + 1.17.1 + 3.2.1 + - - - - org.apache.cxf - cxf-codegen-plugin - 2.5.2 - - - org.apache.maven.plugins - maven-dependency-plugin - - - maven-failsafe-plugin - 2.6 - - - - integration-test - verify - - - - - - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + org.apache.maven.plugins - + maven-antrun-plugin - + [1.3,) - - run - - - - - - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - default-test - - test - - - - **/AllTestsTestSuite.java - - - - - tasks-test - - test - - - - **/AllTasksTestsTestSuite.java - - - - - bpmn-test - - test - - - - **/AllBPMNTestSuites.java - - - - - - suites - - - - - ${project.artifactId}-${project.version} - + + run + + + + + + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + default-test + + test + + + + **/AllTestsTestSuite.java + + + + + tasks-test + + test + + + + **/AllTasksTestsTestSuite.java + + + + + bpmn-test + + test + + + + **/AllBPMNTestSuites.java + + + + + + suites + + + + + ${project.artifactId}-${project.version} + - - - - org.camunda.bpm - camunda-bom - ${camunda.version} - import - pom - - - + + + + org.camunda.bpm + camunda-bom + ${camunda.version} + import + pom + + + - - - org.camunda.bpm.springboot - camunda-bpm-spring-boot-starter - ${camunda.springboot.version} - test - - - org.camunda.bpm.springboot - camunda-bpm-spring-boot-starter-webapp - ${camunda.springboot.version} - test - - - org.camunda.bpm.extension.mockito - camunda-bpm-mockito - ${camunda.mockito.version} - test - - - org.springframework.boot - spring-boot-starter-test - test - - - org.springframework.boot - spring-boot-starter-web - test - - - org.springframework.boot - spring-boot-starter-data-jpa - true - - - org.apache.cxf - cxf-spring-boot-starter-jaxws - ${cxf.version} - - - org.apache.cxf - cxf-spring-boot-starter-jaxrs - ${cxf.version} - - - org.apache.cxf - cxf-rt-rs-service-description-swagger - ${cxf.version} - - - com.h2database - h2 - test - - - org.mockito - mockito-core - 1.10.19 - test - - - com.fasterxml.uuid - java-uuid-generator - - - org.codehaus.groovy - groovy-all - - - org.apache.commons - commons-lang3 - 3.4 - - - org.onap.so - MSOCoreBPMN - ${project.version} - - - org.onap.so - MSOCoreBPMN - ${project.version} - tests - test - - - org.onap.so - MSOCommonBPMN - ${project.version} - - - org.onap.so - MSOCommonBPMN - ${project.version} - tests - test - - - org.onap.so - so-bpmn-building-blocks - ${project.version} - test - - - javax.ws.rs - javax.ws.rs-api - ${jax.ws.rs} - - - org.camunda.spin - camunda-spin-core - test - - - org.camunda.spin - camunda-spin-dataformat-all - test - - - camunda-spin-dataformat-all - org.camunda.spin - test - - - org.camunda.bpm - camunda-engine-plugin-spin - + + + org.camunda.bpm.springboot + camunda-bpm-spring-boot-starter + ${camunda.springboot.version} + test + + + org.camunda.bpm.springboot + camunda-bpm-spring-boot-starter-webapp + ${camunda.springboot.version} + test + + + org.camunda.bpm.extension.mockito + camunda-bpm-mockito + ${camunda.mockito.version} + test + + + org.springframework.boot + spring-boot-starter-test + test + + + org.springframework.boot + spring-boot-starter-web + test + + + org.springframework.boot + spring-boot-starter-data-jpa + true + + + org.apache.cxf + cxf-spring-boot-starter-jaxws + ${cxf.version} + + + org.apache.cxf + cxf-spring-boot-starter-jaxrs + ${cxf.version} + + + org.apache.cxf + cxf-rt-rs-service-description-swagger + ${cxf.version} + + + com.h2database + h2 + test + + + org.mockito + mockito-core + 1.10.19 + test + + + com.fasterxml.uuid + java-uuid-generator + + + org.codehaus.groovy + groovy-all + + + org.apache.commons + commons-lang3 + 3.4 + + + org.onap.so + MSOCoreBPMN + ${project.version} + + + org.onap.so + MSOCoreBPMN + ${project.version} + tests + test + + + org.onap.so + MSOCommonBPMN + ${project.version} + + + org.onap.so + MSOCommonBPMN + ${project.version} + tests + test + + + org.onap.so + so-bpmn-building-blocks + ${project.version} + test + + + javax.ws.rs + javax.ws.rs-api + ${jax.ws.rs} + + + org.camunda.spin + camunda-spin-core + test + + + org.camunda.spin + camunda-spin-dataformat-all + test + + + camunda-spin-dataformat-all + org.camunda.spin + test + + + org.camunda.bpm + camunda-engine-plugin-spin + - - org.camunda.bpm - camunda-engine-plugin-connect - test - - - org.camunda.bpm.extension - camunda-bpm-assert - ${camunda.bpm.assert.version} - test - - - org.assertj - assertj-core - ${assertj.core.version} - test - - - javax.annotation - javax.annotation-api - 1.3 - - - org.springframework.boot - spring-boot-configuration-processor - true - - - ch.qos.logback - logback-classic - - - ch.qos.logback - logback-core - - - org.slf4j - slf4j-api - - - org.mariadb.jdbc - mariadb-java-client - - - ch.vorburger.mariaDB4j - mariaDB4j - 2.2.3 - test - - - io.grpc - grpc-testing - ${grpc.version} - test - + + org.camunda.bpm + camunda-engine-plugin-connect + test + + + org.camunda.bpm.extension + camunda-bpm-assert + ${camunda.bpm.assert.version} + test + + + org.assertj + assertj-core + ${assertj.core.version} + test + + + javax.annotation + javax.annotation-api + 1.3 + + + org.springframework.boot + spring-boot-configuration-processor + true + + + ch.qos.logback + logback-classic + + + ch.qos.logback + logback-core + + + org.slf4j + slf4j-api + + + org.mariadb.jdbc + mariadb-java-client + + + ch.vorburger.mariaDB4j + mariaDB4j + 2.2.3 + test + + + io.grpc + grpc-testing + ${grpc.version} + test + - + diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/HandlePNF.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/HandlePNF.bpmn new file mode 100644 index 0000000000..c81b289737 --- /dev/null +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/HandlePNF.bpmn @@ -0,0 +1,119 @@ + + + + + SequenceFlow_1c92ks3_activate + + + SequenceFlow_1c92ks3_activate + SequenceFlow_17xr584 + SequenceFlow_12q67gd + import org.onap.so.bpmn.infrastructure.scripts.* +def handlePNF = new HandlePNF() +handlePNF.preProcessRequest(execution) + + + + + + SequenceFlow_02fi1yn + + + + + + + + SequenceFlow_1apj1fn + SequenceFlow_0pujwl4 + + + SequenceFlow_0pujwl4 + SequenceFlow_1la8oih + SequenceFlow_1ezf4gu + import org.onap.so.bpmn.infrastructure.scripts.* +def handlePNF = new HandlePNF() +handlePNF.postProcessRequest(execution) + + + + + SequenceFlow_12q67gd + SequenceFlow_17xr584 + SequenceFlow_1apj1fn + + + + + SequenceFlow_1ezf4gu + SequenceFlow_1la8oih + SequenceFlow_02fi1yn + import org.onap.so.bpmn.infrastructure.scripts.* +def handlePNF = new HandlePNF() +handlePNF.sendSyncResponse(execution) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bpmn/so-bpmn-tasks/pom.xml b/bpmn/so-bpmn-tasks/pom.xml index 42073ed08a..bf129dfc56 100644 --- a/bpmn/so-bpmn-tasks/pom.xml +++ b/bpmn/so-bpmn-tasks/pom.xml @@ -1,169 +1,169 @@ - - org.onap.so - bpmn - 1.4.0-SNAPSHOT - - 4.0.0 - so-bpmn-tasks - jar - - UTF-8 - UTF-8 - 1.8 - 1.8 - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - default-test - - test - - - - **/UnitTestSuite.java - - - - - integration-test - - test - - - - **/IntegrationTestSuite.java - - - - - - suites - - - - io.swagger - swagger-codegen-maven-plugin - 2.3.1 - - - - generate - - - ${project.basedir}/src/main/resources/naming-service/swagger.json - org.onap.namingservice.api - org.onap.namingservice.model - org.onap.namingservice.invoker - - - - - ${project.basedir}/src/main/resources/swagger.json - java - - src/gen/java/main - true - - ${project.build.directory}/generated-sources - false - jersey2 - false - - - - - - - - - org.springframework.boot - spring-boot-dependencies - ${springboot.version} - pom - import - - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + org.onap.so + bpmn + 1.4.0-SNAPSHOT + + 4.0.0 + so-bpmn-tasks + jar + + UTF-8 + UTF-8 + 1.8 + 1.8 + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + default-test + + test + + + + **/UnitTestSuite.java + + + + + integration-test + + test + + + + **/IntegrationTestSuite.java + + + + + + suites + + + + io.swagger + swagger-codegen-maven-plugin + 2.3.1 + + + + generate + + + ${project.basedir}/src/main/resources/naming-service/swagger.json + org.onap.namingservice.api + org.onap.namingservice.model + org.onap.namingservice.invoker + + + + + ${project.basedir}/src/main/resources/swagger.json + java + + src/gen/java/main + true + + ${project.build.directory}/generated-sources + false + jersey2 + false + + + + + - - org.camunda.bpm.springboot - camunda-bpm-spring-boot-starter - ${camunda.springboot.version} - test - - - org.springframework.cloud - spring-cloud-contract-wiremock - 1.2.4.RELEASE - test - - - org.springframework.boot - spring-boot-starter-test - test - - - org.camunda.bpm.extension.mockito - camunda-bpm-mockito - - - org.onap.so - MSOCommonBPMN - ${project.version} - - - org.onap.so - so-bpmn-infrastructure-common - ${project.version} - - - org.onap.so.adapters - mso-adapter-utils - ${project.version} - - - org.onap.sdnc.northbound - generic-resource-api-client - ${sdnc.northbound.version} - - - javax.ws.rs - jsr311-api - - - - - ch.vorburger.mariaDB4j - mariaDB4j - 2.2.3 - test - - - org.apache.commons - commons-lang3 - - - org.onap.so.adapters - mso-vnfm-adapter-api - ${project.version} - - - org.springframework.boot - spring-boot-configuration-processor - true - - - nl.jqno.equalsverifier - equalsverifier - 2.5.1 - test - + + + org.springframework.boot + spring-boot-dependencies + ${springboot.version} + pom + import + + + + + org.camunda.bpm.springboot + camunda-bpm-spring-boot-starter + ${camunda.springboot.version} + test + + + org.springframework.cloud + spring-cloud-contract-wiremock + 1.2.4.RELEASE + test + + + org.springframework.boot + spring-boot-starter-test + test + + + org.camunda.bpm.extension.mockito + camunda-bpm-mockito + + + org.onap.so + MSOCommonBPMN + ${project.version} + + + org.onap.so + so-bpmn-infrastructure-common + ${project.version} + + + org.onap.so.adapters + mso-adapter-utils + ${project.version} + + + org.onap.sdnc.northbound + generic-resource-api-client + ${sdnc.northbound.version} + + + javax.ws.rs + jsr311-api + + + + + ch.vorburger.mariaDB4j + mariaDB4j + 2.2.3 + test + + + org.apache.commons + commons-lang3 + + + org.onap.so.adapters + mso-vnfm-adapter-api + ${project.version} + + + org.springframework.boot + spring-boot-configuration-processor + true + + + nl.jqno.equalsverifier + equalsverifier + 2.5.1 + test + + diff --git a/cloudify-client/pom.xml b/cloudify-client/pom.xml index 44242e934f..6f4ea03ca5 100644 --- a/cloudify-client/pom.xml +++ b/cloudify-client/pom.xml @@ -1,49 +1,49 @@ - 4.0.0 - - org.onap.so - so - 1.4.0-SNAPSHOT - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + org.onap.so + so + 1.4.0-SNAPSHOT + - org.onap.so - cloudify-client - jar - Cloudify Rest Client - Java client for Cloudify REST interface + org.onap.so + cloudify-client + jar + Cloudify Rest Client + Java client for Cloudify REST interface - - ${project.artifactId}-${project.version} - - - maven-jar-plugin - 2.6 - - target/classes - - - - + + ${project.artifactId}-${project.version} + + + maven-jar-plugin + 2.6 + + target/classes + + + + - - - org.onap.so - common - ${project.version} - - - org.apache.httpcomponents - httpcore - - - org.apache.httpcomponents - httpclient - - - commons-lang - commons-lang - 2.6 - - + + + org.onap.so + common + ${project.version} + + + org.apache.httpcomponents + httpcore + + + org.apache.httpcomponents + httpclient + + + commons-lang + commons-lang + 2.6 + + diff --git a/common/pom.xml b/common/pom.xml index 2a9f88f6d2..0e9aa1d47c 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -1,232 +1,232 @@ - 4.0.0 - - org.onap.so - so - 1.4.0-SNAPSHOT - - common - MSO Common classes - MSO Common classes:- Logger + 4.0.0 + + org.onap.so + so + 1.4.0-SNAPSHOT + + common + MSO Common classes + MSO Common classes:- Logger - - 1.17.1 - 3.6.1 - 4.1.30.Final - 0.4.2-SNAPSHOT - + + 1.17.1 + 3.6.1 + 4.1.30.Final + 0.4.2-SNAPSHOT + - - - org.apache.httpcomponents - httpclient - - - javax.servlet - javax.servlet-api - - - org.springframework - spring-aspects - - - org.springframework.boot - spring-boot-starter-security - - - org.springframework.boot - spring-boot-starter-actuator - - - com.jayway.jsonpath - json-path - - - org.hibernate - hibernate-core - - - org.springframework - spring-web - - - org.springframework - spring-webmvc - - - org.onap.aai.schema-service - aai-schema - 1.0.0 - - - org.modelmapper - modelmapper - 1.1.0 - - - com.google.guava - guava - - - org.apache.commons - commons-lang3 - - - org.apache.cxf - cxf-rt-rs-client - ${cxf.version} - test - - - com.shazam - shazamcrest - 0.11 - test - - - com.google.guava - guava - - - org.apache.commons - commons-lang3 - - - - - org.slf4j - slf4j-ext - - - org.slf4j - slf4j-api - - - org.springframework.boot - spring-boot-configuration-processor - true - - - net.jodah - failsafe - 1.1.0 - - - org.springframework.security - spring-security-web - - - org.onap.logging-analytics - logging-slf4j - 1.2.2 - - - org.mockito - mockito-core - - - org.json - json - - - org.springframework.boot - spring-boot-starter-test - test - - - org.reflections - reflections - 0.9.11 - + + + org.apache.httpcomponents + httpclient + + + javax.servlet + javax.servlet-api + + + org.springframework + spring-aspects + + + org.springframework.boot + spring-boot-starter-security + + + org.springframework.boot + spring-boot-starter-actuator + + + com.jayway.jsonpath + json-path + + + org.hibernate + hibernate-core + + + org.springframework + spring-web + + + org.springframework + spring-webmvc + + + org.onap.aai.schema-service + aai-schema + 1.0.0 + + + org.modelmapper + modelmapper + 1.1.0 + + + com.google.guava + guava + + + org.apache.commons + commons-lang3 + + + org.apache.cxf + cxf-rt-rs-client + ${cxf.version} + test + + + com.shazam + shazamcrest + 0.11 + test + + + com.google.guava + guava + + + org.apache.commons + commons-lang3 + + + + + org.slf4j + slf4j-ext + + + org.slf4j + slf4j-api + + + org.springframework.boot + spring-boot-configuration-processor + true + + + net.jodah + failsafe + 1.1.0 + + + org.springframework.security + spring-security-web + + + org.onap.logging-analytics + logging-slf4j + 1.2.2 + + + org.mockito + mockito-core + + + org.json + json + + + org.springframework.boot + spring-boot-starter-test + test + + + org.reflections + reflections + 0.9.11 + - - - org.onap.ccsdk.cds.components - proto-definition - ${ccsdk.version} - + + + org.onap.ccsdk.cds.components + proto-definition + ${ccsdk.version} + - - - com.google.protobuf - protobuf-java - ${protobuf.version} - + + + com.google.protobuf + protobuf-java + ${protobuf.version} + - - - io.grpc - grpc-protobuf - ${grpc.version} - - - com.google.code.findbugs - jsr305 - - - - - io.grpc - grpc-stub - ${grpc.version} - - - io.grpc - grpc-netty - ${grpc.version} - - - io.grpc - grpc-testing - ${grpc.version} - test - + + + io.grpc + grpc-protobuf + ${grpc.version} + + + com.google.code.findbugs + jsr305 + + + + + io.grpc + grpc-stub + ${grpc.version} + + + io.grpc + grpc-netty + ${grpc.version} + + + io.grpc + grpc-testing + ${grpc.version} + test + - - - - - src/main/resources - true - - - src/main/java - - **/*.java - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - default-test - - test - - - - **/NonSpringSuite.java - - - - - spring-tests - - test - - - - **/SpringSuite.java - - - - - - - + + + + + src/main/resources + true + + + src/main/java + + **/*.java + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + default-test + + test + + + + **/NonSpringSuite.java + + + + + spring-tests + + test + + + + **/SpringSuite.java + + + + + + + diff --git a/cxf-logging/pom.xml b/cxf-logging/pom.xml index 3f4c99e749..2c891f2c4a 100644 --- a/cxf-logging/pom.xml +++ b/cxf-logging/pom.xml @@ -1,60 +1,61 @@ - - 4.0.0 - - org.onap.so - so - 1.4.0-SNAPSHOT - - CXFLogging - Common CXF Logging Classes - - - org.apache.cxf - cxf-rt-rs-client - ${cxf.version} - - - org.apache.cxf - cxf-rt-bindings-soap - ${cxf.version} - - - org.apache.cxf - cxf-rt-transports-http - ${cxf.version} - - - javax.servlet - javax.servlet-api - - - org.slf4j - slf4j-ext - - - org.slf4j - slf4j-api - - - org.onap.logging-analytics - logging-slf4j - 1.2.2 - - - - - - src/main/resources - true - - - src/main/java - - **/*.java - - - - - cxf-logging + + 4.0.0 + + org.onap.so + so + 1.4.0-SNAPSHOT + + CXFLogging + Common CXF Logging Classes + + + org.apache.cxf + cxf-rt-rs-client + ${cxf.version} + + + org.apache.cxf + cxf-rt-bindings-soap + ${cxf.version} + + + org.apache.cxf + cxf-rt-transports-http + ${cxf.version} + + + javax.servlet + javax.servlet-api + + + org.slf4j + slf4j-ext + + + org.slf4j + slf4j-api + + + org.onap.logging-analytics + logging-slf4j + 1.2.2 + + + + + + src/main/resources + true + + + src/main/java + + **/*.java + + + + + cxf-logging diff --git a/deployment-configs/pom.xml b/deployment-configs/pom.xml index 704ca4e4a8..6935a15955 100644 --- a/deployment-configs/pom.xml +++ b/deployment-configs/pom.xml @@ -1,6 +1,6 @@ - + 4.0.0 org.onap.so @@ -15,16 +15,16 @@ - - org.apache.maven.plugins - maven-resources-plugin - - - jks - - - - + + org.apache.maven.plugins + maven-resources-plugin + + + jks + + + + diff --git a/mso-api-handlers/mso-api-handler-common/pom.xml b/mso-api-handlers/mso-api-handler-common/pom.xml index 7adb7d1131..a3fd37ce2b 100644 --- a/mso-api-handlers/mso-api-handler-common/pom.xml +++ b/mso-api-handlers/mso-api-handler-common/pom.xml @@ -1,129 +1,129 @@ - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - - org.onap.so - mso-api-handlers - 1.4.0-SNAPSHOT - + + org.onap.so + mso-api-handlers + 1.4.0-SNAPSHOT + - mso-api-handler-common + mso-api-handler-common - mso-api-handler-common - ONAP SO API Handler Common Libraries - - UTF-8 - UTF-8 - 1.3.0 - 1.1.1 - 3.6.0 - 3.6.0 - 0.9.9-RC1 - 2.5.2 - 1.0.3 - 1.8 - - - - - - org.springframework.boot - spring-boot-dependencies - ${springboot.version} - pom - import - - - - - - - org.onap.so - mso-requests-db - ${project.version} - - - org.springframework.boot - spring-boot-starter-jersey - - - commons-lang - commons-lang - 2.6 - - - antlr - antlr - - - javax.activation - activation - 1.1.1 - - - javax.transaction - jta - 1.1 - - - org.json4s - json4s-jackson_2.12 - ${json4s-jackson-version} - - - org.json4s - json4s-core_2.12 - ${json4s-core-version} - - - javax.servlet - servlet-api - 2.5 - - - org.json - json - - - org.springframework.boot - spring-boot-starter-test - test - - - org.springframework.boot - spring-boot-configuration-processor - true - - - com.googlecode.junit-toolbox - junit-toolbox - 2.4 - - - org.onap.so - common - ${project.version} - - + mso-api-handler-common + ONAP SO API Handler Common Libraries + + UTF-8 + UTF-8 + 1.3.0 + 1.1.1 + 3.6.0 + 3.6.0 + 0.9.9-RC1 + 2.5.2 + 1.0.3 + 1.8 + + + + + + org.springframework.boot + spring-boot-dependencies + ${springboot.version} + pom + import + + + + + + + org.onap.so + mso-requests-db + ${project.version} + + + org.springframework.boot + spring-boot-starter-jersey + + + commons-lang + commons-lang + 2.6 + + + antlr + antlr + + + javax.activation + activation + 1.1.1 + + + javax.transaction + jta + 1.1 + + + org.json4s + json4s-jackson_2.12 + ${json4s-jackson-version} + + + org.json4s + json4s-core_2.12 + ${json4s-core-version} + + + javax.servlet + servlet-api + 2.5 + + + org.json + json + + + org.springframework.boot + spring-boot-starter-test + test + + + org.springframework.boot + spring-boot-configuration-processor + true + + + com.googlecode.junit-toolbox + junit-toolbox + 2.4 + + + org.onap.so + common + ${project.version} + + - - ${project.artifactId}-${project.version} - - - org.apache.maven.plugins - maven-surefire-plugin - - - default-test - - test - - - - - - - jar + + ${project.artifactId}-${project.version} + + + org.apache.maven.plugins + maven-surefire-plugin + + + default-test + + test + + + + + + + jar diff --git a/mso-api-handlers/mso-api-handler-infra/pom.xml b/mso-api-handlers/mso-api-handler-infra/pom.xml index 1359a7f9db..dc665a9446 100644 --- a/mso-api-handlers/mso-api-handler-infra/pom.xml +++ b/mso-api-handlers/mso-api-handler-infra/pom.xml @@ -1,285 +1,285 @@ - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - - org.onap.so - mso-api-handlers - 1.4.0-SNAPSHOT - + + org.onap.so + mso-api-handlers + 1.4.0-SNAPSHOT + - mso-api-handler-infra + mso-api-handler-infra - mso-api-handler-infra - ONAP SO API Handler Infra - - 7.10.0 - 1.2 - UTF-8 - UTF-8 - 1.3.0 - 1.1.1 - 3.6.0 - 3.6.0 - 0.9.9-RC1 - 2.5.2 - 1.0.3 - 1.8 - - - - - - org.springframework.boot - spring-boot-dependencies - ${springboot.version} - pom - import - - - - org.camunda.bpm - camunda-bom - ${camunda.version} - import - pom - - - - - - org.camunda.bpm - camunda-engine - - - org.springframework.boot - spring-boot-starter-web - - - io.swagger - swagger-jersey2-jaxrs - 1.5.16 - - - com.h2database - h2 - - - org.mariadb.jdbc - mariadb-java-client - - - org.springframework.boot - spring-boot-starter-actuator - - - org.springframework.boot - spring-boot-starter-jersey - - - org.springframework.boot - spring-boot-starter-data-jpa - - - org.apache.tomcat - tomcat-jdbc - - - - - commons-lang - commons-lang - 2.6 - - - javax.activation - activation - 1.1.1 - - - javax.transaction - jta - 1.1 - - - org.json4s - json4s-jackson_2.12 - ${json4s-jackson-version} - - - org.json4s - json4s-core_2.12 - ${json4s-core-version} - - - javax.servlet - javax.servlet-api - - - javax.interceptor - javax.interceptor-api - + mso-api-handler-infra + ONAP SO API Handler Infra + + 7.10.0 + 1.2 + UTF-8 + UTF-8 + 1.3.0 + 1.1.1 + 3.6.0 + 3.6.0 + 0.9.9-RC1 + 2.5.2 + 1.0.3 + 1.8 + + + + + + org.springframework.boot + spring-boot-dependencies + ${springboot.version} + pom + import + + + + org.camunda.bpm + camunda-bom + ${camunda.version} + import + pom + + + + + + org.camunda.bpm + camunda-engine + + + org.springframework.boot + spring-boot-starter-web + + + io.swagger + swagger-jersey2-jaxrs + 1.5.16 + + + com.h2database + h2 + + + org.mariadb.jdbc + mariadb-java-client + + + org.springframework.boot + spring-boot-starter-actuator + + + org.springframework.boot + spring-boot-starter-jersey + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.apache.tomcat + tomcat-jdbc + + + + + commons-lang + commons-lang + 2.6 + + + javax.activation + activation + 1.1.1 + + + javax.transaction + jta + 1.1 + + + org.json4s + json4s-jackson_2.12 + ${json4s-jackson-version} + + + org.json4s + json4s-core_2.12 + ${json4s-core-version} + + + javax.servlet + javax.servlet-api + + + javax.interceptor + javax.interceptor-api + - - - org.onap.so - mso-requests-db - ${project.version} - - - org.onap.so - mso-requests-db-repositories - ${project.version} - - - org.onap.so - mso-catalog-db - ${project.version} - + + + org.onap.so + mso-requests-db + ${project.version} + + + org.onap.so + mso-requests-db-repositories + ${project.version} + + + org.onap.so + mso-catalog-db + ${project.version} + - - - pl.pragmatists - JUnitParams - 1.0.5 - test - - - junit - junit - test - - - org.onap.sdc.sdc-distribution-client - sdc-distribution-client - 1.3.0 - - - org.slf4j - slf4j-log4j12 - - - - - com.github.java-json-tools - json-schema-core - 1.2.8 - - - com.github.java-json-tools - json-schema-validator - 2.2.8 - - - org.springframework.boot - spring-boot-starter-test - test - - - com.h2database - h2 - - - org.springframework.boot - spring-boot-configuration-processor - true - - - ch.vorburger.mariaDB4j - mariaDB4j - 2.2.3 - test - - - com.googlecode.junit-toolbox - junit-toolbox - 2.4 - - - org.onap.so - mso-api-handler-common - ${project.version} - - - org.springframework.cloud - spring-cloud-contract-wiremock - 1.2.4.RELEASE - test - - - io.micrometer - micrometer-core - - - io.micrometer - micrometer-registry-prometheus - - + + + pl.pragmatists + JUnitParams + 1.0.5 + test + + + junit + junit + test + + + org.onap.sdc.sdc-distribution-client + sdc-distribution-client + 1.3.0 + + + org.slf4j + slf4j-log4j12 + + + + + com.github.java-json-tools + json-schema-core + 1.2.8 + + + com.github.java-json-tools + json-schema-validator + 2.2.8 + + + org.springframework.boot + spring-boot-starter-test + test + + + com.h2database + h2 + + + org.springframework.boot + spring-boot-configuration-processor + true + + + ch.vorburger.mariaDB4j + mariaDB4j + 2.2.3 + test + + + com.googlecode.junit-toolbox + junit-toolbox + 2.4 + + + org.onap.so + mso-api-handler-common + ${project.version} + + + org.springframework.cloud + spring-cloud-contract-wiremock + 1.2.4.RELEASE + test + + + io.micrometer + micrometer-core + + + io.micrometer + micrometer-registry-prometheus + + - - ${project.artifactId}-${project.version} - - - org.apache.maven.plugins - maven-surefire-plugin - - - default-test - - test - - - - **/AllTestsTestSuite.java - - suites - - - - - - org.springframework.boot - spring-boot-maven-plugin - - org.onap.so.apihandlerinfra.ApiHandlerApplication - - - - - repackage - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - extract-docker-file - - - - - org.apache.maven.plugins - maven-jar-plugin - - - original - - - - - io.fabric8 - fabric8-maven-plugin - - - start - - - - - - jar + + ${project.artifactId}-${project.version} + + + org.apache.maven.plugins + maven-surefire-plugin + + + default-test + + test + + + + **/AllTestsTestSuite.java + + suites + + + + + + org.springframework.boot + spring-boot-maven-plugin + + org.onap.so.apihandlerinfra.ApiHandlerApplication + + + + + repackage + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + extract-docker-file + + + + + org.apache.maven.plugins + maven-jar-plugin + + + original + + + + + io.fabric8 + fabric8-maven-plugin + + + start + + + + + + jar diff --git a/mso-api-handlers/mso-requests-db-repositories/pom.xml b/mso-api-handlers/mso-requests-db-repositories/pom.xml index 954b9ee381..f890dabedd 100644 --- a/mso-api-handlers/mso-requests-db-repositories/pom.xml +++ b/mso-api-handlers/mso-requests-db-repositories/pom.xml @@ -1,55 +1,55 @@ - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - - org.onap.so - mso-api-handlers - 1.4.0-SNAPSHOT - + + org.onap.so + mso-api-handlers + 1.4.0-SNAPSHOT + - mso-requests-db-repositories + mso-requests-db-repositories - mso-requests-db-repositories - SO Request Database JPA Respositories - - UTF-8 - UTF-8 - - - - org.onap.so - mso-requests-db - ${project.version} - - - org.springframework.boot - spring-boot-starter-data-jpa - true - - - org.springframework.boot - spring-boot-starter-data-rest - true - - - com.h2database - h2 - test - - - org.mariadb.jdbc - mariadb-java-client - test - - - org.springframework.boot - spring-boot-starter-test - test - - - jar - - ${project.artifactId} - + mso-requests-db-repositories + SO Request Database JPA Respositories + + UTF-8 + UTF-8 + + + + org.onap.so + mso-requests-db + ${project.version} + + + org.springframework.boot + spring-boot-starter-data-jpa + true + + + org.springframework.boot + spring-boot-starter-data-rest + true + + + com.h2database + h2 + test + + + org.mariadb.jdbc + mariadb-java-client + test + + + org.springframework.boot + spring-boot-starter-test + test + + + jar + + ${project.artifactId} + diff --git a/mso-api-handlers/mso-requests-db/pom.xml b/mso-api-handlers/mso-requests-db/pom.xml index 82bf6af659..651f35fd5c 100644 --- a/mso-api-handlers/mso-requests-db/pom.xml +++ b/mso-api-handlers/mso-requests-db/pom.xml @@ -1,39 +1,39 @@ - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - - org.onap.so - mso-api-handlers - 1.4.0-SNAPSHOT - + + org.onap.so + mso-api-handlers + 1.4.0-SNAPSHOT + - mso-requests-db - mso-requests-db - MSO Requests Database definition and Hibernate objects - - UTF-8 - UTF-8 - - - - uk.co.blackpepper.bowman - bowman-client - 0.3.0 - - - org.onap.so - common - ${project.version} - - - org.springframework.boot - spring-boot-starter-test - test - - - jar - - ${project.artifactId} - + mso-requests-db + mso-requests-db + MSO Requests Database definition and Hibernate objects + + UTF-8 + UTF-8 + + + + uk.co.blackpepper.bowman + bowman-client + 0.3.0 + + + org.onap.so + common + ${project.version} + + + org.springframework.boot + spring-boot-starter-test + test + + + jar + + ${project.artifactId} + diff --git a/mso-api-handlers/pom.xml b/mso-api-handlers/pom.xml index 3ed6ab72f6..b4d5c7070a 100644 --- a/mso-api-handlers/pom.xml +++ b/mso-api-handlers/pom.xml @@ -1,37 +1,38 @@ - - 4.0.0 - - org.onap.so - so - 1.4.0-SNAPSHOT - + + 4.0.0 + + org.onap.so + so + 1.4.0-SNAPSHOT + - mso-api-handlers - API Handler - API Handler for MSO - pom + mso-api-handlers + API Handler + API Handler for MSO + pom - - mso-requests-db - mso-requests-db-repositories - mso-api-handler-common - mso-api-handler-infra + + mso-requests-db + mso-requests-db-repositories + mso-api-handler-common + mso-api-handler-infra - - - org.apache.httpcomponents - httpcore - - - org.apache.httpcomponents - httpclient - - - junit - junit - test - - + + + org.apache.httpcomponents + httpcore + + + org.apache.httpcomponents + httpclient + + + junit + junit + test + + diff --git a/mso-catalog-db/pom.xml b/mso-catalog-db/pom.xml index de88d29f52..08e9719f50 100644 --- a/mso-catalog-db/pom.xml +++ b/mso-catalog-db/pom.xml @@ -1,106 +1,106 @@ - 4.0.0 - - org.onap.so - so - 1.4.0-SNAPSHOT - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + org.onap.so + so + 1.4.0-SNAPSHOT + - mso-catalog-db - mso-catalog-db - MSO Catalog Database definition and Hibernate objects + mso-catalog-db + mso-catalog-db + MSO Catalog Database definition and Hibernate objects - - ${project.artifactId} - - - org.apache.maven.plugins - maven-jar-plugin - - - package - - jar - - - beans - - **/beans/* - **/macro/* - **/utils/* - - - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.3 - - 1.8 - 1.8 - true - - -parameters - - - - - - - - - uk.co.blackpepper.bowman - bowman-client - 0.3.0 - - - org.onap.so - common - ${project.version} - - - org.springframework.boot - spring-boot-starter-data-jpa - true - - - org.mariadb.jdbc - mariadb-java-client - - - com.openpojo - openpojo - 0.8.6 - - - org.springframework.boot - spring-boot-starter-test - test - - - ch.vorburger.mariaDB4j - mariaDB4j - 2.2.3 - test - - - org.springframework.boot - spring-boot-starter-data-rest - - - org.springframework.data - spring-data-rest-hal-browser - - - org.ow2.asm - asm-xml - 6.1 - - + + ${project.artifactId} + + + org.apache.maven.plugins + maven-jar-plugin + + + package + + jar + + + beans + + **/beans/* + **/macro/* + **/utils/* + + + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.3 + + 1.8 + 1.8 + true + + -parameters + + + + + + + + + uk.co.blackpepper.bowman + bowman-client + 0.3.0 + + + org.onap.so + common + ${project.version} + + + org.springframework.boot + spring-boot-starter-data-jpa + true + + + org.mariadb.jdbc + mariadb-java-client + + + com.openpojo + openpojo + 0.8.6 + + + org.springframework.boot + spring-boot-starter-test + test + + + ch.vorburger.mariaDB4j + mariaDB4j + 2.2.3 + test + + + org.springframework.boot + spring-boot-starter-data-rest + + + org.springframework.data + spring-data-rest-hal-browser + + + org.ow2.asm + asm-xml + 6.1 + + diff --git a/packages/pom.xml b/packages/pom.xml index da068c33fc..029fa3d446 100644 --- a/packages/pom.xml +++ b/packages/pom.xml @@ -1,37 +1,37 @@ - 4.0.0 - - org.onap.so - so - 1.4.0-SNAPSHOT - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + org.onap.so + so + 1.4.0-SNAPSHOT + - packages - pom - MSO Packages + packages + pom + MSO Packages - - + + - - default - - true - - + + default + + true + + - - docker - - docker - - - - false - - - + + docker + + docker + + + + false + + + diff --git a/pom.xml b/pom.xml index 8a954e1fc7..90fa8d4e14 100644 --- a/pom.xml +++ b/pom.xml @@ -224,7 +224,8 @@ org.apache.maven.plugins maven-deploy-plugin - 2.8 + 2.8 + @@ -458,7 +459,7 @@ ${project.basedir} ${base-path}/project-configs/code-tools/pom-format.properties - ${project.basedir}/pom.xml + pom.xml @@ -480,8 +481,8 @@ ${format.skipValidate} ${base-path}/project-configs/code-tools/pom-format.properties - - ${project.basedir}/pom.xml + + pom.xml @@ -505,11 +506,15 @@ ${docker.skip} ${docker.skip.build} ${docker.skip.push} - ${docker.newHost} - ${docker.host.cert.path} + ${docker.host.cert.path} + - ${dockerPushRepo} - ${dockerPullRepo} + ${dockerPushRepo} + + ${dockerPullRepo} + service diff --git a/so-monitoring/pom.xml b/so-monitoring/pom.xml index 47ef60bd71..243073554e 100644 --- a/so-monitoring/pom.xml +++ b/so-monitoring/pom.xml @@ -19,48 +19,48 @@ --> - 4.0.0 - - org.onap.so - so - 1.4.0-SNAPSHOT - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + org.onap.so + so + 1.4.0-SNAPSHOT + - org.onap.so.monitoring - so-monitoring + org.onap.so.monitoring + so-monitoring - pom - ${project.artifactId} + pom + ${project.artifactId} - - 1.8 - 1.8 - UTF-8 - UTF-8 - + + 1.8 + 1.8 + UTF-8 + UTF-8 + - - - - org.springframework.boot - spring-boot-maven-plugin - + + + + org.springframework.boot + spring-boot-maven-plugin + - - org.apache.maven.plugins - maven-compiler-plugin - - ${version.java.compiler} - ${version.java.compiler} - - - - + + org.apache.maven.plugins + maven-compiler-plugin + + ${version.java.compiler} + ${version.java.compiler} + + + + - - so-monitoring-ui - so-monitoring-handler - so-monitoring-service - + + so-monitoring-ui + so-monitoring-handler + so-monitoring-service + diff --git a/so-monitoring/so-monitoring-handler/pom.xml b/so-monitoring/so-monitoring-handler/pom.xml index c045dd0abd..59546861c5 100644 --- a/so-monitoring/so-monitoring-handler/pom.xml +++ b/so-monitoring/so-monitoring-handler/pom.xml @@ -19,75 +19,75 @@ --> - 4.0.0 - - org.onap.so.monitoring - so-monitoring - 1.4.0-SNAPSHOT - - so-monitoring-handler - ${project.artifactId} + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + org.onap.so.monitoring + so-monitoring + 1.4.0-SNAPSHOT + + so-monitoring-handler + ${project.artifactId} - - UTF-8 - UTF-8 - 1.8 - 0.8.6 - + + UTF-8 + UTF-8 + 1.8 + 0.8.6 + - - - com.google.guava - guava - - - org.springframework.boot - spring-boot-starter-data-jpa - - - org.apache.tomcat - tomcat-jdbc - - - - - org.slf4j - slf4j-ext - - - org.apache.httpcomponents - httpclient - - - org.apache.httpcomponents - httpcore - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-configuration-processor - compile - - - org.springframework.boot - spring-boot-starter-test - test - - - nl.jqno.equalsverifier - equalsverifier - 2.5.1 - test - - - org.onap.so - common - ${project.version} - - + + + com.google.guava + guava + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.apache.tomcat + tomcat-jdbc + + + + + org.slf4j + slf4j-ext + + + org.apache.httpcomponents + httpclient + + + org.apache.httpcomponents + httpcore + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-configuration-processor + compile + + + org.springframework.boot + spring-boot-starter-test + test + + + nl.jqno.equalsverifier + equalsverifier + 2.5.1 + test + + + org.onap.so + common + ${project.version} + + diff --git a/so-monitoring/so-monitoring-service/pom.xml b/so-monitoring/so-monitoring-service/pom.xml index fd46d096ff..ff70a77239 100644 --- a/so-monitoring/so-monitoring-service/pom.xml +++ b/so-monitoring/so-monitoring-service/pom.xml @@ -19,96 +19,96 @@ --> - 4.0.0 - - org.onap.so.monitoring - so-monitoring - 1.4.0-SNAPSHOT - - so-monitoring-service - ${project.artifactId} + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + org.onap.so.monitoring + so-monitoring + 1.4.0-SNAPSHOT + + so-monitoring-service + ${project.artifactId} - - - org.onap.so.monitoring - so-monitoring-handler - ${project.version} - - - org.springframework.boot - spring-boot-starter-security - - - org.springframework.boot - spring-boot-starter-data-jpa - - - + + + org.onap.so.monitoring + so-monitoring-handler + ${project.version} + + + org.springframework.boot + spring-boot-starter-security + + + org.springframework.boot + spring-boot-starter-data-jpa + + + - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-test - test - - - org.springframework.boot - spring-boot-starter-jersey - - - org.springframework.boot - spring-boot-configuration-processor - compile - - + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-test + test + + + org.springframework.boot + spring-boot-starter-jersey + + + org.springframework.boot + spring-boot-configuration-processor + compile + + - - - - org.springframework.boot - spring-boot-maven-plugin - ${springboot.version} - - org.onap.so.monitoring.rest.api.SoMonitoringApplication - - - - - repackage - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - maven-resources-plugin - 3.0.2 - - - copy-resources - validate - - copy-resources - - - ${project.basedir}/target/classes/static/ - - - ${project.basedir}/../so-monitoring-ui/src/main/frontend/dist/ONAP-SO-Monitor/ - - - - - - - - + + + + org.springframework.boot + spring-boot-maven-plugin + ${springboot.version} + + org.onap.so.monitoring.rest.api.SoMonitoringApplication + + + + + repackage + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + maven-resources-plugin + 3.0.2 + + + copy-resources + validate + + copy-resources + + + ${project.basedir}/target/classes/static/ + + + ${project.basedir}/../so-monitoring-ui/src/main/frontend/dist/ONAP-SO-Monitor/ + + + + + + + + diff --git a/so-monitoring/so-monitoring-ui/pom.xml b/so-monitoring/so-monitoring-ui/pom.xml index cd5ad8bfe9..a5f1a6c18e 100644 --- a/so-monitoring/so-monitoring-ui/pom.xml +++ b/so-monitoring/so-monitoring-ui/pom.xml @@ -19,73 +19,73 @@ --> - 4.0.0 - - org.onap.so.monitoring - so-monitoring - 1.4.0-SNAPSHOT - - so-monitoring-ui + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + org.onap.so.monitoring + so-monitoring + 1.4.0-SNAPSHOT + + so-monitoring-ui - - - - com.github.eirslett - frontend-maven-plugin - 1.6 - - ${project.basedir}/src/main/frontend - target - - - - install node and yarn - - install-node-and-yarn - - generate-resources - - v10.8.0 - v1.7.0 - - - - yarn install - - yarn - - - install - - - - yarn run webpack build - - yarn - - - false - build - - - - - - org.apache.maven.plugins - maven-clean-plugin - 3.0.0 - - false - - - ${project.basedir}/src/main/frontend/dist/ - false - - - - - - + + + + com.github.eirslett + frontend-maven-plugin + 1.6 + + ${project.basedir}/src/main/frontend + target + + + + install node and yarn + + install-node-and-yarn + + generate-resources + + v10.8.0 + v1.7.0 + + + + yarn install + + yarn + + + install + + + + yarn run webpack build + + yarn + + + false + build + + + + + + org.apache.maven.plugins + maven-clean-plugin + 3.0.0 + + false + + + ${project.basedir}/src/main/frontend/dist/ + false + + + + + + diff --git a/vnfm-simulator/pom.xml b/vnfm-simulator/pom.xml index 3923a3e9ec..2f9f0cde28 100644 --- a/vnfm-simulator/pom.xml +++ b/vnfm-simulator/pom.xml @@ -1,43 +1,43 @@ - 4.0.0 - - org.onap.so - so - 1.4.0-SNAPSHOT - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + org.onap.so + so + 1.4.0-SNAPSHOT + - org.onap.so.vnfm - vnfm-simulator - 1.4.0-SNAPSHOT - pom - ${project.artifactId} + org.onap.so.vnfm + vnfm-simulator + 1.4.0-SNAPSHOT + pom + ${project.artifactId} - - 2.0.5.RELEASE - 1.8 - + + 2.0.5.RELEASE + 1.8 + - - - - org.springframework.boot - spring-boot-maven-plugin - + + + + org.springframework.boot + spring-boot-maven-plugin + - - org.apache.maven.plugins - maven-compiler-plugin - - ${version.java.compiler} - ${version.java.compiler} - - - - + + org.apache.maven.plugins + maven-compiler-plugin + + ${version.java.compiler} + ${version.java.compiler} + + + + - - vnfm-api - vnfm-service - + + vnfm-api + vnfm-service + \ No newline at end of file diff --git a/vnfm-simulator/vnfm-api/pom.xml b/vnfm-simulator/vnfm-api/pom.xml index 3bb6f4facf..ee5ef03964 100644 --- a/vnfm-simulator/vnfm-api/pom.xml +++ b/vnfm-simulator/vnfm-api/pom.xml @@ -1,110 +1,110 @@ - 4.0.0 - - org.onap.so.vnfm - vnfm-simulator - 1.4.0-SNAPSHOT - - vnfm-api - ${project.artifactId} - - UTF-8 - UTF-8 - 1.8 - 1.8 - 1.8.2 - 2.3.0 - 1.3.5 - 2.0.0-RC1 - 1.0.1 - 1.5.15 - 2.8.5 - - VNFM Simulator adapter API + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + org.onap.so.vnfm + vnfm-simulator + 1.4.0-SNAPSHOT + + vnfm-api + ${project.artifactId} + + UTF-8 + UTF-8 + 1.8 + 1.8 + 1.8.2 + 2.3.0 + 1.3.5 + 2.0.0-RC1 + 1.0.1 + 1.5.15 + 2.8.5 + + VNFM Simulator adapter API - - - - io.swagger - swagger-codegen-maven-plugin - 2.3.1 - - - vnfmsimulator - generate-sources - - generate - - - ${basedir}/src/main/resources/vnfm-sim-swagger.yaml - java - retrofit2 - ${project.build.directory}/generated-sources/vnfmsimulator - org.onap.vnfm.v1.api - org.onap.vnfm.v1.model - - true - src/gen/java/main - true - true - - - - - - - - - - io.swagger - swagger-annotations - ${swagger-core-version} - - - com.squareup.retrofit2 - converter-gson - ${retrofit-version} - - - com.squareup.retrofit2 - retrofit - ${retrofit-version} - - - com.squareup.retrofit2 - converter-scalars - ${retrofit-version} - - - org.apache.oltu.oauth2 - org.apache.oltu.oauth2.client - ${oltu-version} - - - io.gsonfire - gson-fire - ${gson-fire-version} - - - org.threeten - threetenbp - ${threetenbp-version} - - - io.reactivex.rxjava2 - rxjava - ${rxjava-version} - - - com.squareup.retrofit2 - adapter-rxjava2 - ${retrofit-version} - - - com.google.code.gson - gson - ${gson-version} - - + + + + io.swagger + swagger-codegen-maven-plugin + 2.3.1 + + + vnfmsimulator + generate-sources + + generate + + + ${basedir}/src/main/resources/vnfm-sim-swagger.yaml + java + retrofit2 + ${project.build.directory}/generated-sources/vnfmsimulator + org.onap.vnfm.v1.api + org.onap.vnfm.v1.model + + true + src/gen/java/main + true + true + + + + + + + + + + io.swagger + swagger-annotations + ${swagger-core-version} + + + com.squareup.retrofit2 + converter-gson + ${retrofit-version} + + + com.squareup.retrofit2 + retrofit + ${retrofit-version} + + + com.squareup.retrofit2 + converter-scalars + ${retrofit-version} + + + org.apache.oltu.oauth2 + org.apache.oltu.oauth2.client + ${oltu-version} + + + io.gsonfire + gson-fire + ${gson-fire-version} + + + org.threeten + threetenbp + ${threetenbp-version} + + + io.reactivex.rxjava2 + rxjava + ${rxjava-version} + + + com.squareup.retrofit2 + adapter-rxjava2 + ${retrofit-version} + + + com.google.code.gson + gson + ${gson-version} + + \ No newline at end of file diff --git a/vnfm-simulator/vnfm-service/pom.xml b/vnfm-simulator/vnfm-service/pom.xml index 7b74126a96..3f4f4512b3 100644 --- a/vnfm-simulator/vnfm-service/pom.xml +++ b/vnfm-simulator/vnfm-service/pom.xml @@ -1,116 +1,116 @@ - 4.0.0 - - org.onap.so.vnfm - vnfm-simulator - 1.4.0-SNAPSHOT - - vnfm-service - ${project.artifactId} + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + org.onap.so.vnfm + vnfm-simulator + 1.4.0-SNAPSHOT + + vnfm-service + ${project.artifactId} - - UTF-8 - 1.8 - - - - org.onap.so.vnfm - vnfm-api - ${project.version} - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-data-jpa - - - org.springframework.boot - spring-boot-starter-actuator - - - org.springframework.boot - spring-boot-starter-test - test - - - org.springframework.boot - spring-boot-devtools - runtime - - - junit - junit - test - - - io.swagger - swagger-jaxrs - 1.5.0 - - - org.apache.directory.studio - org.apache.commons.io - 2.4 - - - com.googlecode.json-simple - json-simple - 1.1.1 - + + UTF-8 + 1.8 + + + + org.onap.so.vnfm + vnfm-api + ${project.version} + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.springframework.boot + spring-boot-starter-actuator + + + org.springframework.boot + spring-boot-starter-test + test + + + org.springframework.boot + spring-boot-devtools + runtime + + + junit + junit + test + + + io.swagger + swagger-jaxrs + 1.5.0 + + + org.apache.directory.studio + org.apache.commons.io + 2.4 + + + com.googlecode.json-simple + json-simple + 1.1.1 + - - io.springfox - springfox-swagger-ui - 2.6.1 - compile - - - io.springfox - springfox-swagger2 - 2.6.1 - compile - - - com.fasterxml.jackson.core - jackson-databind - 2.9.8 - - - com.h2database - h2 - - - - commons-beanutils - commons-beanutils - 1.9.3 - - - - - - org.springframework.boot - spring-boot-maven-plugin - ${springboot.version} - - org.onap.svnfm.simulator.config.SvnfmApplication - - - - - repackage - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - + + io.springfox + springfox-swagger-ui + 2.6.1 + compile + + + io.springfox + springfox-swagger2 + 2.6.1 + compile + + + com.fasterxml.jackson.core + jackson-databind + 2.9.8 + + + com.h2database + h2 + + + + commons-beanutils + commons-beanutils + 1.9.3 + + + + + + org.springframework.boot + spring-boot-maven-plugin + ${springboot.version} + + org.onap.svnfm.simulator.config.SvnfmApplication + + + + + repackage + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + \ No newline at end of file