From a03a411f057059fc418878a64393414178c9f310 Mon Sep 17 00:00:00 2001 From: Ofir Sonsino Date: Sun, 3 Dec 2017 17:32:12 +0200 Subject: Align changes to Amsterdam Change-Id: I392a33f0fb1f23e56877b544fb9b9085e1499d85 Issue-ID: VID-97 Signed-off-by: Ofir Sonsino --- .../src/main/java/org/openecomp/vid/controller/MsoController.java | 2 +- .../src/main/java/org/openecomp/vid/mso/MsoBusinessLogic.java | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'vid-app-common/src/main/java/org') diff --git a/vid-app-common/src/main/java/org/openecomp/vid/controller/MsoController.java b/vid-app-common/src/main/java/org/openecomp/vid/controller/MsoController.java index 9a064b00..451b19de 100755 --- a/vid-app-common/src/main/java/org/openecomp/vid/controller/MsoController.java +++ b/vid-app-common/src/main/java/org/openecomp/vid/controller/MsoController.java @@ -405,7 +405,7 @@ public class MsoController extends RestrictedBaseController { MsoBusinessLogic mbl = new MsoBusinessLogic(); - MsoResponseWrapper w = mbl.deleteVfModule(mso_request, serviceInstanceId, vnfInstanceId); + MsoResponseWrapper w = mbl.deleteVfModule(mso_request, serviceInstanceId, vnfInstanceId, vfModuleId); // always return OK, the MSO status code is embedded in the body return (new ResponseEntity(w.getResponse(), HttpStatus.OK)); diff --git a/vid-app-common/src/main/java/org/openecomp/vid/mso/MsoBusinessLogic.java b/vid-app-common/src/main/java/org/openecomp/vid/mso/MsoBusinessLogic.java index cd6003ad..f6847e45 100644 --- a/vid-app-common/src/main/java/org/openecomp/vid/mso/MsoBusinessLogic.java +++ b/vid-app-common/src/main/java/org/openecomp/vid/mso/MsoBusinessLogic.java @@ -153,7 +153,7 @@ public class MsoBusinessLogic { return msoClientInterface.deleteVnf(requestDetails, vnf_endpoint); } - public MsoResponseWrapper deleteVfModule(RequestDetails requestDetails, String serviceInstanceId, String vnfInstanceId) throws Exception{ + public MsoResponseWrapper deleteVfModule(RequestDetails requestDetails, String serviceInstanceId, String vnfInstanceId, String vfModuleId) throws Exception{ String methodName = "deleteVfModule"; logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " start"); @@ -164,8 +164,9 @@ public class MsoBusinessLogic { throw exception; } - String svc_endpoint = endpoint.replaceFirst(SVC_INSTANCE_ID, serviceInstanceId); - String delete_vf_endpoint = svc_endpoint.replaceFirst(VNF_INSTANCE_ID, vnfInstanceId); + String vf__modules_endpoint = endpoint.replaceFirst(SVC_INSTANCE_ID, serviceInstanceId).replaceFirst(VNF_INSTANCE_ID, vnfInstanceId); + + String delete_vf_endpoint = vf__modules_endpoint + '/' + vfModuleId; return msoClientInterface.deleteVfModule(requestDetails, delete_vf_endpoint); } -- cgit 1.2.3-korg