From 8a3f1ea2bee98d30c74317fd31f83b6ea3ec4734 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Fri, 16 Feb 2018 17:12:41 -0500 Subject: Nitrogen port : mdsal/sql Update mdsal-resource and sql-resource to support ODL Nitrogen Change-Id: Id7f7ac2da0de9d034e052ee16ef9c2a765a056bf Issue-ID: CCSDK-176 Signed-off-by: Dan Timoney --- .../features/ccsdk-resource-assignment/pom.xml | 78 ++++++++++++ .../features/features-resource-assignment/pom.xml | 30 +++++ resource-assignment/features/pom.xml | 140 +++------------------ .../features/src/main/resources/features.xml | 41 ------ resource-assignment/installer/pom.xml | 44 +++++-- .../src/main/resources/scripts/install-feature.sh | 9 +- resource-assignment/pom.xml | 46 +++---- resource-assignment/provider/pom.xml | 49 +++----- 8 files changed, 190 insertions(+), 247 deletions(-) create mode 100644 resource-assignment/features/ccsdk-resource-assignment/pom.xml create mode 100755 resource-assignment/features/features-resource-assignment/pom.xml delete mode 100644 resource-assignment/features/src/main/resources/features.xml (limited to 'resource-assignment') diff --git a/resource-assignment/features/ccsdk-resource-assignment/pom.xml b/resource-assignment/features/ccsdk-resource-assignment/pom.xml new file mode 100644 index 000000000..c50cf3ca5 --- /dev/null +++ b/resource-assignment/features/ccsdk-resource-assignment/pom.xml @@ -0,0 +1,78 @@ + + + 4.0.0 + + + org.onap.ccsdk.parent + single-feature-parent + 1.0.1-SNAPSHOT + + + + org.onap.ccsdk.sli.adaptors + ccsdk-resource-assignment + 0.2.1-SNAPSHOT + feature + + ccsdk-sli-adaptors :: resource-assignment :: ${project.artifactId} + + + + org.opendaylight.controller + odl-mdsal-broker + xml + features + + + + org.onap.ccsdk.sli.core + ccsdk-sli + ${project.version} + xml + features + + + + org.onap.ccsdk.sli.core + ccsdk-dblib + ${project.version} + xml + features + + + + ${project.groupId} + resource-assignment-provider + ${project.version} + + + + org.mariadb.jdbc + mariadb-java-client + ${mariadb.connector.version} + jar + runtime + + + org.springframework + spring-beans + ${spring.version} + + + org.springframework + spring-context + ${spring.version} + + + org.springframework + spring-jdbc + ${spring.version} + + + equinoxSDK381 + org.eclipse.osgi + provided + + + diff --git a/resource-assignment/features/features-resource-assignment/pom.xml b/resource-assignment/features/features-resource-assignment/pom.xml new file mode 100755 index 000000000..1eace060a --- /dev/null +++ b/resource-assignment/features/features-resource-assignment/pom.xml @@ -0,0 +1,30 @@ + + + 4.0.0 + + + org.onap.ccsdk.parent + feature-repo-parent + 1.0.1-SNAPSHOT + + + + org.onap.ccsdk.sli.adaptors + features-resource-assignment + 0.2.1-SNAPSHOT + feature + + ccsdk-sli-adaptors :: resource-assignment :: ${project.artifactId} + + + + ${project.groupId} + ccsdk-resource-assignment + ${project.version} + xml + features + + + + diff --git a/resource-assignment/features/pom.xml b/resource-assignment/features/pom.xml index 584f1ca50..530a5bfe8 100755 --- a/resource-assignment/features/pom.xml +++ b/resource-assignment/features/pom.xml @@ -1,133 +1,23 @@ - + 4.0.0 + - resource-assignment - org.onap.ccsdk.sli.adaptors - 0.2.0-SNAPSHOT + org.onap.ccsdk.parent + odlparent-lite + 1.0.1-SNAPSHOT - resource-assignment-features - Resource Assignment Adaptor - Features - - jar - - - - - - org.onap.ccsdk.sli.adaptors - resource-assignment-provider - ${project.version} - - - - commons-lang - commons-lang - 2.6 - compile - - - org.opendaylight.mdsal - features-mdsal - ${odl.mdsal.features.version} - features - xml - - runtime - - - - - - org.opendaylight.odlparent - opendaylight-karaf-empty - ${odl.karaf.empty.distro.version} - zip - - - - - org.opendaylight.odlparent - features-test - ${odl.commons.opendaylight.version} - test - - - - org.opendaylight.yangtools - features-yangtools - ${odl.yangtools.version} - features - xml - runtime - - + org.onap.ccsdk.sli.adaptors + resource-assignment-features + 0.2.1-SNAPSHOT + pom - - - - 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 - - - - - - - - + + ccsdk-resource-assignment + features-resource-assignment + diff --git a/resource-assignment/features/src/main/resources/features.xml b/resource-assignment/features/src/main/resources/features.xml deleted file mode 100644 index c9161a635..000000000 --- a/resource-assignment/features/src/main/resources/features.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - mvn:org.opendaylight.mdsal/features-mdsal/${odl.mdsal.features.version}/xml/features - - - sdnc-sli - sdnc-dblib - spring - spring-jdbc - spring-dm - mvn:org.onap.ccsdk.sli.adaptors/resource-assignment-provider/${project.version} - mvn:org.mariadb.jdbc/mariadb-java-client/${mariadb.connector.version} - mvn:commons-lang/commons-lang/2.6 - - - diff --git a/resource-assignment/installer/pom.xml b/resource-assignment/installer/pom.xml index e875e4729..9b59cfff7 100755 --- a/resource-assignment/installer/pom.xml +++ b/resource-assignment/installer/pom.xml @@ -1,31 +1,36 @@ - + 4.0.0 + - resource-assignment - org.onap.ccsdk.sli.adaptors - 0.2.0-SNAPSHOT + org.onap.ccsdk.parent + odlparent-lite + 1.0.1-SNAPSHOT + + org.onap.ccsdk.sli.adaptors resource-assignment-installer - Resource allocator- Karaf Installer + 0.2.1-SNAPSHOT pom + ccsdk-sli-adaptors :: resource-assignment :: ${project.artifactId} + - sdnc-resource-assignment - sdnc-resource-assignment - mvn:org.onap.ccsdk.sli.adaptors/resource-assignment-features/${project.version}/xml/features + ccsdk-resource-assignment + ${application.name} + mvn:org.onap.ccsdk.sli.adaptors/${features.boot}/${project.version}/xml/features false - 2.6 org.onap.ccsdk.sli.adaptors - resource-assignment-features + ccsdk-resource-assignment ${project.version} - features xml + features * @@ -40,7 +45,21 @@ ${project.version} - + + org.springframework + spring-beans + ${spring.version} + + + org.springframework + spring-context + ${spring.version} + + + org.springframework + spring-jdbc + ${spring.version} + @@ -136,5 +155,4 @@ - diff --git a/resource-assignment/installer/src/main/resources/scripts/install-feature.sh b/resource-assignment/installer/src/main/resources/scripts/install-feature.sh index 2aaab4dfa..b631cdca6 100644 --- a/resource-assignment/installer/src/main/resources/scripts/install-feature.sh +++ b/resource-assignment/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/resource-assignment/pom.xml b/resource-assignment/pom.xml index 25a525795..299cb69c6 100755 --- a/resource-assignment/pom.xml +++ b/resource-assignment/pom.xml @@ -1,43 +1,27 @@ - + + 4.0.0 + - org.onap.ccsdk.sli.adaptors - ccsdk-sli-adaptors - 0.2.0-SNAPSHOT + org.onap.ccsdk.parent + odlparent-lite + 1.0.1-SNAPSHOT - 4.0.0 - pom org.onap.ccsdk.sli.adaptors resource-assignment - 0.2.0-SNAPSHOT - + 0.2.1-SNAPSHOT + pom - Resource Assignment Adaptor + ccsdk-sli-adaptors :: resource-assignment The resource assignment adaptor allows service logic to check and allocate network capacity - - - - org.onap.ccsdk.sli.adaptors - resource-assignment-features - features - xml - ${project.version} - + + provider + features + installer + - - org.onap.ccsdk.sli.adaptors - resource-assignment-provider - ${project.version} - - - - - provider - features - installer - - diff --git a/resource-assignment/provider/pom.xml b/resource-assignment/provider/pom.xml index 309c2a6f1..771ef0292 100755 --- a/resource-assignment/provider/pom.xml +++ b/resource-assignment/provider/pom.xml @@ -1,24 +1,32 @@ - + 4.0.0 + - org.onap.ccsdk.sli.adaptors - resource-assignment - 0.2.0-SNAPSHOT + org.onap.ccsdk.parent + binding-parent + 1.0.1-SNAPSHOT + + org.onap.ccsdk.sli.adaptors resource-assignment-provider + 0.2.1-SNAPSHOT bundle - Resource Assignment Adaptor - Provider + + ccsdk-sli-adaptors :: resource-assignment :: ${project.artifactId} http://maven.apache.org + UTF-8 + junit junit - test ${junit.version} + test org.springframework @@ -55,11 +63,7 @@ slf4j-api ${slf4j.version} - - org.slf4j - jcl-over-slf4j - ${slf4j.version} - + org.mariadb.jdbc mariadb-java-client @@ -83,25 +87,6 @@ ${spring.version} - - - - org.apache.felix - maven-bundle-plugin - ${bundle.plugin.version} - true - - - org.onap.ccsdk.sli.adaptors.ra - org.onap.ccsdk.sli.adaptors.ra - - *,org.onap.ccsdk.sli.core.dblib - - - - - + + -- cgit 1.2.3-korg