Remove DCAE inventory call when CL is deployed from SDC in submit
action, as the DCAE inventory is already done during deployment.
Issue-ID: CLAMP-151
Change-Id: Ib2c744b53a8e4dc9371ae982612ea2822d7a9ad8
Signed-off-by: Determe, Sebastien (sd378r) <sd378r@intl.att.com>
if (!isTest && (actionCd.equalsIgnoreCase(CldsEvent.ACTION_SUBMIT)
|| actionCd.equalsIgnoreCase(CldsEvent.ACTION_RESUBMIT)
|| actionCd.equalsIgnoreCase(CldsEvent.ACTION_SUBMITDCAE))) {
if (!isTest && (actionCd.equalsIgnoreCase(CldsEvent.ACTION_SUBMIT)
|| actionCd.equalsIgnoreCase(CldsEvent.ACTION_RESUBMIT)
|| actionCd.equalsIgnoreCase(CldsEvent.ACTION_SUBMITDCAE))) {
- // To verify inventory status and modify model status to
- // distribute
- dcaeInventoryServices.setEventInventory(retrievedModel, getUserId());
- retrievedModel.save(cldsDao, getUserId());
+ if (retrievedModel.getDeploymentId() == null) {
+ // This should be done only when the call to DCAE
+ // has not yet been done. When CL comes from SDC
+ // this is not required as the DCAE inventory call is done
+ // during the CL deployment.
+ dcaeInventoryServices.setEventInventory(retrievedModel, getUserId());
+ retrievedModel.save(cldsDao, getUserId());
+ } else {
+ logger.info("Skipping DCAE inventory call as closed loop has been created from SDC notification");
+ }
}
// audit log
LoggingUtils.setTimeContext(startTime, new Date());
}
// audit log
LoggingUtils.setTimeContext(startTime, new Date());