summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimoney, Dan (dt5972) <dt5972@att.com>2018-04-24 14:56:41 -0400
committerTimoney, Dan (dt5972) <dt5972@att.com>2018-04-24 17:01:30 -0400
commit1d53aedef097d095ba87ae656369706ff7f3c64b (patch)
tree998c93f2913e29d1f7d0c969ce07429271626c67
parent00dc2e8bc3ee13eb28335dd491a30897a3256c77 (diff)
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) <dt5972@att.com>
-rwxr-xr-x.gitignore1
-rwxr-xr-xdmaap-listener/pom.xml2
-rw-r--r--lcm/provider/src/main/resources/org/onap/appc/default.properties58
-rw-r--r--lcm/provider/src/main/resources/org/onap/appc/logback.xml287
-rw-r--r--lcm/provider/src/main/resources/org/opendaylight/blueprint/lcm-blueprint.xml34
5 files changed, 36 insertions, 346 deletions
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 @@
<velocity.version>2.0</velocity.version>
<skip.SWM>true</skip.SWM>
<dmaap.listener.base>/opt/app/dmaap-listener</dmaap.listener.base>
- <dmaap.listener.version>1.1.5-SNAPSHOT</dmaap.listener.version>
+ <dmaap.listener.version>1.1.5</dmaap.listener.version>
<maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
<build.number>${maven.build.timestamp}</build.number>
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 @@
-<!--
- ============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=========================================================
- -->
-
-<configuration scan="true" scanPeriod="3 seconds" debug="true">
- <!--<jmxConfigurator /> -->
- <property name="logDirectory" value="logs" />
- <property name="debugLogDirectory" value="debug-logs" />
- <!-- Example evaluator filter applied against console appender -->
- <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
- <encoder>
- <pattern>%d{MM/dd-HH:mm:ss.SSS} [%-16thread] %.-5level
- %-36.36logger - %msg%n</pattern>
- </encoder>
- </appender>
-
- <!-- ============================================================================ -->
- <!-- CDP Appenders -->
- <!-- ============================================================================ -->
-
- <!-- The CDPAppender is used to record events to the general CDP application
- log. This is the log file used by default as the application root log, if
- no other log is defined or the application creates specialized loggers of
- the form com.att.cdp.x.y.z where the name occupied by the "x" is NOT security,
- perf, server, coordinator, gui, or policy. These are defined as specialization
- loggers for various business purposes. -->
- <appender name="CDP"
- class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>${logDirectory}/cdp.log</file>
- <rollingPolicy
- class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
- <fileNamePattern>${logDirectory}/cdp.%i.log.zip
- </fileNamePattern>
- <minIndex>1</minIndex>
- <maxIndex>9</maxIndex>
- </rollingPolicy>
- <triggeringPolicy
- class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
- <maxFileSize>5MB</maxFileSize>
- </triggeringPolicy>
- <encoder>
- <!-- <pattern>"%d{HH:mm:ss.SSS} [%thread] %-5level %logger{1024} -
- %msg%n"</pattern> -->
- <pattern>%d{MM/dd-HH:mm:ss.SSS} [%-16thread] %.-5level
- %-36.36logger [%X{User} %X{RemoteHost} %X{RequestId} %X{Method}
- %X{Path}] - %msg%n</pattern>
- </encoder>
- </appender>
- <appender name="asyncCDP" class="ch.qos.logback.classic.AsyncAppender">
- <queueSize>256</queueSize>
- <appender-ref ref="CDP" />
- </appender>
-
- <!-- CDP Security Appender. This appender is used to record security events
- to the security log file. Security events are separate from other loggers
- in CDP so that security log records can be captured and managed in a secure
- way separate from the other logs. This appender is set to never discard any
- events. -->
- <appender name="CDPSecurity"
- class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>${logDirectory}/cdp-security.log</file>
- <rollingPolicy
- class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
- <fileNamePattern>${logDirectory}/cdp-security.%i.log.zip
- </fileNamePattern>
- <minIndex>1</minIndex>
- <maxIndex>9</maxIndex>
- </rollingPolicy>
- <triggeringPolicy
- class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
- <maxFileSize>5MB</maxFileSize>
- </triggeringPolicy>
- <encoder>
- <!-- <pattern>"%d{HH:mm:ss.SSS} [%thread] %-5level %logger{1024} -
- %msg%n"</pattern> -->
- <pattern>%d{MM/dd-HH:mm:ss.SSS} [%-16thread] %.-5level
- %-36.36logger [%X{User} %X{RemoteHost} %X{RequestId} %X{Method}
- %X{Path}] - %msg%n</pattern>
- </encoder>
- </appender>
- <appender name="asyncCDPSecurity" class="ch.qos.logback.classic.AsyncAppender">
- <queueSize>256</queueSize>
- <discardingThreshold>0</discardingThreshold>
- <appender-ref ref="CDPSecurity" />
- </appender>
-
- <!-- CDP Performance Appender. This appender is used to record performance
- records. -->
- <appender name="CDPPerformance"
- class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>${logDirectory}/cdp-performance.log</file>
- <rollingPolicy
- class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
- <fileNamePattern>${logDirectory}/cdp-performance.%i.log.zip
- </fileNamePattern>
- <minIndex>1</minIndex>
- <maxIndex>9</maxIndex>
- </rollingPolicy>
- <triggeringPolicy
- class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
- <maxFileSize>5MB</maxFileSize>
- </triggeringPolicy>
- <encoder>
- <outputPatternAsHeader>true</outputPatternAsHeader>
- <pattern>%d{MM/dd-HH:mm:ss.SSS} [%-16thread] %.-5level
- %-36.36logger [%X{User} %X{RemoteHost} %X{RequestId} %X{Method}
- %X{Path}] - %msg%n</pattern>
- </encoder>
- </appender>
- <appender name="asyncCDPPerformance" class="ch.qos.logback.classic.AsyncAppender">
- <queueSize>256</queueSize>
- <appender-ref ref="CDPPerformance" />
- </appender>
-
- <!-- CDP Server Appender. This appender is used to record Server related
- logging events. The Server logger and appender are specializations of the
- CDP application root logger and appender. This can be used to segregate Server
- events from other components, or it can be eliminated to record these events
- as part of the application root log. -->
- <appender name="CDPServer"
- class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>${logDirectory}/cdp-server.log</file>
- <rollingPolicy
- class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
- <fileNamePattern>${logDirectory}/cdp-server.%i.log.zip
- </fileNamePattern>
- <minIndex>1</minIndex>
- <maxIndex>9</maxIndex>
- </rollingPolicy>
- <triggeringPolicy
- class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
- <maxFileSize>5MB</maxFileSize>
- </triggeringPolicy>
- <encoder>
- <!-- <pattern>"%d{HH:mm:ss.SSS} [%thread] %-5level %logger{1024} -
- %msg%n"</pattern> -->
- <pattern>%d{MM/dd-HH:mm:ss.SSS} [%-16thread] %.-5level
- %-36.36logger [%X{User} %X{RemoteHost} %X{RequestId} %X{Method}
- %X{Path}] - %msg%n</pattern>
- </encoder>
- </appender>
- <appender name="asyncCDPServer" class="ch.qos.logback.classic.AsyncAppender">
- <queueSize>256</queueSize>
- <appender-ref ref="CDPServer" />
- </appender>
-
- <!-- CDP Coordinator Appender. This appender is used to record Coordinator
- related logging events. The Coordinator logger and appender are specializations
- of the CDP application root logger and appender. This can be used to segregate
- Coordinator events from other components, or it can be eliminated to record
- these events as part of the application root log. -->
- <appender name="CDPCoordinator"
- class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>${logDirectory}/cdp-coordinator.log</file>
- <rollingPolicy
- class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
- <fileNamePattern>${logDirectory}/cdp-coordinator.%i.log.zip
- </fileNamePattern>
- <minIndex>1</minIndex>
- <maxIndex>9</maxIndex>
- </rollingPolicy>
- <triggeringPolicy
- class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
- <maxFileSize>5MB</maxFileSize>
- </triggeringPolicy>
- <encoder>
- <!-- <pattern>"%d{HH:mm:ss.SSS} [%thread] %-5level %logger{1024} -
- %msg%n"</pattern> -->
- <pattern>%d{MM/dd-HH:mm:ss.SSS} [%-16thread] %.-5level
- %-36.36logger - %msg%n</pattern>
- </encoder>
- </appender>
- <appender name="asyncCDPCoordinator" class="ch.qos.logback.classic.AsyncAppender">
- <queueSize>256</queueSize>
- <appender-ref ref="CDPCoordinator" />
- </appender>
-
- <!-- CDP Policy Appender. This appender is used to record Policy engine
- related logging events. The Policy logger and appender are specializations
- of the CDP application root logger and appender. This can be used to segregate
- Policy engine events from other components, or it can be eliminated to record
- these events as part of the application root log. -->
- <appender name="CDPPolicy"
- class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>${logDirectory}/cdp-policy.log</file>
- <rollingPolicy
- class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
- <fileNamePattern>${logDirectory}/cdp-policy.%i.log.zip
- </fileNamePattern>
- <minIndex>1</minIndex>
- <maxIndex>9</maxIndex>
- </rollingPolicy>
- <triggeringPolicy
- class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
- <maxFileSize>5MB</maxFileSize>
- </triggeringPolicy>
- <encoder>
- <!-- <pattern>"%d{HH:mm:ss.SSS} [%thread] %-5level %logger{1024} -
- %msg%n"</pattern> -->
- <pattern>%d{MM/dd-HH:mm:ss.SSS} [%-16thread] %.-5level
- %-36.36logger - %msg%n</pattern>
- </encoder>
- </appender>
- <appender name="asyncCDPPolicy" class="ch.qos.logback.classic.AsyncAppender">
- <queueSize>256</queueSize>
- <appender-ref ref="CDPPolicy" />
- </appender>
- <appender name="CommandExecutor"
- class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>${debugLogDirectory}/appc-debug.log</file>
- <rollingPolicy
- class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
- <fileNamePattern>${logDirectory}/command-executor.%i.log.zip
- </fileNamePattern>
- <minIndex>1</minIndex>
- <maxIndex>9</maxIndex>
- </rollingPolicy>
- <triggeringPolicy
- class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
- <maxFileSize>5MB</maxFileSize>
- </triggeringPolicy>
- <encoder>
- <!--<Pattern>
- %d{yyyy-MM-dd'T'HH:mm:ss.SSSZ}|%X{RequestID}|%X{ServiceInstanceID}|%thread|%X{ServerName}|%X{ServiceName}|%X{UUID}|%-5.5p|%X{Severity}|%X{ServerIPAddress}|%X{Server}|%X{IPAddress}|[%c{3}]|%X{Timer}| - %msg%n
- </Pattern>-->
- <Pattern>
- %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
- </Pattern>
- </encoder>
- </appender>
-
- <logger name="org.onap.appc" level="DEBUG" additivity="false">
- <appender-ref ref="CommandExecutor" />
- </logger>
-
- <!-- ============================================================================ -->
- <!-- CDP loggers -->
- <!-- ============================================================================ -->
- <logger name="com.att.cdp" level="info" additivity="false">
- <appender-ref ref="asyncCDP" />
- </logger>
- <logger name="com.att.cdp.security" level="info" additivity="false">
- <appender-ref ref="asyncCDPSecurity" />
- </logger>
- <logger name="com.att.cdp.perf" level="info" additivity="false">
- <appender-ref ref="asyncCDPPerformance" />
- </logger>
- <logger name="com.att.cdp.server" level="debug" additivity="false">
- <appender-ref ref="asyncCDPServer" />
- </logger>
- <logger name="com.att.cdp.coordinator" level="info" additivity="false">
- <appender-ref ref="asyncCDPCoordinator" />
- </logger>
- <logger name="com.att.cdp.policy" level="info" additivity="false">
- <appender-ref ref="asyncCDPPolicy" />
- </logger>
-
- <!-- The OpenStack connector logger -->
- <logger name="os" level="debug" additivity="false">
- <appender-ref ref="asyncCDPServer" />
- </logger>
-
- <root level="WARN">
- <appender-ref ref="STDOUT" />
- </root>
-
-</configuration>
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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+ xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"
+ odl:use-default-for-reference-types="true">
+
+ <reference id="svcLogicService"
+ interface="org.onap.ccsdk.sli.core.sli.provider.SvcLogicService" />
+
+ <bean id="client" class="org.onap.ccsdk.sli.northbound.LcmSliClient">
+ <argument ref="svcLogicService" />
+ </bean>
+
+ <reference id="dataBroker"
+ interface="org.opendaylight.controller.md.sal.binding.api.DataBroker"
+ odl:type="default" />
+
+ <reference id="notificationService"
+ interface="org.opendaylight.controller.md.sal.binding.api.NotificationPublishService"
+ odl:type="default" />
+
+ <reference id="rpcRegistry"
+ interface="org.opendaylight.controller.sal.binding.api.RpcProviderRegistry"
+ odl:type="default" />
+
+ <bean id="provider" class="org.onap.ccsdk.sli.northbound.LcmProvider">
+ <argument ref="dataBroker" />
+ <argument ref="notificationService" />
+ <argument ref="rpcRegistry" />
+ <argument ref="client" />
+ </bean>
+
+ <odl:rpc-implementation ref="provider"/>
+
+</blueprint> \ No newline at end of file