From 8b4d54436b3283580d2776b0d48eab3c381d0419 Mon Sep 17 00:00:00 2001 From: "Determe, Sebastien (sd378r)" Date: Fri, 27 Apr 2018 14:39:55 +0200 Subject: [PATCH] Remove DCAE call 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) --- src/main/java/org/onap/clamp/clds/service/CldsService.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/onap/clamp/clds/service/CldsService.java b/src/main/java/org/onap/clamp/clds/service/CldsService.java index c3eb83bf..6da3cb64 100644 --- a/src/main/java/org/onap/clamp/clds/service/CldsService.java +++ b/src/main/java/org/onap/clamp/clds/service/CldsService.java @@ -489,10 +489,16 @@ public class CldsService extends SecureServiceBase { 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()); -- 2.16.6