X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=appc-outbound%2Fappc-aai-client%2Fprovider%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fappc%2Faai%2Fclient%2Faai%2FAaiService.java;fp=appc-outbound%2Fappc-aai-client%2Fprovider%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fappc%2Faai%2Fclient%2Faai%2FAaiService.java;h=474ead89f40331c0cb5eb1da489dc1d2d2a5164f;hb=74a340555461715c177df449ca357449ec9f11ed;hp=3902f86c0d960b7f8fe41d8fe7addbf61f7efb08;hpb=e31159c2410ae360d23346c593d63106e317d972;p=appc.git diff --git a/appc-outbound/appc-aai-client/provider/src/main/java/org/onap/appc/aai/client/aai/AaiService.java b/appc-outbound/appc-aai-client/provider/src/main/java/org/onap/appc/aai/client/aai/AaiService.java index 3902f86c0..474ead89f 100644 --- a/appc-outbound/appc-aai-client/provider/src/main/java/org/onap/appc/aai/client/aai/AaiService.java +++ b/appc-outbound/appc-aai-client/provider/src/main/java/org/onap/appc/aai/client/aai/AaiService.java @@ -7,6 +7,7 @@ * Copyright (C) 2017 Amdocs * ================================================================================ * Modifications (C) 2019 Ericsson + * Modifications (C) 2019 IBM * ============================================================================= * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -71,6 +72,7 @@ public class AaiService { private static final String ATTR_VNFC_FUNC_CODE = "VNFC-FUNCTION-CODE"; private static final String ATTR_VSERVER_NAME = "vserver-name"; private static final String ATTR_VNF_ID = "vnf-id"; + private static final String ATTR_VF_MODULE_ID = "vf-module-id"; private AAIClient aaiClient; @@ -256,7 +258,7 @@ public class AaiService { //ConfigScaleOut - Do not process vms that are not associated with vfmodule id if vfmodule id is present if (StringUtils.isNotBlank(vfModuleIdFromRequest)) { - String vmVfModuleId = ctx.getAttribute(aaiRefKey + "vf-module-id"); + String vmVfModuleId = ctx.getAttribute(aaiRefKey + ATTR_VF_MODULE_ID); log.info("insertVnfcs():::vfModule for vm is=" + vmVfModuleId); if (StringUtils.isBlank(vmVfModuleId) || !StringUtils .equalsIgnoreCase(vmVfModuleId, vfModuleIdFromRequest)) { @@ -382,7 +384,7 @@ public class AaiService { vnfcParams.put("relationship-list.relationship[2].relationship-data[1].relationship-key", "vf-module.vf-module-id"); vnfcParams.put("relationship-list.relationship[2].relationship-data[1].relationship-value", - ctx.getAttribute(aaiRefKey + "vf-module-id")); + ctx.getAttribute(aaiRefKey + ATTR_VF_MODULE_ID)); return vnfcParams; } @@ -510,7 +512,7 @@ public class AaiService { String ind = "tmp.vnfInfo.vm[" + i + "]."; String aaiFuncCode = ctx.getAttribute(ind + "vnfc-function-code"); String aaiGroupNotation = ctx.getAttribute(ind + "group-notation"); - String aaiVfModuleId = ctx.getAttribute(ind + "vf-module-id"); + String aaiVfModuleId = ctx.getAttribute(ind + ATTR_VF_MODULE_ID); log.info("getGroupNotationForExistigValue()::: vfModuleId=" + vfModuleId + ", aaiFuncCode=" + aaiFuncCode + ", aaiGroupNotation=" + aaiGroupNotation + ",aaiVfMOduleId=" + aaiVfModuleId);