From: Dilip kumar Pampana <dp583p@att.com>
Date: Fri, 19 Jan 2018 15:11:40 +0000 (-0500)
Subject: AAIResourceNode file update in AAI Client
X-Git-Tag: v1.3.0~404
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=807546231d446577fc96f91a1f1ee1a8560af265;p=appc.git

AAIResourceNode file update in AAI Client

Sync up LF_APPC AAIResourceNode with ONAP.

Issue-ID: APPC-352
Change-Id: Ia0a64acd9a156782ef73f27e633b4c049fdf21e1
Signed-off-by: Dilip kumar Pampana <dp583p@att.com>
---

diff --git a/appc-outbound/appc-aai-client/provider/src/main/java/org/onap/appc/aai/client/node/AAIResourceNode.java b/appc-outbound/appc-aai-client/provider/src/main/java/org/onap/appc/aai/client/node/AAIResourceNode.java
index 676e98173..92b74dac2 100644
--- a/appc-outbound/appc-aai-client/provider/src/main/java/org/onap/appc/aai/client/node/AAIResourceNode.java
+++ b/appc-outbound/appc-aai-client/provider/src/main/java/org/onap/appc/aai/client/node/AAIResourceNode.java
@@ -238,6 +238,7 @@ public class AAIResourceNode implements SvcLogicJavaPlugin {
             responsePrefix = StringUtils.isNotBlank(responsePrefix) ? (responsePrefix+".") : "";
             AaiService aai = getAaiService();
 
+            //no:of vnfcs from the vnfc_reference table          
             String vnfcRefLenStr = ctx.getAttribute("vnfcReference_length");
 
             if ( vnfcRefLenStr == null) {
@@ -248,6 +249,7 @@ public class AAIResourceNode implements SvcLogicJavaPlugin {
             else
                 vnfcRefLen = Integer.parseInt(vnfcRefLenStr);
 
+            //Vms without vnfc from A&AI
             String vmWithNoVnfcCountStr = ctx.getAttribute(responsePrefix+"vnf.vm-with-no-vnfcs-count");
 
       //Commented  for backward compatibility
@@ -303,18 +305,10 @@ public class AAIResourceNode implements SvcLogicJavaPlugin {
                 aai.updateVnfStatusWithOAMAddress(inParams, ctx);
             }
 
-            if ( vmWithNoVnfcCount!= vnfcRefLen ) {
-                //throw new Exception("Unable to Add Vnfcs to A&AI. Reference data mismatch.");
-                log.info("vmWithNoVnfcCount and vnfcRefLen data from table are not same ");
-                aai.checkAndUpdateVnfc(inParams,ctx, vnfcRefLen, vmCount);
-            }
-
-            else {
-
-                aai.insertVnfcs(inParams,ctx, vnfcRefLen, vmCount);
-            }
+            
+            aai.insertVnfcs(inParams,ctx, vnfcRefLen, vmCount);
+            
 
-                   //// Modified 1710
 
             ctx.setAttribute(responsePrefix + AppcAaiClientConstant.OUTPUT_PARAM_STATUS,
                     AppcAaiClientConstant.OUTPUT_STATUS_SUCCESS);