From: Determe, Sebastien (sd378r) <sd378r@intl.att.com>
Date: Fri, 27 Apr 2018 12:39:55 +0000 (+0200)
Subject: Remove DCAE call
X-Git-Tag: v2.0.0~23
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=clamp.git;a=commitdiff_plain;h=8b4d54436b3283580d2776b0d48eab3c381d0419

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) <sd378r@intl.att.com>
---

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());