aboutsummaryrefslogtreecommitdiffstats
path: root/sliapi/provider
diff options
context:
space:
mode:
authorTimoney, Dan (dt5972) <dtimoney@att.com>2019-07-03 13:53:18 -0400
committerDan Timoney <dtimoney@att.com>2019-08-14 19:23:54 +0000
commit06877cb9a30c4ea3e7e95c230f214a78fb4db9e1 (patch)
tree6b9ebd8871269451d7194eff0cad646261e81cfe /sliapi/provider
parentb663ad6126af491136470415c8761ce321c2f90e (diff)
Code changes for OpenDaylight Neon
Updated code for OpenDaylight Neon (using ccsdk/parent/tools/fluorine2neon.sh) Change-Id: Ic54b636f691cb2c9dd627dfc3b22b523c0f4f8da Issue-ID: CCSDK-1389 Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
Diffstat (limited to 'sliapi/provider')
-rwxr-xr-xsliapi/provider/pom.xml4
-rw-r--r--sliapi/provider/src/main/java/org/onap/ccsdk/sli/core/sliapi/SliapiProvider.java (renamed from sliapi/provider/src/main/java/org/onap/ccsdk/sli/core/sliapi/sliapiProvider.java)15
-rw-r--r--sliapi/provider/src/main/resources/OSGI-INF/blueprint/sliapi-blueprint.xml28
-rw-r--r--sliapi/provider/src/main/resources/org/opendaylight/blueprint/sliapi-blueprint.xml2
-rw-r--r--sliapi/provider/src/test/java/org/onap/ccsdk/sli/core/sliapi/TestSliapiProvider.java10
-rw-r--r--sliapi/provider/src/test/resources/simplelogger.properties2
6 files changed, 44 insertions, 17 deletions
diff --git a/sliapi/provider/pom.xml b/sliapi/provider/pom.xml
index 8dd79432..533b18e0 100755
--- a/sliapi/provider/pom.xml
+++ b/sliapi/provider/pom.xml
@@ -5,13 +5,13 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>1.3.3-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.sli.core</groupId>
<artifactId>sliapi-provider</artifactId>
- <version>0.5.2-SNAPSHOT</version>
+ <version>0.6.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>ccsdk-sli-core :: sliapi :: ${project.artifactId}</name>
diff --git a/sliapi/provider/src/main/java/org/onap/ccsdk/sli/core/sliapi/sliapiProvider.java b/sliapi/provider/src/main/java/org/onap/ccsdk/sli/core/sliapi/SliapiProvider.java
index 20cbc2e0..449fc382 100644
--- a/sliapi/provider/src/main/java/org/onap/ccsdk/sli/core/sliapi/sliapiProvider.java
+++ b/sliapi/provider/src/main/java/org/onap/ccsdk/sli/core/sliapi/SliapiProvider.java
@@ -28,7 +28,6 @@ import java.io.IOException;
import java.util.Enumeration;
import java.util.LinkedList;
import java.util.Properties;
-import java.util.concurrent.Future;
import org.onap.ccsdk.sli.core.sli.provider.SvcLogicService;
import org.opendaylight.controller.md.sal.binding.api.DataBroker;
@@ -97,7 +96,7 @@ import com.google.common.util.concurrent.ListenableFuture;
* &#64;Override
* public java.lang.AutoCloseable createInstance() {
*
- * final sliapiProvider provider = new sliapiProvider();
+ * final SliapiProvider provider = new SliapiProvider();
* provider.setDataBroker(getDataBrokerDependency());
* provider.setNotificationService(getNotificationServiceDependency());
* provider.setRpcRegistry(getRpcRegistryDependency());
@@ -116,9 +115,9 @@ import com.google.common.util.concurrent.ListenableFuture;
*
* </pre>
*/
-public class sliapiProvider implements AutoCloseable, SLIAPIService {
+public class SliapiProvider implements AutoCloseable, SLIAPIService {
- private static final Logger LOG = LoggerFactory.getLogger(sliapiProvider.class);
+ private static final Logger LOG = LoggerFactory.getLogger(SliapiProvider.class);
private static final String appName = "slitester";
protected DataBroker dataBroker;
@@ -149,13 +148,13 @@ public class sliapiProvider implements AutoCloseable, SLIAPIService {
RESULTS_QNAME = QName.create(TEST_RESULT_QNAME, "results");
}
- public sliapiProvider(DataBroker dataBroker, NotificationPublishService notificationPublishService,
- RpcProviderRegistry rpcProviderRegistry) {
+ public SliapiProvider(DataBroker dataBroker, NotificationPublishService notificationPublishService,
+ RpcProviderRegistry rpcProviderRegistry) {
this(dataBroker, notificationPublishService, rpcProviderRegistry, findSvcLogicService());
}
- public sliapiProvider(DataBroker dataBroker, NotificationPublishService notificationPublishService,
- RpcProviderRegistry rpcProviderRegistry, SvcLogicService svcLogic) {
+ public SliapiProvider(DataBroker dataBroker, NotificationPublishService notificationPublishService,
+ RpcProviderRegistry rpcProviderRegistry, SvcLogicService svcLogic) {
this.LOG.info("Creating provider for " + appName);
this.dataBroker = dataBroker;
this.notificationService = notificationPublishService;
diff --git a/sliapi/provider/src/main/resources/OSGI-INF/blueprint/sliapi-blueprint.xml b/sliapi/provider/src/main/resources/OSGI-INF/blueprint/sliapi-blueprint.xml
new file mode 100644
index 00000000..875027e6
--- /dev/null
+++ b/sliapi/provider/src/main/resources/OSGI-INF/blueprint/sliapi-blueprint.xml
@@ -0,0 +1,28 @@
+<?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" />
+
+
+ <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.core.sliapi.SliapiProvider">
+ <argument ref="dataBroker" />
+ <argument ref="notificationService" />
+ <argument ref="rpcRegistry" />
+
+ </bean>
+</blueprint> \ No newline at end of file
diff --git a/sliapi/provider/src/main/resources/org/opendaylight/blueprint/sliapi-blueprint.xml b/sliapi/provider/src/main/resources/org/opendaylight/blueprint/sliapi-blueprint.xml
index 761b014a..875027e6 100644
--- a/sliapi/provider/src/main/resources/org/opendaylight/blueprint/sliapi-blueprint.xml
+++ b/sliapi/provider/src/main/resources/org/opendaylight/blueprint/sliapi-blueprint.xml
@@ -19,7 +19,7 @@
interface="org.opendaylight.controller.sal.binding.api.RpcProviderRegistry"
odl:type="default" />
- <bean id="provider" class="org.onap.ccsdk.sli.core.sliapi.sliapiProvider">
+ <bean id="provider" class="org.onap.ccsdk.sli.core.sliapi.SliapiProvider">
<argument ref="dataBroker" />
<argument ref="notificationService" />
<argument ref="rpcRegistry" />
diff --git a/sliapi/provider/src/test/java/org/onap/ccsdk/sli/core/sliapi/TestSliapiProvider.java b/sliapi/provider/src/test/java/org/onap/ccsdk/sli/core/sliapi/TestSliapiProvider.java
index 0326429c..c898ffff 100644
--- a/sliapi/provider/src/test/java/org/onap/ccsdk/sli/core/sliapi/TestSliapiProvider.java
+++ b/sliapi/provider/src/test/java/org/onap/ccsdk/sli/core/sliapi/TestSliapiProvider.java
@@ -65,7 +65,7 @@ import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.exe
*/
public class TestSliapiProvider {
- private sliapiProvider provider;
+ private SliapiProvider provider;
private static final String HEALTHCHECK_DG = "sli_healthcheck.xml";
@@ -129,8 +129,8 @@ public class TestSliapiProvider {
svc.registerExecutor(nodeType, BUILTIN_NODES.get(nodeType));
}
- // Finally ready to create sliapiProvider
- provider = new sliapiProvider(dataBroker, notifyService, rpcRegistry, svc);
+ // Finally ready to create SliapiProvider
+ provider = new SliapiProvider(dataBroker, notifyService, rpcRegistry, svc);
provider.setDataBroker(dataBroker);
provider.setNotificationService(notifyService);
provider.setRpcRegistry(rpcRegistry);
@@ -146,7 +146,7 @@ public class TestSliapiProvider {
/**
* Test method for
- * {@link org.onap.ccsdk.sli.core.sliapi.sliapiProvider#executeGraph(org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ExecuteGraphInput)}.
+ * {@link SliapiProvider#executeGraph(org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ExecuteGraphInput)}.
*/
@Test
public void testExecuteGraph() {
@@ -198,7 +198,7 @@ public class TestSliapiProvider {
/**
* Test method for
- * {@link org.onap.ccsdk.sli.core.sliapi.sliapiProvider#healthcheck()}.
+ * {@link SliapiProvider#healthcheck()}.
*/
@Test
public void testHealthcheck() {
diff --git a/sliapi/provider/src/test/resources/simplelogger.properties b/sliapi/provider/src/test/resources/simplelogger.properties
index 417c4d14..2f7d8ea0 100644
--- a/sliapi/provider/src/test/resources/simplelogger.properties
+++ b/sliapi/provider/src/test/resources/simplelogger.properties
@@ -20,4 +20,4 @@
###
org.slf4j.simpleLogger.defaultLogLevel=info
-org.slf4j.simplelogger.log.org.onap.ccsdk.sli.core.sliapi.sliapiProvider=debug
+org.slf4j.simplelogger.log.org.onap.ccsdk.sli.core.sliapi.SliapiProvider=debug