From: shashikanth.vh <shashikanth.vh@huawei.com>
Date: Mon, 27 Aug 2018 11:11:22 +0000 (+0530)
Subject: Fixed vnfTopoOperation vnf-id return in response
X-Git-Tag: 1.4.0~2
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=sdnc%2Fnorthbound.git;a=commitdiff_plain;h=78a6948602fec40c00644567433ae2d73250c67c

Fixed vnfTopoOperation vnf-id return in response

Fixed issue vnfTopologyOperation, vnf-id not returning in response when vnf-id
is not provided as part of input

Change-Id: Iaa3b1387a45c60c27e3fdf1120e127648323e352
Issue-ID: SDNC-434
Signed-off-by: shashikanth.vh <shashikanth.vh@huawei.com>
---

diff --git a/generic-resource-api/provider/src/main/java/org/onap/sdnc/northbound/GenericResourceApiProvider.java b/generic-resource-api/provider/src/main/java/org/onap/sdnc/northbound/GenericResourceApiProvider.java
index 8609b600..d29e674d 100644
--- a/generic-resource-api/provider/src/main/java/org/onap/sdnc/northbound/GenericResourceApiProvider.java
+++ b/generic-resource-api/provider/src/main/java/org/onap/sdnc/northbound/GenericResourceApiProvider.java
@@ -869,6 +869,9 @@ public class GenericResourceApiProvider implements AutoCloseable, GENERICRESOURC
             responseObject.setMessage(respProps.getProperty(ERROR_MESSAGE_PARAM));
             responseObject.setStatusCode(respProps.getProperty(ERROR_CODE_PARAM));
             ackFinal = respProps.getProperty(ACK_FINAL_PARAM, "Y");
+            if (vnfId == null) {
+                vnfId = respProps.getProperty("vnfId");
+            }
             serviceObjectPath = respProps.getProperty(SERVICE_OBJECT_PATH_PARAM);
             vnfObjectPath = respProps.getProperty(VNF_OBJECT_PATH_PARAM);
         }