diff options
Diffstat (limited to 'holmes-actions/src/main')
| -rw-r--r-- | holmes-actions/src/main/java/org/onap/holmes/common/aai/AaiQuery4Ccvpn2.java | 8 | ||||
| -rw-r--r-- | holmes-actions/src/main/java/org/onap/holmes/common/aai/config/AaiConfig.java | 2 |
2 files changed, 4 insertions, 6 deletions
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; diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/aai/config/AaiConfig.java b/holmes-actions/src/main/java/org/onap/holmes/common/aai/config/AaiConfig.java index 8d86900..4879e33 100644 --- a/holmes-actions/src/main/java/org/onap/holmes/common/aai/config/AaiConfig.java +++ b/holmes-actions/src/main/java/org/onap/holmes/common/aai/config/AaiConfig.java @@ -15,7 +15,7 @@ package org.onap.holmes.common.aai.config; public class AaiConfig { - private static final String AAI_API_VERSION = "v14"; + private static final String AAI_API_VERSION = "v16"; public static final String X_TRANSACTION_ID = "9999"; |