From d55beb2a5f9831c09601362b2e994e932ef9da74 Mon Sep 17 00:00:00 2001 From: "beili.zhou" Date: Fri, 11 Aug 2017 15:52:51 -0400 Subject: [APPC-44] command executor feature installer ONAP used karaf plugin installation which required each feature has installer, this one is adding the feature installer for command executor. Pre-change for APPC OAM operations. Issue-Id: APPC-44 Change-Id: I02080f4ee52ee0e9794237e11ef86f4c330de420 Signed-off-by: beili.zhou --- .../appc-command-executor-installer/.gitignore | 2 + .../appc-command-executor-installer/pom.xml | 137 +++++++++++++++++++++ .../src/assembly/assemble_installer_zip.xml | 60 +++++++++ .../src/assembly/assemble_mvnrepo_zip.xml | 51 ++++++++ .../src/main/resources/scripts/install-feature.sh | 63 ++++++++++ 5 files changed, 313 insertions(+) create mode 100644 appc-dispatcher/appc-command-executor/appc-command-executor-installer/.gitignore create mode 100644 appc-dispatcher/appc-command-executor/appc-command-executor-installer/pom.xml create mode 100644 appc-dispatcher/appc-command-executor/appc-command-executor-installer/src/assembly/assemble_installer_zip.xml create mode 100644 appc-dispatcher/appc-command-executor/appc-command-executor-installer/src/assembly/assemble_mvnrepo_zip.xml create mode 100644 appc-dispatcher/appc-command-executor/appc-command-executor-installer/src/main/resources/scripts/install-feature.sh (limited to 'appc-dispatcher/appc-command-executor/appc-command-executor-installer') diff --git a/appc-dispatcher/appc-command-executor/appc-command-executor-installer/.gitignore b/appc-dispatcher/appc-command-executor/appc-command-executor-installer/.gitignore new file mode 100644 index 000000000..731eb433c --- /dev/null +++ b/appc-dispatcher/appc-command-executor/appc-command-executor-installer/.gitignore @@ -0,0 +1,2 @@ +/target/ +/.settings/ diff --git a/appc-dispatcher/appc-command-executor/appc-command-executor-installer/pom.xml b/appc-dispatcher/appc-command-executor/appc-command-executor-installer/pom.xml new file mode 100644 index 000000000..d91d2e0f0 --- /dev/null +++ b/appc-dispatcher/appc-command-executor/appc-command-executor-installer/pom.xml @@ -0,0 +1,137 @@ + + + 4.0.0 + + org.openecomp.appc + appc-command-executor + 1.1.0-SNAPSHOT + + + appc-command-executor-installer + APPC Command Executor - Karaf Installer + pom + + + appc-command-executor + appc-command-executor + + mvn:org.openecomp.appc/appc-command-executor-features/${project.version}/xml/features + + false + + + + + org.openecomp.appc + appc-command-executor-features + ${project.version} + features + xml + + + * + * + + + + + org.openecomp.appc + appc-command-executor-api + ${project.version} + + + org.openecomp.appc + appc-command-executor-core + ${project.version} + + + + + + + maven-assembly-plugin + + + maven-repo-zip + + single + + package + + false + false + stage/${application.name}-${project.version} + + src/assembly/assemble_mvnrepo_zip.xml + + + + + installer-zip + + single + + package + + false + true + ${application.name}-${project.version} + + src/assembly/assemble_installer_zip.xml + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy-dependencies + + copy-dependencies + + prepare-package + + ${project.build.directory}/assembly/system + false + true + true + true + false + false + org.opendaylight + + + + + + maven-resources-plugin + + + copy-version + + copy-resources + + + validate + + ${basedir}/target/stage + + + src/main/resources/scripts + + install-feature.sh + + true + + + + + + + + + + diff --git a/appc-dispatcher/appc-command-executor/appc-command-executor-installer/src/assembly/assemble_installer_zip.xml b/appc-dispatcher/appc-command-executor/appc-command-executor-installer/src/assembly/assemble_installer_zip.xml new file mode 100644 index 000000000..df18e1889 --- /dev/null +++ b/appc-dispatcher/appc-command-executor/appc-command-executor-installer/src/assembly/assemble_installer_zip.xml @@ -0,0 +1,60 @@ + + + + + + controller + + zip + + + + false + + + + target/stage/ + ${application.name} + 755 + + *.sh + + + + target/stage/ + ${application.name} + 644 + + *.sh + + + + + diff --git a/appc-dispatcher/appc-command-executor/appc-command-executor-installer/src/assembly/assemble_mvnrepo_zip.xml b/appc-dispatcher/appc-command-executor/appc-command-executor-installer/src/assembly/assemble_mvnrepo_zip.xml new file mode 100644 index 000000000..4278b4d95 --- /dev/null +++ b/appc-dispatcher/appc-command-executor/appc-command-executor-installer/src/assembly/assemble_mvnrepo_zip.xml @@ -0,0 +1,51 @@ + + + + + + controller + + zip + + + + false + + + + target/assembly/ + . + + + + + + diff --git a/appc-dispatcher/appc-command-executor/appc-command-executor-installer/src/main/resources/scripts/install-feature.sh b/appc-dispatcher/appc-command-executor/appc-command-executor-installer/src/main/resources/scripts/install-feature.sh new file mode 100644 index 000000000..d3596c688 --- /dev/null +++ b/appc-dispatcher/appc-command-executor/appc-command-executor-installer/src/main/resources/scripts/install-feature.sh @@ -0,0 +1,63 @@ +### +# ============LICENSE_START======================================================= +# ONAP : APPC +# ================================================================================ +# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# ================================================================================ +# Copyright (C) 2017 Amdocs +# ============================================================================= +# 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. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. +# ============LICENSE_END========================================================= +### + +#!/bin/bash + +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 + +if [ -f ${REPOZIP} ] +then + unzip -n -d ${ODL_HOME} ${REPOZIP} +else + echo "ERROR : repo zip ($REPOZIP) not found" + exit 1 +fi + +COUNT=0 +while [ $COUNT -lt 10 ]; do + ${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} 2> /tmp/installErr + cat /tmp/installErr + if grep -q 'Failed to get the session' /tmp/installErr; then + sleep 10 + else + let COUNT=10 + fi + let COUNT=COUNT+1 +done +COUNT=0 +while [ $COUNT -lt 10 ]; do + ${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:install ${features.boot} 2> /tmp/installErr + cat /tmp/installErr + if grep -q 'Failed to get the session' /tmp/installErr; then + sleep 10 + else + let COUNT=10 + fi + let COUNT=COUNT+1 +done -- cgit 1.2.3-korg