Add reason for rApp instance deploy/undeploy failure

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

diff --git a/rapp-manager-dme/src/main/java/com/oransc/rappmanager/dme/service/DmeDeployer.java b/rapp-manager-dme/src/main/java/com/oransc/rappmanager/dme/service/DmeDeployer.java
index 388a565..329841f 100755 (executable)
--- a/rapp-manager-dme/src/main/java/com/oransc/rappmanager/dme/service/DmeDeployer.java
+++ b/rapp-manager-dme/src/main/java/com/oransc/rappmanager/dme/service/DmeDeployer.java
@@ -80,6 +80,7 @@ public class DmeDeployer implements RappDeployer {
         if (deployState) {
             rappInstanceStateMachine.sendRappInstanceEvent(rappInstance, RappEvent.DMEDEPLOYED);
         } else {
+            rappInstance.setReason("Unable to deploy DME");
             rappInstanceStateMachine.sendRappInstanceEvent(rappInstance, RappEvent.DMEDEPLOYFAILED);
         }
         return deployState;
@@ -98,6 +99,7 @@ public class DmeDeployer implements RappDeployer {
         if (undeployState) {
             rappInstanceStateMachine.sendRappInstanceEvent(rappInstance, RappEvent.DMEUNDEPLOYED);
         } else {
+            rappInstance.setReason("Unable to undeploy DME");
             rappInstanceStateMachine.sendRappInstanceEvent(rappInstance, RappEvent.DMEUNDEPLOYFAILED);
         }
         return undeployState;
@@ -127,19 +129,14 @@ public class DmeDeployer implements RappDeployer {
                 allInfoTypes.addAll(dataProducerRegistrationApiClient.getInfoTypdentifiers());
                 requiredInfoTypes.removeAll(allInfoTypes);
                 if (!requiredInfoTypes.isEmpty()) {
-                    logger.info("Invalid rapp package as the following info types cannot be found {}",
-                            requiredInfoTypes);
-                    rapp.setIsDmeValid(false);
-                } else {
-                    rapp.setIsDmeValid(true);
+                    rapp.setReason(String.format("Invalid rapp package as the following info types cannot be found %s",
+                                    requiredInfoTypes));
                 }
-            } else {
-                rapp.setIsDmeValid(true);
             }
             return true;
         } catch (Exception e) {
             logger.warn("Failed to prime DME", e);
-            rapp.setIsDmeValid(false);
+            rapp.setReason("Failed to prime DME");
             return false;
         }
     }
@@ -147,7 +144,6 @@ public class DmeDeployer implements RappDeployer {
     @Override
     public boolean deprimeRapp(Rapp rapp) {
         logger.debug("Depriming DME functions for rApp {}", rapp.getRappId());
-        rapp.setIsDmeValid(null);
         return true;
     }