Invert test 43/45643/1
authorDeterme, Sebastien (sd378r) <sd378r@intl.att.com>
Wed, 2 May 2018 11:53:39 +0000 (13:53 +0200)
committerDeterme, Sebastien (sd378r) <sd378r@intl.att.com>
Wed, 2 May 2018 11:53:39 +0000 (13:53 +0200)
Invert the test for SDC controller case when submitting the CL

Issue-ID: CLAMP-151
Change-Id: I7d3fa51bf77580eaf0843440c9073cd3ccb393b2
Signed-off-by: Determe, Sebastien (sd378r) <sd378r@intl.att.com>
src/main/java/org/onap/clamp/clds/service/CldsService.java

index ef78875..4d14590 100644 (file)
@@ -491,18 +491,19 @@ public class CldsService extends SecureServiceBase {
                     || actionCd.equalsIgnoreCase(CldsEvent.ACTION_RESUBMIT)
                     || actionCd.equalsIgnoreCase(CldsEvent.ACTION_SUBMITDCAE))) {
                 if (retrievedModel.getTemplateName().startsWith(CsarInstallerImpl.TEMPLATE_NAME_PREFIX)) {
-                    // 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());
-                } else {
+                    // SDC artifact case
                     logger.info("Skipping DCAE inventory call as closed loop has been created from SDC notification");
                     DcaeEvent dcaeEvent = new DcaeEvent();
                     dcaeEvent.setArtifactName("SDC artifact-" + retrievedModel.getName());
                     dcaeEvent.setEvent(DcaeEvent.EVENT_DISTRIBUTION);
                     CldsEvent.insEvent(cldsDao, dcaeEvent.getControlName(), userId, dcaeEvent.getCldsActionCd(),
                             CldsEvent.ACTION_STATE_RECEIVED, null);
+                } else {
+                    // 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());
             }