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>

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 9bc3a9c..7e395c9 100755 (executable)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -4,7 +4,7 @@
 
        <groupId>org.onap.ccsdk.sli.plugins</groupId>
        <artifactId>sli-plugins-artifacts</artifactId>
-       <version>0.5.2-SNAPSHOT</version>
+       <version>0.6.0-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>ccsdk-sli-plugins :: sli-plugins-artifacts</name>
@@ -17,7 +17,7 @@
        <parent>
            <groupId>org.onap.ccsdk.parent</groupId>
            <artifactId>parent</artifactId>
-           <version>1.3.3-SNAPSHOT</version>   
+           <version>1.4.0-SNAPSHOT</version>   
        </parent>
        
        <dependencyManagement>

diff --git a/features/ccsdk-sli-plugins-all/pom.xml b/features/ccsdk-sli-plugins-all/pom.xml
index 6b7bf94..bbcfb75 100644 (file)
--- a/features/ccsdk-sli-plugins-all/pom.xml
+++ b/features/ccsdk-sli-plugins-all/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-sli-plugins-all</artifactId>
-       <version>0.5.2-SNAPSHOT</version>
+       <version>0.6.0-SNAPSHOT</version>
        <packaging>feature</packaging>
 
        <name>ccsdk-sli-plugins :: features :: ${project.artifactId}</name>

diff --git a/features/features-sli-plugins/pom.xml b/features/features-sli-plugins/pom.xml
index 4363067..1ace61b 100644 (file)
--- a/features/features-sli-plugins/pom.xml
+++ b/features/features-sli-plugins/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-sli-plugins</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>ccsdk-sli-plugins :: features :: ${project.artifactId}</name>

diff --git a/features/installer/pom.xml b/features/installer/pom.xml
index 3d662e4..3347487 100755 (executable)
--- a/features/installer/pom.xml
+++ b/features/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.plugins</groupId>
        <artifactId>sliplugins-features-installer</artifactId>
-       <version>0.5.2-SNAPSHOT</version>
+       <version>0.6.0-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>ccsdk-sli-plugins :: features :: ${project.artifactId}</name>

diff --git a/features/pom.xml b/features/pom.xml
index 29a67a8..6e349ca 100755 (executable)
--- a/features/pom.xml
+++ b/features/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>sliplugins-feature-aggregator</artifactId>
-       <version>0.5.2-SNAPSHOT</version>
+       <version>0.6.0-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>ccsdk-sli-plugins :: features</name>

diff --git a/grToolkit/features/ccsdk-gr-toolkit/pom.xml b/grToolkit/features/ccsdk-gr-toolkit/pom.xml
index 1f4aec3..3266f66 100644 (file)
--- 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 65b1a5d..511ba38 100755 (executable)
--- 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 c7f8ffe..34f706c 100755 (executable)
--- 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 64e172c..8c7ec32 100755 (executable)
--- 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 f400a04..8abf89a 100755 (executable)
--- 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 c36c1a0..916df44 100755 (executable)
--- 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 1d81495..0267f24 100755 (executable)
--- 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 (executable)
index 0000000..5a4492c
--- /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>

diff --git a/pom.xml b/pom.xml
index 32ce564..6ee7dea 100755 (executable)
--- a/pom.xml
+++ b/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.plugins</groupId>
     <artifactId>ccsdk-sli-plugins</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-sli-plugins</name>

diff --git a/properties-node/features/ccsdk-properties-node/pom.xml b/properties-node/features/ccsdk-properties-node/pom.xml
index 45adc93..4781ac3 100644 (file)
--- a/properties-node/features/ccsdk-properties-node/pom.xml
+++ b/properties-node/features/ccsdk-properties-node/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-properties-node</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>ccsdk-sli-plugins :: properties-node :: ${project.artifactId}</name>

diff --git a/properties-node/features/features-properties-node/pom.xml b/properties-node/features/features-properties-node/pom.xml
index 16588ad..58944cc 100644 (file)
--- a/properties-node/features/features-properties-node/pom.xml
+++ b/properties-node/features/features-properties-node/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-properties-node</artifactId>
-       <version>0.5.2-SNAPSHOT</version>
+       <version>0.6.0-SNAPSHOT</version>
        <packaging>feature</packaging>
 
        <name>ccsdk-sli-plugins :: properties-node :: ${project.artifactId}</name>

diff --git a/properties-node/features/pom.xml b/properties-node/features/pom.xml
index 96121c6..bd93644 100755 (executable)
--- a/properties-node/features/pom.xml
+++ b/properties-node/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.plugins</groupId>
     <artifactId>properties-node-features</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-sli-plugins :: properties-node :: ${project.artifactId}</name>

diff --git a/properties-node/installer/pom.xml b/properties-node/installer/pom.xml
index cfc02dd..536e204 100755 (executable)
--- a/properties-node/installer/pom.xml
+++ b/properties-node/installer/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.plugins</groupId>
     <artifactId>properties-node-installer</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-sli-plugins :: properties-node :: ${project.artifactId}</name>

diff --git a/properties-node/pom.xml b/properties-node/pom.xml
index aa5e75a..09991f4 100755 (executable)
--- a/properties-node/pom.xml
+++ b/properties-node/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.plugins</groupId>
     <artifactId>properties-node</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-sli-plugins :: properties-node</name>

diff --git a/properties-node/provider/pom.xml b/properties-node/provider/pom.xml
index 1f9fd46..8ca58c4 100755 (executable)
--- a/properties-node/provider/pom.xml
+++ b/properties-node/provider/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>1.3.3-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.plugins</groupId>
     <artifactId>properties-node-provider</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <name>ccsdk-sli-plugins :: properties-node :: ${project.artifactId}</name>

diff --git a/properties-node/provider/src/main/resources/OSGI-INF/blueprint/properties-node-blueprint.xml b/properties-node/provider/src/main/resources/OSGI-INF/blueprint/properties-node-blueprint.xml
new file mode 100755 (executable)
index 0000000..6e1d48e
--- /dev/null
+++ b/properties-node/provider/src/main/resources/OSGI-INF/blueprint/properties-node-blueprint.xml
@@ -0,0 +1,16 @@
+<?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">
+
+    <bean id="propNodeProvider" class="org.onap.ccsdk.sli.plugins.prop.PropertiesNode" />
+
+
+
+    <service ref="propNodeProvider">
+        <interfaces>
+            <value>org.onap.ccsdk.sli.plugins.prop.PropertiesNode</value>
+        </interfaces>
+    </service>
+
+</blueprint>
\ No newline at end of file

diff --git a/restapi-call-node/features/ccsdk-restapi-call-node/pom.xml b/restapi-call-node/features/ccsdk-restapi-call-node/pom.xml
index 6578de4..2697c4e 100644 (file)
--- a/restapi-call-node/features/ccsdk-restapi-call-node/pom.xml
+++ b/restapi-call-node/features/ccsdk-restapi-call-node/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-restapi-call-node</artifactId>
-       <version>0.5.2-SNAPSHOT</version>
+       <version>0.6.0-SNAPSHOT</version>
        <packaging>feature</packaging>
 
        <name>ccsdk-sli-plugins :: restapi-call-node :: ${project.artifactId}</name>

diff --git a/restapi-call-node/features/features-restapi-call-node/pom.xml b/restapi-call-node/features/features-restapi-call-node/pom.xml
index dd3af78..41a5d8a 100644 (file)
--- a/restapi-call-node/features/features-restapi-call-node/pom.xml
+++ b/restapi-call-node/features/features-restapi-call-node/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-restapi-call-node</artifactId>
-       <version>0.5.2-SNAPSHOT</version>
+       <version>0.6.0-SNAPSHOT</version>
        <packaging>feature</packaging>
 
        <name>ccsdk-sli-plugins :: restapi-call-node :: ${project.artifactId}</name>

diff --git a/restapi-call-node/features/pom.xml b/restapi-call-node/features/pom.xml
index 48b9182..981db51 100755 (executable)
--- a/restapi-call-node/features/pom.xml
+++ b/restapi-call-node/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.plugins</groupId>
     <artifactId>restapi-call-node-features</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-sli-plugins :: restapi-call-node :: ${project.artifactId}</name>

diff --git a/restapi-call-node/installer/pom.xml b/restapi-call-node/installer/pom.xml
index f63597c..8b2d60b 100755 (executable)
--- a/restapi-call-node/installer/pom.xml
+++ b/restapi-call-node/installer/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.plugins</groupId>
        <artifactId>restapi-call-node-installer</artifactId>
-       <version>0.5.2-SNAPSHOT</version>
+       <version>0.6.0-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>ccsdk-sli-plugins :: restapi-call-node :: ${project.artifactId}</name>

diff --git a/restapi-call-node/pom.xml b/restapi-call-node/pom.xml
index 10497fd..d6fb0b4 100755 (executable)
--- a/restapi-call-node/pom.xml
+++ b/restapi-call-node/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.plugins</groupId>
     <artifactId>restapi-call-node</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-sli-plugins :: restapi-call-node</name>

diff --git a/restapi-call-node/provider/pom.xml b/restapi-call-node/provider/pom.xml
index 74f0a98..7a03a38 100755 (executable)
--- a/restapi-call-node/provider/pom.xml
+++ b/restapi-call-node/provider/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>1.3.3-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.plugins</groupId>
     <artifactId>restapi-call-node-provider</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <name>ccsdk-sli-plugins :: restapi-call-node :: ${project.artifactId}</name>

diff --git a/restapi-call-node/provider/src/main/resources/OSGI-INF/blueprint/restapi-call-node-blueprint.xml b/restapi-call-node/provider/src/main/resources/OSGI-INF/blueprint/restapi-call-node-blueprint.xml
new file mode 100755 (executable)
index 0000000..390bb0a
--- /dev/null
+++ b/restapi-call-node/provider/src/main/resources/OSGI-INF/blueprint/restapi-call-node-blueprint.xml
@@ -0,0 +1,16 @@
+<?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">
+
+    <bean id="restapiCallNodeProvider" class="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" />
+
+
+
+    <service ref="restapiCallNodeProvider">
+        <interfaces>
+            <value>org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode</value>
+        </interfaces>
+    </service>
+
+</blueprint>
\ No newline at end of file

diff --git a/restconf-client/features/ccsdk-restconf-client/pom.xml b/restconf-client/features/ccsdk-restconf-client/pom.xml
index af235f8..8faa16a 100644 (file)
--- a/restconf-client/features/ccsdk-restconf-client/pom.xml
+++ b/restconf-client/features/ccsdk-restconf-client/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-restconf-client</artifactId>
-       <version>0.5.2-SNAPSHOT</version>
+       <version>0.6.0-SNAPSHOT</version>
        <packaging>feature</packaging>
 
        <properties>

diff --git a/restconf-client/features/features-restconf-client/pom.xml b/restconf-client/features/features-restconf-client/pom.xml
index 17065ac..790e5b1 100644 (file)
--- a/restconf-client/features/features-restconf-client/pom.xml
+++ b/restconf-client/features/features-restconf-client/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-restconf-client</artifactId>
-       <version>0.5.2-SNAPSHOT</version>
+       <version>0.6.0-SNAPSHOT</version>
        <packaging>feature</packaging>
 
        <name>ccsdk-sli-plugins :: restconf-client :: ${project.artifactId}</name>

diff --git a/restconf-client/features/pom.xml b/restconf-client/features/pom.xml
index 455987f..4537098 100755 (executable)
--- a/restconf-client/features/pom.xml
+++ b/restconf-client/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.plugins</groupId>
     <artifactId>restconf-client-features</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-sli-plugins :: restconf-client :: ${project.artifactId}</name>

diff --git a/restconf-client/installer/pom.xml b/restconf-client/installer/pom.xml
index e7d8b4a..09d2900 100755 (executable)
--- a/restconf-client/installer/pom.xml
+++ b/restconf-client/installer/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.plugins</groupId>
     <artifactId>restconf-client-installer</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-sli-plugins :: restconf-client :: ${project.artifactId}</name>

diff --git a/restconf-client/pom.xml b/restconf-client/pom.xml
index 296282a..e8b0123 100755 (executable)
--- a/restconf-client/pom.xml
+++ b/restconf-client/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.plugins</groupId>
     <artifactId>restconf-client</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-sli-plugins :: restconf-client</name>

diff --git a/restconf-client/provider/pom.xml b/restconf-client/provider/pom.xml
index 1a734cd..ab685bb 100755 (executable)
--- a/restconf-client/provider/pom.xml
+++ b/restconf-client/provider/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>1.3.3-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.plugins</groupId>
     <artifactId>restconf-client-provider</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <name>ccsdk-sli-plugins :: restconf-client :: ${project.artifactId}</name>

diff --git a/restconf-client/provider/src/main/resources/OSGI-INF/blueprint/restconf-client-blueprint.xml b/restconf-client/provider/src/main/resources/OSGI-INF/blueprint/restconf-client-blueprint.xml
new file mode 100755 (executable)
index 0000000..45c335b
--- /dev/null
+++ b/restconf-client/provider/src/main/resources/OSGI-INF/blueprint/restconf-client-blueprint.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * ============LICENSE_START=======================================================
+ * ONAP - CCSDK
+ * ================================================================================
+ * Copyright (C) 2018 Huawei Technologies Co., Ltd. All rights reserved.
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+  -->
+
+<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 xmlns:ext="http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.0.0"
+               id="restapiCallNodeProvider"
+               interface="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode"
+               ext:proxy-method="classes"/>
+
+    <bean id="restconfapiCallNodeProvider" class="org.onap.ccsdk.sli.plugins.restconfapicall.RestconfApiCallNode" >
+        <argument ref="restapiCallNodeProvider"/>
+    </bean>
+
+    <bean id="restconfDiscoveryNodeProvider" class="org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode" >
+        <argument ref="restconfapiCallNodeProvider"/>
+    </bean>
+
+    <service ref="restconfapiCallNodeProvider">
+        <interfaces>
+            <value>org.onap.ccsdk.sli.plugins.restconfapicall.RestconfApiCallNode</value>
+        </interfaces>
+    </service>
+
+    <service ref="restconfDiscoveryNodeProvider">
+        <interfaces>
+            <value>org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode</value>
+        </interfaces>
+    </service>
+
+</blueprint>
\ No newline at end of file

diff --git a/sshapi-call-node/features/ccsdk-sshapi-call-node/pom.xml b/sshapi-call-node/features/ccsdk-sshapi-call-node/pom.xml
index 3f6c97c..44c5540 100644 (file)
--- a/sshapi-call-node/features/ccsdk-sshapi-call-node/pom.xml
+++ b/sshapi-call-node/features/ccsdk-sshapi-call-node/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-sshapi-call-node</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>ccsdk-sli-plugins :: sshapi-call-node :: ${project.artifactId}</name>

diff --git a/sshapi-call-node/features/features-sshapi-call-node/pom.xml b/sshapi-call-node/features/features-sshapi-call-node/pom.xml
index 8a49668..893b68a 100644 (file)
--- a/sshapi-call-node/features/features-sshapi-call-node/pom.xml
+++ b/sshapi-call-node/features/features-sshapi-call-node/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-sshapi-call-node</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>ccsdk-sli-plugins :: sshapi-call-node :: ${project.artifactId}</name>

diff --git a/sshapi-call-node/features/pom.xml b/sshapi-call-node/features/pom.xml
index 4db5892..6e31170 100755 (executable)
--- a/sshapi-call-node/features/pom.xml
+++ b/sshapi-call-node/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.plugins</groupId>
     <artifactId>sshapi-call-node-features</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-sli-plugins :: sshapi-call-node :: ${project.artifactId}</name>

diff --git a/sshapi-call-node/installer/pom.xml b/sshapi-call-node/installer/pom.xml
index 5d4ef71..1b248a3 100755 (executable)
--- a/sshapi-call-node/installer/pom.xml
+++ b/sshapi-call-node/installer/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.plugins</groupId>
        <artifactId>sshapi-call-node-installer</artifactId>
-       <version>0.5.2-SNAPSHOT</version>
+       <version>0.6.0-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>ccsdk-sli-plugins :: sshapi-call-node :: ${project.artifactId}</name>

diff --git a/sshapi-call-node/pom.xml b/sshapi-call-node/pom.xml
index 90bb6d5..66e2af3 100755 (executable)
--- a/sshapi-call-node/pom.xml
+++ b/sshapi-call-node/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.plugins</groupId>
     <artifactId>sshapi-call-node</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-sli-plugins :: sshapi-call-node</name>

diff --git a/sshapi-call-node/provider/pom.xml b/sshapi-call-node/provider/pom.xml
index 8af4faa..cd920a8 100755 (executable)
--- a/sshapi-call-node/provider/pom.xml
+++ b/sshapi-call-node/provider/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>1.3.3-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.plugins</groupId>
     <artifactId>sshapi-call-node-provider</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <name>ccsdk-sli-plugins :: sshapi-call-node :: ${project.artifactId}</name>

diff --git a/sshapi-call-node/provider/src/main/resources/OSGI-INF/blueprint/sshapi-call-node-blueprint.xml b/sshapi-call-node/provider/src/main/resources/OSGI-INF/blueprint/sshapi-call-node-blueprint.xml
new file mode 100755 (executable)
index 0000000..7a54243
--- /dev/null
+++ b/sshapi-call-node/provider/src/main/resources/OSGI-INF/blueprint/sshapi-call-node-blueprint.xml
@@ -0,0 +1,16 @@
+<?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">
+
+    <bean id="sshapiCallNodeProvider" class="org.onap.ccsdk.sli.plugins.sshapicall.SshApiCallNode" />
+
+
+
+    <service ref="sshapiCallNodeProvider">
+        <interfaces>
+            <value>org.onap.ccsdk.sli.plugins.sshapicall.SshApiCallNode</value>
+        </interfaces>
+    </service>
+
+</blueprint>
\ No newline at end of file

diff --git a/template-node/features/ccsdk-template-node/pom.xml b/template-node/features/ccsdk-template-node/pom.xml
index a1b16a5..91658ae 100644 (file)
--- a/template-node/features/ccsdk-template-node/pom.xml
+++ b/template-node/features/ccsdk-template-node/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-template-node</artifactId>
-       <version>0.5.2-SNAPSHOT</version>
+       <version>0.6.0-SNAPSHOT</version>
        <packaging>feature</packaging>
 
        <name>ccsdk-sli-plugins :: template-node :: ${project.artifactId}</name>

diff --git a/template-node/features/features-template-node/pom.xml b/template-node/features/features-template-node/pom.xml
index c220d4f..105a032 100644 (file)
--- a/template-node/features/features-template-node/pom.xml
+++ b/template-node/features/features-template-node/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-template-node</artifactId>
-       <version>0.5.2-SNAPSHOT</version>
+       <version>0.6.0-SNAPSHOT</version>
        <packaging>feature</packaging>
 
        <dependencies>

diff --git a/template-node/features/pom.xml b/template-node/features/pom.xml
index 143d974..391a6ce 100644 (file)
--- a/template-node/features/pom.xml
+++ b/template-node/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.plugins</groupId>
     <artifactId>template-node-features</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <modules>

diff --git a/template-node/installer/pom.xml b/template-node/installer/pom.xml
index 5de1284..2a5891d 100644 (file)
--- a/template-node/installer/pom.xml
+++ b/template-node/installer/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.plugins</groupId>
        <artifactId>template-node-installer</artifactId>
-       <version>0.5.2-SNAPSHOT</version>
+       <version>0.6.0-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>ccsdk-sli-plugins :: template-node :: ${project.artifactId}</name>

diff --git a/template-node/pom.xml b/template-node/pom.xml
index 5193882..0c811f7 100644 (file)
--- a/template-node/pom.xml
+++ b/template-node/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.plugins</groupId>
     <artifactId>template-node</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <modules>

diff --git a/template-node/provider/pom.xml b/template-node/provider/pom.xml
index d3dd794..f9cd3ef 100644 (file)
--- a/template-node/provider/pom.xml
+++ b/template-node/provider/pom.xml
@@ -5,12 +5,12 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>binding-parent</artifactId>
-               <version>1.3.3-SNAPSHOT</version>
+               <version>1.4.0-SNAPSHOT</version>
        </parent>
 
        <groupId>org.onap.ccsdk.sli.plugins</groupId>
        <artifactId>template-node-provider</artifactId>
-       <version>0.5.2-SNAPSHOT</version>
+       <version>0.6.0-SNAPSHOT</version>
        <packaging>bundle</packaging>
 
     <name>ccsdk-sli-plugins :: template-node :: ${project.artifactId}</name>

diff --git a/version.properties b/version.properties
index dc2c5ad..3fc281c 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -6,8 +6,8 @@
 # Comment
 
 release_name=0
-sprint_number=5
-feature_revision=2
+sprint_number=6
+feature_revision=0
 
 base_version=${release_name}.${sprint_number}.${feature_revision}