summaryrefslogtreecommitdiffstats
path: root/lcm
diff options
context:
space:
mode:
authorTimoney, Dan (dt5972) <dtimoney@att.com>2019-07-09 13:36:38 -0400
committerDan Timoney <dtimoney@att.com>2019-08-15 16:35:30 +0000
commit5e2c493f9856c2d8cc966ca9a89506f57f00930f (patch)
tree8739219486471f6d4ab993ee853c749495b1abcf /lcm
parent1f685ea0295dc23233fa91cdc32ba412535d3f50 (diff)
Code changes for Neon
Updated code via ccsdk/parent/tools/fluorine2neon.sh script. Change-Id: Ie19b69db481318afa9224d4673f27e74bfc65a81 Issue-ID: CCSDK-1389 Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
Diffstat (limited to 'lcm')
-rw-r--r--lcm/features/ccsdk-lcm/pom.xml4
-rw-r--r--lcm/features/features-lcm/pom.xml4
-rwxr-xr-xlcm/features/pom.xml4
-rwxr-xr-xlcm/installer/pom.xml4
-rwxr-xr-xlcm/model/pom.xml14
-rwxr-xr-xlcm/pom.xml4
-rwxr-xr-xlcm/provider/pom.xml4
-rw-r--r--lcm/provider/src/main/resources/OSGI-INF/blueprint/lcm-blueprint.xml34
8 files changed, 52 insertions, 20 deletions
diff --git a/lcm/features/ccsdk-lcm/pom.xml b/lcm/features/ccsdk-lcm/pom.xml
index cd80fb34..0528e6e5 100644
--- a/lcm/features/ccsdk-lcm/pom.xml
+++ b/lcm/features/ccsdk-lcm/pom.xml
@@ -5,13 +5,13 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>1.3.3-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.sli.northbound</groupId>
<artifactId>ccsdk-lcm</artifactId>
- <version>0.5.2-SNAPSHOT</version>
+ <version>0.6.0-SNAPSHOT</version>
<packaging>feature</packaging>
<name>ccsdk-sli-northbound :: lcm :: ${project.artifactId}</name>
diff --git a/lcm/features/features-lcm/pom.xml b/lcm/features/features-lcm/pom.xml
index cb712618..68e2150e 100644
--- a/lcm/features/features-lcm/pom.xml
+++ b/lcm/features/features-lcm/pom.xml
@@ -5,13 +5,13 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>feature-repo-parent</artifactId>
- <version>1.3.3-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.sli.northbound</groupId>
<artifactId>features-lcm</artifactId>
- <version>0.5.2-SNAPSHOT</version>
+ <version>0.6.0-SNAPSHOT</version>
<packaging>feature</packaging>
<name>ccsdk-sli-northbound :: lcm :: ${project.artifactId}</name>
diff --git a/lcm/features/pom.xml b/lcm/features/pom.xml
index b59d2b92..f5b49230 100755
--- a/lcm/features/pom.xml
+++ b/lcm/features/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>1.3.3-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
</parent>
<groupId>org.onap.ccsdk.sli.northbound</groupId>
<artifactId>lcm-features</artifactId>
- <version>0.5.2-SNAPSHOT</version>
+ <version>0.6.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-sli-northbound :: lcm :: ${project.artifactId}</name>
diff --git a/lcm/installer/pom.xml b/lcm/installer/pom.xml
index 3966c9d2..fb3123df 100755
--- a/lcm/installer/pom.xml
+++ b/lcm/installer/pom.xml
@@ -5,13 +5,13 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>1.3.3-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.sli.northbound</groupId>
<artifactId>lcm-installer</artifactId>
- <version>0.5.2-SNAPSHOT</version>
+ <version>0.6.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-sli-northbound :: lcm :: ${project.artifactId}</name>
diff --git a/lcm/model/pom.xml b/lcm/model/pom.xml
index 6f41820c..e2787508 100755
--- a/lcm/model/pom.xml
+++ b/lcm/model/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.northbound</groupId>
<artifactId>lcm-model</artifactId>
- <version>0.5.2-SNAPSHOT</version>
+ <version>0.6.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>ccsdk-sli-northbound :: lcm :: ${project.artifactId}</name>
@@ -23,13 +23,11 @@
<dependencies>
<dependency>
- <groupId>org.opendaylight.mdsal.model</groupId>
- <artifactId>ietf-inet-types-2013-07-15</artifactId>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.mdsal.model</groupId>
- <artifactId>ietf-yang-types-20130715</artifactId>
+ <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+ <artifactId>rfc6991</artifactId>
</dependency>
+
+
</dependencies>
diff --git a/lcm/pom.xml b/lcm/pom.xml
index 455beb89..d2299d15 100755
--- a/lcm/pom.xml
+++ b/lcm/pom.xml
@@ -5,13 +5,13 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>1.3.3-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.sli.northbound</groupId>
<artifactId>lcm</artifactId>
- <version>0.5.2-SNAPSHOT</version>
+ <version>0.6.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-sli-northbound :: lcm</name>
diff --git a/lcm/provider/pom.xml b/lcm/provider/pom.xml
index def00a9b..7eba7c9b 100755
--- a/lcm/provider/pom.xml
+++ b/lcm/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.northbound</groupId>
<artifactId>lcm-provider</artifactId>
- <version>0.5.2-SNAPSHOT</version>
+ <version>0.6.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>ccsdk-sli-northbound :: lcm :: ${project.artifactId}</name>
diff --git a/lcm/provider/src/main/resources/OSGI-INF/blueprint/lcm-blueprint.xml b/lcm/provider/src/main/resources/OSGI-INF/blueprint/lcm-blueprint.xml
new file mode 100644
index 00000000..5597d080
--- /dev/null
+++ b/lcm/provider/src/main/resources/OSGI-INF/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