Add reason for rApp priming/depriming failures

[nonrtric/plt/rappmanager.git] / rapp-manager-application / src / main / java / com / oransc / rappmanager / service / RappService.java

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 82054f5..8546082 100755 (executable)
--- 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
@@ -19,11 +19,13 @@
 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;
 import com.oransc.rappmanager.models.rappinstance.RappInstance;
 import com.oransc.rappmanager.models.rappinstance.RappInstanceState;
-import com.oransc.rappmanager.models.rapp.RappState;
 import com.oransc.rappmanager.models.statemachine.RappInstanceStateMachine;
 import com.oransc.rappmanager.sme.service.SmeDeployer;
 import lombok.RequiredArgsConstructor;
@@ -37,37 +39,62 @@ public class RappService {
 
     private final AcmDeployer acmDeployer;
     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);
-            if (!acmDeployer.primeRapp(rapp)) {
+            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("State transition from " + RappState.PRIMED.name() + " to " + rapp.getState().name()
-                                         + " is not permitted.");
+                           .body(String.format(STATE_TRANSITION_NOT_PERMITTED, RappState.PRIMED.name(),
+                                   rapp.getState().name()));
         }
     }
 
     public ResponseEntity<String> deprimeRapp(Rapp rapp) {
         if (rapp.getState().equals(RappState.PRIMED) && rapp.getRappInstances().isEmpty()) {
             rapp.setState(RappState.DEPRIMING);
-            if (!acmDeployer.deprimeRapp(rapp)) {
+            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,");
             } else {
                 return ResponseEntity.badRequest()
-                               .body("State transition from " + RappState.COMMISSIONED.name() + " to " + rapp.getState()
-                                                                                                                 .name()
-                                             + " is not permitted.");
+                               .body(String.format(STATE_TRANSITION_NOT_PERMITTED, RappState.COMMISSIONED.name(),
+                                       rapp.getState().name()));
+            }
+        }
+    }
+
+    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.");
             }
         }
     }
@@ -75,14 +102,15 @@ public class RappService {
     public ResponseEntity<String> deployRappInstance(Rapp rapp, RappInstance rappInstance) {
         if (rappInstance.getState().equals(RappInstanceState.UNDEPLOYED)) {
             rappInstanceStateMachine.sendRappInstanceEvent(rappInstance, RappEvent.DEPLOYING);
-            if (acmDeployer.deployRappInstance(rapp, rappInstance) && smeDeployer.deployRappInstance(rapp,
-                    rappInstance)) {
+            if (acmDeployer.deployRappInstance(rapp, rappInstance) && smeDeployer.deployRappInstance(rapp, rappInstance)
+                        && dmeDeployer.deployRappInstance(rapp, rappInstance)) {
                 return ResponseEntity.accepted().build();
             }
             return ResponseEntity.status(HttpStatus.BAD_GATEWAY).build();
         } else {
-            return ResponseEntity.badRequest().body("State transition from " + rappInstance.getState().name() + " to "
-                                                            + RappInstanceState.DEPLOYED.name() + " is not permitted.");
+            return ResponseEntity.badRequest()
+                           .body(String.format(STATE_TRANSITION_NOT_PERMITTED, rappInstance.getState().name(),
+                                   RappInstanceState.DEPLOYED.name()));
         }
     }
 
@@ -90,14 +118,14 @@ public class RappService {
         if (rappInstance.getState().equals(RappInstanceState.DEPLOYED)) {
             rappInstanceStateMachine.sendRappInstanceEvent(rappInstance, RappEvent.UNDEPLOYING);
             if (acmDeployer.undeployRappInstance(rapp, rappInstance) && smeDeployer.undeployRappInstance(rapp,
-                    rappInstance)) {
+                    rappInstance) && dmeDeployer.undeployRappInstance(rapp, rappInstance)) {
                 return ResponseEntity.accepted().build();
             }
             return ResponseEntity.status(HttpStatus.BAD_GATEWAY).build();
         } else {
-            return ResponseEntity.badRequest().body("State transition from " + rappInstance.getState().name() + " to "
-                                                            + RappInstanceState.UNDEPLOYED.name()
-                                                            + " is not permitted.");
+            return ResponseEntity.badRequest()
+                           .body(String.format(STATE_TRANSITION_NOT_PERMITTED, rappInstance.getState().name(),
+                                   RappInstanceState.UNDEPLOYED.name()));
         }
     }