Merge "Update the operation type string."

2 files changed, 6 insertions, 2 deletions

diff --git a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/adapters/dcae/dmaap/DCAENotificationCallback.java b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/adapters/dcae/dmaap/DCAENotificationCallback.java
index 3c387a1..c35b2fa 100644
--- a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/adapters/dcae/dmaap/DCAENotificationCallback.java
+++ b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/adapters/dcae/dmaap/DCAENotificationCallback.java
@@ -32,6 +32,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 public class DCAENotificationCallback implements NotificationCallback {
     private static final Logger logger = LoggerFactory.getLogger(DCAENotificationCallback.class);
 
+    private static final String IntentOperation = "Assurance";
+
     @Autowired
     ComponentNotificationService componentNotificationService;
 
@@ -40,7 +42,7 @@ public class DCAENotificationCallback implements NotificationCallback {
         logger.info("Received event from DCAE: \n" + msg);
         NotificationEventModel event = (new Gson()).fromJson(msg, NotificationEventModel.class);
         FulfillmentOperation info = new FulfillmentOperation();
-        info.setOperation(event.getEntity().getOperation());
+        info.setOperation(IntentOperation);
         info.setFulfillmentStatus(FulfillmentStatus.NOT_FULFILLED);
         List<String> instances = new ArrayList<>();
         instances.add(event.getEntity().getId());
diff --git a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/adapters/policy/dmaap/PolicyNotificationCallback.java b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/adapters/policy/dmaap/PolicyNotificationCallback.java
index 429f952..2230574 100644
--- a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/adapters/policy/dmaap/PolicyNotificationCallback.java
+++ b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/adapters/policy/dmaap/PolicyNotificationCallback.java
@@ -32,6 +32,8 @@ public class PolicyNotificationCallback implements NotificationCallback {
 
     private static final Logger logger = LoggerFactory.getLogger(PolicyNotificationCallback.class);
 
+    //only Assurance support . Delivery will be supported next release.
+    private static final String IntentOperation = "Assurance";
     @Autowired
     ComponentNotificationService componentNotificationService;
 
@@ -40,7 +42,7 @@ public class PolicyNotificationCallback implements NotificationCallback {
         logger.info("Received event from Policy: \n" + msg);
         NotificationEventModel event = (new Gson()).fromJson(msg, NotificationEventModel.class);
         FulfillmentOperation info = new FulfillmentOperation();
-        info.setOperation(event.getEntity().getOperation());
+        info.setOperation(IntentOperation);
         info.setFulfillmentStatus(FulfillmentStatus.NOT_FULFILLED);
         List<String> instances = new ArrayList<>();
         instances.add(event.getEntity().getId());