diff options
| author |   Ramya Balaji <rb111y@att.com> | 2018-01-04 22:32:27 -0500 |
|---|---|---|
| committer | Ramya Balaji <rb111y@att.com> | 2018-01-04 22:45:39 -0500 |
| commit | 7c5f3f0e807f4bd5cba6dd380fb7a3014ec707b0 (patch) | |
| tree | 870ea6a1f18ef90b11c04b4c98e5a5c10e6c24cb /appc-dg-util/appc-dg-util-bundle/src/main/java/org/onap | |
| parent | 169da8c70bdfdf63456e8fb1efe5a14b4e1c20d0 (diff) | |
Updates and code clean up for DG Util bundle
Issue-ID: APPC-372
Change-Id: I4a84ac57b220c5e7582351a0fc3b584d7b92596f
Signed-off-by: Ramya Balaji <rb111y@att.com>
Diffstat (limited to 'appc-dg-util/appc-dg-util-bundle/src/main/java/org/onap')
| -rw-r--r-- | appc-dg-util/appc-dg-util-bundle/src/main/java/org/onap/appc/dg/util/impl/ExecuteNodeActionImpl.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/appc-dg-util/appc-dg-util-bundle/src/main/java/org/onap/appc/dg/util/impl/ExecuteNodeActionImpl.java b/appc-dg-util/appc-dg-util-bundle/src/main/java/org/onap/appc/dg/util/impl/ExecuteNodeActionImpl.java index b5dc40712..9f7353408 100644 --- a/appc-dg-util/appc-dg-util-bundle/src/main/java/org/onap/appc/dg/util/impl/ExecuteNodeActionImpl.java +++ b/appc-dg-util/appc-dg-util-bundle/src/main/java/org/onap/appc/dg/util/impl/ExecuteNodeActionImpl.java @@ -166,7 +166,6 @@ public class ExecuteNodeActionImpl implements ExecuteNodeAction { if (logger.isDebugEnabled()) { logger.debug("Inside getVnfHierarchy======"); } - //String ctx_prefix = params.get("prefix"); String resourceKey = params.get("resourceKey"); // String retrivalVnfKey = "vnf-id = '" + resourceKey + "' AND relationship-key = 'vserver.vserver-id'"; String retrivalVnfKey = "generic-vnf.vnf-id = '" + resourceKey + "'"; @@ -235,7 +234,10 @@ public class ExecuteNodeActionImpl implements ExecuteNodeAction { } //Retrive VM relations to find vnfc's //VM to VNFC is 1 to 1 relation - String vmRetrivalKey = "vserver.vserver-id = '" + vserverID + "' AND tenant.tenant_id = '" + tenantID + "'" + "' AND cloud-region.cloud-owner = '" + cloudOwner + "' AND cloud-region.cloud-region-id = '" + cloudRegionId + "'"; + String vmRetrivalKey = "vserver.vserver-id = '" + vserverID + + "' AND tenant.tenant_id = '" + tenantID + + "'" + "' AND cloud-region.cloud-owner = '" + cloudOwner + + "' AND cloud-region.cloud-region-id = '" + cloudRegionId + "'"; Map<String, String> paramsVm = new HashMap<String, String>(); paramsVm.put("resourceType", "vserver"); paramsVm.put("prefix", "vmRetrived"); @@ -320,7 +322,6 @@ public class ExecuteNodeActionImpl implements ExecuteNodeAction { } private void populateVnfcsDetailsinContext(Map<String, Set<String>> vnfcHierarchyMap, SvcLogicContext ctx) throws APPCException { -// int vnfcCount = vnfcHierarchyMap.size(); SvcLogicContext vnfcCtx = new SvcLogicContext(); int vnfcCounter = 0; for (String vnfcName : vnfcHierarchyMap.keySet()) { |