diff options
30 files changed, 70 insertions, 105 deletions
diff --git a/releases/3.0.2-container.yaml b/releases/3.0.2-container.yaml new file mode 100644 index 00000000..b4f441be --- /dev/null +++ b/releases/3.0.2-container.yaml @@ -0,0 +1,10 @@ +distribution_type: 'container' +container_release_tag: '3.0.2' +project: 'usecase-ui-serve' +container_pull_registry: nexus3.onap.org:10003 +container_push_registry: nexus3.onap.org:10002 +log_dir: 'usecase-ui-server-master-docker-java-daily/1054' +ref: 'c26283161fc152e41c73e427448381b472329439' +containers: + - name: 'usecase-ui-server' + version: '3.0.1-STAGING-20200427T063119Z' diff --git a/server/pom.xml b/server/pom.xml index aed50d5b..3015d657 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -112,11 +112,12 @@ <version>9.1-901-1.jdbc4</version> </dependency> - <dependency> + <dependency> <groupId>org.projectlombok</groupId> - <artifactId>lombok</artifactId> - <optional>true</optional> - </dependency> + <artifactId>lombok</artifactId> + <version>1.18.2</version> + <optional>true</optional> + </dependency> <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-test</artifactId> @@ -463,4 +464,4 @@ </snapshots> </pluginRepository> </pluginRepositories> -</project>
\ No newline at end of file +</project> diff --git a/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/Connectivity.java b/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/Connectivity.java index f6ed3ed9..3db0d415 100644 --- a/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/Connectivity.java +++ b/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/Connectivity.java @@ -15,7 +15,6 @@ */ package org.onap.usecaseui.server.bean.lcm.sotne2eservice; -import com.fasterxml.jackson.annotation.JsonProperty; import java.util.HashMap; import java.util.Map; import com.fasterxml.jackson.annotation.JsonAnyGetter; diff --git a/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/Edge.java b/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/Edge.java index 246cd746..97a7c547 100644 --- a/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/Edge.java +++ b/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/Edge.java @@ -15,7 +15,6 @@ */ package org.onap.usecaseui.server.bean.lcm.sotne2eservice; -import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyOrder; diff --git a/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/ModelConfig.java b/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/ModelConfig.java index 1bb842ed..e03db1bb 100644 --- a/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/ModelConfig.java +++ b/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/ModelConfig.java @@ -17,7 +17,6 @@ package org.onap.usecaseui.server.bean.lcm.sotne2eservice; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import org.immutables.value.internal.$processor$.meta.$GsonMirrors; import java.util.List; diff --git a/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/ModelInfor.java b/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/ModelInfor.java index f1af2f3c..6462e1c9 100644 --- a/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/ModelInfor.java +++ b/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/ModelInfor.java @@ -16,7 +16,6 @@ package org.onap.usecaseui.server.bean.lcm.sotne2eservice; import com.fasterxml.jackson.annotation.JsonProperty; -import org.immutables.value.internal.$processor$.meta.$GsonMirrors; public class ModelInfor { diff --git a/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/Node.java b/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/Node.java index 84e083c1..008a6ded 100644 --- a/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/Node.java +++ b/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/Node.java @@ -15,14 +15,11 @@ */ package org.onap.usecaseui.server.bean.lcm.sotne2eservice; -import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyOrder; //import org.onap.usecaseui.server.bean.orderservice.DataNode; -import java.util.HashMap; -import java.util.Map; @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ diff --git a/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/Pinterface.java b/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/Pinterface.java index 231c9950..886261da 100644 --- a/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/Pinterface.java +++ b/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/Pinterface.java @@ -15,11 +15,6 @@ */ package org.onap.usecaseui.server.bean.lcm.sotne2eservice; -import java.util.HashMap; -import java.util.Map; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyOrder; diff --git a/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/Uni.java b/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/Uni.java index 56e96c31..983177cf 100644 --- a/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/Uni.java +++ b/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/Uni.java @@ -20,8 +20,6 @@ import lombok.Getter; import lombok.Setter; import org.onap.usecaseui.server.bean.activateEdge.RelationshipList; -import java.util.HashMap; -import java.util.Map; @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ diff --git a/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/Vnfs.java b/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/Vnfs.java index fde4ef5b..4813589e 100644 --- a/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/Vnfs.java +++ b/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/Vnfs.java @@ -20,9 +20,6 @@ import lombok.Getter; import lombok.Setter; import org.onap.usecaseui.server.bean.activateEdge.RelationshipList; -import java.util.HashMap; -import java.util.Map; - @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ "vnf-id", diff --git a/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/VpnBinding.java b/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/VpnBinding.java index 20424dd3..27791641 100644 --- a/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/VpnBinding.java +++ b/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/VpnBinding.java @@ -17,8 +17,6 @@ package org.onap.usecaseui.server.bean.lcm.sotne2eservice; import java.util.HashMap; import java.util.List; import java.util.Map; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/resourcemodelinformation.java b/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/resourcemodelinformation.java index cc74ec80..254913ab 100644 --- a/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/resourcemodelinformation.java +++ b/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/resourcemodelinformation.java @@ -15,9 +15,6 @@ */ package org.onap.usecaseui.server.bean.lcm.sotne2eservice; -import com.fasterxml.jackson.annotation.JsonProperty; - -import java.util.List; public class resourcemodelinformation { 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 70e796af..47ff54ef 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 @@ -42,6 +42,10 @@ import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; @@ -72,50 +76,50 @@ public class PackageDistributionController { } @ResponseBody - @RequestMapping(value = {"/uui-lcm/vf-ns-packages"}, method = RequestMethod.GET , produces = "application/json") + @GetMapping(value = {"/uui-lcm/vf-ns-packages"}, produces = "application/json") public VfNsPackageInfo retrievePackageInfo(){ return packageDistributionService.retrievePackageInfo(); } @ResponseBody - @RequestMapping(value = {"/uui-lcm/sdc-ns-packages"}, method = RequestMethod.GET , produces = "application/json") + @GetMapping(value = {"/uui-lcm/sdc-ns-packages"}, produces = "application/json") public List<SDCServiceTemplate> sdcNsPackageInfo(){ return packageDistributionService.sdcNsPackageInfo(); } @ResponseBody - @RequestMapping(value = {"/uui-lcm/sdc-vf-packages"}, method = RequestMethod.GET , produces = "application/json") + @GetMapping(value = {"/uui-lcm/sdc-vf-packages"}, produces = "application/json") public List<Vnf> sdcVfPackageInfo(){ return packageDistributionService.sdcVfPackageInfo(); } @ResponseBody - @RequestMapping(value = {"/uui-lcm/ns-packages"}, method = RequestMethod.POST , produces = "application/json") + @PostMapping(value = {"/uui-lcm/ns-packages"}, produces = "application/json") public DistributionResult distributeNsPackage(@RequestBody Csar csar){ return packageDistributionService.postNsPackage(csar); } @ResponseBody - @RequestMapping(value = {"/uui-lcm/vf-packages"}, method = RequestMethod.POST , produces = "application/json") + @PostMapping(value = {"/uui-lcm/vf-packages"}, produces = "application/json") public Job distributeVfPackage(@RequestBody Csar csar){ return packageDistributionService.postVfPackage(csar); } @ResponseBody - @RequestMapping(value = {"/uui-lcm/jobs/{jobId}"}, method = RequestMethod.GET , produces = "application/json") + @GetMapping(value = {"/uui-lcm/jobs/{jobId}"}, produces = "application/json") public JobStatus getJobStatus(@PathVariable(value="jobId") String jobId, HttpServletRequest request){ String responseId = request.getParameter("responseId"); return packageDistributionService.getJobStatus(jobId, responseId); } @ResponseBody - @RequestMapping(value = {"/uui-lcm/ns-packages/{casrId}"}, method = RequestMethod.DELETE , produces = "application/json") + @DeleteMapping(value = {"/uui-lcm/ns-packages/{casrId}"}, produces = "application/json") public DistributionResult deleteNsPackage(@PathVariable("casrId") String casrId){ return packageDistributionService.deleteNsPackage(casrId); } @ResponseBody - @RequestMapping(value = {"/uui-lcm/jobs/getNsLcmJobStatus/{jobId}"}, method = RequestMethod.GET , produces = "application/json") + @GetMapping(value = {"/uui-lcm/jobs/getNsLcmJobStatus/{jobId}"}, produces = "application/json") public JobStatus getNsLcmJobStatus(@PathVariable(value="jobId") String jobId, HttpServletRequest request){ String responseId = request.getParameter("responseId"); String serviceInstanceId = request.getParameter("serviceInstanceId"); @@ -136,117 +140,117 @@ public class PackageDistributionController { } @ResponseBody - @RequestMapping(value = {"/uui-lcm/vf-packages/{casrId}"}, method = RequestMethod.DELETE , produces = "application/json") + @DeleteMapping(value = {"/uui-lcm/vf-packages/{casrId}"}, produces = "application/json") public Job deleteVfPackage(@PathVariable("casrId") String casrId){ return packageDistributionService.deleteVfPackage(casrId); } - @RequestMapping(value = {"/uui-lcm/fetchNsTemplateData"}, method = RequestMethod.POST , produces = "application/json") + @PostMapping(value = {"/uui-lcm/fetchNsTemplateData"}, produces = "application/json") public String fetchNsTemplateData(HttpServletRequest request){ return packageDistributionService.fetchNsTemplateData(request); } - @RequestMapping(value={"/uui-lcm/fetchCCVPNTemplateData/{csarId}"},method = RequestMethod.POST,produces="application/json") + @PostMapping(value={"/uui-lcm/fetchCCVPNTemplateData/{csarId}"},produces="application/json") public JSONObject fetchCCVPNTemplateData(HttpServletRequest request, @PathVariable String csarId){ JSONObject model = (JSONObject) packageDistributionService.fetchCCVPNTemplateData(request, csarId).get("result"); return model; } - @RequestMapping(value = {"/uui-lcm/listNsTemplates"}, method = RequestMethod.GET , produces = "application/json") + @GetMapping(value = {"/uui-lcm/listNsTemplates"}, produces = "application/json") public String listNsTemplates(){ return packageDistributionService.listNsTemplates(); } - @RequestMapping(value = {"/uui-lcm/ns-packages"}, method = RequestMethod.GET , produces = "application/json") + @GetMapping(value = {"/uui-lcm/ns-packages"}, produces = "application/json") public String getNsPackages(){ return packageDistributionService.getNetworkServicePackages(); } - @RequestMapping(value = {"/uui-lcm/vnf-packages"}, method = RequestMethod.GET , produces = "application/json") + @GetMapping(value = {"/uui-lcm/vnf-packages"}, produces = "application/json") public String getVnfPackages(){ return packageDistributionService.getVnfPackages(); } - @RequestMapping(value = {"/uui-lcm/pnf-packages"}, method = RequestMethod.GET , produces = "application/json") + @GetMapping(value = {"/uui-lcm/pnf-packages"}, produces = "application/json") public String getPnfPackages(){ return packageDistributionService.getPnfPackages(); } - @RequestMapping(value = {"/uui-lcm/createNetworkServiceData"}, method = RequestMethod.POST , produces = "application/json") + @PostMapping(value = {"/uui-lcm/createNetworkServiceData"}, produces = "application/json") public String createNetworkServiceData(HttpServletRequest request){ return packageDistributionService.createNetworkServiceData(request); } - @RequestMapping(value = {"/uui-lcm/createVnfData"}, method = RequestMethod.POST , produces = "application/json") + @PostMapping(value = {"/uui-lcm/createVnfData"}, produces = "application/json") public String createVnfData(HttpServletRequest request){ return packageDistributionService.createVnfData(request); } - @RequestMapping(value = {"/uui-lcm/createPnfData"}, method = RequestMethod.POST , produces = "application/json") + @PostMapping(value = {"/uui-lcm/createPnfData"}, produces = "application/json") public String createPnfData(HttpServletRequest request){ return packageDistributionService.createPnfData(request); } - @RequestMapping(value = {"/uui-lcm/getNsdInfo"}, method = RequestMethod.GET , produces = "application/json") + @GetMapping(value = {"/uui-lcm/getNsdInfo"}, produces = "application/json") public String getNsdInfo(@RequestParam String nsdInfoId){ return packageDistributionService.getNsdInfo(nsdInfoId); } - @RequestMapping(value = {"/uui-lcm/getVnfInfo"}, method = RequestMethod.GET , produces = "application/json") + @GetMapping(value = {"/uui-lcm/getVnfInfo"}, produces = "application/json") public String getVnfInfo(@RequestParam String vnfPkgId){ return packageDistributionService.getVnfInfo(vnfPkgId); } - @RequestMapping(value = {"/uui-lcm/getPnfInfo"}, method = RequestMethod.GET , produces = "application/json") + @GetMapping(value = {"/uui-lcm/getPnfInfo"}, produces = "application/json") public String getPnfInfo(@RequestParam String pnfdInfoId){ return packageDistributionService.getPnfInfo(pnfdInfoId); } - @RequestMapping(value = {"/uui-lcm/downLoadNsPackage"}, method = RequestMethod.GET , produces = "application/json") + @GetMapping(value = {"/uui-lcm/downLoadNsPackage"}, produces = "application/json") public String downLoadNsPackage(@RequestParam String nsdInfoId){ return packageDistributionService.downLoadNsPackage(nsdInfoId); } - @RequestMapping(value = {"/uui-lcm/downLoadPnfPackage"}, method = RequestMethod.GET , produces = "application/json") + @GetMapping(value = {"/uui-lcm/downLoadPnfPackage"}, produces = "application/json") public String downLoadPnfPackage(@RequestParam String pnfdInfoId){ return packageDistributionService.downLoadPnfPackage(pnfdInfoId); } - @RequestMapping(value = {"/uui-lcm/downLoadVnfPackage"}, method = RequestMethod.GET , produces = "application/json") + @GetMapping(value = {"/uui-lcm/downLoadVnfPackage"}, produces = "application/json") public String downLoadVnfPackage(@RequestParam String vnfPkgId){ return packageDistributionService.downLoadVnfPackage(vnfPkgId); } - @RequestMapping(value = {"/uui-lcm/deleteNsdPackage"}, method = RequestMethod.DELETE , produces = "application/json") + @DeleteMapping(value = {"/uui-lcm/deleteNsdPackage"}, produces = "application/json") public String deleteNsdPackage(@RequestParam String nsdInfoId){ return packageDistributionService.deleteNsdPackage(nsdInfoId); } - @RequestMapping(value = {"/uui-lcm/deleteVnfPackage"}, method = RequestMethod.DELETE , produces = "application/json") + @DeleteMapping(value = {"/uui-lcm/deleteVnfPackage"}, produces = "application/json") public String deleteVnfPackage(@RequestParam String vnfPkgId){ return packageDistributionService.deleteVnfPackage(vnfPkgId); } - @RequestMapping(value = {"/uui-lcm/deletePnfPackage"}, method = RequestMethod.DELETE , produces = "application/json") + @DeleteMapping(value = {"/uui-lcm/deletePnfPackage"} , produces = "application/json") public String deletePnfPackage(@RequestParam String pnfdInfoId){ return packageDistributionService.deletePnfPackage(pnfdInfoId); } - @RequestMapping(value = {"/uui-lcm/getNetworkServiceInfo"}, method = RequestMethod.GET , produces = "application/json") + @GetMapping(value = {"/uui-lcm/getNetworkServiceInfo"} , produces = "application/json") public List<String> getNetworkServiceInfo(){ return packageDistributionService.getNetworkServiceInfo(); } - @RequestMapping(value = {"/uui-lcm/createNetworkServiceInstance"}, method = RequestMethod.POST , produces = "application/json") + @PostMapping(value = {"/uui-lcm/createNetworkServiceInstance"}, produces = "application/json") public String createNetworkServiceInstance(HttpServletRequest request){ return packageDistributionService.createNetworkServiceInstance(request); } - @RequestMapping(value = {"/uui-lcm/deleteNetworkServiceInstance"}, method = RequestMethod.DELETE , produces = "application/json") + @DeleteMapping(value = {"/uui-lcm/deleteNetworkServiceInstance"}, produces = "application/json") public String deleteNetworkServiceInstance(@RequestParam String ns_instance_id){ return packageDistributionService.deleteNetworkServiceInstance(ns_instance_id); } - @RequestMapping(value = {"/uui-lcm/instantiateNetworkServiceInstance"}, method = RequestMethod.POST , produces = "application/json") + @PostMapping(value = {"/uui-lcm/instantiateNetworkServiceInstance"} , produces = "application/json") public String instantiateNetworkServiceInstance(HttpServletRequest request) throws ParseException{ String customerId = request.getParameter("customerId"); String serviceType = request.getParameter("serviceType"); @@ -262,7 +266,7 @@ public class PackageDistributionController { return object; } - @RequestMapping(value = {"/uui-lcm/terminateNetworkServiceInstance"}, method = RequestMethod.POST , produces = "application/json") + @PostMapping(value = {"/uui-lcm/terminateNetworkServiceInstance"} , produces = "application/json") public String terminateNetworkServiceInstance(HttpServletRequest request,@RequestParam String ns_instance_id) throws ParseException{ String result = packageDistributionService.terminateNetworkServiceInstance(request,ns_instance_id); String jobId = ""; @@ -275,7 +279,7 @@ public class PackageDistributionController { return result; } - @RequestMapping(value = {"/uui-lcm/healNetworkServiceInstance"}, method = RequestMethod.POST , produces = "application/json") + @PostMapping(value = {"/uui-lcm/healNetworkServiceInstance"} , produces = "application/json") public String healNetworkServiceInstance(HttpServletRequest request,@RequestParam String ns_instance_id) throws ParseException{ String result= packageDistributionService.healNetworkServiceInstance(request,ns_instance_id); String jobId = ""; @@ -288,12 +292,12 @@ public class PackageDistributionController { return result; } - @RequestMapping(value = {"/uui-lcm/scaleNetworkServiceInstance"}, method = RequestMethod.POST , produces = "application/json") + @PostMapping(value = {"/uui-lcm/scaleNetworkServiceInstance"} , produces = "application/json") public String scaleNetworkServiceInstance(HttpServletRequest request,@RequestParam String ns_instance_id){ return packageDistributionService.scaleNetworkServiceInstance(request,ns_instance_id); } - @RequestMapping(value = {"/uui-lcm/VnfInfo/{vnfinstid}"}, method = RequestMethod.GET , produces = "application/json") + @GetMapping(value = {"/uui-lcm/VnfInfo/{vnfinstid}"} , 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 4e9102f8..2f63425d 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 @@ -83,12 +83,17 @@ public class ServiceLcmController { if(UuiCommonUtil.isNotNullOrEmpty(operationProgressInformation)&&UuiCommonUtil.isNotNullOrEmpty(operationProgressInformation.getOperationStatus())){ //serviceLcmService.updateServiceInstanceStatusById(operationProgressInformation.getOperationStatus().getResult(), serviceId); int progress =operationProgressInformation.getOperationStatus().getProgress(); - if(0<=progress&&progress<100){ - operationResult= CommonConstant.IN_PROGRESS_CODE; - }else if(progress==100){ - operationResult= CommonConstant.SUCCESS_CODE; - } - serviceLcmService.updateServiceInstanceOperation(serviceId,operationType,progress+"",operationResult); + String status = operationProgressInformation.getOperationStatus().getOperationContent().toLowerCase(); + if (status.contains("failed")) { + operationResult = CommonConstant.FAIL_CODE; + } else { + if(0<=progress&&progress<100){ + operationResult= CommonConstant.IN_PROGRESS_CODE; + }else if(progress==100){ + operationResult= CommonConstant.SUCCESS_CODE; + } + } + serviceLcmService.updateServiceInstanceOperation(serviceId,operationType,progress+"",operationResult); } return operationProgressInformation; } diff --git a/server/src/main/java/org/onap/usecaseui/server/controller/lcm/SotnServiceQryController.java b/server/src/main/java/org/onap/usecaseui/server/controller/lcm/SotnServiceQryController.java index cde87934..677e655a 100644 --- a/server/src/main/java/org/onap/usecaseui/server/controller/lcm/SotnServiceQryController.java +++ b/server/src/main/java/org/onap/usecaseui/server/controller/lcm/SotnServiceQryController.java @@ -18,11 +18,8 @@ package org.onap.usecaseui.server.controller.lcm; import org.onap.usecaseui.server.service.customer.CcvpnCustomerService; import org.onap.usecaseui.server.service.lcm.CustomerService; import org.onap.usecaseui.server.service.lcm.SotnServiceQryService; -import org.onap.usecaseui.server.service.lcm.domain.aai.bean.AAIServiceSubscription; import org.springframework.context.annotation.EnableAspectJAutoProxy; import org.springframework.stereotype.Controller; -import org.onap.usecaseui.server.service.lcm.ServiceLcmService; -import org.onap.usecaseui.server.util.UuiCommonUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.bind.annotation.PathVariable; @@ -31,8 +28,6 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.ResponseBody; import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import java.util.List; @Controller @org.springframework.context.annotation.Configuration diff --git a/server/src/main/java/org/onap/usecaseui/server/service/customer/impl/CcvpnCustomerServiceImpl.java b/server/src/main/java/org/onap/usecaseui/server/service/customer/impl/CcvpnCustomerServiceImpl.java index cb4a44b8..c1dbfce5 100644 --- a/server/src/main/java/org/onap/usecaseui/server/service/customer/impl/CcvpnCustomerServiceImpl.java +++ b/server/src/main/java/org/onap/usecaseui/server/service/customer/impl/CcvpnCustomerServiceImpl.java @@ -18,8 +18,6 @@ package org.onap.usecaseui.server.service.customer.impl; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.core.type.TypeReference; import okhttp3.ResponseBody; -import org.json.simple.parser.JSONParser; -import org.json.simple.parser.ParseException; import org.onap.usecaseui.server.bean.customer.ServiceInstance; import org.onap.usecaseui.server.bean.customer.ServiceInstances; @@ -40,7 +38,6 @@ import org.springframework.stereotype.Service; import retrofit2.Response; import java.io.File; -import java.io.FileReader; import java.io.IOException; import java.util.*; import java.util.stream.Collectors; diff --git a/server/src/main/java/org/onap/usecaseui/server/service/lcm/SotnServiceTemplateService.java b/server/src/main/java/org/onap/usecaseui/server/service/lcm/SotnServiceTemplateService.java index 2d9c563f..e70c8398 100644 --- a/server/src/main/java/org/onap/usecaseui/server/service/lcm/SotnServiceTemplateService.java +++ b/server/src/main/java/org/onap/usecaseui/server/service/lcm/SotnServiceTemplateService.java @@ -18,7 +18,6 @@ package org.onap.usecaseui.server.service.lcm; import org.onap.usecaseui.server.service.lcm.domain.so.bean.DeleteOperationRsp; import org.onap.usecaseui.server.service.lcm.domain.so.bean.ServiceOperation; -import javax.servlet.http.HttpServletRequest; import java.util.HashMap; public interface SotnServiceTemplateService { diff --git a/server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/aai/AAIService.java b/server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/aai/AAIService.java index 3ba4fc90..ccf3d957 100644 --- a/server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/aai/AAIService.java +++ b/server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/aai/AAIService.java @@ -19,12 +19,10 @@ package org.onap.usecaseui.server.service.lcm.domain.aai; import org.onap.usecaseui.server.bean.sotn.PinterfaceRsp; import org.onap.usecaseui.server.service.lcm.domain.aai.bean.AAICustomer; import org.onap.usecaseui.server.service.lcm.domain.aai.bean.AAICustomerRsp; -import org.onap.usecaseui.server.service.lcm.domain.aai.bean.AAINetworkInterfaceResponse; import org.onap.usecaseui.server.service.lcm.domain.aai.bean.AAIOrchestratorRsp; import org.onap.usecaseui.server.service.lcm.domain.aai.bean.AAIServiceSubscription; import org.onap.usecaseui.server.service.lcm.domain.aai.bean.AAISingleOrchestratorRsp; import org.onap.usecaseui.server.service.lcm.domain.aai.bean.SDNCControllerRsp; -import org.onap.usecaseui.server.service.lcm.domain.aai.bean.ServiceInstanceRsp; import org.onap.usecaseui.server.service.lcm.domain.aai.bean.ServiceSubscriptionRsp; import org.onap.usecaseui.server.service.lcm.domain.aai.bean.VimInfoRsp; @@ -353,7 +351,7 @@ public interface AAIService { "Authorization: Basic QUFJOkFBSQ==", "Accept: application/json" }) - @PUT("/api/aai-query/v16?format=resource") + @PUT("/api/aai-query/v19?format=resource") Call<ResponseBody> querynNetworkResourceList(@Body RequestBody body); @Headers({ "X-TransactionId: 7777", diff --git a/server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/aai/bean/EsrSystemInfo.java b/server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/aai/bean/EsrSystemInfo.java index 4ba05cf9..313488d1 100644 --- a/server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/aai/bean/EsrSystemInfo.java +++ b/server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/aai/bean/EsrSystemInfo.java @@ -17,7 +17,6 @@ package org.onap.usecaseui.server.service.lcm.domain.aai.bean; import com.fasterxml.jackson.annotation.JsonProperty; -import org.immutables.value.internal.$processor$.meta.$JacksonMirrors; public class EsrSystemInfo { diff --git a/server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/sdc/bean/Vnf.java b/server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/sdc/bean/Vnf.java index 6e401cef..7faba4d3 100644 --- a/server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/sdc/bean/Vnf.java +++ b/server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/sdc/bean/Vnf.java @@ -15,9 +15,7 @@ */ package org.onap.usecaseui.server.service.lcm.domain.sdc.bean; -import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonProperty; import java.util.Objects; diff --git a/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultCustomerService.java b/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultCustomerService.java index c63bd5fe..7cfb762e 100644 --- a/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultCustomerService.java +++ b/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultCustomerService.java @@ -325,8 +325,9 @@ public class DefaultCustomerService implements CustomerService { PInterface pInterface = result.getPinterface(); niList.add(pInterface.getInterfaceName()); } - } - + + } + Collections.sort(niList); return niList; } diff --git a/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultOrchestratorService.java b/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultOrchestratorService.java index 32a7c32b..5ddda29f 100644 --- a/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultOrchestratorService.java +++ b/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultOrchestratorService.java @@ -16,7 +16,6 @@ package org.onap.usecaseui.server.service.lcm.impl; import java.io.IOException; -import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultServiceInstanceService.java b/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultServiceInstanceService.java index e302ccb3..17a44656 100644 --- a/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultServiceInstanceService.java +++ b/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultServiceInstanceService.java @@ -21,7 +21,6 @@ import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Iterator; import javax.annotation.Resource; import org.onap.usecaseui.server.bean.ServiceBean; @@ -32,7 +31,6 @@ import org.onap.usecaseui.server.service.lcm.ServiceLcmService; import org.onap.usecaseui.server.service.lcm.domain.aai.AAIService; import org.onap.usecaseui.server.service.lcm.domain.aai.bean.AAICustomer; import org.onap.usecaseui.server.service.lcm.domain.aai.bean.AAIServiceSubscription; -import org.onap.usecaseui.server.service.lcm.domain.aai.bean.ServiceInstanceRsp; import org.onap.usecaseui.server.util.RestfulServices; import org.onap.usecaseui.server.util.UuiCommonUtil; import org.slf4j.Logger; diff --git a/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/SotnServiceQryServiceImpl.java b/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/SotnServiceQryServiceImpl.java index d20959ca..9124cca0 100644 --- a/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/SotnServiceQryServiceImpl.java +++ b/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/SotnServiceQryServiceImpl.java @@ -15,23 +15,19 @@ */ package org.onap.usecaseui.server.service.lcm.impl; -import com.alibaba.fastjson.JSONObject; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import okhttp3.ResponseBody; import org.json.simple.parser.JSONParser; -import org.json.simple.parser.ParseException; import org.onap.usecaseui.server.bean.activateEdge.ServiceInstance; import org.onap.usecaseui.server.bean.lcm.sotne2eservice.ModelConfig; import org.onap.usecaseui.server.bean.lcm.sotne2eservicemonitor.ResponseServiceInstanceWrapper; import org.onap.usecaseui.server.bean.lcm.sotne2eservicemonitor.ServiceInstanceList; import org.onap.usecaseui.server.bean.lcm.sotne2eservicemonitor.ServiceInstanceListWrapper; //import org.onap.usecaseui.server.bean.lcm.sotne2eservicemonitor.ServiceSubscriptionWrapper; -import org.onap.usecaseui.server.service.customer.impl.CcvpnCustomerServiceImpl; import org.onap.usecaseui.server.service.lcm.SotnServiceQryService; import org.onap.usecaseui.server.service.lcm.domain.aai.AAIService; import org.onap.usecaseui.server.util.RestfulServices; -import org.onap.usecaseui.server.util.UuiCommonUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.annotation.EnableAspectJAutoProxy; @@ -40,11 +36,8 @@ import org.springframework.core.io.Resource; import org.springframework.stereotype.Service; import retrofit2.Response; -import java.io.File; -import java.io.FileReader; import java.io.IOException; import java.util.ArrayList; -import java.util.Collections; import java.util.List; @Service("SotnServiceQry") diff --git a/server/src/main/java/org/onap/usecaseui/server/service/nsmf/impl/ResourceMgtServiceConvert.java b/server/src/main/java/org/onap/usecaseui/server/service/nsmf/impl/ResourceMgtServiceConvert.java index c3764960..445445c1 100644 --- a/server/src/main/java/org/onap/usecaseui/server/service/nsmf/impl/ResourceMgtServiceConvert.java +++ b/server/src/main/java/org/onap/usecaseui/server/service/nsmf/impl/ResourceMgtServiceConvert.java @@ -55,7 +55,6 @@ import org.onap.usecaseui.server.service.slicingdomain.aai.bean.AAIServiceRsp; import org.onap.usecaseui.server.service.slicingdomain.aai.bean.Relationship; import org.onap.usecaseui.server.service.slicingdomain.aai.bean.RelationshipData; import org.onap.usecaseui.server.service.slicingdomain.so.SOSliceService; -import org.onap.usecaseui.server.service.slicingdomain.so.bean.SOOperation; import org.onap.usecaseui.server.util.RestfulServices; import org.onap.usecaseui.server.util.nsmf.NsmfCommonUtil; import org.slf4j.Logger; diff --git a/server/src/main/java/org/onap/usecaseui/server/service/nsmf/impl/ResourceMgtServiceImpl.java b/server/src/main/java/org/onap/usecaseui/server/service/nsmf/impl/ResourceMgtServiceImpl.java index a0a626e1..e6c68a37 100644 --- a/server/src/main/java/org/onap/usecaseui/server/service/nsmf/impl/ResourceMgtServiceImpl.java +++ b/server/src/main/java/org/onap/usecaseui/server/service/nsmf/impl/ResourceMgtServiceImpl.java @@ -18,7 +18,6 @@ package org.onap.usecaseui.server.service.nsmf.impl; import java.io.IOException; import java.lang.reflect.Type; -import java.text.ParseException; import java.util.List; import com.alibaba.fastjson.JSON; diff --git a/server/src/main/java/org/onap/usecaseui/server/service/nsmf/impl/ResourceMonitorServiceConvert.java b/server/src/main/java/org/onap/usecaseui/server/service/nsmf/impl/ResourceMonitorServiceConvert.java index 3b421a0c..f6b20617 100644 --- a/server/src/main/java/org/onap/usecaseui/server/service/nsmf/impl/ResourceMonitorServiceConvert.java +++ b/server/src/main/java/org/onap/usecaseui/server/service/nsmf/impl/ResourceMonitorServiceConvert.java @@ -19,7 +19,6 @@ import java.lang.reflect.InvocationTargetException; import java.text.ParseException; import java.util.ArrayList; import java.util.List; -import org.apache.commons.beanutils.BeanUtils; import org.onap.usecaseui.server.bean.nsmf.monitor.ServiceInfo; import org.onap.usecaseui.server.bean.nsmf.monitor.ServiceOnlineUserInfo; import org.onap.usecaseui.server.bean.nsmf.monitor.ServiceTotalBandwidthInfo; diff --git a/server/src/main/java/org/onap/usecaseui/server/service/slicingdomain/aai/bean/AAIServiceAndInstance.java b/server/src/main/java/org/onap/usecaseui/server/service/slicingdomain/aai/bean/AAIServiceAndInstance.java index dd6f5c6a..413c0e97 100644 --- a/server/src/main/java/org/onap/usecaseui/server/service/slicingdomain/aai/bean/AAIServiceAndInstance.java +++ b/server/src/main/java/org/onap/usecaseui/server/service/slicingdomain/aai/bean/AAIServiceAndInstance.java @@ -14,8 +14,6 @@ package org.onap.usecaseui.server.service.slicingdomain.aai.bean; import java.util.List; -import com.fasterxml.jackson.annotation.JsonProperty; - public class AAIServiceAndInstance { private String serviceInstanceId; diff --git a/server/src/main/java/org/onap/usecaseui/server/service/slicingdomain/aai/bean/AAIServiceInstance.java b/server/src/main/java/org/onap/usecaseui/server/service/slicingdomain/aai/bean/AAIServiceInstance.java index 0e50f614..ae5084a8 100644 --- a/server/src/main/java/org/onap/usecaseui/server/service/slicingdomain/aai/bean/AAIServiceInstance.java +++ b/server/src/main/java/org/onap/usecaseui/server/service/slicingdomain/aai/bean/AAIServiceInstance.java @@ -15,9 +15,6 @@ package org.onap.usecaseui.server.service.slicingdomain.aai.bean; import java.io.Serializable; import java.util.List; -import javax.persistence.Column; -import javax.persistence.Id; -import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/server/src/main/java/org/onap/usecaseui/server/service/slicingdomain/aai/bean/Relationship.java b/server/src/main/java/org/onap/usecaseui/server/service/slicingdomain/aai/bean/Relationship.java index c0dda4ac..1855089b 100644 --- a/server/src/main/java/org/onap/usecaseui/server/service/slicingdomain/aai/bean/Relationship.java +++ b/server/src/main/java/org/onap/usecaseui/server/service/slicingdomain/aai/bean/Relationship.java @@ -14,8 +14,6 @@ package org.onap.usecaseui.server.service.slicingdomain.aai.bean; import java.util.List; -import com.fasterxml.jackson.annotation.JsonProperty; - public class Relationship { |