From 1ad367386f315646cec9cd4b179e8e941a19970a Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Tue, 6 Jun 2023 06:21:43 -0400 Subject: Add installer for Bierman API Add installer for Bierman API feature Issue-ID: CCSDK-3876 Signed-off-by: Dan Timoney Change-Id: Ia9228e18579ed37a8ed6b9800f06a77ca7faad3c --- .../restconf/odl-restconf-nb-bierman02/pom.xml | 6 - netconf/restconf/pom.xml | 1 + .../restconf-nb-bierman02-installer/pom.xml | 161 +++++++++++++++++++++ .../src/assembly/assemble_installer_zip.xml | 58 ++++++++ .../src/assembly/assemble_mvnrepo_zip.xml | 48 ++++++ .../src/main/resources/scripts/install-feature.sh | 18 +++ 6 files changed, 286 insertions(+), 6 deletions(-) create mode 100755 netconf/restconf/restconf-nb-bierman02-installer/pom.xml create mode 100755 netconf/restconf/restconf-nb-bierman02-installer/src/assembly/assemble_installer_zip.xml create mode 100755 netconf/restconf/restconf-nb-bierman02-installer/src/assembly/assemble_mvnrepo_zip.xml create mode 100755 netconf/restconf/restconf-nb-bierman02-installer/src/main/resources/scripts/install-feature.sh diff --git a/netconf/features/restconf/odl-restconf-nb-bierman02/pom.xml b/netconf/features/restconf/odl-restconf-nb-bierman02/pom.xml index 9a18633..925e29f 100644 --- a/netconf/features/restconf/odl-restconf-nb-bierman02/pom.xml +++ b/netconf/features/restconf/odl-restconf-nb-bierman02/pom.xml @@ -40,12 +40,6 @@ restconf-nb-bierman02 ${project.version} - - org.opendaylight.netconf - sal-rest-connector-config - cfg - restconf - diff --git a/netconf/restconf/pom.xml b/netconf/restconf/pom.xml index dc270fb..817923f 100644 --- a/netconf/restconf/pom.xml +++ b/netconf/restconf/pom.xml @@ -30,6 +30,7 @@ restconf-common restconf-nb-bierman02 + restconf-nb-bierman02-installer diff --git a/netconf/restconf/restconf-nb-bierman02-installer/pom.xml b/netconf/restconf/restconf-nb-bierman02-installer/pom.xml new file mode 100755 index 0000000..60eb277 --- /dev/null +++ b/netconf/restconf/restconf-nb-bierman02-installer/pom.xml @@ -0,0 +1,161 @@ + + + + 4.0.0 + + + org.opendaylight.netconf + netconf-parent + 4.0.4 + + + + org.onap.ccsdk.odl-legacy.netconf + restconf-nb-bierman02-installer + 1.0.0-SNAPSHOT + pom + + ccsdk-odl-legacy :: ${project.artifactId} + + + odl-restconf-nb-bierman02 + ${application.name} + mvn:org.onap.ccsdk.odl-legacy/${features.boot}/${project.version}/xml/features + false + + + + + + org.onap.ccsdk.odl-legacy.netconf + ${application.name} + ${project.version} + xml + features + + + * + * + + + + + org.onap.ccsdk.odl-legacy.netconf + restconf-nb-bierman02 + ${project.version} + + + + + + + maven-assembly-plugin + + + maven-repo-zip + + single + + package + + true + stage/${application.name}-${project.version} + + src/assembly/assemble_mvnrepo_zip.xml + + true + + + + installer-zip + + single + + package + + true + ${application.name}-${project.version}-installer + + src/assembly/assemble_installer_zip.xml + + false + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy-dependencies + + copy-dependencies + + prepare-package + + false + ${project.build.directory}/assembly/system + false + true + true + true + false + false + provided + + + + + + + maven-resources-plugin + 2.6 + + + copy-version + + copy-resources + + validate + + ${basedir}/target/stage + + + src/main/resources/scripts + + install-feature.sh + + true + + + + + + + + + + + diff --git a/netconf/restconf/restconf-nb-bierman02-installer/src/assembly/assemble_installer_zip.xml b/netconf/restconf/restconf-nb-bierman02-installer/src/assembly/assemble_installer_zip.xml new file mode 100755 index 0000000..6146ebb --- /dev/null +++ b/netconf/restconf/restconf-nb-bierman02-installer/src/assembly/assemble_installer_zip.xml @@ -0,0 +1,58 @@ + + + + + + installer_zip + + + zip + + + + false + + + + target/stage/ + ${application.name} + 755 + + *.sh + + + + target/stage/ + ${application.name} + 644 + + *.sh + + + + + diff --git a/netconf/restconf/restconf-nb-bierman02-installer/src/assembly/assemble_mvnrepo_zip.xml b/netconf/restconf/restconf-nb-bierman02-installer/src/assembly/assemble_mvnrepo_zip.xml new file mode 100755 index 0000000..325b72b --- /dev/null +++ b/netconf/restconf/restconf-nb-bierman02-installer/src/assembly/assemble_mvnrepo_zip.xml @@ -0,0 +1,48 @@ + + + + + + repo + + + zip + + + + false + + + + target/assembly/ + . + + + + + + diff --git a/netconf/restconf/restconf-nb-bierman02-installer/src/main/resources/scripts/install-feature.sh b/netconf/restconf/restconf-nb-bierman02-installer/src/main/resources/scripts/install-feature.sh new file mode 100755 index 0000000..e16e79a --- /dev/null +++ b/netconf/restconf/restconf-nb-bierman02-installer/src/main/resources/scripts/install-feature.sh @@ -0,0 +1,18 @@ +#!/bin/bash + +ODL_HOME=${ODL_HOME:-/opt/opendaylight/current} +ODL_KARAF_CLIENT=${ODL_KARAF_CLIENT:-${ODL_HOME}/bin/client} +INSTALLERDIR=$(dirname $0) + +REPOZIP=${INSTALLERDIR}/${features.boot}-${project.version}.zip + +if [ -f ${REPOZIP} ] +then + unzip -d ${ODL_HOME} ${REPOZIP} +else + echo "ERROR : repo zip ($REPOZIP) not found" + exit 1 +fi + +${ODL_KARAF_CLIENT} feature:repo-add ${features.repositories} +${ODL_KARAF_CLIENT} feature:install ${features.boot} -- cgit 1.2.3-korg