summaryrefslogtreecommitdiffstats
path: root/asdcApi
diff options
context:
space:
mode:
authorTimoney, Dan (dt5972) <dtimoney@att.com>2018-12-20 14:29:35 -0500
committerTimoney, Dan (dt5972) <dtimoney@att.com>2019-01-11 17:05:43 -0500
commit90adbb654c878bfc9e1ba61c75feb3cba8280733 (patch)
treefc64077e7eae83fdb018b48f62bd74096fea8b76 /asdcApi
parentc3888cff5246447a2b011e27f130fcd087c60295 (diff)
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>
Diffstat (limited to 'asdcApi')
-rw-r--r--asdcApi/features/ccsdk-asdcApi/pom.xml26
-rw-r--r--asdcApi/features/features-asdcApi/pom.xml4
-rwxr-xr-xasdcApi/features/pom.xml4
-rwxr-xr-xasdcApi/installer/pom.xml4
-rwxr-xr-xasdcApi/model/pom.xml8
-rwxr-xr-xasdcApi/model/src/main/yang/ASDC-API.yang2
-rwxr-xr-xasdcApi/pom.xml4
-rwxr-xr-xasdcApi/provider/pom.xml20
-rw-r--r--asdcApi/provider/src/main/java/org/onap/ccsdk/sli/northbound/asdcapi/AsdcApiProvider.java10
9 files changed, 34 insertions, 48 deletions
diff --git a/asdcApi/features/ccsdk-asdcApi/pom.xml b/asdcApi/features/ccsdk-asdcApi/pom.xml
index e538aab22..d492848f0 100644
--- 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 48bff872d..312c7b71a 100644
--- 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 a63f2ee5d..260878a2c 100755
--- 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 f4d1552d4..f17b7a1f7 100755
--- 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 944ca8c9b..61384fd9b 100755
--- 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 00ef4522a..12cfb9a56 100755
--- 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 f37b06974..c724d452a 100755
--- 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 84ac3313e..9d41cdca8 100755
--- 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 27280d2d3..1a79f8c41 100644
--- 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();