X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=holmes-actions%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fholmes%2Fcommon%2Faai%2FAaiQuery4Ccvpn2.java;fp=holmes-actions%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fholmes%2Fcommon%2Faai%2FAaiQuery4Ccvpn2.java;h=aff064b2ff11d01f8fe152bf4498bb58d6ebf805;hb=8aa19f8f7ea63044ffb9837e2aa21a6914c64fbc;hp=d025feac72ba5c9efe3f84049078614f2b5b24b9;hpb=02ca90c5c95e234e5331cd6643467b0492d49f0c;p=holmes%2Fcommon.git

diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/aai/AaiQuery4Ccvpn2.java b/holmes-actions/src/main/java/org/onap/holmes/common/aai/AaiQuery4Ccvpn2.java
index d025fea..aff064b 100644
--- a/holmes-actions/src/main/java/org/onap/holmes/common/aai/AaiQuery4Ccvpn2.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/aai/AaiQuery4Ccvpn2.java
@@ -68,16 +68,14 @@ public class AaiQuery4Ccvpn2 {
             for (int i = 0; i < siteResources.size(); i++) {
                 final JSONObject object = siteResources.getJSONObject(i);
                 if (siteService.equals(object.getString("site-resource-name"))) {
-                    JSONObject vnfInfo = getInfo(object.toJSONString(), "vnf-instance");
+                    JSONObject vnfInfo = getInfo(object.toJSONString(), "generic-vnf");
                     String vnfPath = vnfInfo.getString("related-link");
 
                     String vnfId = null;
-                    Pattern pattern = Pattern.compile("/aai/v\\d+/business/customers/customer/(.+)" +
-                                                              "/service-subscriptions/service-subscription/(.+)" +
-                                                              "/vnf-instances/vnf-instance/(.+)");
+                    Pattern pattern = Pattern.compile("/aai/v\\d+/network/generic-vnfs/generic-vnf/(.+)");
                     Matcher matcher = pattern.matcher(vnfPath);
                     if (matcher.find()) {
-                        vnfId = matcher.group(3);
+                        vnfId = matcher.group(1);
                     }
 
                     return vnfId;