From 131f1fab6bea5eeb6467e8836ec00ef7c6bf5eac Mon Sep 17 00:00:00 2001 From: "Timoney, Dan (dt5972)" Date: Wed, 28 Feb 2018 21:13:09 -0500 Subject: [PATCH] Nitrogen port : sdnc-northbound Update sdnc/northbound to OpenDaylight Nitrogen release. Change-Id: I6e299418a7ab441899b78b5d3df5f8ee96829222 Issue-ID: SDNC-269 Signed-off-by: Timoney, Dan (dt5972) --- .../features/features-generic-resource-api/pom.xml | 29 +++ generic-resource-api/features/pom.xml | 99 ++-------- .../features/sdnc-generic-resource-api/pom.xml | 45 +++++ .../features/src/main/resources/features.xml | 17 -- generic-resource-api/installer/pom.xml | 29 +-- .../src/main/resources/scripts/install-feature.sh | 9 +- generic-resource-api/model/pom.xml | 210 +++++---------------- generic-resource-api/pom.xml | 37 +--- generic-resource-api/provider/pom.xml | 164 +++++++--------- .../yang/GENERIC-RESOURCE-API-provider-impl.yang | 65 ------- pom.xml | 97 +++++----- version.properties | 2 +- vnfapi/features/features-vnfapi/pom.xml | 29 +++ vnfapi/features/pom.xml | 136 ++----------- vnfapi/features/sdnc-vnfapi/pom.xml | 45 +++++ vnfapi/features/src/main/resources/features.xml | 38 ---- vnfapi/installer/pom.xml | 33 ++-- .../src/assembly/assemble_mvnrepo_zip.xml | 6 - vnfapi/model/pom.xml | 123 +----------- vnfapi/pom.xml | 61 ++---- vnfapi/provider/pom.xml | 43 +---- .../java/org/onap/sdnc/vnfapi/VnfApiProvider.java | 2 +- .../vnfapi/VnfInstanceTopologyOperationTest.java | 1 + vnftools/features/features-vnftools/pom.xml | 29 +++ vnftools/features/pom.xml | 151 ++------------- vnftools/features/sdnc-vnftools/pom.xml | 40 ++++ vnftools/features/src/main/resources/features.xml | 38 ---- vnftools/installer/pom.xml | 30 +-- vnftools/pom.xml | 34 ++-- vnftools/provider/pom.xml | 65 ++----- 30 files changed, 551 insertions(+), 1156 deletions(-) create mode 100644 generic-resource-api/features/features-generic-resource-api/pom.xml create mode 100644 generic-resource-api/features/sdnc-generic-resource-api/pom.xml delete mode 100644 generic-resource-api/features/src/main/resources/features.xml delete mode 100644 generic-resource-api/provider/src/main/yang/GENERIC-RESOURCE-API-provider-impl.yang create mode 100644 vnfapi/features/features-vnfapi/pom.xml create mode 100644 vnfapi/features/sdnc-vnfapi/pom.xml delete mode 100644 vnfapi/features/src/main/resources/features.xml create mode 100644 vnftools/features/features-vnftools/pom.xml create mode 100644 vnftools/features/sdnc-vnftools/pom.xml delete mode 100644 vnftools/features/src/main/resources/features.xml diff --git a/generic-resource-api/features/features-generic-resource-api/pom.xml b/generic-resource-api/features/features-generic-resource-api/pom.xml new file mode 100644 index 00000000..0275b59d --- /dev/null +++ b/generic-resource-api/features/features-generic-resource-api/pom.xml @@ -0,0 +1,29 @@ + + + 4.0.0 + + + org.onap.ccsdk.parent + feature-repo-parent + 1.0.1-SNAPSHOT + + + + org.onap.sdnc.northbound + features-generic-resource-api + 1.3.1-SNAPSHOT + feature + + sdnc-northbound :: generic-resource-api :: ${project.artifactId} + + + + ${project.groupId} + sdnc-generic-resource-api + ${project.version} + xml + features + + + + diff --git a/generic-resource-api/features/pom.xml b/generic-resource-api/features/pom.xml index 8b3e0e49..7c83e30c 100644 --- a/generic-resource-api/features/pom.xml +++ b/generic-resource-api/features/pom.xml @@ -1,96 +1,23 @@ - + 4.0.0 - org.onap.sdnc.northbound - generic-resource-api - 1.3.0-SNAPSHOT + org.onap.ccsdk.parent + odlparent-lite + 1.0.1-SNAPSHOT + + org.onap.sdnc.northbound generic-resource-api-features - jar + 1.3.1-SNAPSHOT + pom - - - org.onap.sdnc.northbound - generic-resource-api-model - - - org.onap.sdnc.northbound - generic-resource-api-provider - + sdnc-northbound :: generic-resource-api :: ${project.artifactId} - - org.opendaylight.mdsal - features-mdsal - ${odl.mdsal.features.version} - xml - features - runtime - - - - org.opendaylight.odlparent - features-test - ${odl.commons.opendaylight.version} - test - - - - org.opendaylight.yangtools - features-yangtools - ${odl.yangtools.version} - xml - features - runtime - - - - - - - true - src/main/resources - - - - - org.apache.maven.plugins - maven-resources-plugin - - - filter - - resources - - generate-resources - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - attach-artifacts - - attach-artifact - - package - - - - ${project.build.directory}/classes/${features.file} - xml - features - - - - - - - - + + sdnc-generic-resource-api + features-generic-resource-api + diff --git a/generic-resource-api/features/sdnc-generic-resource-api/pom.xml b/generic-resource-api/features/sdnc-generic-resource-api/pom.xml new file mode 100644 index 00000000..817145d3 --- /dev/null +++ b/generic-resource-api/features/sdnc-generic-resource-api/pom.xml @@ -0,0 +1,45 @@ + + + 4.0.0 + + + org.onap.ccsdk.parent + single-feature-parent + 1.0.1-SNAPSHOT + + + + org.onap.sdnc.northbound + sdnc-generic-resource-api + 1.3.1-SNAPSHOT + feature + + sdnc-northbound :: generic-resource-api :: ${project.artifactId} + + + + org.opendaylight.controller + odl-mdsal-broker + xml + features + + + org.onap.ccsdk.sli.core + ccsdk-sli + ${ccsdk.sli.core.version} + xml + features + + + ${project.groupId} + generic-resource-api-model + ${project.version} + + + ${project.groupId} + generic-resource-api-provider + ${project.version} + + + + diff --git a/generic-resource-api/features/src/main/resources/features.xml b/generic-resource-api/features/src/main/resources/features.xml deleted file mode 100644 index 219c7215..00000000 --- a/generic-resource-api/features/src/main/resources/features.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - odl-mdsal-broker - sdnc-sli - - mvn:org.onap.sdnc.northbound/generic-resource-api-model/${project.version} - mvn:org.onap.sdnc.northbound/generic-resource-api-provider/${project.version} - - - diff --git a/generic-resource-api/installer/pom.xml b/generic-resource-api/installer/pom.xml index e3ca5eb8..ea8967e4 100755 --- a/generic-resource-api/installer/pom.xml +++ b/generic-resource-api/installer/pom.xml @@ -1,20 +1,25 @@ - + 4.0.0 + - generic-resource-api - org.onap.sdnc.northbound - 1.3.0-SNAPSHOT + org.onap.ccsdk.parent + odlparent-lite + 1.0.1-SNAPSHOT + + + org.onap.sdnc.northbound generic-resource-api-installer - Generic Resource API - Karaf Installer + 1.3.1-SNAPSHOT pom + sdnc-northbound :: generic-resource-api :: ${project.artifactId} + sdnc-generic-resource-api - sdnc-generic-resource-api - mvn:org.onap.sdnc.northbound/generic-resource-api-features/${project.version}/xml/features + ${application.name} + mvn:org.onap.sdnc.northbound/${application.name}/${project.version}/xml/features false @@ -22,10 +27,10 @@ org.onap.sdnc.northbound - generic-resource-api-features + ${application.name} ${project.version} - features xml + features * @@ -100,8 +105,7 @@ true false false - org.onap.sdnc - sli-common,sli-provider,dblib-common,dblib-provider + org.onap.sdnc.northbound provided @@ -136,5 +140,4 @@ - diff --git a/generic-resource-api/installer/src/main/resources/scripts/install-feature.sh b/generic-resource-api/installer/src/main/resources/scripts/install-feature.sh index 6e8620e1..d5f620f1 100644 --- a/generic-resource-api/installer/src/main/resources/scripts/install-feature.sh +++ b/generic-resource-api/installer/src/main/resources/scripts/install-feature.sh @@ -10,9 +10,9 @@ # 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. @@ -23,7 +23,6 @@ ODL_HOME=${ODL_HOME:-/opt/opendaylight/current} ODL_KARAF_CLIENT=${ODL_KARAF_CLIENT:-${ODL_HOME}/bin/client} -ODL_KARAF_CLIENT_OPTS=${ODL_KARAF_CLIENT_OPTS:-"-u karaf"} INSTALLERDIR=$(dirname $0) REPOZIP=${INSTALLERDIR}/${features.boot}-${project.version}.zip @@ -36,5 +35,5 @@ else exit 1 fi -${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} -${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:install ${features.boot} +${ODL_KARAF_CLIENT} feature:repo-add ${features.repositories} +${ODL_KARAF_CLIENT} feature:install ${features.boot} diff --git a/generic-resource-api/model/pom.xml b/generic-resource-api/model/pom.xml index 7a140323..c47c915d 100644 --- a/generic-resource-api/model/pom.xml +++ b/generic-resource-api/model/pom.xml @@ -1,172 +1,56 @@ - 4.0.0 + 4.0.0 - - org.onap.sdnc.northbound - generic-resource-api - 1.3.0-SNAPSHOT - + + org.onap.ccsdk.parent + binding-parent + 1.0.1-SNAPSHOT + + - generic-resource-api-model - bundle + org.onap.sdnc.northbound + generic-resource-api-model + 1.3.1-SNAPSHOT + bundle - - - org.opendaylight.mdsal - yang-binding - ${odl.mdsal.yang.binding.version} - - - org.opendaylight.yangtools - yang-common - ${odl.yangtools.version} - - - org.opendaylight.mdsal.model - ietf-inet-types - ${odl.ietf-inet-types.version} - - - org.opendaylight.mdsal.model - ietf-yang-types - ${odl.ietf-yang-types.version} - - + sdnc-northbound :: generic-resource-api :: ${project.artifactId} - - - - - org.apache.felix - maven-bundle-plugin - true - - - * - - - - - org.opendaylight.yangtools - yang-maven-plugin - ${odl.yangtools.yang.maven.plugin.version} - - - org.opendaylight.mdsal - maven-sal-api-gen-plugin - ${odl.sal.api.gen.plugin.version} - jar - - - org.opendaylight.netconf - sal-rest-docgen-maven - ${odl.restconf.version} - jar - - - - - - generate-sources - - - ${yang.file.directory} - - - org.opendaylight.mdsal.binding.maven.api.gen.plugin.CodeGeneratorImpl - ${salGeneratorPath} - - - org.opendaylight.netconf.sal.rest.doc.maven.StaticDocGenerator - target/swagger - - - true - - - - - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - - - - python - - scripts/python/yang2props.py - src/main/yang/GENERIC-RESOURCE-API.yang - target/generic-resource-api.properties - - - generation - generate-resources - - exec - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - attach-artifacts - - attach-artifact - - package - - - - ${project.build.directory}/generic-resource-api.properties - properties - generic-resource-api - - - - - - + + + org.opendaylight.mdsal.model + ietf-inet-types + + + org.opendaylight.mdsal.model + ietf-yang-types + + + + + + org.codehaus.mojo + exec-maven-plugin + 1.2.1 + + + + python + + scripts/python/yang2props.py + src/main/yang/GENERIC-RESOURCE-API.yang + target/generic-resource-api.properties + + + generation + generate-resources + + exec + + + + - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - - org.codehaus.mojo - - - exec-maven-plugin - - - [1.2.1,) - - - exec - - - - - - - - - - - - - + diff --git a/generic-resource-api/pom.xml b/generic-resource-api/pom.xml index 7696de8a..fc43e7d1 100644 --- a/generic-resource-api/pom.xml +++ b/generic-resource-api/pom.xml @@ -3,46 +3,23 @@ 4.0.0 - org.onap.sdnc.northbound - sdnc-northbound - 1.3.0-SNAPSHOT + org.onap.ccsdk.parent + odlparent-lite + 1.0.1-SNAPSHOT + org.onap.sdnc.northbound generic-resource-api - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT pom - - generic-resource-api - + sdnc-northbound :: generic-resource-api + model provider features installer - - - - - - org.onap.sdnc.northbound - generic-resource-api-features - ${project.version} - xml - features - - - org.onap.sdnc.northbound - generic-resource-api-model - ${project.version} - - - org.onap.sdnc.northbound - generic-resource-api-provider - ${project.version} - - - diff --git a/generic-resource-api/provider/pom.xml b/generic-resource-api/provider/pom.xml index 4d82ec99..df15737e 100644 --- a/generic-resource-api/provider/pom.xml +++ b/generic-resource-api/provider/pom.xml @@ -1,116 +1,86 @@ - 4.0.0 + 4.0.0 - - org.onap.sdnc.northbound - generic-resource-api - 1.3.0-SNAPSHOT - + + org.onap.ccsdk.parent + binding-parent + 1.0.1-SNAPSHOT + + - generic-resource-api-provider - bundle + org.onap.sdnc.northbound + generic-resource-api-provider + 1.3.1-SNAPSHOT + bundle - - - org.onap.sdnc.northbound - generic-resource-api-model - - - org.opendaylight.controller - config-api - ${odl.controller.config.api.version} - - - org.opendaylight.controller - sal-binding-config - ${odl.mdsal.version} - - - org.opendaylight.controller - sal-binding-api - ${odl.mdsal.version} - - - org.opendaylight.controller - sal-common-util - ${odl.mdsal.version} - - - - org.opendaylight.controller - sal-test-model - ${odl.mdsal.version} - test - - - org.opendaylight.netconf - sal-rest-connector - ${odl.mdsal.version} - test - - - - org.opendaylight.controller - sal-binding-broker-impl - ${odl.mdsal.version} - test - - - org.opendaylight.controller - sal-binding-broker-impl - ${odl.mdsal.version} - test-jar - tests - test - - - - org.apache.commons - commons-lang3 - + sdnc-northbound :: generic-resource-api :: ${project.artifactId} + + + org.onap.sdnc.northbound + generic-resource-api-model + ${project.version} + + + org.apache.commons + commons-lang3 + org.onap.ccsdk.sli.core sli-common - ${sdnctl.sli.version} org.onap.ccsdk.sli.core sli-provider - ${sdnctl.sli.version} - - junit - junit - ${junit.version} - test - - - org.mockito - mockito-core - ${mockito.version} - test - - - - - + + org.opendaylight.controller + sal-binding-config + - - org.apache.felix - maven-bundle-plugin - true - - - !* - * - - - + + org.opendaylight.controller + sal-binding-api + + + org.opendaylight.controller + sal-common-util + + + org.opendaylight.controller + sal-test-model + test + + + org.opendaylight.netconf + sal-rest-connector + test + - - + + org.opendaylight.controller + sal-binding-broker-impl + test + + + org.opendaylight.controller + sal-binding-broker-impl + test-jar + tests + test + + + junit + junit + test + + + org.mockito + mockito-core + test + + diff --git a/generic-resource-api/provider/src/main/yang/GENERIC-RESOURCE-API-provider-impl.yang b/generic-resource-api/provider/src/main/yang/GENERIC-RESOURCE-API-provider-impl.yang deleted file mode 100644 index b2ce7f21..00000000 --- a/generic-resource-api/provider/src/main/yang/GENERIC-RESOURCE-API-provider-impl.yang +++ /dev/null @@ -1,65 +0,0 @@ -module GENERIC-RESOURCE-API-provider-impl { - - yang-version 1; - namespace "org:onap:sdnc:northbound:GENERIC-RESOURCE-API:provider:impl"; - prefix "GENERIC-RESOURCE-API-provider-impl"; - - import config { prefix config; revision-date 2013-04-05; } - import opendaylight-md-sal-binding { prefix mdsal; revision-date 2013-10-28; } - import opendaylight-sal-binding-broker-impl { - prefix binding-impl; - revision-date 2013-10-28; - } - - description - "This module contains the base YANG definitions for - GENERIC-RESOURCE-API-provider impl implementation."; - - revision "2017-08-24" { - description - "ONAP Amsterdam version."; - } - - // This is the definition of the service implementation as a module identity. - identity GENERIC-RESOURCE-API-provider-impl { - base config:module-type; - - // Specifies the prefix for generated java classes. - config:java-name-prefix GENERIC-RESOURCE-APIProvider; - } - - // Augments the 'configuration' choice node under modules/module. - // We consume the three main services, RPCs, DataStore, and Notifications - augment "/config:modules/config:module/config:configuration" { - case GENERIC-RESOURCE-API-provider-impl { - when "/config:modules/config:module/config:type = 'GENERIC-RESOURCE-API-provider-impl'"; - - container rpc-registry { - uses config:service-ref { - refine type { - mandatory true; - config:required-identity mdsal:binding-rpc-registry; - } - } - } - - container notification-publish-adapter { - uses config:service-ref { - refine type { - mandatory true; - config:required-identity binding-impl:binding-new-notification-publish-service; - } - } - } - - container data-broker { - uses config:service-ref { - refine type { - mandatory false; - config:required-identity mdsal:binding-async-data-broker; - } - } - } - } - } -} diff --git a/pom.xml b/pom.xml index 247fd676..a635ee14 100644 --- a/pom.xml +++ b/pom.xml @@ -1,29 +1,31 @@ - + + 4.0.0 org.onap.ccsdk.parent - odlparent-carbon-sr1 - 0.1.0 - + odlparent-lite + 1.0.1-SNAPSHOT + - 4.0.0 - pom org.onap.sdnc.northbound sdnc-northbound + 1.3.1-SNAPSHOT + pom sdnc-northbound - https://wiki.onap.org The SDN-C Northbound APIs repo contains code for northbound API adaptors, typically MD-SAL applications + https://wiki.onap.org + + ONAP + - - - JIRA - https://jira.onap.org/ - - + + generic-resource-api + vnfapi + vnftools + scm:git:ssh://git@${onap.git.host}/sdnc-northbound.git @@ -31,18 +33,45 @@ scm:git:ssh://${onap.git.host}:${onap.git.port}/${onap.git.project}/sdnc-northbound.git ${onap.git.protocol}://${onap.git.host}/projects/${onap.git.project}/repos/sdnc-northbound/browse - + + JIRA + https://jira.onap.org/ + Jenkins https://jenkins.onap.org/ - sdnc-javadoc dav:https://${onap.nexus.host}:${onap.nexus.port}/repository/sdn-c-javadoc/${project.artifactId}/${project.version} + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.17 + + false + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.7 + true + + https://${onap.nexus.host} + ${onap.nexus.staging.profile-id} + ${onap.nexus.staging.server-id} + + + + + blackduck @@ -80,40 +109,4 @@ - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.17 - - false - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - https://${onap.nexus.host} - ${onap.nexus.staging.profile-id} - ${onap.nexus.staging.server-id} - - - - - - - generic-resource-api - vnfapi - vnftools - - - ONAP - - 1.3.0-SNAPSHOT - - diff --git a/version.properties b/version.properties index 1dcc37c2..9614fbff 100644 --- a/version.properties +++ b/version.properties @@ -5,7 +5,7 @@ release_name=1 sprint_number=3 -feature_revision=0 +feature_revision=1 base_version=${release_name}.${sprint_number}.${feature_revision} diff --git a/vnfapi/features/features-vnfapi/pom.xml b/vnfapi/features/features-vnfapi/pom.xml new file mode 100644 index 00000000..cd116c96 --- /dev/null +++ b/vnfapi/features/features-vnfapi/pom.xml @@ -0,0 +1,29 @@ + + + 4.0.0 + + + org.onap.ccsdk.parent + feature-repo-parent + 1.0.1-SNAPSHOT + + + + org.onap.sdnc.northbound + features-vnfapi + 1.3.1-SNAPSHOT + feature + + sdnc-northbound :: vnfapi :: ${project.artifactId} + + + + ${project.groupId} + sdnc-vnfapi + ${project.version} + xml + features + + + + diff --git a/vnfapi/features/pom.xml b/vnfapi/features/pom.xml index f8e78914..72ae9fc3 100644 --- a/vnfapi/features/pom.xml +++ b/vnfapi/features/pom.xml @@ -1,131 +1,23 @@ 4.0.0 + - vnfapi - org.onap.sdnc.northbound - 1.3.0-SNAPSHOT + org.onap.ccsdk.parent + odlparent-lite + 1.0.1-SNAPSHOT + - vnfapi-features - - jar - - - - org.onap.sdnc.northbound - vnfapi-model - ${project.version} - - - - org.onap.sdnc.northbound - vnfapi-provider - ${project.version} - - - - org.opendaylight.mdsal - features-mdsal - ${odl.mdsal.features.version} - features - xml - runtime - - - - - - - org.opendaylight.controller - opendaylight-karaf-empty - ${odl.karaf.empty.distro.version} - zip - - - - - - org.opendaylight.odlparent - features-test - test - ${odl.commons.opendaylight.version} - + org.onap.sdnc.northbound + vnfapi-features + 1.3.1-SNAPSHOT + pom - - org.opendaylight.yangtools - features-yangtools - ${odl.yangtools.version} - features - xml - runtime - - + sdnc-northbound :: vnfapi :: ${project.artifactId} - - - - true - src/main/resources - - - - - org.apache.maven.plugins - maven-resources-plugin - - - filter - - resources - - generate-resources - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - attach-artifacts - - attach-artifact - - package - - - - ${project.build.directory}/classes/${features.file} - xml - features - - - - - - - - + + sdnc-vnfapi + features-vnfapi + diff --git a/vnfapi/features/sdnc-vnfapi/pom.xml b/vnfapi/features/sdnc-vnfapi/pom.xml new file mode 100644 index 00000000..1220766b --- /dev/null +++ b/vnfapi/features/sdnc-vnfapi/pom.xml @@ -0,0 +1,45 @@ + + + 4.0.0 + + + org.onap.ccsdk.parent + single-feature-parent + 1.0.1-SNAPSHOT + + + + org.onap.sdnc.northbound + sdnc-vnfapi + 1.3.1-SNAPSHOT + feature + + sdnc-northbound :: vnfapi :: ${project.artifactId} + + + + org.opendaylight.controller + odl-mdsal-broker + xml + features + + + org.onap.ccsdk.sli.core + ccsdk-sli + ${ccsdk.sli.core.version} + xml + features + + + ${project.groupId} + vnfapi-model + ${project.version} + + + ${project.groupId} + vnfapi-provider + ${project.version} + + + + diff --git a/vnfapi/features/src/main/resources/features.xml b/vnfapi/features/src/main/resources/features.xml deleted file mode 100644 index 2301d5a9..00000000 --- a/vnfapi/features/src/main/resources/features.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - mvn:org.opendaylight.mdsal/features-mdsal/${odl.mdsal.features.version}/xml/features - - - - odl-mdsal-broker - sdnc-sli - mvn:org.onap.sdnc.northbound/vnfapi-model/${project.version} - mvn:org.onap.sdnc.northbound/vnfapi-provider/${project.version} - - - diff --git a/vnfapi/installer/pom.xml b/vnfapi/installer/pom.xml index a3fc6350..2257be33 100755 --- a/vnfapi/installer/pom.xml +++ b/vnfapi/installer/pom.xml @@ -1,31 +1,36 @@ - + 4.0.0 + - vnfapi - org.onap.sdnc.northbound - 1.3.0-SNAPSHOT + org.onap.ccsdk.parent + odlparent-lite + 1.0.1-SNAPSHOT + + + org.onap.sdnc.northbound vnfapi-installer - VNF API - Karaf Installer + 1.3.1-SNAPSHOT pom + sdnc-northbound :: vnfapi :: ${project.artifactId} + sdnc-vnfapi - sdnc-vnfapi - mvn:org.onap.sdnc.northbound/vnfapi-features/${project.version}/xml/features + ${application.name} + mvn:org.onap.sdnc.northbound/${application.name}/${project.version}/xml/features false - org.onap.sdnc.northbound - vnfapi-features + ${project.groupId} + ${application.name} ${project.version} - features xml + features * @@ -35,7 +40,7 @@ - org.onap.sdnc.northbound + ${project.groupId} vnfapi-provider ${project.version} @@ -100,8 +105,7 @@ true false false - org.onap.sdnc - sli-common,sli-provider,dblib-common,dblib-provider + org.onap.sdnc.northbound provided @@ -136,5 +140,4 @@ - diff --git a/vnfapi/installer/src/assembly/assemble_mvnrepo_zip.xml b/vnfapi/installer/src/assembly/assemble_mvnrepo_zip.xml index 0612e6ed..bfb308e2 100644 --- a/vnfapi/installer/src/assembly/assemble_mvnrepo_zip.xml +++ b/vnfapi/installer/src/assembly/assemble_mvnrepo_zip.xml @@ -42,12 +42,6 @@ - - - ../model/target/vnfapi.properties - ./configuration/vnfapi.properties - - diff --git a/vnfapi/model/pom.xml b/vnfapi/model/pom.xml index da38b467..2a134d32 100644 --- a/vnfapi/model/pom.xml +++ b/vnfapi/model/pom.xml @@ -1,134 +1,29 @@ 4.0.0 + - vnfapi - org.onap.sdnc.northbound - 1.3.0-SNAPSHOT + org.onap.ccsdk.parent + binding-parent + 1.0.1-SNAPSHOT + + + org.onap.sdnc.northbound vnfapi-model + 1.3.1-SNAPSHOT bundle - + sdnc-northbound :: vnfapi :: ${project.artifactId} - - - org.apache.felix - maven-bundle-plugin - true - - - * - - - - - org.opendaylight.yangtools - yang-maven-plugin - ${odl.yangtools.yang.maven.plugin.version} - - - org.opendaylight.mdsal - maven-sal-api-gen-plugin - ${odl.sal.api.gen.plugin.version} - jar - - - org.opendaylight.netconf - sal-rest-docgen-maven - ${odl.restconf.version} - jar - - - - - - generate-sources - - - ${yang.file.directory} - - - org.opendaylight.mdsal.binding.maven.api.gen.plugin.CodeGeneratorImpl - ${salGeneratorPath} - - - org.opendaylight.netconf.sal.rest.doc.maven.StaticDocGenerator - target/swagger - - - true - - - - - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - - - - python - - scripts/python/yang2props.py - src/main/yang/VNF-API.yang - target/vnfapi.properties - - - generation - generate-resources - - exec - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - attach-artifacts - - attach-artifact - - package - - - - ${project.build.directory}/vnfapi.properties - properties - vnfapi - - - - - - - - - - - org.opendaylight.mdsal - yang-binding - ${odl.mdsal.yang.binding.version} - - - org.opendaylight.yangtools - yang-common - ${odl.yangtools.version} - org.opendaylight.mdsal.model ietf-inet-types - ${odl.ietf-inet-types.version} org.opendaylight.mdsal.model ietf-yang-types - ${odl.ietf-yang-types.version} diff --git a/vnfapi/pom.xml b/vnfapi/pom.xml index 17403b05..e6de738d 100644 --- a/vnfapi/pom.xml +++ b/vnfapi/pom.xml @@ -1,58 +1,25 @@ - + 4.0.0 - org.onap.sdnc.northbound - sdnc-northbound - 1.3.0-SNAPSHOT + org.onap.ccsdk.parent + odlparent-lite + 1.0.1-SNAPSHOT + - pom org.onap.sdnc.northbound vnfapi - 1.3.0-SNAPSHOT - - - vnfapi - - - - - - - org.onap.sdnc.northbound - vnfapi-features - features - xml - ${project.version} - - - - org.onap.sdnc.northbound - vnfapi-model - ${project.version} - - - org.onap.sdnc.northbound - vnfapi-provider - ${project.version} - config - xml - - - org.onap.sdnc.northbound - vnfapi-provider - ${project.version} - - + 1.3.1-SNAPSHOT + pom - + sdnc-northbound :: vnfapi - - model - features - provider - installer - + + model + features + provider + installer + diff --git a/vnfapi/provider/pom.xml b/vnfapi/provider/pom.xml index 35021adb..5f3bb253 100644 --- a/vnfapi/provider/pom.xml +++ b/vnfapi/provider/pom.xml @@ -1,89 +1,67 @@ 4.0.0 + - vnfapi - org.onap.sdnc.northbound - 1.3.0-SNAPSHOT + org.onap.ccsdk.parent + binding-parent + 1.0.1-SNAPSHOT + + + org.onap.sdnc.northbound vnfapi-provider + 1.3.1-SNAPSHOT bundle - - - - org.apache.felix - maven-bundle-plugin - true - - - org.opendaylight.controller.config.yang.config.vnfapi_provider.impl - * - - - - - + sdnc-northbound :: vnfapi :: ${project.artifactId} org.onap.sdnc.northbound vnfapi-model - - - org.opendaylight.controller - config-api - ${odl.controller.config.api.version} + ${project.version} org.opendaylight.controller sal-binding-config - ${odl.mdsal.version} org.opendaylight.controller sal-binding-api - ${odl.mdsal.version} org.opendaylight.controller sal-common-util - ${odl.mdsal.version} org.onap.ccsdk.sli.core sli-common - ${sdnctl.sli.version} org.onap.ccsdk.sli.core sli-provider - ${sdnctl.sli.version} org.opendaylight.controller sal-test-model - ${odl.mdsal.version} test org.opendaylight.netconf sal-rest-connector - ${odl.mdsal.version} test org.opendaylight.controller sal-binding-broker-impl - ${odl.mdsal.version} test org.opendaylight.controller sal-binding-broker-impl - ${odl.mdsal.version} test-jar tests test @@ -93,7 +71,6 @@ junit junit - ${junit.version} test diff --git a/vnfapi/provider/src/main/java/org/onap/sdnc/vnfapi/VnfApiProvider.java b/vnfapi/provider/src/main/java/org/onap/sdnc/vnfapi/VnfApiProvider.java index 42d02419..1a05d2db 100644 --- a/vnfapi/provider/src/main/java/org/onap/sdnc/vnfapi/VnfApiProvider.java +++ b/vnfapi/provider/src/main/java/org/onap/sdnc/vnfapi/VnfApiProvider.java @@ -195,7 +195,7 @@ public class VnfApiProvider implements AutoCloseable, VNFAPIService, DataChangeL private static final String INVALID_INPUT_VNF_INSTANCE_STR = "invalid input, null or empty vnf-instance-id"; private VNFSDNSvcLogicServiceClient svcLogicClient; - + public VnfApiProvider(DataBroker dataBroker2, NotificationPublishService notificationPublishService, RpcProviderRegistry rpcProviderRegistry, VNFSDNSvcLogicServiceClient client) { log.info("Creating provider for " + APP_NAME); diff --git a/vnfapi/provider/src/test/java/org/onap/sdnc/vnfapi/VnfInstanceTopologyOperationTest.java b/vnfapi/provider/src/test/java/org/onap/sdnc/vnfapi/VnfInstanceTopologyOperationTest.java index d8cea301..72c0c9d5 100644 --- a/vnfapi/provider/src/test/java/org/onap/sdnc/vnfapi/VnfInstanceTopologyOperationTest.java +++ b/vnfapi/provider/src/test/java/org/onap/sdnc/vnfapi/VnfInstanceTopologyOperationTest.java @@ -109,6 +109,7 @@ class VnfApiProviderDataBrokerTestCustomizer extends ConcurrentDataBrokerTestCu ExceptionThrowerConfigurator exceptionThrowerConfigurator; public VnfApiProviderDataBrokerTestCustomizer(ExceptionThrowerConfigurator exceptionThrowerConfigurator) { + super(false); this.exceptionThrowerConfigurator = exceptionThrowerConfigurator; } diff --git a/vnftools/features/features-vnftools/pom.xml b/vnftools/features/features-vnftools/pom.xml new file mode 100644 index 00000000..2540cf3d --- /dev/null +++ b/vnftools/features/features-vnftools/pom.xml @@ -0,0 +1,29 @@ + + + 4.0.0 + + + org.onap.ccsdk.parent + feature-repo-parent + 1.0.1-SNAPSHOT + + + + org.onap.sdnc.northbound + features-vnftools + 1.3.1-SNAPSHOT + feature + + sdnc-northbound :: vnftools :: ${project.artifactId} + + + + ${project.groupId} + sdnc-vnftools + ${project.version} + xml + features + + + + diff --git a/vnftools/features/pom.xml b/vnftools/features/pom.xml index e16e2db7..64bd18f8 100644 --- a/vnftools/features/pom.xml +++ b/vnftools/features/pom.xml @@ -1,134 +1,23 @@ - 4.0.0 - - vnftools - org.onap.sdnc.northbound - 1.3.0-SNAPSHOT - - vnftools-features - VNF tools Plugin - Features - - jar - - - - - - org.onap.sdnc.northbound - vnftools-provider - ${project.version} - - - - commons-lang - commons-lang - 2.6 - compile - - - - org.opendaylight.mdsal - features-mdsal - ${odl.mdsal.features.version} - features - xml - - runtime - - - - - - org.opendaylight.controller - opendaylight-karaf-empty - ${odl.karaf.empty.distro.version} - zip - - - - - - org.opendaylight.odlparent - features-test - test - ${odl.commons.opendaylight.version} - - - - org.opendaylight.yangtools - features-yangtools - ${odl.yangtools.version} - features - xml - runtime - - - - - - - true - src/main/resources - - - - - org.apache.maven.plugins - maven-resources-plugin - - - filter - - resources - - generate-resources - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - attach-artifacts - - attach-artifact - - package - - - - ${project.build.directory}/classes/${features.file} - xml - features - - - - - - - - + 4.0.0 + + + org.onap.ccsdk.parent + odlparent-lite + 1.0.1-SNAPSHOT + + + + org.onap.sdnc.northbound + vnftools-features + 1.3.1-SNAPSHOT + pom + + sdnc-northbound :: vnftools :: ${project.artifactId} + + + sdnc-vnftools + features-vnftools + diff --git a/vnftools/features/sdnc-vnftools/pom.xml b/vnftools/features/sdnc-vnftools/pom.xml new file mode 100644 index 00000000..9eb11c3a --- /dev/null +++ b/vnftools/features/sdnc-vnftools/pom.xml @@ -0,0 +1,40 @@ + + + 4.0.0 + + + org.onap.ccsdk.parent + single-feature-parent + 1.0.1-SNAPSHOT + + + + org.onap.sdnc.northbound + sdnc-vnftools + 1.3.1-SNAPSHOT + feature + + sdnc-northbound :: vnftools :: ${project.artifactId} + + + + org.opendaylight.controller + odl-mdsal-broker + xml + features + + + org.onap.ccsdk.sli.core + ccsdk-sli + ${ccsdk.sli.core.version} + xml + features + + + ${project.groupId} + vnftools-provider + ${project.version} + + + + diff --git a/vnftools/features/src/main/resources/features.xml b/vnftools/features/src/main/resources/features.xml deleted file mode 100644 index 742efb47..00000000 --- a/vnftools/features/src/main/resources/features.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - mvn:org.opendaylight.controller/features-mdsal/${odl.mdsal.version}/xml/features - - - - - odl-mdsal-broker - sdnc-sli - mvn:org.onap.sdnc.northbound/vnftools-provider/${project.version} - - - diff --git a/vnftools/installer/pom.xml b/vnftools/installer/pom.xml index 134fb1ff..659a97c0 100755 --- a/vnftools/installer/pom.xml +++ b/vnftools/installer/pom.xml @@ -1,31 +1,35 @@ - + 4.0.0 + - vnftools - org.onap.sdnc.northbound - 1.3.0-SNAPSHOT + org.onap.ccsdk.parent + odlparent-lite + 1.0.1-SNAPSHOT + + org.onap.sdnc.northbound vnftools-installer - VNF Tools Plugin - Karaf Installer + 1.3.1-SNAPSHOT pom + sdnc-northbound :: vnftools :: ${project.artifactId} + sdnc-vnftools - sdnc-vnftools - mvn:org.onap.sdnc.northbound/vnftools-features/${project.version}/xml/features + ${application.name} + mvn:org.onap.sdnc.northbound/${application.name}/${project.version}/xml/features false - org.onap.sdnc.northbound - vnftools-features + ${project.groupId} + ${application.name} ${project.version} - features xml + features * @@ -100,8 +104,7 @@ true false false - org.onap.sdnc - sli-common,sli-provider,dblib-common,dblib-provider,sliPluginUtils-provider + org.onap.sdnc.northbound provided @@ -136,5 +139,4 @@ - diff --git a/vnftools/pom.xml b/vnftools/pom.xml index 1e58c729..ebdee6a1 100644 --- a/vnftools/pom.xml +++ b/vnftools/pom.xml @@ -1,34 +1,40 @@ - + + 4.0.0 + org.onap.sdnc.northbound sdnc-northbound 1.3.0-SNAPSHOT - 4.0.0 - pom org.onap.sdnc.northbound vnftools - - - vnftools - + 1.3.0-SNAPSHOT + pom VNF Tools Plugin Provides execute nodes to Directed Graphs that use the VNF Module. - 1.3.0-SNAPSHOT + + provider + features + installer + - + + vnftools + + + org.onap.sdnc.northbound vnftools-features - features - xml ${project.version} + xml + features @@ -40,10 +46,4 @@ - - - provider - features - installer - diff --git a/vnftools/provider/pom.xml b/vnftools/provider/pom.xml index 29ca7198..99d0d14a 100644 --- a/vnftools/provider/pom.xml +++ b/vnftools/provider/pom.xml @@ -1,89 +1,52 @@ - + 4.0.0 + - org.onap.sdnc.northbound - vnftools - 1.3.0-SNAPSHOT + org.onap.ccsdk.parent + binding-parent + 1.0.1-SNAPSHOT + + + org.onap.sdnc.northbound vnftools-provider + 1.3.1-SNAPSHOT bundle - VNF Tools Plugin - Provider - http://maven.apache.org + + sdnc-northbound :: vnftools :: ${project.artifactId} + UTF-8 + junit junit - ${junit.version} test org.mockito mockito-core - ${mockito.version} test org.onap.ccsdk.sli.core sli-common - ${sdnctl.sli.version} - compile org.onap.ccsdk.sli.core sli-provider - ${sdnctl.sli.version} - compile - - - equinoxSDK381 - org.eclipse.osgi - ${equinox.osgi.version} org.slf4j slf4j-api - ${slf4j.version} - - org.slf4j - jcl-over-slf4j - ${slf4j.version} - - org.onap.ccsdk.sli.core sliPluginUtils-provider - ${sdnctl.slipluginutils.version} - jar - compile + ${ccsdk.sli.core.version} - - - - - - - org.apache.felix - maven-bundle-plugin - ${bundle.plugin.version} - true - - - org.onap.sdnc.vnftools - org.onap.sdnc.vnftools.* - org.onap.sdnc.*,org.onap.ccsdk.*,org.osgi.framework.*,org.slf4j.*,java.net.*,org.apache.commons.* - *;scope=compile|runtime;artifactId=!sli-common|org.eclipse.osgi|mysql-connector-java|slf4j-api|jcl-over-slf4j|xml-apis|InetAddress|commons-lang3 - true - - - - - - -- 2.16.6