From 8e083980a42491522f46fe5a691735603f1b8e9a Mon Sep 17 00:00:00 2001 From: guochuyicmri Date: Tue, 13 Nov 2018 15:37:30 +0800 Subject: Support NS Package Query for VF-C Change-Id: Ie51ef5a0dd873c1a2771d73cb2a5a1fd21ab9629 Issue-ID: USECASEUI-159 Signed-off-by: guochuyicmri --- .../lcm/PackageDistributionController.java | 48 +++++++++++----------- .../server/controller/sotn/SotnController.java | 2 +- 2 files changed, 25 insertions(+), 25 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 d60e38d6..8a6f1983 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 @@ -123,107 +123,107 @@ public class PackageDistributionController { return packageDistributionService.deleteVfPackage(casrId); } - @RequestMapping(value = {"/uui-lcm/fetchNsTemplateData}"}, method = RequestMethod.POST , produces = "application/json") + @RequestMapping(value = {"/uui-lcm/fetchNsTemplateData"}, method = RequestMethod.POST , produces = "application/json") public String fetchNsTemplateData(HttpServletRequest request){ return packageDistributionService.fetchNsTemplateData(request); } - @RequestMapping(value = {"/uui-lcm/listNsTemplates}"}, method = RequestMethod.GET , produces = "application/json") + @RequestMapping(value = {"/uui-lcm/listNsTemplates"}, method = RequestMethod.GET , produces = "application/json") public String listNsTemplates(){ return packageDistributionService.listNsTemplates(); } - @RequestMapping(value = {"/uui-lcm/ns-packages}"}, method = RequestMethod.GET , produces = "application/json") + @RequestMapping(value = {"/uui-lcm/ns-packages"}, method = RequestMethod.GET , produces = "application/json") public String getNsPackages(){ return packageDistributionService.getNetworkServicePackages(); } - @RequestMapping(value = {"/uui-lcm/vnf-packages}"}, method = RequestMethod.GET , produces = "application/json") + @RequestMapping(value = {"/uui-lcm/vnf-packages"}, method = RequestMethod.GET , produces = "application/json") public String getVnfPackages(){ return packageDistributionService.getVnfPackages(); } - @RequestMapping(value = {"/uui-lcm/pnf-packages}"}, method = RequestMethod.GET , produces = "application/json") + @RequestMapping(value = {"/uui-lcm/pnf-packages"}, method = RequestMethod.GET , produces = "application/json") public String getPnfPackages(){ return packageDistributionService.getPnfPackages(); } - @RequestMapping(value = {"/uui-lcm/createNetworkServiceData}"}, method = RequestMethod.POST , produces = "application/json") + @RequestMapping(value = {"/uui-lcm/createNetworkServiceData"}, method = RequestMethod.POST , produces = "application/json") public String createNetworkServiceData(HttpServletRequest request){ return packageDistributionService.createNetworkServiceData(request); } - @RequestMapping(value = {"/uui-lcm/createVnfData}"}, method = RequestMethod.POST , produces = "application/json") + @RequestMapping(value = {"/uui-lcm/createVnfData"}, method = RequestMethod.POST , produces = "application/json") public String createVnfData(HttpServletRequest request){ return packageDistributionService.createVnfData(request); } - @RequestMapping(value = {"/uui-lcm/createPnfData}"}, method = RequestMethod.POST , produces = "application/json") + @RequestMapping(value = {"/uui-lcm/createPnfData"}, method = RequestMethod.POST , produces = "application/json") public String createPnfData(HttpServletRequest request){ return packageDistributionService.createPnfData(request); } - @RequestMapping(value = {"/uui-lcm/getNsdInfo}"}, method = RequestMethod.GET , produces = "application/json") + @RequestMapping(value = {"/uui-lcm/getNsdInfo"}, method = RequestMethod.GET , produces = "application/json") public String getNsdInfo(@RequestParam String nsdInfoId){ return packageDistributionService.getNsdInfo(nsdInfoId); } - @RequestMapping(value = {"/uui-lcm/getVnfInfo}"}, method = RequestMethod.GET , produces = "application/json") + @RequestMapping(value = {"/uui-lcm/getVnfInfo"}, method = RequestMethod.GET , produces = "application/json") public String getVnfInfo(@RequestParam String vnfPkgId){ return packageDistributionService.getVnfInfo(vnfPkgId); } - @RequestMapping(value = {"/uui-lcm/getPnfInfo}"}, method = RequestMethod.GET , produces = "application/json") + @RequestMapping(value = {"/uui-lcm/getPnfInfo"}, method = RequestMethod.GET , produces = "application/json") public String getPnfInfo(@RequestParam String pnfdInfoId){ return packageDistributionService.getPnfInfo(pnfdInfoId); } - @RequestMapping(value = {"/uui-lcm/downLoadNsPackage}"}, method = RequestMethod.GET , produces = "application/json") + @RequestMapping(value = {"/uui-lcm/downLoadNsPackage"}, method = RequestMethod.GET , produces = "application/json") public String downLoadNsPackage(@RequestParam String nsdInfoId){ return packageDistributionService.downLoadNsPackage(nsdInfoId); } - @RequestMapping(value = {"/uui-lcm/downLoadPnfPackage}"}, method = RequestMethod.GET , produces = "application/json") + @RequestMapping(value = {"/uui-lcm/downLoadPnfPackage"}, method = RequestMethod.GET , produces = "application/json") public String downLoadPnfPackage(@RequestParam String pnfdInfoId){ return packageDistributionService.downLoadPnfPackage(pnfdInfoId); } - @RequestMapping(value = {"/uui-lcm/downLoadVnfPackage}"}, method = RequestMethod.GET , produces = "application/json") + @RequestMapping(value = {"/uui-lcm/downLoadVnfPackage"}, method = RequestMethod.GET , produces = "application/json") public String downLoadVnfPackage(@RequestParam String vnfPkgId){ return packageDistributionService.downLoadVnfPackage(vnfPkgId); } - @RequestMapping(value = {"/uui-lcm/deleteNsdPackage}"}, method = RequestMethod.GET , produces = "application/json") + @RequestMapping(value = {"/uui-lcm/deleteNsdPackage"}, method = RequestMethod.GET , produces = "application/json") public String deleteNsdPackage(@RequestParam String nsdInfoId){ return packageDistributionService.deleteNsdPackage(nsdInfoId); } - @RequestMapping(value = {"/uui-lcm/deleteVnfPackage}"}, method = RequestMethod.GET , produces = "application/json") + @RequestMapping(value = {"/uui-lcm/deleteVnfPackage"}, method = RequestMethod.GET , produces = "application/json") public String deleteVnfPackage(@RequestParam String vnfPkgId){ return packageDistributionService.deleteVnfPackage(vnfPkgId); } - @RequestMapping(value = {"/uui-lcm/deletePnfPackage}"}, method = RequestMethod.GET , produces = "application/json") + @RequestMapping(value = {"/uui-lcm/deletePnfPackage"}, method = RequestMethod.GET , produces = "application/json") public String deletePnfPackage(@RequestParam String pnfdInfoId){ return packageDistributionService.deletePnfPackage(pnfdInfoId); } - @RequestMapping(value = {"/uui-lcm/getNetworkServiceInfo}"}, method = RequestMethod.GET , produces = "application/json") + @RequestMapping(value = {"/uui-lcm/getNetworkServiceInfo"}, method = RequestMethod.GET , produces = "application/json") public List getNetworkServiceInfo(){ return packageDistributionService.getNetworkServiceInfo(); } - @RequestMapping(value = {"/uui-lcm/createNetworkServiceInstance}"}, method = RequestMethod.POST , produces = "application/json") + @RequestMapping(value = {"/uui-lcm/createNetworkServiceInstance"}, method = RequestMethod.POST , produces = "application/json") public String createNetworkServiceInstance(HttpServletRequest request){ return packageDistributionService.createNetworkServiceInstance(request); } - @RequestMapping(value = {"/uui-lcm/deleteNetworkServiceInstance}"}, method = RequestMethod.DELETE , produces = "application/json") + @RequestMapping(value = {"/uui-lcm/deleteNetworkServiceInstance"}, method = RequestMethod.DELETE , 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") + @RequestMapping(value = {"/uui-lcm/instantiateNetworkServiceInstance"}, method = RequestMethod.POST , produces = "application/json") public String instantiateNetworkServiceInstance(HttpServletRequest request){ String customerId = request.getParameter("customerId"); String serviceType = request.getParameter("serviceType"); @@ -234,17 +234,17 @@ public class PackageDistributionController { return packageDistributionService.instantiateNetworkServiceInstance(request,ns_instance_id); } - @RequestMapping(value = {"/uui-lcm/terminateNetworkServiceInstance}"}, method = RequestMethod.POST , produces = "application/json") + @RequestMapping(value = {"/uui-lcm/terminateNetworkServiceInstance"}, method = RequestMethod.POST , produces = "application/json") public String terminateNetworkServiceInstance(HttpServletRequest request,@RequestParam String ns_instance_id){ return packageDistributionService.terminateNetworkServiceInstance(request,ns_instance_id); } - @RequestMapping(value = {"/uui-lcm/healNetworkServiceInstance}"}, method = RequestMethod.POST , produces = "application/json") + @RequestMapping(value = {"/uui-lcm/healNetworkServiceInstance"}, method = RequestMethod.POST , produces = "application/json") public String healNetworkServiceInstance(HttpServletRequest request,@RequestParam String ns_instance_id){ return packageDistributionService.healNetworkServiceInstance(request,ns_instance_id); } - @RequestMapping(value = {"/uui-lcm/scaleNetworkServiceInstance}"}, method = RequestMethod.POST , produces = "application/json") + @RequestMapping(value = {"/uui-lcm/scaleNetworkServiceInstance"}, method = RequestMethod.POST , produces = "application/json") public String scaleNetworkServiceInstance(HttpServletRequest request,@RequestParam String ns_instance_id){ return packageDistributionService.scaleNetworkServiceInstance(request,ns_instance_id); } diff --git a/server/src/main/java/org/onap/usecaseui/server/controller/sotn/SotnController.java b/server/src/main/java/org/onap/usecaseui/server/controller/sotn/SotnController.java index 51f63e3a..976942b6 100644 --- a/server/src/main/java/org/onap/usecaseui/server/controller/sotn/SotnController.java +++ b/server/src/main/java/org/onap/usecaseui/server/controller/sotn/SotnController.java @@ -96,7 +96,7 @@ public class SotnController { @RequestMapping(value = {"/createHostUrl/{aaiId:.+}"}, method = RequestMethod.PUT) public String createHostUrl(HttpServletRequest request,@PathVariable(value="aaiId") String aaiId){ - return sotnService.createTopoNetwork(request,aaiId); + return sotnService.createHostUrl(request, aaiId); } @RequestMapping(value = {"/createTopoNetwork/{networkId:.+}"}, method = RequestMethod.PUT) -- cgit 1.2.3-korg