aboutsummaryrefslogtreecommitdiffstats
path: root/sdnr/northbound/ranSlice
diff options
context:
space:
mode:
authorMichael DÜrre <michael.duerre@highstreet-technologies.com>2022-03-10 10:39:16 +0100
committerDan Timoney <dtimoney@att.com>2022-03-23 15:08:48 -0400
commiteb2a7c97c0007b013bd1784ac17d57be02b63d03 (patch)
treeb0861438532727219216cfd426e21ae053abb31a /sdnr/northbound/ranSlice
parent3c74361514bb920ed441d105f66ca978bd074ced (diff)
migrate sdnr features to phosphorus
fix mapper and switch to dom api Updated to use phosphorus version of parent poms Issue-ID: CCSDK-3566 Signed-off-by: Michael DÜrre <michael.duerre@highstreet-technologies.com> Change-Id: I98c5bef9286622e0d66b53db687557d798cd53f5 Signed-off-by: Michael DÜrre <michael.duerre@highstreet-technologies.com>
Diffstat (limited to 'sdnr/northbound/ranSlice')
-rw-r--r--sdnr/northbound/ranSlice/feature/pom.xml2
-rw-r--r--sdnr/northbound/ranSlice/installer/pom.xml2
-rw-r--r--sdnr/northbound/ranSlice/model/pom.xml2
-rw-r--r--sdnr/northbound/ranSlice/pom.xml2
-rw-r--r--sdnr/northbound/ranSlice/provider/pom.xml2
-rw-r--r--sdnr/northbound/ranSlice/provider/src/main/java/org/onap/ccsdk/features/sdnr/northbound/ranSlice/RANSliceProvider.java11
6 files changed, 12 insertions, 9 deletions
diff --git a/sdnr/northbound/ranSlice/feature/pom.xml b/sdnr/northbound/ranSlice/feature/pom.xml
index 5fd71bb90..1b9d049c5 100644
--- a/sdnr/northbound/ranSlice/feature/pom.xml
+++ b/sdnr/northbound/ranSlice/feature/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>2.3.2</version>
+ <version>2.3.3-SNAPSHOT</version>
<relativePath/>
</parent>
diff --git a/sdnr/northbound/ranSlice/installer/pom.xml b/sdnr/northbound/ranSlice/installer/pom.xml
index 77d453624..f69b7d13e 100644
--- a/sdnr/northbound/ranSlice/installer/pom.xml
+++ b/sdnr/northbound/ranSlice/installer/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.3.2</version>
+ <version>2.3.3-SNAPSHOT</version>
<relativePath/>
</parent>
diff --git a/sdnr/northbound/ranSlice/model/pom.xml b/sdnr/northbound/ranSlice/model/pom.xml
index 20aea181f..8adb1d43f 100644
--- a/sdnr/northbound/ranSlice/model/pom.xml
+++ b/sdnr/northbound/ranSlice/model/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>2.3.2</version>
+ <version>2.3.3-SNAPSHOT</version>
<relativePath/>
</parent>
diff --git a/sdnr/northbound/ranSlice/pom.xml b/sdnr/northbound/ranSlice/pom.xml
index 52d564be4..c27af8243 100644
--- a/sdnr/northbound/ranSlice/pom.xml
+++ b/sdnr/northbound/ranSlice/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.3.2</version>
+ <version>2.3.3-SNAPSHOT</version>
<relativePath/>
</parent>
diff --git a/sdnr/northbound/ranSlice/provider/pom.xml b/sdnr/northbound/ranSlice/provider/pom.xml
index 43a8ba0ce..f99427d35 100644
--- a/sdnr/northbound/ranSlice/provider/pom.xml
+++ b/sdnr/northbound/ranSlice/provider/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>2.3.2</version>
+ <version>2.3.3-SNAPSHOT</version>
<relativePath/>
</parent>
diff --git a/sdnr/northbound/ranSlice/provider/src/main/java/org/onap/ccsdk/features/sdnr/northbound/ranSlice/RANSliceProvider.java b/sdnr/northbound/ranSlice/provider/src/main/java/org/onap/ccsdk/features/sdnr/northbound/ranSlice/RANSliceProvider.java
index fbaab938c..7c690d163 100644
--- a/sdnr/northbound/ranSlice/provider/src/main/java/org/onap/ccsdk/features/sdnr/northbound/ranSlice/RANSliceProvider.java
+++ b/sdnr/northbound/ranSlice/provider/src/main/java/org/onap/ccsdk/features/sdnr/northbound/ranSlice/RANSliceProvider.java
@@ -37,6 +37,9 @@ import org.opendaylight.yang.gen.v1.org.onap.ccsdk.rev200806.common.header.Commo
import org.opendaylight.yang.gen.v1.org.onap.ccsdk.rev200806.status.StatusBuilder;
import org.opendaylight.yangtools.concepts.ObjectRegistration;
import org.opendaylight.yangtools.yang.common.RpcResult;
+import org.opendaylight.yangtools.yang.common.Uint16;
+import org.slf4j.Logger;
+
import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -403,7 +406,7 @@ public class RANSliceProvider implements AutoCloseable, RanSliceApiService {
if (input == null) {
LOG.debug("Rejecting " +rpcName+ " because of invalid input");
- statusBuilder.setCode(RANSliceResponseCode.REJECT_INVALID_INPUT.getValue());
+ statusBuilder.setCode(Uint16.valueOf(RANSliceResponseCode.REJECT_INVALID_INPUT.getValue()));
statusBuilder.setMessage("REJECT - INVALID INPUT. Missing input");
CommonHeaderBuilder hBuilder = new CommonHeaderBuilder();
hBuilder.setApiVer("1");
@@ -442,14 +445,14 @@ public class RANSliceProvider implements AutoCloseable, RanSliceApiService {
catch (Exception e)
{
LOG.error("Caught exception executing service logic for "+ rpcName, e);
- statusBuilder.setCode(RANSliceResponseCode.FAILURE_DG_FAILURE.getValue());
+ statusBuilder.setCode(Uint16.valueOf(RANSliceResponseCode.FAILURE_DG_FAILURE.getValue()));
statusBuilder.setMessage("FAILURE - DG FAILURE ("+e.getMessage()+")");
throw new RANSliceRpcInvocationException(statusBuilder.build(), hBuilder.build());
}
} else {
LOG.error("No service logic active for RANSlice: '" + rpcName + "'");
- statusBuilder.setCode(RANSliceResponseCode.REJECT_DG_NOT_FOUND.getValue());
+ statusBuilder.setCode(Uint16.valueOf(RANSliceResponseCode.REJECT_DG_NOT_FOUND.getValue()));
statusBuilder.setMessage("FAILURE - DG not found for action "+rpcName);
throw new RANSliceRpcInvocationException(statusBuilder.build(), hBuilder.build());
}
@@ -458,7 +461,7 @@ public class RANSliceProvider implements AutoCloseable, RanSliceApiService {
{
LOG.error("Caught exception looking for service logic", e);
- statusBuilder.setCode(RANSliceResponseCode.FAILURE_DG_FAILURE.getValue());
+ statusBuilder.setCode(Uint16.valueOf(RANSliceResponseCode.FAILURE_DG_FAILURE.getValue()));
statusBuilder.setMessage("FAILURE - Unexpected error looking for DG ("+e.getMessage()+")");
throw new RANSliceRpcInvocationException(statusBuilder.build(), hBuilder.build());
}