From 15d0a2646c2fb6ce75fdd90fd972df70fb9acee0 Mon Sep 17 00:00:00 2001 From: yufei_zhou Date: Thu, 19 Oct 2017 17:59:54 +0800 Subject: add swagger.json display part Change-Id: I572e1ac570ca8041077e4a779a9a40967d211a4d Issue-ID: VFC-544 Signed-off-by: yufei_zhou --- nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/pom.xml | 7 ++++++- .../vnfm/svnfm/vnfmdriver/controller/VnfmDriverController.java | 7 +++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/pom.xml b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/pom.xml index 89b06760..b12c681e 100644 --- a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/pom.xml +++ b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/pom.xml @@ -97,7 +97,12 @@ test - + + commons-io + commons-io + 2.5 + + org.apache.httpcomponents httpclient diff --git a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/vnfmdriver/controller/VnfmDriverController.java b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/vnfmdriver/controller/VnfmDriverController.java index 25fef06d..c4826862 100644 --- a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/vnfmdriver/controller/VnfmDriverController.java +++ b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/vnfmdriver/controller/VnfmDriverController.java @@ -21,6 +21,7 @@ import java.io.IOException; import javax.servlet.http.HttpServletResponse; import org.apache.http.HttpStatus; +import org.apache.commons.io.IOUtils; import org.onap.vfc.nfvo.driver.vnfm.svnfm.exception.VnfmDriverException; import org.onap.vfc.nfvo.driver.vnfm.svnfm.vnfmdriver.bo.HealVnfRequest; import org.onap.vfc.nfvo.driver.vnfm.svnfm.vnfmdriver.bo.HealVnfResponse; @@ -56,6 +57,12 @@ public class VnfmDriverController { private Gson gson = new Gson(); + @RequestMapping(value = "/swagger.json", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + public String apidoc() throws IOException { + ClassLoader classLoader = getClass().getClassLoader(); + return IOUtils.toString(classLoader.getResourceAsStream("swagger.json")); + } + @RequestMapping(value = "/{vnfmId}/vnfs", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) @ResponseBody public InstantiateVnfResponse instantiateVnf(@RequestBody InstantiateVnfRequest request, @PathVariable("vnfmId") String vnfmId, HttpServletResponse httpResponse) -- cgit 1.2.3-korg