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=8546082d2122755a8b44bbcc9ca91c1500ed238f;hb=7c96a8b483bb12318a04433ce36bccff314ddacb;hp=1b9fb68b7a0d5edadddc130ed72d086a4eddf25f;hpb=40a82302ff06348e446a2de3c4a552b1ee9bc61b;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 1b9fb68..8546082 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
@@ -20,6 +20,7 @@ package com.oransc.rappmanager.service;
 
 import com.oransc.rappmanager.acm.service.AcmDeployer;
 import com.oransc.rappmanager.dme.service.DmeDeployer;
+import com.oransc.rappmanager.models.cache.RappCacheService;
 import com.oransc.rappmanager.models.rapp.Rapp;
 import com.oransc.rappmanager.models.rapp.RappEvent;
 import com.oransc.rappmanager.models.rapp.RappState;
@@ -40,17 +41,20 @@ public class RappService {
     private final SmeDeployer smeDeployer;
     private final DmeDeployer dmeDeployer;
     private final RappInstanceStateMachine rappInstanceStateMachine;
+    private final RappCacheService rappCacheService;
     private static final String STATE_TRANSITION_NOT_PERMITTED = "State transition from %s to %s is not permitted.";
 
     public ResponseEntity<String> primeRapp(Rapp rapp) {
         if (rapp.getState().equals(RappState.COMMISSIONED)) {
             rapp.setState(RappState.PRIMING);
+            rapp.setReason(null);
             if (acmDeployer.primeRapp(rapp) && dmeDeployer.primeRapp(rapp)) {
                 rapp.setState(RappState.PRIMED);
+                return ResponseEntity.ok().build();
             } else {
                 rapp.setState(RappState.COMMISSIONED);
+                return ResponseEntity.status(HttpStatus.BAD_GATEWAY).build();
             }
-            return ResponseEntity.ok().build();
         } else {
             return ResponseEntity.badRequest()
                            .body(String.format(STATE_TRANSITION_NOT_PERMITTED, RappState.PRIMED.name(),
@@ -61,12 +65,14 @@ public class RappService {
     public ResponseEntity<String> deprimeRapp(Rapp rapp) {
         if (rapp.getState().equals(RappState.PRIMED) && rapp.getRappInstances().isEmpty()) {
             rapp.setState(RappState.DEPRIMING);
+            rapp.setReason(null);
             if (acmDeployer.deprimeRapp(rapp) && dmeDeployer.deprimeRapp(rapp)) {
                 rapp.setState(RappState.COMMISSIONED);
+                return ResponseEntity.ok().build();
             } else {
                 rapp.setState(RappState.PRIMED);
+                return ResponseEntity.status(HttpStatus.BAD_GATEWAY).build();
             }
-            return ResponseEntity.ok().build();
         } else {
             if (!rapp.getRappInstances().isEmpty()) {
                 return ResponseEntity.badRequest().body("Unable to deprime as there are active rapp instances,");
@@ -78,6 +84,21 @@ public class RappService {
         }
     }
 
+    public ResponseEntity<String> deleteRapp(Rapp rApp) {
+        if (rApp.getRappInstances().isEmpty() && rApp.getState().equals(RappState.COMMISSIONED)) {
+            rappCacheService.deleteRapp(rApp);
+            return ResponseEntity.ok().build();
+        } else {
+            if (!rApp.getRappInstances().isEmpty()) {
+                return ResponseEntity.badRequest()
+                               .body("Unable to delete '" + rApp.getName() + "' as there are active rApp instances.");
+            } else {
+                return ResponseEntity.badRequest().body("Unable to delete '" + rApp.getName()
+                                                                + "' as the rApp is not in COMMISSIONED state.");
+            }
+        }
+    }
+
     public ResponseEntity<String> deployRappInstance(Rapp rapp, RappInstance rappInstance) {
         if (rappInstance.getState().equals(RappInstanceState.UNDEPLOYED)) {
             rappInstanceStateMachine.sendRappInstanceEvent(rappInstance, RappEvent.DEPLOYING);