summaryrefslogtreecommitdiffstats
path: root/grToolkit
diff options
context:
space:
mode:
authorTimoney, Dan (dt5972) <dtimoney@att.com>2019-07-09 13:41:32 -0400
committerDan Timoney <dtimoney@att.com>2019-08-15 16:35:52 +0000
commit9e7f1417df26d634482f053be2cf39b920a22106 (patch)
treeb9df0f8e5c2ab9148716911ff9de9e77d334da36 /grToolkit
parent36b83bd4c1b5e20b23cc2986aca15ed31107c2a3 (diff)
Code changes for Neon
Updated code via ccsdk/parent/tools/fluorine2neon.sh script. Change-Id: Ice154214e118ca6ad5043eb0fe337095fd2246d9 Issue-ID: CCSDK-1389 Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
Diffstat (limited to 'grToolkit')
-rw-r--r--grToolkit/features/ccsdk-gr-toolkit/pom.xml4
-rwxr-xr-xgrToolkit/features/features-gr-toolkit/pom.xml4
-rwxr-xr-xgrToolkit/features/pom.xml4
-rwxr-xr-xgrToolkit/installer/pom.xml4
-rwxr-xr-xgrToolkit/model/pom.xml14
-rwxr-xr-xgrToolkit/pom.xml4
-rwxr-xr-xgrToolkit/provider/pom.xml4
-rwxr-xr-xgrToolkit/provider/src/main/resources/OSGI-INF/blueprint/GrToolkit.xml33
8 files changed, 51 insertions, 20 deletions
diff --git a/grToolkit/features/ccsdk-gr-toolkit/pom.xml b/grToolkit/features/ccsdk-gr-toolkit/pom.xml
index 1f4aec3f8..3266f6604 100644
--- a/grToolkit/features/ccsdk-gr-toolkit/pom.xml
+++ b/grToolkit/features/ccsdk-gr-toolkit/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.plugins</groupId>
<artifactId>ccsdk-gr-toolkit</artifactId>
- <version>0.5.2-SNAPSHOT</version>
+ <version>0.6.0-SNAPSHOT</version>
<packaging>feature</packaging>
<name>ccsdk-sli-plugins :: gr-toolkit :: ${project.artifactId}</name>
diff --git a/grToolkit/features/features-gr-toolkit/pom.xml b/grToolkit/features/features-gr-toolkit/pom.xml
index 65b1a5d57..511ba38a0 100755
--- a/grToolkit/features/features-gr-toolkit/pom.xml
+++ b/grToolkit/features/features-gr-toolkit/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.plugins</groupId>
<artifactId>features-gr-toolkit</artifactId>
- <version>0.5.2-SNAPSHOT</version>
+ <version>0.6.0-SNAPSHOT</version>
<packaging>feature</packaging>
<name>ccsdk-sli-plugins :: gr-toolkit :: ${project.artifactId}</name>
diff --git a/grToolkit/features/pom.xml b/grToolkit/features/pom.xml
index c7f8ffea7..34f706c8f 100755
--- a/grToolkit/features/pom.xml
+++ b/grToolkit/features/pom.xml
@@ -4,14 +4,14 @@
<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>
<name>ccsdk-sli-plugins :: gr-toolkit :: ${project.artifactId}</name>
<artifactId>gr-toolkit-features</artifactId>
<groupId>org.onap.ccsdk.sli.plugins</groupId>
- <version>0.5.2-SNAPSHOT</version>
+ <version>0.6.0-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
diff --git a/grToolkit/installer/pom.xml b/grToolkit/installer/pom.xml
index 64e172cc2..8c7ec32b2 100755
--- a/grToolkit/installer/pom.xml
+++ b/grToolkit/installer/pom.xml
@@ -4,14 +4,14 @@
<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>
<name>ccsdk-sli-plugins :: gr-toolkit :: ${project.artifactId}</name>
<groupId>org.onap.ccsdk.sli.plugins</groupId>
<artifactId>gr-toolkit-installer</artifactId>
- <version>0.5.2-SNAPSHOT</version>
+ <version>0.6.0-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
<application.name>ccsdk-gr-toolkit</application.name>
diff --git a/grToolkit/model/pom.xml b/grToolkit/model/pom.xml
index f400a04cc..8abf89a08 100755
--- a/grToolkit/model/pom.xml
+++ b/grToolkit/model/pom.xml
@@ -4,23 +4,21 @@
<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>
<name>ccsdk-sli-plugins :: gr-toolkit :: ${project.artifactId}</name>
<groupId>org.onap.ccsdk.sli.plugins</groupId>
<artifactId>gr-toolkit-model</artifactId>
- <version>0.5.2-SNAPSHOT</version>
+ <version>0.6.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<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>
</project>
diff --git a/grToolkit/pom.xml b/grToolkit/pom.xml
index c36c1a08d..916df4427 100755
--- a/grToolkit/pom.xml
+++ b/grToolkit/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.plugins</groupId>
<artifactId>gr-toolkit</artifactId>
- <version>0.5.2-SNAPSHOT</version>
+ <version>0.6.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-sli-plugins :: gr-toolkit</name>
diff --git a/grToolkit/provider/pom.xml b/grToolkit/provider/pom.xml
index 1d8149592..0267f2488 100755
--- a/grToolkit/provider/pom.xml
+++ b/grToolkit/provider/pom.xml
@@ -4,13 +4,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>
<name>ccsdk-sli-plugins :: gr-toolkit :: ${project.artifactId}</name>
<groupId>org.onap.ccsdk.sli.plugins</groupId>
<artifactId>gr-toolkit-provider</artifactId>
- <version>0.5.2-SNAPSHOT</version>
+ <version>0.6.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<build>
diff --git a/grToolkit/provider/src/main/resources/OSGI-INF/blueprint/GrToolkit.xml b/grToolkit/provider/src/main/resources/OSGI-INF/blueprint/GrToolkit.xml
new file mode 100755
index 000000000..5a4492c56
--- /dev/null
+++ b/grToolkit/provider/src/main/resources/OSGI-INF/blueprint/GrToolkit.xml
@@ -0,0 +1,33 @@
+<?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="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" />
+
+ <reference id="dbLib"
+ interface="org.onap.ccsdk.sli.core.dblib.DbLibService" />
+
+ <reference id="configDatastore" interface="org.opendaylight.controller.cluster.datastore.DistributedDataStoreInterface"
+ odl:type="distributed-config"/>
+
+ <bean id="provider" class="org.onap.ccsdk.sli.plugins.grtoolkit.GrToolkitProvider">
+ <argument ref="dataBroker" />
+ <argument ref="notificationService" />
+ <argument ref="rpcRegistry" />
+ <argument ref="dbLib" />
+ <argument ref="configDatastore" />
+ </bean>
+
+ <odl:rpc-implementation ref="provider"/>
+</blueprint>