X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=rapp-manager-acm%2Fsrc%2Fmain%2Fjava%2Fcom%2Foransc%2Frappmanager%2Facm%2Fservice%2FAcmDeployer.java;h=0bbf42245b40b80d9a67c0ec82164a94ee27ceb5;hb=7c96a8b483bb12318a04433ce36bccff314ddacb;hp=41f4bae05f8ba27ada5c220c6e4d52764d11f86d;hpb=77d91d4af1b3845fc8a3ef20cd6e54e9e6ff5a37;p=nonrtric%2Fplt%2Frappmanager.git diff --git a/rapp-manager-acm/src/main/java/com/oransc/rappmanager/acm/service/AcmDeployer.java b/rapp-manager-acm/src/main/java/com/oransc/rappmanager/acm/service/AcmDeployer.java index 41f4bae..0bbf422 100755 --- a/rapp-manager-acm/src/main/java/com/oransc/rappmanager/acm/service/AcmDeployer.java +++ b/rapp-manager-acm/src/main/java/com/oransc/rappmanager/acm/service/AcmDeployer.java @@ -25,7 +25,6 @@ import com.oransc.rappmanager.models.RappDeployer; import com.oransc.rappmanager.models.csar.RappCsarConfigurationHandler; 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.RappACMInstance; import com.oransc.rappmanager.models.rappinstance.RappInstance; import com.oransc.rappmanager.models.statemachine.RappInstanceStateMachine; @@ -172,14 +171,14 @@ public class AcmDeployer implements RappDeployer { rapp.setCompositionId(commissioningResponse.getCompositionId()); logger.info("Priming automation Composition"); primeACMComposition(commissioningResponse.getCompositionId(), PrimeOrder.PRIME); - rapp.setState(RappState.PRIMED); return true; } else { - logger.error("Failed to create automation composition"); + logger.warn("Failed to create automation composition"); } } catch (Exception e) { - logger.error("Failed to create automation composition", e); + logger.warn("Error in creating automation composition", e); } + rapp.setReason("Unable to create automation composition"); return false; } @@ -189,12 +188,12 @@ public class AcmDeployer implements RappDeployer { primeACMComposition(rapp.getCompositionId(), PrimeOrder.DEPRIME); CommissioningResponse commissioningResponse = deleteComposition(rapp.getCompositionId()); if (commissioningResponse != null) { - rapp.setState(RappState.COMMISSIONED); return true; } } catch (Exception e) { logger.error("Failed deprime automation composition", e); } + rapp.setReason("Unable to delete automation composition"); return false; }