From 5e373056b435f35f577e4e69ab068c9611e9de91 Mon Sep 17 00:00:00 2001 From: guochuyicmri Date: Wed, 21 Nov 2018 20:18:57 +0800 Subject: modify update status for ccvpn by operation Change-Id: Ie2bdf5f8bdf56a43ad9defb4ac7b5db4b4f7df3a Issue-ID: USECASEUI-167 Signed-off-by: guochuyicmri --- .../usecaseui/server/controller/lcm/PackageDistributionController.java | 2 +- .../org/onap/usecaseui/server/controller/lcm/ServiceLcmController.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/src/main/java/org/onap/usecaseui/server/controller/lcm/PackageDistributionController.java b/server/src/main/java/org/onap/usecaseui/server/controller/lcm/PackageDistributionController.java index ed6bfcf8..f9654d84 100644 --- a/server/src/main/java/org/onap/usecaseui/server/controller/lcm/PackageDistributionController.java +++ b/server/src/main/java/org/onap/usecaseui/server/controller/lcm/PackageDistributionController.java @@ -268,7 +268,7 @@ public class PackageDistributionController { return packageDistributionService.scaleNetworkServiceInstance(request,ns_instance_id); } - @RequestMapping(value = {"/uui-lcm/VnfInfo/{vnfinstid}"}, method = RequestMethod.POST , produces = "application/json") + @RequestMapping(value = {"/uui-lcm/VnfInfo/{vnfinstid}"}, method = RequestMethod.GET , produces = "application/json") public String getVnfInfoById(@PathVariable String vnfinstid){ return packageDistributionService.getVnfInfoById(vnfinstid); } diff --git a/server/src/main/java/org/onap/usecaseui/server/controller/lcm/ServiceLcmController.java b/server/src/main/java/org/onap/usecaseui/server/controller/lcm/ServiceLcmController.java index 9a8feb66..77c7ec55 100644 --- a/server/src/main/java/org/onap/usecaseui/server/controller/lcm/ServiceLcmController.java +++ b/server/src/main/java/org/onap/usecaseui/server/controller/lcm/ServiceLcmController.java @@ -67,7 +67,7 @@ public class ServiceLcmController { @RequestMapping(value = {"/uui-lcm/services/{serviceId}/operations/{operationId}"}, method = RequestMethod.GET , produces = "application/json") public OperationProgressInformation queryOperationProgress(@PathVariable(value="serviceId") String serviceId, @PathVariable(value="operationId") String operationId){ OperationProgressInformation operationProgressInformation =serviceLcmService.queryOperationProgress(serviceId, operationId); - if(UuiCommonUtil.isNotNullOrEmpty(operationProgressInformation)&&UuiCommonUtil.isNotNullOrEmpty(operationProgressInformation.getOperationStatus())){ + if(UuiCommonUtil.isNotNullOrEmpty(operationProgressInformation)&&UuiCommonUtil.isNotNullOrEmpty(operationProgressInformation.getOperationStatus())&&"CREATE".equals(operationProgressInformation.getOperationStatus().getOperation())){ serviceLcmService.updateServiceInstanceStatusById(operationProgressInformation.getOperationStatus().getResult(), serviceId); } return operationProgressInformation; -- cgit 1.2.3-korg