Code changes to sli/northbound for ODL Fluorine

Code changes needed to support port to ODL Fluorine.

Change-Id: If898ed120a3d03773db815f797f1eee633ca77e3
Issue-ID: CCSDK-870
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index a89e193..d15621f 100755 (executable)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>org.onap.ccsdk.sli.northbound</groupId>
     <artifactId>sli-northbound-artifacts</artifactId>
-    <version>0.4.0-SNAPSHOT</version>
+    <version>0.4.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-sli-northbound :: sli-northbound-artifacts</name>
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>parent</artifactId>
-        <version>1.2.0</version>    
+        <version>1.2.1-SNAPSHOT</version>    
     </parent>
 
     <properties>

diff --git a/asdcApi/features/ccsdk-asdcApi/pom.xml b/asdcApi/features/ccsdk-asdcApi/pom.xml
index e538aab..d492848 100644 (file)
--- a/asdcApi/features/ccsdk-asdcApi/pom.xml
+++ b/asdcApi/features/ccsdk-asdcApi/pom.xml
@@ -5,43 +5,21 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.2.0</version>
+        <version>1.2.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.northbound</groupId>
     <artifactId>ccsdk-asdcApi</artifactId>
-    <version>0.4.0-SNAPSHOT</version>
+    <version>0.4.1-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>ccsdk-sli-northbound :: asdcApi :: ${project.artifactId}</name>
     
-
     <properties>
         <ccsdk.sli.northbound.version>${project.version}</ccsdk.sli.northbound.version>
     </properties>
 
-
-    <dependencyManagement>
-        <dependencies>
-             <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>mdsal-model-artifacts</artifactId>
-                <version>${odl.mdsal.model.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>mdsal-artifacts</artifactId>
-                <version>${odl.mdsal.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-    
-
     <dependencies>
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>

diff --git a/asdcApi/features/features-asdcApi/pom.xml b/asdcApi/features/features-asdcApi/pom.xml
index 48bff87..312c7b7 100644 (file)
--- a/asdcApi/features/features-asdcApi/pom.xml
+++ b/asdcApi/features/features-asdcApi/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>1.2.0</version>
+        <version>1.2.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.northbound</groupId>
     <artifactId>features-asdcApi</artifactId>
-    <version>0.4.0-SNAPSHOT</version>
+    <version>0.4.1-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>ccsdk-sli-northbound :: asdcApi :: ${project.artifactId}</name>

diff --git a/asdcApi/features/pom.xml b/asdcApi/features/pom.xml
index a63f2ee..260878a 100755 (executable)
--- a/asdcApi/features/pom.xml
+++ b/asdcApi/features/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.2.0</version>
+        <version>1.2.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.northbound</groupId>
     <artifactId>asdcApi-features</artifactId>
-    <version>0.4.0-SNAPSHOT</version>
+    <version>0.4.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-sli-northbound :: asdcApi :: ${project.artifactId}</name>

diff --git a/asdcApi/installer/pom.xml b/asdcApi/installer/pom.xml
index f4d1552..f17b7a1 100755 (executable)
--- a/asdcApi/installer/pom.xml
+++ b/asdcApi/installer/pom.xml
@@ -5,13 +5,13 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.2.0</version>
+               <version>1.2.1-SNAPSHOT</version>
         <relativePath/>
        </parent>
 
     <groupId>org.onap.ccsdk.sli.northbound</groupId>
        <artifactId>asdcApi-installer</artifactId>
-    <version>0.4.0-SNAPSHOT</version>
+    <version>0.4.1-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>ccsdk-sli-northbound :: asdcApi :: ${project.artifactId}</name>

diff --git a/asdcApi/model/pom.xml b/asdcApi/model/pom.xml
index 944ca8c..61384fd 100755 (executable)
--- a/asdcApi/model/pom.xml
+++ b/asdcApi/model/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>1.2.0</version>
+        <version>1.2.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.northbound</groupId>
     <artifactId>asdcApi-model</artifactId>
-    <version>0.4.0-SNAPSHOT</version>
+    <version>0.4.1-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <name>ccsdk-sli-northbound :: asdcApi :: ${project.artifactId}</name>
@@ -24,11 +24,11 @@
 
         <dependency>
             <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>ietf-inet-types</artifactId>
+            <artifactId>ietf-inet-types-2013-07-15</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>ietf-yang-types</artifactId>
+            <artifactId>ietf-yang-types-20130715</artifactId>
         </dependency>
     </dependencies>
 

diff --git a/asdcApi/model/src/main/yang/ASDC-API.yang b/asdcApi/model/src/main/yang/ASDC-API.yang
index 00ef452..12cfb9a 100755 (executable)
--- a/asdcApi/model/src/main/yang/ASDC-API.yang
+++ b/asdcApi/model/src/main/yang/ASDC-API.yang
@@ -13,7 +13,7 @@ module ASDC-API {
 
     import ietf-inet-types {
         prefix inet;
-        revision-date "2010-09-24";
+        revision-date "2013-07-15";
         }
 
     organization

diff --git a/asdcApi/pom.xml b/asdcApi/pom.xml
index f37b069..c724d45 100755 (executable)
--- a/asdcApi/pom.xml
+++ b/asdcApi/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.2.0</version>
+        <version>1.2.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.northbound</groupId>
     <artifactId>asdcApi</artifactId>
-    <version>0.4.0-SNAPSHOT</version>
+    <version>0.4.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-sli-northbound :: asdcApi</name>

diff --git a/asdcApi/provider/pom.xml b/asdcApi/provider/pom.xml
index 84ac331..9d41cdc 100755 (executable)
--- a/asdcApi/provider/pom.xml
+++ b/asdcApi/provider/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>1.2.0</version>
+        <version>1.2.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.northbound</groupId>
     <artifactId>asdcApi-provider</artifactId>
-    <version>0.4.0-SNAPSHOT</version>
+    <version>0.4.1-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <name>ccsdk-sli-northbound :: asdcApi :: ${project.artifactId}</name>
@@ -20,16 +20,24 @@
         <ccsdk.sli.northbound.version>${project.version}</ccsdk.sli.northbound.version>
     </properties>
 
+    <dependencyManagement>
+       <dependencies>
+               <dependency>
+                       <groupId>org.onap.ccsdk.sli.core</groupId>
+                       <artifactId>sli-core-artifacts</artifactId>
+                       <version>${ccsdk.sli.core.version}</version>
+                       <type>pom</type>
+                       <scope>import</scope>
+               </dependency>
+       </dependencies>
+    </dependencyManagement>
+
     <dependencies>
         <dependency>
             <groupId>org.onap.ccsdk.sli.northbound</groupId>
             <artifactId>asdcApi-model</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-config</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>org.opendaylight.controller</groupId>

diff --git a/asdcApi/provider/src/main/java/org/onap/ccsdk/sli/northbound/asdcapi/AsdcApiProvider.java b/asdcApi/provider/src/main/java/org/onap/ccsdk/sli/northbound/asdcapi/AsdcApiProvider.java
index 27280d2..1a79f8c 100644 (file)
--- a/asdcApi/provider/src/main/java/org/onap/ccsdk/sli/northbound/asdcapi/AsdcApiProvider.java
+++ b/asdcApi/provider/src/main/java/org/onap/ccsdk/sli/northbound/asdcapi/AsdcApiProvider.java
@@ -25,7 +25,6 @@ import java.util.Properties;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
 
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService;
@@ -59,6 +58,7 @@ import org.slf4j.LoggerFactory;
 import com.google.common.base.Optional;
 import com.google.common.util.concurrent.CheckedFuture;
 import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
 
 /**
  * Defines a base implementation for your provider. This class extends from a helper class
@@ -203,7 +203,7 @@ public class AsdcApiProvider implements AutoCloseable, ASDCAPIService {
 
             InstanceIdentifier.InstanceIdentifierBuilder<Artifact> aIdBuilder = InstanceIdentifier
                     .<Artifacts> builder(Artifacts.class)
-                    .child(Artifact.class, artifact.getKey());
+                    .child(Artifact.class, artifact.key());
 
             InstanceIdentifier<Artifact> path = aIdBuilder.build();
 
@@ -238,7 +238,7 @@ public class AsdcApiProvider implements AutoCloseable, ASDCAPIService {
 
         InstanceIdentifier.InstanceIdentifierBuilder<VfLicenseModelVersion> versionIdBuilder = InstanceIdentifier
                 .<VfLicenseModelVersions> builder(VfLicenseModelVersions.class)
-                .child(VfLicenseModelVersion.class, version.getKey());
+                .child(VfLicenseModelVersion.class, version.key());
 
         InstanceIdentifier<VfLicenseModelVersion> path = versionIdBuilder.build();
 
@@ -264,7 +264,7 @@ public class AsdcApiProvider implements AutoCloseable, ASDCAPIService {
         VfLicenseModelVersion version = vBuilder.build();
         InstanceIdentifier.InstanceIdentifierBuilder<VfLicenseModelVersion> versionIdBuilder = InstanceIdentifier
                 .<VfLicenseModelVersions> builder(VfLicenseModelVersions.class)
-                .child(VfLicenseModelVersion.class, version.getKey());
+                .child(VfLicenseModelVersion.class, version.key());
 
         InstanceIdentifier<VfLicenseModelVersion> path = versionIdBuilder.build();
 
@@ -282,7 +282,7 @@ public class AsdcApiProvider implements AutoCloseable, ASDCAPIService {
 }
 
 @Override
-public Future<RpcResult<VfLicenseModelUpdateOutput>> vfLicenseModelUpdate(VfLicenseModelUpdateInput input) {
+public ListenableFuture<RpcResult<VfLicenseModelUpdateOutput>> vfLicenseModelUpdate(VfLicenseModelUpdateInput input) {
     final String svcOperation = "vf-license-model-update";
 
     Properties parms = new Properties();

diff --git a/dataChange/features/ccsdk-dataChange/pom.xml b/dataChange/features/ccsdk-dataChange/pom.xml
index a18d2ac..16383e8 100644 (file)
--- a/dataChange/features/ccsdk-dataChange/pom.xml
+++ b/dataChange/features/ccsdk-dataChange/pom.xml
@@ -5,42 +5,21 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.2.0</version>
+        <version>1.2.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.northbound</groupId>
     <artifactId>ccsdk-dataChange</artifactId>
-    <version>0.4.0-SNAPSHOT</version>
+    <version>0.4.1-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>ccsdk-sli-northbound :: dataChange :: ${project.artifactId}</name>
 
-
     <properties>
         <ccsdk.sli.northbound.version>${project.version}</ccsdk.sli.northbound.version>
     </properties>
 
-
-    <dependencyManagement>
-        <dependencies>
-             <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>mdsal-model-artifacts</artifactId>
-                <version>${odl.mdsal.model.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>mdsal-artifacts</artifactId>
-                <version>${odl.mdsal.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-    
     <dependencies>
 
         <dependency>

diff --git a/dataChange/features/features-dataChange/pom.xml b/dataChange/features/features-dataChange/pom.xml
index 7924750..66264cd 100644 (file)
--- a/dataChange/features/features-dataChange/pom.xml
+++ b/dataChange/features/features-dataChange/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>1.2.0</version>
+        <version>1.2.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.northbound</groupId>
     <artifactId>features-dataChange</artifactId>
-    <version>0.4.0-SNAPSHOT</version>
+    <version>0.4.1-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>ccsdk-sli-northbound :: dataChange :: ${project.artifactId}</name>

diff --git a/dataChange/features/pom.xml b/dataChange/features/pom.xml
index 99b8b86..02e257f 100755 (executable)
--- a/dataChange/features/pom.xml
+++ b/dataChange/features/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.2.0</version>
+        <version>1.2.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.northbound</groupId>
     <artifactId>dataChange-features</artifactId>
-    <version>0.4.0-SNAPSHOT</version>
+    <version>0.4.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-sli-northbound :: dataChange :: ${project.artifactId}</name>

diff --git a/dataChange/installer/pom.xml b/dataChange/installer/pom.xml
index 83aaec0..d2d9b15 100755 (executable)
--- a/dataChange/installer/pom.xml
+++ b/dataChange/installer/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.2.0</version>
+        <version>1.2.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.northbound</groupId>
     <artifactId>dataChange-installer</artifactId>
-    <version>0.4.0-SNAPSHOT</version>
+    <version>0.4.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-sli-northbound :: dataChange :: ${project.artifactId}</name>

diff --git a/dataChange/model/pom.xml b/dataChange/model/pom.xml
index 5d2ce7d..aa98730 100755 (executable)
--- a/dataChange/model/pom.xml
+++ b/dataChange/model/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>1.2.0</version>
+        <version>1.2.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.northbound</groupId>
     <artifactId>dataChange-model</artifactId>
-    <version>0.4.0-SNAPSHOT</version>
+    <version>0.4.1-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <name>ccsdk-sli-northbound :: dataChange :: ${project.artifactId}</name>
@@ -23,11 +23,11 @@
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>ietf-inet-types</artifactId>
+            <artifactId>ietf-inet-types-2013-07-15</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>ietf-yang-types</artifactId>
+            <artifactId>ietf-yang-types-20130715</artifactId>
         </dependency>
     </dependencies>
 

diff --git a/dataChange/pom.xml b/dataChange/pom.xml
index 824cd58..b6418f4 100755 (executable)
--- a/dataChange/pom.xml
+++ b/dataChange/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.2.0</version>
+        <version>1.2.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.northbound</groupId>
     <artifactId>dataChange</artifactId>
-    <version>0.4.0-SNAPSHOT</version>
+    <version>0.4.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-sli-northbound :: dataChange</name>

diff --git a/dataChange/provider/pom.xml b/dataChange/provider/pom.xml
index 09b7741..dd08e3e 100755 (executable)
--- a/dataChange/provider/pom.xml
+++ b/dataChange/provider/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>1.2.0</version>
+        <version>1.2.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.northbound</groupId>
     <artifactId>dataChange-provider</artifactId>
-    <version>0.4.0-SNAPSHOT</version>
+    <version>0.4.1-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <name>ccsdk-sli-northbound :: dataChange :: ${project.artifactId}</name>
@@ -19,6 +19,18 @@
     <properties>
         <ccsdk.sli.northbound.version>${project.version}</ccsdk.sli.northbound.version>
     </properties>
+    
+    <dependencyManagement>
+       <dependencies>
+               <dependency>
+                       <groupId>org.onap.ccsdk.sli.core</groupId>
+                       <artifactId>sli-core-artifacts</artifactId>
+                       <version>${ccsdk.sli.core.version}</version>
+                       <type>pom</type>
+                       <scope>import</scope>
+               </dependency>
+       </dependencies>
+    </dependencyManagement>
 
     <dependencies>
         <dependency>
@@ -26,10 +38,6 @@
             <artifactId>dataChange-model</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-config</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>org.opendaylight.controller</groupId>

diff --git a/dataChange/provider/src/main/java/org/onap/ccsdk/sli/northbound/DataChangeProvider.java b/dataChange/provider/src/main/java/org/onap/ccsdk/sli/northbound/DataChangeProvider.java
index f272dbb..3301ca8 100644 (file)
--- a/dataChange/provider/src/main/java/org/onap/ccsdk/sli/northbound/DataChangeProvider.java
+++ b/dataChange/provider/src/main/java/org/onap/ccsdk/sli/northbound/DataChangeProvider.java
@@ -25,7 +25,6 @@ package org.onap.ccsdk.sli.northbound;
 import java.util.Properties;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
 
 import org.onap.ccsdk.sli.core.sli.provider.MdsalHelper;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
@@ -43,6 +42,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
 
 /**
  * Defines a base implementation for your provider. This class extends from a helper class
@@ -98,7 +98,7 @@ public class DataChangeProvider implements AutoCloseable, DataChangeService {
     }
 
        @Override
-       public Future<RpcResult<DataChangeNotificationOutput>> dataChangeNotification(
+       public ListenableFuture<RpcResult<DataChangeNotificationOutput>> dataChangeNotification(
                        DataChangeNotificationInput input) {
                final String svcOperation = "data-change-notification";
 

diff --git a/dataChange/provider/src/test/java/org/onap/sdnc/northbound/dataChange/TestDataChange.java b/dataChange/provider/src/test/java/org/onap/sdnc/northbound/dataChange/TestDataChange.java
index 7855375..f9c39b7 100644 (file)
--- a/dataChange/provider/src/test/java/org/onap/sdnc/northbound/dataChange/TestDataChange.java
+++ b/dataChange/provider/src/test/java/org/onap/sdnc/northbound/dataChange/TestDataChange.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.sdnc.northbound;
+package org.onap.sdnc.northbound.dataChange;
 
 import org.junit.Before;
 import org.junit.Test;

diff --git a/dmaap-listener/pom.xml b/dmaap-listener/pom.xml
index 86c7d54..07c80d0 100755 (executable)
--- a/dmaap-listener/pom.xml
+++ b/dmaap-listener/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.2.0</version>
+        <version>1.2.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.northbound</groupId>
     <artifactId>dmaap-listener</artifactId>
-    <version>0.4.0-SNAPSHOT</version>
+    <version>0.4.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>ccsdk-sli-northbound :: dmaap-listener</name>

diff --git a/features/ccsdk-sli-northbound-all/pom.xml b/features/ccsdk-sli-northbound-all/pom.xml
index 181621b..f4d2338 100644 (file)
--- a/features/ccsdk-sli-northbound-all/pom.xml
+++ b/features/ccsdk-sli-northbound-all/pom.xml
@@ -5,41 +5,20 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.2.0</version>
+        <version>1.2.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.northbound</groupId>
     <artifactId>ccsdk-sli-northbound-all</artifactId>
-    <version>0.4.0-SNAPSHOT</version>
+    <version>0.4.1-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>ccsdk-sli-northbound :: features :: ${project.artifactId}</name>
 
-
     <properties>
         <ccsdk.sli.northbound.version>${project.version}</ccsdk.sli.northbound.version>
     </properties>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>mdsal-model-artifacts</artifactId>
-                <version>${odl.mdsal.model.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>mdsal-artifacts</artifactId>
-                <version>${odl.mdsal.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>

diff --git a/features/features-sli-northbound/pom.xml b/features/features-sli-northbound/pom.xml
index 60f8d73..5d44335 100644 (file)
--- a/features/features-sli-northbound/pom.xml
+++ b/features/features-sli-northbound/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>1.2.0</version>
+        <version>1.2.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.northbound</groupId>
     <artifactId>features-sli-northbound</artifactId>
-    <version>0.4.0-SNAPSHOT</version>
+    <version>0.4.1-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>ccsdk-sli-northbound :: features :: ${project.artifactId}</name>

diff --git a/features/installer/pom.xml b/features/installer/pom.xml
index 37e9a26..644ca1c 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.2.0</version>
+        <version>1.2.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.northbound</groupId>
     <artifactId>slinorthbound-features-installer</artifactId>
-    <version>0.4.0-SNAPSHOT</version>
+    <version>0.4.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-sli-northbound :: features :: ${project.artifactId}</name>

diff --git a/features/pom.xml b/features/pom.xml
index 2744c5c..f968836 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.2.0</version>
+        <version>1.2.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.northbound</groupId>
     <artifactId>slinorthbound-feature-aggregator</artifactId>
-    <version>0.4.0-SNAPSHOT</version>
+    <version>0.4.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-sli-northbound :: features</name>

diff --git a/lcm/features/ccsdk-lcm/pom.xml b/lcm/features/ccsdk-lcm/pom.xml
index 6138a36..67fadb1 100644 (file)
--- a/lcm/features/ccsdk-lcm/pom.xml
+++ b/lcm/features/ccsdk-lcm/pom.xml
@@ -5,42 +5,21 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.2.0</version>
+        <version>1.2.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.northbound</groupId>
     <artifactId>ccsdk-lcm</artifactId>
-    <version>0.4.0-SNAPSHOT</version>
+    <version>0.4.1-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>ccsdk-sli-northbound :: lcm :: ${project.artifactId}</name>
 
-
     <properties>
         <ccsdk.sli.northbound.version>${project.version}</ccsdk.sli.northbound.version>
     </properties>
-
-
-    <dependencyManagement>
-        <dependencies>
-             <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>mdsal-model-artifacts</artifactId>
-                <version>${odl.mdsal.model.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>mdsal-artifacts</artifactId>
-                <version>${odl.mdsal.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-    
+       
     <dependencies>
 
         <dependency>

diff --git a/lcm/features/features-lcm/pom.xml b/lcm/features/features-lcm/pom.xml
index 08e4fa8..571b8e0 100644 (file)
--- 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.2.0</version>
+        <version>1.2.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.northbound</groupId>
     <artifactId>features-lcm</artifactId>
-    <version>0.4.0-SNAPSHOT</version>
+    <version>0.4.1-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 27fdcef..afde4e1 100755 (executable)
--- 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.2.0</version>
+        <version>1.2.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.northbound</groupId>
     <artifactId>lcm-features</artifactId>
-    <version>0.4.0-SNAPSHOT</version>
+    <version>0.4.1-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 e51a95e..10e7bdd 100755 (executable)
--- 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.2.0</version>
+        <version>1.2.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.northbound</groupId>
     <artifactId>lcm-installer</artifactId>
-    <version>0.4.0-SNAPSHOT</version>
+    <version>0.4.1-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 090ed64..38416fe 100755 (executable)
--- 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.2.0</version>
+        <version>1.2.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.northbound</groupId>
     <artifactId>lcm-model</artifactId>
-    <version>0.4.0-SNAPSHOT</version>
+    <version>0.4.1-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <name>ccsdk-sli-northbound :: lcm :: ${project.artifactId}</name>
@@ -24,11 +24,11 @@
 
         <dependency>
             <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>ietf-inet-types</artifactId>
+            <artifactId>ietf-inet-types-2013-07-15</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>ietf-yang-types</artifactId>
+            <artifactId>ietf-yang-types-20130715</artifactId>
         </dependency>
     </dependencies>
 

diff --git a/lcm/pom.xml b/lcm/pom.xml
index 54f1ba6..4e9f103 100755 (executable)
--- 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.2.0</version>
+        <version>1.2.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.northbound</groupId>
     <artifactId>lcm</artifactId>
-    <version>0.4.0-SNAPSHOT</version>
+    <version>0.4.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-sli-northbound :: lcm</name>

diff --git a/lcm/provider/pom.xml b/lcm/provider/pom.xml
index 1881040..a6dd863 100755 (executable)
--- 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.2.0</version>
+        <version>1.2.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.northbound</groupId>
     <artifactId>lcm-provider</artifactId>
-    <version>0.4.0-SNAPSHOT</version>
+    <version>0.4.1-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <name>ccsdk-sli-northbound :: lcm :: ${project.artifactId}</name>
@@ -20,16 +20,17 @@
         <ccsdk.sli.northbound.version>${project.version}</ccsdk.sli.northbound.version>
     </properties>
 
+
     <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>mdsal-artifacts</artifactId>
-                <version>1.6.1</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
+       <dependencies>
+               <dependency>
+                       <groupId>org.onap.ccsdk.sli.core</groupId>
+                       <artifactId>sli-core-artifacts</artifactId>
+                       <version>${ccsdk.sli.core.version}</version>
+                       <type>pom</type>
+                       <scope>import</scope>
+               </dependency>
+       </dependencies>
     </dependencyManagement>
 
     <dependencies>
@@ -38,16 +39,15 @@
             <artifactId>lcm-model</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-config</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-binding-api</artifactId>
         </dependency>
-
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>sal-binding-broker-impl</artifactId>
+        </dependency> 
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-common-util</artifactId>
@@ -95,6 +95,11 @@
             <version>10.12.1.1</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+                       <groupId>org.osgi</groupId>
+                       <artifactId>org.osgi.core</artifactId>
+                       <scope>test</scope>
+               </dependency>
     </dependencies>
 
 

diff --git a/lcm/provider/src/main/java/org/onap/ccsdk/sli/northbound/LcmProvider.java b/lcm/provider/src/main/java/org/onap/ccsdk/sli/northbound/LcmProvider.java
index 570e89e..d1f3ba5 100644 (file)
--- a/lcm/provider/src/main/java/org/onap/ccsdk/sli/northbound/LcmProvider.java
+++ b/lcm/provider/src/main/java/org/onap/ccsdk/sli/northbound/LcmProvider.java
@@ -43,6 +43,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
 
 import org.onap.ccsdk.sli.northbound.LcmResponseCode.*;
 
@@ -131,7 +132,7 @@ public class LcmProvider implements AutoCloseable, LCMService {
 
 
        @Override
-       public Future<RpcResult<CheckLockOutput>> checkLock(CheckLockInput input) {
+       public ListenableFuture<RpcResult<CheckLockOutput>> checkLock(CheckLockInput input) {
                CheckLockInputBuilder iBuilder = new CheckLockInputBuilder(input);
                CheckLockOutputBuilder oBuilder = new CheckLockOutputBuilder();
 
@@ -153,7 +154,7 @@ public class LcmProvider implements AutoCloseable, LCMService {
        }
 
        @Override
-       public Future<RpcResult<RebootOutput>> reboot(RebootInput input) {
+       public ListenableFuture<RpcResult<RebootOutput>> reboot(RebootInput input) {
                RebootInputBuilder iBuilder = new RebootInputBuilder(input);
                RebootOutputBuilder oBuilder = new RebootOutputBuilder();
 
@@ -174,7 +175,7 @@ public class LcmProvider implements AutoCloseable, LCMService {
        }
 
        @Override
-       public Future<RpcResult<UpgradeBackupOutput>> upgradeBackup(UpgradeBackupInput input) {
+       public ListenableFuture<RpcResult<UpgradeBackupOutput>> upgradeBackup(UpgradeBackupInput input) {
                UpgradeBackupInputBuilder iBuilder = new UpgradeBackupInputBuilder(input);
                UpgradeBackupOutputBuilder oBuilder = new UpgradeBackupOutputBuilder();
 
@@ -196,7 +197,7 @@ public class LcmProvider implements AutoCloseable, LCMService {
        }
 
        @Override
-       public Future<RpcResult<RollbackOutput>> rollback(RollbackInput input) {
+       public ListenableFuture<RpcResult<RollbackOutput>> rollback(RollbackInput input) {
                RollbackInputBuilder iBuilder = new RollbackInputBuilder(input);
                RollbackOutputBuilder oBuilder = new RollbackOutputBuilder();
 
@@ -217,7 +218,7 @@ public class LcmProvider implements AutoCloseable, LCMService {
        }
 
        @Override
-       public Future<RpcResult<SyncOutput>> sync(SyncInput input) {
+       public ListenableFuture<RpcResult<SyncOutput>> sync(SyncInput input) {
                SyncInputBuilder iBuilder = new SyncInputBuilder(input);
                SyncOutputBuilder oBuilder = new SyncOutputBuilder();
 
@@ -238,7 +239,7 @@ public class LcmProvider implements AutoCloseable, LCMService {
        }
 
        @Override
-       public Future<RpcResult<QueryOutput>> query(QueryInput input) {
+       public ListenableFuture<RpcResult<QueryOutput>> query(QueryInput input) {
                QueryInputBuilder iBuilder = new QueryInputBuilder(input);
                QueryOutputBuilder oBuilder = new QueryOutputBuilder();
 
@@ -259,7 +260,7 @@ public class LcmProvider implements AutoCloseable, LCMService {
        }
 
        @Override
-       public Future<RpcResult<ConfigExportOutput>> configExport(ConfigExportInput input) {
+       public ListenableFuture<RpcResult<ConfigExportOutput>> configExport(ConfigExportInput input) {
                ConfigExportInputBuilder iBuilder = new ConfigExportInputBuilder(input);
                ConfigExportOutputBuilder oBuilder = new ConfigExportOutputBuilder();
 
@@ -280,7 +281,7 @@ public class LcmProvider implements AutoCloseable, LCMService {
        }
 
        @Override
-       public Future<RpcResult<StopApplicationOutput>> stopApplication(StopApplicationInput input) {
+       public ListenableFuture<RpcResult<StopApplicationOutput>> stopApplication(StopApplicationInput input) {
                StopApplicationInputBuilder iBuilder = new StopApplicationInputBuilder(input);
                StopApplicationOutputBuilder oBuilder = new StopApplicationOutputBuilder();
 
@@ -301,7 +302,7 @@ public class LcmProvider implements AutoCloseable, LCMService {
        }
 
        @Override
-       public Future<RpcResult<SoftwareUploadOutput>> softwareUpload(SoftwareUploadInput input) {
+       public ListenableFuture<RpcResult<SoftwareUploadOutput>> softwareUpload(SoftwareUploadInput input) {
                SoftwareUploadInputBuilder iBuilder = new SoftwareUploadInputBuilder(input);
                SoftwareUploadOutputBuilder oBuilder = new SoftwareUploadOutputBuilder();
 
@@ -322,7 +323,7 @@ public class LcmProvider implements AutoCloseable, LCMService {
        }
 
        @Override
-       public Future<RpcResult<ResumeTrafficOutput>> resumeTraffic(ResumeTrafficInput input) {
+       public ListenableFuture<RpcResult<ResumeTrafficOutput>> resumeTraffic(ResumeTrafficInput input) {
                ResumeTrafficInputBuilder iBuilder = new ResumeTrafficInputBuilder(input);
                ResumeTrafficOutputBuilder oBuilder = new ResumeTrafficOutputBuilder();
 
@@ -343,7 +344,7 @@ public class LcmProvider implements AutoCloseable, LCMService {
        }
 
        @Override
-       public Future<RpcResult<DistributeTrafficOutput>> distributeTraffic(DistributeTrafficInput input) {
+       public ListenableFuture<RpcResult<DistributeTrafficOutput>> distributeTraffic(DistributeTrafficInput input) {
                DistributeTrafficInputBuilder iBuilder = new DistributeTrafficInputBuilder(input);
                DistributeTrafficOutputBuilder oBuilder = new DistributeTrafficOutputBuilder();
 
@@ -364,7 +365,7 @@ public class LcmProvider implements AutoCloseable, LCMService {
        }
 
        @Override
-       public Future<RpcResult<ConfigureOutput>> configure(ConfigureInput input) {
+       public ListenableFuture<RpcResult<ConfigureOutput>> configure(ConfigureInput input) {
                ConfigureInputBuilder iBuilder = new ConfigureInputBuilder(input);
                ConfigureOutputBuilder oBuilder = new ConfigureOutputBuilder();
 
@@ -385,7 +386,7 @@ public class LcmProvider implements AutoCloseable, LCMService {
        }
 
        @Override
-       public Future<RpcResult<ActionStatusOutput>> actionStatus(ActionStatusInput input) {
+       public ListenableFuture<RpcResult<ActionStatusOutput>> actionStatus(ActionStatusInput input) {
                ActionStatusInputBuilder iBuilder = new ActionStatusInputBuilder(input);
                ActionStatusOutputBuilder oBuilder = new ActionStatusOutputBuilder();
 
@@ -406,7 +407,7 @@ public class LcmProvider implements AutoCloseable, LCMService {
        }
 
        @Override
-       public Future<RpcResult<UpgradePreCheckOutput>> upgradePreCheck(UpgradePreCheckInput input) {
+       public ListenableFuture<RpcResult<UpgradePreCheckOutput>> upgradePreCheck(UpgradePreCheckInput input) {
                UpgradePreCheckInputBuilder iBuilder = new UpgradePreCheckInputBuilder(input);
                UpgradePreCheckOutputBuilder oBuilder = new UpgradePreCheckOutputBuilder();
 
@@ -427,7 +428,7 @@ public class LcmProvider implements AutoCloseable, LCMService {
        }
 
        @Override
-       public Future<RpcResult<LiveUpgradeOutput>> liveUpgrade(LiveUpgradeInput input) {
+       public ListenableFuture<RpcResult<LiveUpgradeOutput>> liveUpgrade(LiveUpgradeInput input) {
                LiveUpgradeInputBuilder iBuilder = new LiveUpgradeInputBuilder(input);
                LiveUpgradeOutputBuilder oBuilder = new LiveUpgradeOutputBuilder();
 
@@ -448,7 +449,7 @@ public class LcmProvider implements AutoCloseable, LCMService {
        }
 
        @Override
-       public Future<RpcResult<ConfigModifyOutput>> configModify(ConfigModifyInput input) {
+       public ListenableFuture<RpcResult<ConfigModifyOutput>> configModify(ConfigModifyInput input) {
                ConfigModifyInputBuilder iBuilder = new ConfigModifyInputBuilder(input);
                ConfigModifyOutputBuilder oBuilder = new ConfigModifyOutputBuilder();
 
@@ -469,7 +470,7 @@ public class LcmProvider implements AutoCloseable, LCMService {
        }
 
        @Override
-       public Future<RpcResult<RestartOutput>> restart(RestartInput input) {
+       public ListenableFuture<RpcResult<RestartOutput>> restart(RestartInput input) {
                RestartInputBuilder iBuilder = new RestartInputBuilder(input);
                RestartOutputBuilder oBuilder = new RestartOutputBuilder();
 
@@ -490,7 +491,7 @@ public class LcmProvider implements AutoCloseable, LCMService {
        }
 
        @Override
-       public Future<RpcResult<HealthCheckOutput>> healthCheck(HealthCheckInput input) {
+       public ListenableFuture<RpcResult<HealthCheckOutput>> healthCheck(HealthCheckInput input) {
                HealthCheckInputBuilder iBuilder = new HealthCheckInputBuilder(input);
                HealthCheckOutputBuilder oBuilder = new HealthCheckOutputBuilder();
 
@@ -511,7 +512,7 @@ public class LcmProvider implements AutoCloseable, LCMService {
        }
 
        @Override
-       public Future<RpcResult<LockOutput>> lock(LockInput input) {
+       public ListenableFuture<RpcResult<LockOutput>> lock(LockInput input) {
                LockInputBuilder iBuilder = new LockInputBuilder(input);
                LockOutputBuilder oBuilder = new LockOutputBuilder();
 
@@ -532,7 +533,7 @@ public class LcmProvider implements AutoCloseable, LCMService {
        }
 
        @Override
-       public Future<RpcResult<TerminateOutput>> terminate(TerminateInput input) {
+       public ListenableFuture<RpcResult<TerminateOutput>> terminate(TerminateInput input) {
                TerminateInputBuilder iBuilder = new TerminateInputBuilder(input);
                TerminateOutputBuilder oBuilder = new TerminateOutputBuilder();
 
@@ -553,7 +554,7 @@ public class LcmProvider implements AutoCloseable, LCMService {
        }
 
        @Override
-       public Future<RpcResult<AttachVolumeOutput>> attachVolume(AttachVolumeInput input) {
+       public ListenableFuture<RpcResult<AttachVolumeOutput>> attachVolume(AttachVolumeInput input) {
                AttachVolumeInputBuilder iBuilder = new AttachVolumeInputBuilder(input);
                AttachVolumeOutputBuilder oBuilder = new AttachVolumeOutputBuilder();
 
@@ -574,7 +575,7 @@ public class LcmProvider implements AutoCloseable, LCMService {
        }
 
        @Override
-       public Future<RpcResult<MigrateOutput>> migrate(MigrateInput input) {
+       public ListenableFuture<RpcResult<MigrateOutput>> migrate(MigrateInput input) {
                MigrateInputBuilder iBuilder = new MigrateInputBuilder(input);
                MigrateOutputBuilder oBuilder = new MigrateOutputBuilder();
 
@@ -595,7 +596,7 @@ public class LcmProvider implements AutoCloseable, LCMService {
        }
 
        @Override
-       public Future<RpcResult<QuiesceTrafficOutput>> quiesceTraffic(QuiesceTrafficInput input) {
+       public ListenableFuture<RpcResult<QuiesceTrafficOutput>> quiesceTraffic(QuiesceTrafficInput input) {
                QuiesceTrafficInputBuilder iBuilder = new QuiesceTrafficInputBuilder(input);
                QuiesceTrafficOutputBuilder oBuilder = new QuiesceTrafficOutputBuilder();
 
@@ -616,7 +617,7 @@ public class LcmProvider implements AutoCloseable, LCMService {
        }
 
        @Override
-       public Future<RpcResult<ConfigRestoreOutput>> configRestore(ConfigRestoreInput input) {
+       public ListenableFuture<RpcResult<ConfigRestoreOutput>> configRestore(ConfigRestoreInput input) {
                ConfigRestoreInputBuilder iBuilder = new ConfigRestoreInputBuilder(input);
                ConfigRestoreOutputBuilder oBuilder = new ConfigRestoreOutputBuilder();
 
@@ -637,7 +638,7 @@ public class LcmProvider implements AutoCloseable, LCMService {
        }
 
        @Override
-       public Future<RpcResult<UpgradeBackoutOutput>> upgradeBackout(UpgradeBackoutInput input) {
+       public ListenableFuture<RpcResult<UpgradeBackoutOutput>> upgradeBackout(UpgradeBackoutInput input) {
                UpgradeBackoutInputBuilder iBuilder = new UpgradeBackoutInputBuilder(input);
                UpgradeBackoutOutputBuilder oBuilder = new UpgradeBackoutOutputBuilder();
 
@@ -658,7 +659,7 @@ public class LcmProvider implements AutoCloseable, LCMService {
        }
 
        @Override
-       public Future<RpcResult<EvacuateOutput>> evacuate(EvacuateInput input) {
+       public ListenableFuture<RpcResult<EvacuateOutput>> evacuate(EvacuateInput input) {
                EvacuateInputBuilder iBuilder = new EvacuateInputBuilder(input);
                EvacuateOutputBuilder oBuilder = new EvacuateOutputBuilder();
 
@@ -679,7 +680,7 @@ public class LcmProvider implements AutoCloseable, LCMService {
        }
 
        @Override
-       public Future<RpcResult<UnlockOutput>> unlock(UnlockInput input) {
+       public ListenableFuture<RpcResult<UnlockOutput>> unlock(UnlockInput input) {
                UnlockInputBuilder iBuilder = new UnlockInputBuilder(input);
                UnlockOutputBuilder oBuilder = new UnlockOutputBuilder();
 
@@ -700,7 +701,7 @@ public class LcmProvider implements AutoCloseable, LCMService {
        }
 
        @Override
-       public Future<RpcResult<ConfigBackupDeleteOutput>> configBackupDelete(ConfigBackupDeleteInput input) {
+       public ListenableFuture<RpcResult<ConfigBackupDeleteOutput>> configBackupDelete(ConfigBackupDeleteInput input) {
                ConfigBackupDeleteInputBuilder iBuilder = new ConfigBackupDeleteInputBuilder(input);
                ConfigBackupDeleteOutputBuilder oBuilder = new ConfigBackupDeleteOutputBuilder();
 
@@ -721,7 +722,7 @@ public class LcmProvider implements AutoCloseable, LCMService {
        }
 
        @Override
-       public Future<RpcResult<UpgradeSoftwareOutput>> upgradeSoftware(UpgradeSoftwareInput input) {
+       public ListenableFuture<RpcResult<UpgradeSoftwareOutput>> upgradeSoftware(UpgradeSoftwareInput input) {
                UpgradeSoftwareInputBuilder iBuilder = new UpgradeSoftwareInputBuilder(input);
                UpgradeSoftwareOutputBuilder oBuilder = new UpgradeSoftwareOutputBuilder();
 
@@ -742,7 +743,7 @@ public class LcmProvider implements AutoCloseable, LCMService {
        }
 
        @Override
-       public Future<RpcResult<StopOutput>> stop(StopInput input) {
+       public ListenableFuture<RpcResult<StopOutput>> stop(StopInput input) {
                StopInputBuilder iBuilder = new StopInputBuilder(input);
                StopOutputBuilder oBuilder = new StopOutputBuilder();
 
@@ -763,7 +764,7 @@ public class LcmProvider implements AutoCloseable, LCMService {
        }
 
        @Override
-       public Future<RpcResult<DetachVolumeOutput>> detachVolume(DetachVolumeInput input) {
+       public ListenableFuture<RpcResult<DetachVolumeOutput>> detachVolume(DetachVolumeInput input) {
                DetachVolumeInputBuilder iBuilder = new DetachVolumeInputBuilder(input);
                DetachVolumeOutputBuilder oBuilder = new DetachVolumeOutputBuilder();
 
@@ -784,7 +785,7 @@ public class LcmProvider implements AutoCloseable, LCMService {
        }
 
        @Override
-       public Future<RpcResult<ConfigScaleOutOutput>> configScaleOut(ConfigScaleOutInput input) {
+       public ListenableFuture<RpcResult<ConfigScaleOutOutput>> configScaleOut(ConfigScaleOutInput input) {
                ConfigScaleOutInputBuilder iBuilder = new ConfigScaleOutInputBuilder(input);
                ConfigScaleOutOutputBuilder oBuilder = new ConfigScaleOutOutputBuilder();
 
@@ -805,7 +806,7 @@ public class LcmProvider implements AutoCloseable, LCMService {
        }
 
        @Override
-       public Future<RpcResult<UpgradePostCheckOutput>> upgradePostCheck(UpgradePostCheckInput input) {
+       public ListenableFuture<RpcResult<UpgradePostCheckOutput>> upgradePostCheck(UpgradePostCheckInput input) {
                UpgradePostCheckInputBuilder iBuilder = new UpgradePostCheckInputBuilder(input);
                UpgradePostCheckOutputBuilder oBuilder = new UpgradePostCheckOutputBuilder();
 
@@ -826,7 +827,7 @@ public class LcmProvider implements AutoCloseable, LCMService {
        }
 
        @Override
-       public Future<RpcResult<TestOutput>> test(TestInput input) {
+       public ListenableFuture<RpcResult<TestOutput>> test(TestInput input) {
                TestInputBuilder iBuilder = new TestInputBuilder(input);
                TestOutputBuilder oBuilder = new TestOutputBuilder();
 
@@ -847,7 +848,7 @@ public class LcmProvider implements AutoCloseable, LCMService {
        }
 
        @Override
-       public Future<RpcResult<StartApplicationOutput>> startApplication(StartApplicationInput input) {
+       public ListenableFuture<RpcResult<StartApplicationOutput>> startApplication(StartApplicationInput input) {
                StartApplicationInputBuilder iBuilder = new StartApplicationInputBuilder(input);
                StartApplicationOutputBuilder oBuilder = new StartApplicationOutputBuilder();
 
@@ -868,7 +869,7 @@ public class LcmProvider implements AutoCloseable, LCMService {
        }
 
        @Override
-       public Future<RpcResult<ConfigBackupOutput>> configBackup(ConfigBackupInput input) {
+       public ListenableFuture<RpcResult<ConfigBackupOutput>> configBackup(ConfigBackupInput input) {
                ConfigBackupInputBuilder iBuilder = new ConfigBackupInputBuilder(input);
                ConfigBackupOutputBuilder oBuilder = new ConfigBackupOutputBuilder();
 
@@ -889,7 +890,7 @@ public class LcmProvider implements AutoCloseable, LCMService {
        }
 
        @Override
-       public Future<RpcResult<RebuildOutput>> rebuild(RebuildInput input) {
+       public ListenableFuture<RpcResult<RebuildOutput>> rebuild(RebuildInput input) {
                RebuildInputBuilder iBuilder = new RebuildInputBuilder(input);
                RebuildOutputBuilder oBuilder = new RebuildOutputBuilder();
 
@@ -910,7 +911,7 @@ public class LcmProvider implements AutoCloseable, LCMService {
        }
 
        @Override
-       public Future<RpcResult<AuditOutput>> audit(AuditInput input) {
+       public ListenableFuture<RpcResult<AuditOutput>> audit(AuditInput input) {
                AuditInputBuilder iBuilder = new AuditInputBuilder(input);
                AuditOutputBuilder oBuilder = new AuditOutputBuilder();
 
@@ -931,7 +932,7 @@ public class LcmProvider implements AutoCloseable, LCMService {
        }
 
        @Override
-       public Future<RpcResult<StartOutput>> start(StartInput input) {
+       public ListenableFuture<RpcResult<StartOutput>> start(StartInput input) {
                StartInputBuilder iBuilder = new StartInputBuilder(input);
                StartOutputBuilder oBuilder = new StartOutputBuilder();
 
@@ -952,7 +953,7 @@ public class LcmProvider implements AutoCloseable, LCMService {
        }
 
        @Override
-       public Future<RpcResult<SnapshotOutput>> snapshot(SnapshotInput input) {
+       public ListenableFuture<RpcResult<SnapshotOutput>> snapshot(SnapshotInput input) {
                SnapshotInputBuilder iBuilder = new SnapshotInputBuilder(input);
                SnapshotOutputBuilder oBuilder = new SnapshotOutputBuilder();
 

diff --git a/pom.xml b/pom.xml
index bc96e01..e170498 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.2.0</version>
+        <version>1.2.1-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -84,7 +84,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.17</version>
                 <configuration>
                     <skipTests>false</skipTests>
                 </configuration>
@@ -92,7 +91,6 @@
             <plugin>
                 <groupId>org.sonatype.plugins</groupId>
                 <artifactId>nexus-staging-maven-plugin</artifactId>
-                <version>1.6.7</version>
                 <extensions>true</extensions>
                 <configuration>
                     <nexusUrl>https://${onap.nexus.host}</nexusUrl>
@@ -115,7 +113,7 @@
     <organization>
         <name>ONAP</name>
     </organization>
-    <version>0.4.0-SNAPSHOT</version>
+    <version>0.4.1-SNAPSHOT</version>
 
 
 </project>

diff --git a/ueb-listener/pom.xml b/ueb-listener/pom.xml
index 43832db..87a9dfe 100755 (executable)
--- a/ueb-listener/pom.xml
+++ b/ueb-listener/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.2.0</version>
+        <version>1.2.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.northbound</groupId>
     <artifactId>ueb-listener</artifactId>
-    <version>0.4.0-SNAPSHOT</version>
+    <version>0.4.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>ccsdk-sli-northbound :: ueb-listener</name>

diff --git a/version.properties b/version.properties
index e1b84ee..2a56aed 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -5,7 +5,7 @@
 
 release_name=0
 sprint_number=4
-feature_revision=0
+feature_revision=1
 
 base_version=${release_name}.${sprint_number}.${feature_revision}