X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=adapters%2Fmso-vnfm-adapter%2Fmso-vnfm-etsi-adapter%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fso%2Fadapters%2Fvnfmadapter%2Fextclients%2Faai%2FAaiHelper.java;h=110bbabdb2b7eb7eb280e0ee01658aa8cc1b9de8;hb=a7160456335b2ce3710efd00658711d431eac0b4;hp=1374e89a192d6a0941fd951f9215258f9f4eda8d;hpb=95a2dabaee827528695be6819b15eb3e67fc685f;p=so.git

diff --git a/adapters/mso-vnfm-adapter/mso-vnfm-etsi-adapter/src/main/java/org/onap/so/adapters/vnfmadapter/extclients/aai/AaiHelper.java b/adapters/mso-vnfm-adapter/mso-vnfm-etsi-adapter/src/main/java/org/onap/so/adapters/vnfmadapter/extclients/aai/AaiHelper.java
index 1374e89a19..110bbabdb2 100644
--- a/adapters/mso-vnfm-adapter/mso-vnfm-etsi-adapter/src/main/java/org/onap/so/adapters/vnfmadapter/extclients/aai/AaiHelper.java
+++ b/adapters/mso-vnfm-adapter/mso-vnfm-etsi-adapter/src/main/java/org/onap/so/adapters/vnfmadapter/extclients/aai/AaiHelper.java
@@ -202,6 +202,9 @@ public class AaiHelper {
         logger.debug("VNFMs in ESR: " + vnfmsInEsr);
 
         for (final EsrVnfm vnfm : vnfmsInEsr.getEsrVnfm()) {
+            final EsrSystemInfoList systemInfolist =
+                    aaiServiceProvider.invokeGetVnfmEsrSystemInfoList(vnfm.getVnfmId());
+            vnfm.setEsrSystemInfoList(systemInfolist);
             if (vnfmHasMatchingEsrSystemInfoType(vnfm, vnf.getNfType())) {
                 return vnfm;
             }
@@ -212,7 +215,7 @@ public class AaiHelper {
     private boolean vnfmHasMatchingEsrSystemInfoType(final EsrVnfm vnfm, final String type) {
         logger.debug("Checking VNFM ID: " + vnfm + ": " + vnfm.getVnfmId());
 
-        final EsrSystemInfoList systemInfolist = aaiServiceProvider.invokeGetVnfmEsrSystemInfoList(vnfm.getVnfmId());
+        final EsrSystemInfoList systemInfolist = vnfm.getEsrSystemInfoList();
         if (systemInfolist != null) {
             for (final EsrSystemInfo esrSystemInfo : systemInfolist.getEsrSystemInfo()) {
                 if (esrSystemInfo.getType().equals(type)) {