AAIResourceNode file update in AAI Client 67/28667/2
authorDilip kumar Pampana <dp583p@att.com>
Fri, 19 Jan 2018 15:11:40 +0000 (10:11 -0500)
committerSkip Wonnell <skip@att.com>
Fri, 19 Jan 2018 16:03:11 +0000 (16:03 +0000)
Sync up LF_APPC AAIResourceNode with ONAP.

Issue-ID: APPC-352
Change-Id: Ia0a64acd9a156782ef73f27e633b4c049fdf21e1
Signed-off-by: Dilip kumar Pampana <dp583p@att.com>
appc-outbound/appc-aai-client/provider/src/main/java/org/onap/appc/aai/client/node/AAIResourceNode.java

index 676e981..92b74da 100644 (file)
@@ -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);