From 24a1a1b4a46330e9c5fa54ddabe3d01c3c60571f Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Mon, 21 Aug 2017 10:27:47 -0400 Subject: [PATCH] Add platform DGs to distribution Add platform DGs needed by ODL-SLI docker container to distribution repo. Change-Id: I01c4a466da7bd986447cb44629fee61038664592 Issue-ID: CCSDK-27 Signed-off-by: Dan Timoney --- opendaylight/pom.xml | 4 +- platform-logic/.gitignore | 12 + platform-logic/asdc-api/pom.xml | 57 ++++ .../json/ASDC-API_vf-license-model-update.json | 346 +++++++++++++++++++++ .../asdc-api/src/main/resources/graph.versions | 1 + .../main/xml/ASDC-API_vf-license-model-update.xml | 78 +++++ platform-logic/installer/pom.xml | 129 ++++++++ .../installer/src/assembly/assemble_zip.xml | 71 +++++ .../src/main/resources/svclogic.properties | 26 ++ .../installer/src/main/scripts/install.sh | 54 ++++ .../installer/src/main/scripts/setenv.sh | 45 +++ .../installer/src/main/scripts/showActiveGraphs.sh | 29 ++ .../installer/src/main/scripts/svclogic.sh | 32 ++ platform-logic/pom.xml | 34 ++ platform-logic/sliapi/pom.xml | 57 ++++ .../sliapi/src/main/json/sli_healthcheck.json | 4 + .../sliapi/src/main/resources/graph.versions | 1 + .../sliapi/src/main/xml/sli_healthcheck.xml | 27 ++ pom.xml | 41 +-- ubuntu/pom.xml | 4 +- 20 files changed, 1028 insertions(+), 24 deletions(-) create mode 100644 platform-logic/.gitignore create mode 100644 platform-logic/asdc-api/pom.xml create mode 100644 platform-logic/asdc-api/src/main/json/ASDC-API_vf-license-model-update.json create mode 100644 platform-logic/asdc-api/src/main/resources/graph.versions create mode 100644 platform-logic/asdc-api/src/main/xml/ASDC-API_vf-license-model-update.xml create mode 100644 platform-logic/installer/pom.xml create mode 100644 platform-logic/installer/src/assembly/assemble_zip.xml create mode 100644 platform-logic/installer/src/main/resources/svclogic.properties create mode 100644 platform-logic/installer/src/main/scripts/install.sh create mode 100644 platform-logic/installer/src/main/scripts/setenv.sh create mode 100644 platform-logic/installer/src/main/scripts/showActiveGraphs.sh create mode 100644 platform-logic/installer/src/main/scripts/svclogic.sh create mode 100644 platform-logic/pom.xml create mode 100644 platform-logic/sliapi/pom.xml create mode 100644 platform-logic/sliapi/src/main/json/sli_healthcheck.json create mode 100644 platform-logic/sliapi/src/main/resources/graph.versions create mode 100644 platform-logic/sliapi/src/main/xml/sli_healthcheck.xml diff --git a/opendaylight/pom.xml b/opendaylight/pom.xml index c35546dc..9de65fd0 100644 --- a/opendaylight/pom.xml +++ b/opendaylight/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.distribution distribution-root - 0.0.1-SNAPSHOT + 0.1.0-SNAPSHOT 4.0.0 pom distribution-opendaylight - 0.0.1-SNAPSHOT + 0.1.0-SNAPSHOT Distribution - opendaylight Creates OpenDaylight container diff --git a/platform-logic/.gitignore b/platform-logic/.gitignore new file mode 100644 index 00000000..1b8a6ba9 --- /dev/null +++ b/platform-logic/.gitignore @@ -0,0 +1,12 @@ +org.eclipse.core.resources.prefs +.classpath +.project +.settings +.idea +.externalToolBuilders +maven-eclipse.xml +*.class +target/ +MANIFEST.MF +.DS_STORE +.metadata diff --git a/platform-logic/asdc-api/pom.xml b/platform-logic/asdc-api/pom.xml new file mode 100644 index 00000000..9457d34d --- /dev/null +++ b/platform-logic/asdc-api/pom.xml @@ -0,0 +1,57 @@ + + + + + org.onap.ccsdk.distribution + distribution-platform-logic + 0.1.0-SNAPSHOT + + + 4.0.0 + pom + platform-logic-asdcapi + 0.1.0-SNAPSHOT + + Platform Logic : ASDC-API + Contains platform-level service logic for the ASDC-API + + + + + + maven-resources-plugin + 2.6 + + + copy-version + + copy-resources + + validate + + ../target/graphs/asdcapi + + + src/main/xml + + *.xml + + true + + + src/main/resources + + graph.versions + + true + + + + + + + + + + diff --git a/platform-logic/asdc-api/src/main/json/ASDC-API_vf-license-model-update.json b/platform-logic/asdc-api/src/main/json/ASDC-API_vf-license-model-update.json new file mode 100644 index 00000000..de6d6a05 --- /dev/null +++ b/platform-logic/asdc-api/src/main/json/ASDC-API_vf-license-model-update.json @@ -0,0 +1,346 @@ + + + +[ + { + "id": "c7f3b902.c0fcc8", + "type": "dgstart", + "name": "DGSTART", + "outputs": 1, + "x": 148, + "y": 123, + "z": "b94f5cde.40937", + "wires": [ + [ + "72236e27.a51f78" + ] + ] + }, + { + "id": "612aaed1.f30978", + "type": "comment", + "name": "ASDC update to VF license model", + "info": "", + "comments": "", + "x": 550, + "y": 45, + "z": "b94f5cde.40937", + "wires": [] + }, + { + "id": "72236e27.a51f78", + "type": "service-logic", + "name": "ASDC-API 1.0.0", + "module": "ASDC-API", + "version": "${project.version}", + "comments": "", + "xml": "", + "outputs": 1, + "x": 340, + "y": 124, + "z": "b94f5cde.40937", + "wires": [ + [ + "e6c56f71.e6a96" + ] + ] + }, + { + "id": "e6c56f71.e6a96", + "type": "method", + "name": "method vf-license-model-update", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 588, + "y": 124, + "z": "b94f5cde.40937", + "wires": [ + [ + "90b82ce5.7ff2a" + ] + ] + }, + { + "id": "90b82ce5.7ff2a", + "type": "block", + "name": "block", + "xml": "\n", + "atomic": "false", + "comments": "", + "outputs": 1, + "x": 222, + "y": 230, + "z": "b94f5cde.40937", + "wires": [ + [ + "6a527c25.be62c4", + "b37c86cb.130b8", + "1c4b640e.56b174" + ] + ] + }, + { + "id": "6a527c25.be62c4", + "type": "GenericXML", + "name": "record", + "xml": "\n\n\n", + "comments": "", + "outputs": 1, + "x": 374, + "y": 230, + "z": "b94f5cde.40937", + "wires": [ + [] + ] + }, + { + "id": "b37c86cb.130b8", + "type": "set", + "name": "set resource-plugin", + "xml": "\n\n", + "comments": "", + "outputs": 1, + "x": 410, + "y": 281, + "z": "b94f5cde.40937", + "wires": [ + [] + ] + }, + { + "id": "1c4b640e.56b174", + "type": "switchNode", + "name": "switch: length of feature-group list > 0", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 459, + "y": 344, + "z": "b94f5cde.40937", + "wires": [ + [ + "1b40f4f1.7134f3" + ] + ] + }, + { + "id": "1b40f4f1.7134f3", + "type": "outcomeTrue", + "name": "true", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 695, + "y": 343, + "z": "b94f5cde.40937", + "wires": [ + [ + "9b76ec90.614c08" + ] + ] + }, + { + "id": "9b76ec90.614c08", + "type": "for", + "name": "for: feature groups", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 855, + "y": 343, + "z": "b94f5cde.40937", + "wires": [ + [ + "3dbfa83c.5d206" + ] + ] + }, + { + "id": "44241b8a.fe4ddc", + "type": "save", + "name": "save VNF_MODEL_LICENSES", + "xml": "\n\n\n\n\n\n", + "comments": "", + "outputs": 1, + "x": 1254, + "y": 544, + "z": "b94f5cde.40937", + "wires": [ + [] + ] + }, + { + "id": "90633ed7.848e18", + "type": "switchNode", + "name": "switch: length of license key groups == 0", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 1275, + "y": 294, + "z": "b94f5cde.40937", + "wires": [ + [ + "a36e3c96.3c6238", + "fb2fe0dd.5e4d38" + ] + ] + }, + { + "id": "a36e3c96.3c6238", + "type": "outcomeTrue", + "name": "true", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 1523, + "y": 293, + "z": "b94f5cde.40937", + "wires": [ + [ + "fc3c75a8.272ad" + ] + ] + }, + { + "id": "fc3c75a8.272ad", + "type": "set", + "name": "set license required to 0", + "xml": "\n\n\n", + "comments": "", + "outputs": 1, + "x": 1737, + "y": 293, + "z": "b94f5cde.40937", + "wires": [ + [] + ] + }, + { + "id": "fb2fe0dd.5e4d38", + "type": "outcomeFalse", + "name": "false", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 1521, + "y": 346, + "z": "b94f5cde.40937", + "wires": [ + [ + "2d606ecc.b12bba" + ] + ] + }, + { + "id": "2d606ecc.b12bba", + "type": "set", + "name": "set license required to 1", + "xml": "\n\n\n", + "comments": "", + "outputs": 1, + "x": 1732, + "y": 348, + "z": "b94f5cde.40937", + "wires": [ + [] + ] + }, + { + "id": "64fd0671.15f188", + "type": "switchNode", + "name": "switch: length of entitlement pool == 0", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 1277, + "y": 405, + "z": "b94f5cde.40937", + "wires": [ + [ + "7ebbe15a.bb3988", + "9213bc2a.81103" + ] + ] + }, + { + "id": "7ebbe15a.bb3988", + "type": "outcomeTrue", + "name": "true", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 1525, + "y": 404, + "z": "b94f5cde.40937", + "wires": [ + [ + "eb5a3c7b.4c3dc" + ] + ] + }, + { + "id": "eb5a3c7b.4c3dc", + "type": "set", + "name": "set entitlement required to 0", + "xml": "\n\n\n", + "comments": "", + "outputs": 1, + "x": 1739, + "y": 404, + "z": "b94f5cde.40937", + "wires": [ + [] + ] + }, + { + "id": "9213bc2a.81103", + "type": "outcomeFalse", + "name": "false", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 1523, + "y": 457, + "z": "b94f5cde.40937", + "wires": [ + [ + "b64ce482.a1f508" + ] + ] + }, + { + "id": "b64ce482.a1f508", + "type": "set", + "name": "set entitlement required to 1", + "xml": "\n\n\n", + "comments": "", + "outputs": 1, + "x": 1734, + "y": 459, + "z": "b94f5cde.40937", + "wires": [ + [] + ] + }, + { + "id": "3dbfa83c.5d206", + "type": "block", + "name": "block", + "xml": "\n", + "atomic": "false", + "comments": "", + "outputs": 1, + "x": 1022, + "y": 344, + "z": "b94f5cde.40937", + "wires": [ + [ + "90633ed7.848e18", + "64fd0671.15f188", + "44241b8a.fe4ddc" + ] + ] + } +] diff --git a/platform-logic/asdc-api/src/main/resources/graph.versions b/platform-logic/asdc-api/src/main/resources/graph.versions new file mode 100644 index 00000000..43271614 --- /dev/null +++ b/platform-logic/asdc-api/src/main/resources/graph.versions @@ -0,0 +1 @@ +ASDC-API vf-license-model-update ${project.version} sync diff --git a/platform-logic/asdc-api/src/main/xml/ASDC-API_vf-license-model-update.xml b/platform-logic/asdc-api/src/main/xml/ASDC-API_vf-license-model-update.xml new file mode 100644 index 00000000..c6d079ce --- /dev/null +++ b/platform-logic/asdc-api/src/main/xml/ASDC-API_vf-license-model-update.xml @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/platform-logic/installer/pom.xml b/platform-logic/installer/pom.xml new file mode 100644 index 00000000..f6b8578b --- /dev/null +++ b/platform-logic/installer/pom.xml @@ -0,0 +1,129 @@ + + + + + org.onap.ccsdk.distribution + distribution-platform-logic + 0.1.0-SNAPSHOT + + + 4.0.0 + pom + platform-logic-installer + 0.1.0-SNAPSHOT + + Platform Logic Installer + Contains platform-level service logic installer + + + + + + + maven-resources-plugin + 2.6 + + + copy-version + + copy-resources + + validate + + target/resources + + + src/main/resources + + * + + true + + + + + + + + maven-assembly-plugin + 2.6 + + + create-zip + + single + + package + + true + + src/assembly/assemble_zip.xml + + false + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy-dependencies + + copy-dependencies + + prepare-package + + false + ${project.build.directory}/lib + false + true + true + false + false + false + provided + + + + + + + + + + org.slf4j + slf4j-api + ${slf4j.version} + + + org.slf4j + slf4j-simple + 1.7.5 + compile + + + org.onap.ccsdk.sli.core + sli-common + ${sdnctl.sli.version} + + + org.antlr + antlr4 + ${antlr.version} + jar + compile + + + mysql + mysql-connector-java + ${mysql.connector.version} + jar + compile + + + + diff --git a/platform-logic/installer/src/assembly/assemble_zip.xml b/platform-logic/installer/src/assembly/assemble_zip.xml new file mode 100644 index 00000000..46a8b610 --- /dev/null +++ b/platform-logic/installer/src/assembly/assemble_zip.xml @@ -0,0 +1,71 @@ + + + + + + bin + + zip + + + false + + + + ../target/graphs + svclogic/graphs + + **/*.xml + **/graph.versions + + + + + src/main/scripts + svclogic/bin + + *.sh + + 0755 + + + target/resources + svclogic/config + + * + + + + target/lib + svclogic/lib + + *.jar + + + + + + + diff --git a/platform-logic/installer/src/main/resources/svclogic.properties b/platform-logic/installer/src/main/resources/svclogic.properties new file mode 100644 index 00000000..9ffc298f --- /dev/null +++ b/platform-logic/installer/src/main/resources/svclogic.properties @@ -0,0 +1,26 @@ +### +# ============LICENSE_START======================================================= +# openECOMP : SDN-C +# ================================================================================ +# Copyright (C) 2017 AT&T Intellectual Property. All rights +# reserved. +# ================================================================================ +# 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. +# ============LICENSE_END========================================================= +### + +org.onap.ccsdk.sli.dbtype = jdbc +org.onap.ccsdk.sli.jdbc.url = jdbc:mysql://sdnctldb01:3306/sdnctl +org.onap.ccsdk.sli.jdbc.database = sdnctl +org.onap.ccsdk.sli.jdbc.user = sdnctl +org.onap.ccsdk.sli.jdbc.password = gamma diff --git a/platform-logic/installer/src/main/scripts/install.sh b/platform-logic/installer/src/main/scripts/install.sh new file mode 100644 index 00000000..2c32e93a --- /dev/null +++ b/platform-logic/installer/src/main/scripts/install.sh @@ -0,0 +1,54 @@ +#!/bin/bash + +### +# ============LICENSE_START======================================================= +# openECOMP : SDN-C +# ================================================================================ +# Copyright (C) 2017 AT&T Intellectual Property. All rights +# reserved. +# ================================================================================ +# 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. +# ============LICENSE_END========================================================= +### + +BASEDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )" + + +# Load directed graphs + + +for graphlist in $(find $BASEDIR/graphs -name graph.versions -print) +do + curdir=$(dirname $graphlist) + + # Load files from directory containing graph.versions file + echo "Loading graphs from $curdir" + for file in $(ls $curdir/*.xml) + do + echo "Loading $file ..." + $BASEDIR/bin/svclogic.sh load $file $BASEDIR/config/svclogic.properties + done + + # Activate directed graphs + while read module rpc version mode + do + echo "Activating $module $rpc $version $mode" + $BASEDIR/bin/svclogic.sh activate $module $rpc $version $mode $BASEDIR/config/svclogic.properties + done < $graphlist +done + + + + + + diff --git a/platform-logic/installer/src/main/scripts/setenv.sh b/platform-logic/installer/src/main/scripts/setenv.sh new file mode 100644 index 00000000..c5e520f8 --- /dev/null +++ b/platform-logic/installer/src/main/scripts/setenv.sh @@ -0,0 +1,45 @@ +#!/bin/bash + +### +# ============LICENSE_START======================================================= +# openECOMP : SDN-C +# ================================================================================ +# Copyright (C) 2017 AT&T Intellectual Property. All rights +# reserved. +# ================================================================================ +# 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. +# ============LICENSE_END========================================================= +### + +SDNC_CONFIG_DIR=${SDNC_CONFIG_DIR:-/opt/sdnc/data/properties} + +AAIURI=$(grep org.onap.ccsdk.sli.aai.uri ${SDNC_CONFIG_DIR}/aaiclient.properties | grep -v '#' | cut -d'=' -f2) + +MYSQL_USER=$(grep org.onap.ccsdk.sli.jdbc.user ${SDNC_CONFIG_DIR}/dblib.properties | grep -v '#' | cut -d'=' -f2) +MYSQL_PWD=$(grep org.onap.ccsdk.sli.jdbc.password ${SDNC_CONFIG_DIR}/dblib.properties | grep -v '#' | cut -d'=' -f2) +MYSQL_DB=$(grep org.onap.ccsdk.sli.jdbc.database ${SDNC_CONFIG_DIR}/dblib.properties | grep -v '#' | cut -d'=' -f2) +MYSQL_SERVER=$(grep org.onap.ccsdk.sli.jdbc.hosts ${SDNC_CONFIG_DIR}/dblib.properties | grep -v '#' | cut -d'=' -f2 | cut -d',' -f1) + +ODLUSER=$(grep controllerUser ${SDNC_CONFIG_DIR}/backup.properties | grep -v '#' | cut -d'=' -f2) +ODLPWD=$(grep controllerPass ${SDNC_CONFIG_DIR}/backup.properties | grep -v '#' | cut -d'=' -f2) + +ODLHOST=$(grep odlNodes ${SDNC_CONFIG_DIR}/backup.properties | grep -v '#' | cut -d'=' -f2|cut -d',' -f1) +ODLPORT=$(grep controllerPort ${SDNC_CONFIG_DIR}/backup.properties | grep -v '#' | cut -d'=' -f2) +if [ $ODLPORT = 8443 ] +then + ODLPROTO=https +else + ODLPROTO=http +fi + +unset HTTP_PROXY HTTPS_PROXY http_proxy https_proxy diff --git a/platform-logic/installer/src/main/scripts/showActiveGraphs.sh b/platform-logic/installer/src/main/scripts/showActiveGraphs.sh new file mode 100644 index 00000000..9b89e9cf --- /dev/null +++ b/platform-logic/installer/src/main/scripts/showActiveGraphs.sh @@ -0,0 +1,29 @@ +### +# ============LICENSE_START======================================================= +# openECOMP : SDN-C +# ================================================================================ +# Copyright (C) 2017 AT&T Intellectual Property. All rights +# reserved. +# ================================================================================ +# 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. +# ============LICENSE_END========================================================= +### + +MYSQL_USER=${MYSQL_USER:-sdnctl} +MYSQL_PWD=${MYSQL_PWD:-gamma} +MYSQL_DB=${MYSQL_DB:-sdnctl} +MYSQL_HOST=${MYSQL_HOST:-dbhost} + +mysql --user=${MYSQL_USER} --password=${MYSQL_PWD} --host=${MYSQL_HOST} ${MYSQL_DB} <<-END +SELECT module, rpc, version, mode from SVC_LOGIC where active='Y'; +END diff --git a/platform-logic/installer/src/main/scripts/svclogic.sh b/platform-logic/installer/src/main/scripts/svclogic.sh new file mode 100644 index 00000000..1d6dd2da --- /dev/null +++ b/platform-logic/installer/src/main/scripts/svclogic.sh @@ -0,0 +1,32 @@ +#!/bin/bash + +### +# ============LICENSE_START======================================================= +# openECOMP : SDN-C +# ================================================================================ +# Copyright (C) 2017 AT&T Intellectual Property. All rights +# reserved. +# ================================================================================ +# 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. +# ============LICENSE_END========================================================= +### + +BASEDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )" +JARDIR=${BASEDIR}/lib + +for jar in $JARDIR/*.jar +do + CLASSPATH=$CLASSPATH:${jar} +done + +java -cp ${CLASSPATH}:${MYSQL_JDBC_DRIVER} org.onap.ccsdk.sli.core.sli.SvcLogicParser $* diff --git a/platform-logic/pom.xml b/platform-logic/pom.xml new file mode 100644 index 00000000..3ce0b570 --- /dev/null +++ b/platform-logic/pom.xml @@ -0,0 +1,34 @@ + + + + + org.onap.ccsdk.distribution + distribution-root + 0.1.0-SNAPSHOT + + + 4.0.0 + pom + distribution-platform-logic + 0.1.0-SNAPSHOT + + Platform Logic + Contains platform-level service logic + + + platform-logic + + yyMMdd-HHmmss + ${maven.build.timestamp} + + + + asdc-api + sliapi + installer + + + openECOMP + + diff --git a/platform-logic/sliapi/pom.xml b/platform-logic/sliapi/pom.xml new file mode 100644 index 00000000..ef047a8d --- /dev/null +++ b/platform-logic/sliapi/pom.xml @@ -0,0 +1,57 @@ + + + + + org.onap.ccsdk.distribution + distribution-platform-logic + 0.1.0-SNAPSHOT + + + 4.0.0 + pom + platform-logic-sliapi + 0.1.0-SNAPSHOT + + Platform Logic : SLI-API + Contains platform-level service logic for the SLI-API + + + + + + maven-resources-plugin + 2.6 + + + copy-version + + copy-resources + + validate + + ../target/graphs/sliapi + + + src/main/xml + + *.xml + + true + + + src/main/resources + + graph.versions + + true + + + + + + + + + + diff --git a/platform-logic/sliapi/src/main/json/sli_healthcheck.json b/platform-logic/sliapi/src/main/json/sli_healthcheck.json new file mode 100644 index 00000000..e9394675 --- /dev/null +++ b/platform-logic/sliapi/src/main/json/sli_healthcheck.json @@ -0,0 +1,4 @@ + + + +[{"id":"dbe3f1ee.ed5bb8","type":"dgstart","name":"DGSTART","outputs":1,"x":130,"y":52,"z":"95339741.be0da","wires":[["e5677e2c.75636"]]},{"id":"e5677e2c.75636","type":"service-logic","name":"sli ${project.version}","module":"sli","version":"${project.version}","comments":"","xml":"","outputs":1,"x":169,"y":117,"z":"95339741.be0da","wires":[["2abd790.d32b188"]]},{"id":"2abd790.d32b188","type":"method","name":"method healthcheck","xml":"\n","comments":"","outputs":1,"x":212,"y":184,"z":"95339741.be0da","wires":[["33013f8c.9c1dc8"]]},{"id":"33013f8c.9c1dc8","type":"set","name":"set return message","xml":"\n\n\n\n","comments":"","x":263,"y":264,"z":"95339741.be0da","wires":[]}] diff --git a/platform-logic/sliapi/src/main/resources/graph.versions b/platform-logic/sliapi/src/main/resources/graph.versions new file mode 100644 index 00000000..d0cdbdc3 --- /dev/null +++ b/platform-logic/sliapi/src/main/resources/graph.versions @@ -0,0 +1 @@ +sli healthcheck ${project.version} sync diff --git a/platform-logic/sliapi/src/main/xml/sli_healthcheck.xml b/platform-logic/sliapi/src/main/xml/sli_healthcheck.xml new file mode 100644 index 00000000..c176767e --- /dev/null +++ b/platform-logic/sliapi/src/main/xml/sli_healthcheck.xml @@ -0,0 +1,27 @@ + + + + + + + + diff --git a/pom.xml b/pom.xml index 7ed792e3..0b677627 100644 --- a/pom.xml +++ b/pom.xml @@ -1,32 +1,33 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - - org.onap.ccsdk.parent - odlparent-boron-sr3 - 0.0.1-SNAPSHOT - + + org.onap.ccsdk.parent + odlparent-carbon-sr1 + 0.0.1-SNAPSHOT + - 4.0.0 - pom - org.onap.ccsdk.distribution - distribution-root - 0.0.1-SNAPSHOT + 4.0.0 + pom + org.onap.ccsdk.distribution + distribution-root + 0.1.0-SNAPSHOT - Distribution - Creates distributuon bundles for CCSDK + Distribution + Creates distributuon bundles for CCSDK - - distribution + + distribution - yyMMdd-HHmmss - ${maven.build.timestamp} - UTF-8 - UTF-8 - + yyMMdd-HHmmss + ${maven.build.timestamp} + UTF-8 + UTF-8 + + platform-logic ubuntu opendaylight diff --git a/ubuntu/pom.xml b/ubuntu/pom.xml index 504d6736..f74058b3 100644 --- a/ubuntu/pom.xml +++ b/ubuntu/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.distribution distribution-root - 0.0.1-SNAPSHOT + 0.1.0-SNAPSHOT 4.0.0 pom distribution-ubuntu - 0.0.1-SNAPSHOT + 0.1.0-SNAPSHOT Distribution - ubuntu Creates base ubuntu Docker container -- 2.16.6