From 1d53aedef097d095ba87ae656369706ff7f3c64b Mon Sep 17 00:00:00 2001 From: "Timoney, Dan (dt5972)" Date: Tue, 24 Apr 2018 14:56:41 -0400 Subject: Add missing LCM blueprint Added blueprint descriptor for LCM to register RPC properly. Change-Id: I65d38cd9151f6094479413e06a44da02a7da4c74 Issue-ID: CCSDK-252 Signed-off-by: Timoney, Dan (dt5972) --- .gitignore | 1 + dmaap-listener/pom.xml | 2 +- .../resources/org/onap/appc/default.properties | 58 ----- .../src/main/resources/org/onap/appc/logback.xml | 287 --------------------- .../org/opendaylight/blueprint/lcm-blueprint.xml | 34 +++ 5 files changed, 36 insertions(+), 346 deletions(-) delete mode 100644 lcm/provider/src/main/resources/org/onap/appc/default.properties delete mode 100644 lcm/provider/src/main/resources/org/onap/appc/logback.xml create mode 100644 lcm/provider/src/main/resources/org/opendaylight/blueprint/lcm-blueprint.xml diff --git a/.gitignore b/.gitignore index f9dd2d58a..d66d73564 100755 --- a/.gitignore +++ b/.gitignore @@ -34,6 +34,7 @@ out/ provider/src/main/java/META-INF/ provider/src/main/java/inventory/ model/src/main/yang-gen-sal +yang-gen-sal/ ## BlackDuck generated file sdnc-northbound_bdio.jsonld diff --git a/dmaap-listener/pom.xml b/dmaap-listener/pom.xml index 5d4041e8a..afae113a8 100755 --- a/dmaap-listener/pom.xml +++ b/dmaap-listener/pom.xml @@ -23,7 +23,7 @@ 2.0 true /opt/app/dmaap-listener - 1.1.5-SNAPSHOT + 1.1.5 yyyyMMdd'T'HHmmss'Z' ${maven.build.timestamp} diff --git a/lcm/provider/src/main/resources/org/onap/appc/default.properties b/lcm/provider/src/main/resources/org/onap/appc/default.properties deleted file mode 100644 index 693cd37a8..000000000 --- a/lcm/provider/src/main/resources/org/onap/appc/default.properties +++ /dev/null @@ -1,58 +0,0 @@ -### -# ============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========================================================= -### - -# -# This property file supplies the configuration defaults for the APP-C controller -# -# Default values are supplied so that all defined properties have well-known values and are -# valid even if a configuration file is not supplied. This is done to ensure that a runnable, -# stable, and defined configuration exists at all times. The reason the defaults are supplied -# via this property file and not in the code is so that the properties can be changed -# easily if needed in the future. Use of the "getProperty(name, default)" method is -# discouraged because if the default value needs to be changed, everywhere in the code it -# is used would have to be changed. By loading the defaults in this property file, all -# values can be defined in one place and support is easier. This does mean that all -# properties that are defined must have a default value supplied here. Which also means -# this file documents all defined properties (not a bad thing either). -# -#-------------------------------------------------------------------------------------------- -# The path and file used to load user-supplied configuration settings, if any -org.onap.appc.bootstrap.file=appc.properties -org.onap.appc.bootstrap.path=/opt/onap/appc/data/properties,${user.home},. - -appc.application.name=APPC - -# -# The path to search for logging configuration document, and the name of the document -# -org.onap.appc.logging.path=${user.home},etc,../etc,. -org.onap.appc.logging.file=logback.xml - -# -# The DG properties -# -appc.service.logic.module.name=APPC -appc.topology.dg.method=topology-operation-all -appc.topology.dg.version=2.0.0 - diff --git a/lcm/provider/src/main/resources/org/onap/appc/logback.xml b/lcm/provider/src/main/resources/org/onap/appc/logback.xml deleted file mode 100644 index 0dffe75e0..000000000 --- a/lcm/provider/src/main/resources/org/onap/appc/logback.xml +++ /dev/null @@ -1,287 +0,0 @@ - - - - - - - - - - %d{MM/dd-HH:mm:ss.SSS} [%-16thread] %.-5level - %-36.36logger - %msg%n - - - - - - - - - - ${logDirectory}/cdp.log - - ${logDirectory}/cdp.%i.log.zip - - 1 - 9 - - - 5MB - - - - %d{MM/dd-HH:mm:ss.SSS} [%-16thread] %.-5level - %-36.36logger [%X{User} %X{RemoteHost} %X{RequestId} %X{Method} - %X{Path}] - %msg%n - - - - 256 - - - - - - ${logDirectory}/cdp-security.log - - ${logDirectory}/cdp-security.%i.log.zip - - 1 - 9 - - - 5MB - - - - %d{MM/dd-HH:mm:ss.SSS} [%-16thread] %.-5level - %-36.36logger [%X{User} %X{RemoteHost} %X{RequestId} %X{Method} - %X{Path}] - %msg%n - - - - 256 - 0 - - - - - - ${logDirectory}/cdp-performance.log - - ${logDirectory}/cdp-performance.%i.log.zip - - 1 - 9 - - - 5MB - - - true - %d{MM/dd-HH:mm:ss.SSS} [%-16thread] %.-5level - %-36.36logger [%X{User} %X{RemoteHost} %X{RequestId} %X{Method} - %X{Path}] - %msg%n - - - - 256 - - - - - - ${logDirectory}/cdp-server.log - - ${logDirectory}/cdp-server.%i.log.zip - - 1 - 9 - - - 5MB - - - - %d{MM/dd-HH:mm:ss.SSS} [%-16thread] %.-5level - %-36.36logger [%X{User} %X{RemoteHost} %X{RequestId} %X{Method} - %X{Path}] - %msg%n - - - - 256 - - - - - - ${logDirectory}/cdp-coordinator.log - - ${logDirectory}/cdp-coordinator.%i.log.zip - - 1 - 9 - - - 5MB - - - - %d{MM/dd-HH:mm:ss.SSS} [%-16thread] %.-5level - %-36.36logger - %msg%n - - - - 256 - - - - - - ${logDirectory}/cdp-policy.log - - ${logDirectory}/cdp-policy.%i.log.zip - - 1 - 9 - - - 5MB - - - - %d{MM/dd-HH:mm:ss.SSS} [%-16thread] %.-5level - %-36.36logger - %msg%n - - - - 256 - - - - ${debugLogDirectory}/appc-debug.log - - ${logDirectory}/command-executor.%i.log.zip - - 1 - 9 - - - 5MB - - - - - %d{MM/dd-HH:mm:ss.SSS}|%X{RequestId}|%X{ServiceInstanceId}|%t|%X{ServiceName} - %X{bundle.id} - %X{bundle.name} - %X{bundle.version}|%X{InstanceUUID}|%-5.5p|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ServerFQDN}|%X{RemoteHost}|%X{Timer}|[%c{3}]|%m%n - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/lcm/provider/src/main/resources/org/opendaylight/blueprint/lcm-blueprint.xml b/lcm/provider/src/main/resources/org/opendaylight/blueprint/lcm-blueprint.xml new file mode 100644 index 000000000..5597d0801 --- /dev/null +++ b/lcm/provider/src/main/resources/org/opendaylight/blueprint/lcm-blueprint.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file -- cgit 1.2.3-korg