X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=rapp-manager-application%2Fsrc%2Fmain%2Fjava%2Fcom%2Foransc%2Frappmanager%2Fservice%2FRappService.java;h=8e71d500ad9d627b0833fe6e94731a4eeb19dc6f;hb=refs%2Fchanges%2F96%2F12496%2F1;hp=1e606d1c2de976dc7c264f053caa4cb43adc58e8;hpb=f14562f10f7dd6ed770f2d1232add6b24eb85b91;p=nonrtric%2Fplt%2Frappmanager.git diff --git a/rapp-manager-application/src/main/java/com/oransc/rappmanager/service/RappService.java b/rapp-manager-application/src/main/java/com/oransc/rappmanager/service/RappService.java index 1e606d1..8e71d50 100755 --- a/rapp-manager-application/src/main/java/com/oransc/rappmanager/service/RappService.java +++ b/rapp-manager-application/src/main/java/com/oransc/rappmanager/service/RappService.java @@ -55,7 +55,7 @@ public class RappService { return ResponseEntity.ok().build(); } rapp.setState(RappState.COMMISSIONED); - return ResponseEntity.status(HttpStatus.BAD_GATEWAY).build(); + throw new RappHandlerException(HttpStatus.BAD_GATEWAY, rapp.getReason()); } throw new RappHandlerException(HttpStatus.BAD_REQUEST, String.format(STATE_TRANSITION_NOT_PERMITTED, rapp.getState().name(), RappState.PRIMED.name())); @@ -71,7 +71,7 @@ public class RappService { return ResponseEntity.ok().build(); } rapp.setState(RappState.PRIMED); - return ResponseEntity.status(HttpStatus.BAD_GATEWAY).build(); + throw new RappHandlerException(HttpStatus.BAD_GATEWAY, rapp.getReason()); } if (!rapp.getRappInstances().isEmpty()) { throw new RappHandlerException(HttpStatus.BAD_REQUEST, @@ -106,7 +106,7 @@ public class RappService { .allMatch(rappDeployer -> rappDeployer.deployRappInstance(rapp, rappInstance))) { return ResponseEntity.accepted().build(); } - return ResponseEntity.status(HttpStatus.BAD_GATEWAY).build(); + throw new RappHandlerException(HttpStatus.BAD_GATEWAY, rappInstance.getReason()); } throw new RappHandlerException(HttpStatus.BAD_REQUEST, String.format("Unable to deploy rApp instance %s as it is not in UNDEPLOYED state", @@ -122,7 +122,7 @@ public class RappService { .allMatch(rappDeployer -> rappDeployer.undeployRappInstance(rapp, rappInstance))) { return ResponseEntity.accepted().build(); } - return ResponseEntity.status(HttpStatus.BAD_GATEWAY).build(); + throw new RappHandlerException(HttpStatus.BAD_GATEWAY, rappInstance.getReason()); } throw new RappHandlerException(HttpStatus.BAD_REQUEST, String.format("Unable to undeploy rApp instance %s as it is not in DEPLOYED state",