From: shashikanth.vh <shashikanth.vh@huawei.com>
Date: Fri, 7 Sep 2018 12:00:02 +0000 (+0530)
Subject: Update network topology to aai issue fix
X-Git-Tag: 1.0.4~7^2~117
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=40ff9f9d68660a157f9ff477003fc7b359747148;p=ccsdk%2Fsli.git

Update network topology to aai issue fix

Change-Id: I72d25c8df8726430a087613544a274ca724713cb
Issue-ID: SDNC-387
Signed-off-by: shashikanth.vh <shashikanth.vh@huawei.com>
---

diff --git a/dmaap-listener/src/main/java/org/onap/ccsdk/sli/northbound/dmaapclient/SdncAaiDmaapConsumer.java b/dmaap-listener/src/main/java/org/onap/ccsdk/sli/northbound/dmaapclient/SdncAaiDmaapConsumer.java
index be2e36c1a..fa9544f3f 100644
--- a/dmaap-listener/src/main/java/org/onap/ccsdk/sli/northbound/dmaapclient/SdncAaiDmaapConsumer.java
+++ b/dmaap-listener/src/main/java/org/onap/ccsdk/sli/northbound/dmaapclient/SdncAaiDmaapConsumer.java
@@ -132,8 +132,11 @@ public class SdncAaiDmaapConsumer extends SdncDmaapConsumerImpl {
                 context.put(((String)key).replaceAll("-", ""), eventHeader.get((String)key));
             } else {
                 String action = (String) eventHeader.get((String) key);
-                context.put((String)key, action.substring(0,1).toUpperCase()
-                                         + action.substring(1).toLowerCase());
+                if (action.equalsIgnoreCase("delete")) {
+                    context.put((String) key, "Delete");
+                } else {
+                    context.put((String) key, "Update");
+                }
             }
         }
 
@@ -187,8 +190,8 @@ public class SdncAaiDmaapConsumer extends SdncDmaapConsumerImpl {
             aaiRootNode = oMapper.readTree(msg);
         } catch (Exception e) {
             throw new InvalidMessageException("Cannot parse json object", e);
-        }        
-       
+        }
+
         JsonNode eventHeaderNode = aaiRootNode.get(EVENT_HEADER);
         if(eventHeaderNode == null) {
             LOG.info("Missing Event Header node.");
@@ -196,31 +199,31 @@ public class SdncAaiDmaapConsumer extends SdncDmaapConsumerImpl {
         }
         JsonNode eventTypeNode = eventHeaderNode.get(EVENT_TYPE);
         String eventType = eventTypeNode.textValue();
-        
+
         if(AAI_EVENT.equals(eventType) == false) {
             LOG.info("Unknown Event Type {}", eventType);
             return;
         }
-        
+
         JsonNode entityTypeNode = eventHeaderNode.get(ENTITY_TYPE);
         String entityType = entityTypeNode.textValue();
-        
+
         String mapFilename = rootDir + entityType + ".map";
         Map<String, String> fieldMap = loadMap(mapFilename);
         if (fieldMap == null) {
-            throw new InvalidMessageException("Unable to process message - cannot load mapping file");
+            return;
         }
 
         if (!fieldMap.containsKey(SDNC_ENDPOINT)) {
-            throw new InvalidMessageException("No SDNC endpoint known for message " + entityType);
+            return;
         }
-        String sdncEndpoint = fieldMap.get(SDNC_ENDPOINT);        
-   
+        String sdncEndpoint = fieldMap.get(SDNC_ENDPOINT);
+
         if (!fieldMap.containsKey(TEMPLATE)) {
             throw new InvalidMessageException("No SDNC template known for message " + entityType);
         }
-        String templateName = fieldMap.get(TEMPLATE); 
-        
+        String templateName = fieldMap.get(TEMPLATE);
+
         try {
             String rpcMsgbody = publish(templateName, msg);
             String odlUrlBase = getProperty("sdnc.odl.url-base");