diff options
Diffstat (limited to 'northbound/lcm')
| -rwxr-xr-x | northbound/lcm/installer/pom.xml | 2 | ||||
| -rwxr-xr-x | northbound/lcm/model/pom.xml | 2 | ||||
| -rwxr-xr-x | northbound/lcm/pom.xml | 2 | ||||
| -rwxr-xr-x | northbound/lcm/provider/pom.xml | 2 | ||||
| -rw-r--r-- | northbound/lcm/provider/src/main/java/org/onap/ccsdk/sli/northbound/LcmProvider.java | 10 |
5 files changed, 10 insertions, 8 deletions
diff --git a/northbound/lcm/installer/pom.xml b/northbound/lcm/installer/pom.xml index e099e25a2..123662b8e 100755 --- a/northbound/lcm/installer/pom.xml +++ b/northbound/lcm/installer/pom.xml @@ -5,7 +5,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/northbound/lcm/model/pom.xml b/northbound/lcm/model/pom.xml index 8867dd4e4..0197895af 100755 --- a/northbound/lcm/model/pom.xml +++ b/northbound/lcm/model/pom.xml @@ -5,7 +5,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/northbound/lcm/pom.xml b/northbound/lcm/pom.xml index 220f37d88..7b2b860ae 100755 --- a/northbound/lcm/pom.xml +++ b/northbound/lcm/pom.xml @@ -5,7 +5,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/northbound/lcm/provider/pom.xml b/northbound/lcm/provider/pom.xml index 6be45b230..0eac73f7e 100755 --- a/northbound/lcm/provider/pom.xml +++ b/northbound/lcm/provider/pom.xml @@ -5,7 +5,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/northbound/lcm/provider/src/main/java/org/onap/ccsdk/sli/northbound/LcmProvider.java b/northbound/lcm/provider/src/main/java/org/onap/ccsdk/sli/northbound/LcmProvider.java index 4dd46d597..0178b40dc 100644 --- a/northbound/lcm/provider/src/main/java/org/onap/ccsdk/sli/northbound/LcmProvider.java +++ b/northbound/lcm/provider/src/main/java/org/onap/ccsdk/sli/northbound/LcmProvider.java @@ -38,6 +38,7 @@ import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.northbound.lcm.rev180329. import org.opendaylight.yangtools.concepts.ObjectRegistration; import org.opendaylight.yangtools.yang.common.RpcResult; import org.opendaylight.yangtools.yang.common.RpcResultBuilder; +import org.opendaylight.yangtools.yang.common.Uint16; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -1038,7 +1039,7 @@ public class LcmProvider implements AutoCloseable, LCMService { if (input == null) { LOG.debug("Rejecting " +rpcName+ " because of invalid input"); - statusBuilder.setCode(LcmResponseCode.REJECT_INVALID_INPUT.getValue()); + statusBuilder.setCode(Uint16.valueOf(LcmResponseCode.REJECT_INVALID_INPUT.getValue())); statusBuilder.setMessage("REJECT - INVALID INPUT. Missing input"); CommonHeaderBuilder hBuilder = new CommonHeaderBuilder(); hBuilder.setApiVer("1"); @@ -1069,14 +1070,14 @@ public class LcmProvider implements AutoCloseable, LCMService { catch (Exception e) { LOG.error("Caught exception executing service logic for "+ rpcName, e); - statusBuilder.setCode(LcmResponseCode.FAILURE_DG_FAILURE.getValue()); + statusBuilder.setCode(Uint16.valueOf(LcmResponseCode.FAILURE_DG_FAILURE.getValue())); statusBuilder.setMessage("FAILURE - DG FAILURE ("+e.getMessage()+")"); throw new LcmRpcInvocationException(statusBuilder.build(), hBuilder.build()); } } else { LOG.error("No service logic active for LCM: '" + rpcName + "'"); - statusBuilder.setCode(LcmResponseCode.REJECT_DG_NOT_FOUND.getValue()); + statusBuilder.setCode(Uint16.valueOf(LcmResponseCode.REJECT_DG_NOT_FOUND.getValue())); statusBuilder.setMessage("FAILURE - DG not found for action "+rpcName); throw new LcmRpcInvocationException(statusBuilder.build(), hBuilder.build()); } @@ -1085,7 +1086,7 @@ public class LcmProvider implements AutoCloseable, LCMService { { LOG.error("Caught exception looking for service logic", e); - statusBuilder.setCode(LcmResponseCode.FAILURE_DG_FAILURE.getValue()); + statusBuilder.setCode(Uint16.valueOf(LcmResponseCode.FAILURE_DG_FAILURE.getValue())); statusBuilder.setMessage("FAILURE - Unexpected error looking for DG ("+e.getMessage()+")"); throw new LcmRpcInvocationException(statusBuilder.build(), hBuilder.build()); } @@ -1101,6 +1102,7 @@ public class LcmProvider implements AutoCloseable, LCMService { payload = new Payload(payloadValue); } + String statusCode = sBuilder.getCode().toString(); if (!"400".equals(statusCode)) { |