diff options
| author |   Patrick Brady <pb071s@att.com> | 2018-03-22 15:12:48 -0700 |
|---|---|---|
| committer | Patrick Brady <pb071s@att.com> | 2018-04-11 17:42:20 +0000 |
| commit | 5b81764739425ccb4a418947e1565a7f691f4204 (patch) | |
| tree | 245b7d69f2bc2c093c88bc9fb3c2c3757468e9c1 /appc-event-listener | |
| parent | abd3c649e4e50d9e1e995f81cb080e470eb02b48 (diff) | |
ODL Upgrade Method 2
Changes necessary to support upgrade to ODL Nitrogen,
while continuing to use Karaf 3 style features
Change-Id: I2edf619e0b889420c32793b958c0926b0311e71d
Signed-off-by: Patrick Brady <pb071s@att.com>
Issue-ID: APPC-403
Diffstat (limited to 'appc-event-listener')
| -rw-r--r-- | appc-event-listener/appc-event-listener-features/src/main/resources/features.xml | 10 | ||||
| -rw-r--r-- | appc-event-listener/appc-event-listener-installer/src/main/resources/scripts/install-feature.sh | 7 |
2 files changed, 8 insertions, 9 deletions
diff --git a/appc-event-listener/appc-event-listener-features/src/main/resources/features.xml b/appc-event-listener/appc-event-listener-features/src/main/resources/features.xml index 23612a123..020781911 100644 --- a/appc-event-listener/appc-event-listener-features/src/main/resources/features.xml +++ b/appc-event-listener/appc-event-listener-features/src/main/resources/features.xml @@ -3,7 +3,7 @@ ============LICENSE_START======================================================= ONAP : APPC ================================================================================ - Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. ================================================================================ Copyright (C) 2017 Amdocs ============================================================================= @@ -19,7 +19,6 @@ See the License for the specific language governing permissions and limitations under the License. - ECOMP is a trademark and service mark of AT&T Intellectual Property. ============LICENSE_END========================================================= --> @@ -29,14 +28,15 @@ xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0"> <!-- <repository>mvn:org.opendaylight.mdsal/features-mdsal/${odl.mdsal.version}/xml/features</repository> --> - <repository>mvn:org.opendaylight.mdsal/features-mdsal/${odl.mdsal.features.version}/xml/features</repository> + <!--<repository>mvn:org.opendaylight.mdsal/features-mdsal/${odl.mdsal.features.version}/xml/features</repository>--> <feature name='appc-event-listener' description="event listener" version='${project.version}'> <!-- Most applications will have a dependency on the ODL MD-SAL Broker --> -<!-- <feature version="${odl.mdsal.version}">odl-mdsal-broker</feature> --> - <feature version="${odl.mdsal.version}">odl-mdsal-broker</feature> +<!-- <feature >odl-mdsal-broker</feature> --> + <feature >odl-mdsal-broker</feature> <bundle dependency="true">mvn:org.onap.appc/appc-common/${project.version}</bundle> <bundle dependency="true">mvn:org.onap.appc/appc-metric-bundle/${project.version}</bundle> + <bundle>mvn:org.onap.ccsdk.sli.core/dblib-provider/${sdnctl.dblib.version}</bundle> <bundle>mvn:org.onap.appc/appc-event-listener-bundle/${project.version}</bundle> </feature> diff --git a/appc-event-listener/appc-event-listener-installer/src/main/resources/scripts/install-feature.sh b/appc-event-listener/appc-event-listener-installer/src/main/resources/scripts/install-feature.sh index 13d41ca56..24a74b833 100644 --- a/appc-event-listener/appc-event-listener-installer/src/main/resources/scripts/install-feature.sh +++ b/appc-event-listener/appc-event-listener-installer/src/main/resources/scripts/install-feature.sh @@ -2,7 +2,7 @@ # ============LICENSE_START======================================================= # ONAP : APPC # ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. # ================================================================================ # Copyright (C) 2017 Amdocs # ============================================================================= @@ -18,7 +18,6 @@ # See the License for the specific language governing permissions and # limitations under the License. # -# ECOMP is a trademark and service mark of AT&T Intellectual Property. # ============LICENSE_END========================================================= ### @@ -26,7 +25,7 @@ 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"} +ODL_KARAF_CLIENT_OPTS=${ODL_KARAF_CLIENT_OPTS:-""} INSTALLERDIR=$(dirname $0) REPOZIP=${INSTALLERDIR}/${features.boot}-${project.version}.zip @@ -52,7 +51,7 @@ while [ $COUNT -lt 10 ]; do done COUNT=0 while [ $COUNT -lt 10 ]; do - ${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:install ${features.boot} 2> /tmp/installErr + 2> /tmp/installErr cat /tmp/installErr if grep -q 'Failed to get the session' /tmp/installErr; then sleep 10 |