diff options
| author |   Gao Weitao <victor.gao@huawei.com> | 2017-10-18 09:50:41 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2017-10-18 09:50:41 +0000 |
| commit | 287098d603c6c669d511c18f5c964aac5e21419b (patch) | |
| tree | aa63237ea0d46373085cbc50a219b9a1f13b59ef | |
| parent | 4184f3e8eb01b4b8bd15e99f7a547fa762ccad88 (diff) | |
| parent | 86d17be435aad99cb0e593f55758ad98dc0cc1f0 (diff) | |
Merge "Fix published url for huaweidriver"
3 files changed, 6 insertions, 4 deletions
diff --git a/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release/etc/adapterInfo/vnfmadapterinfo.json b/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release/etc/adapterInfo/vnfmadapterinfo.json index 12dc3304..9d8322c4 100644 --- a/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release/etc/adapterInfo/vnfmadapterinfo.json +++ b/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release/etc/adapterInfo/vnfmadapterinfo.json @@ -1,7 +1,7 @@ { "serviceName": "hwvnfm", "version": "v1", - "url": "/api/hwvnfm/v1", + "url": "/api/huaweivnfmdriver/v1", "protocol": "REST", "visualRange": "1", "nodes": [ diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/SwaggerRoa.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/SwaggerRoa.java index 63e73c97..27a5ae3e 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/SwaggerRoa.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/SwaggerRoa.java @@ -31,18 +31,20 @@ import org.apache.commons.io.IOUtils; * @author * @version VFC 1.0 Oct 24, 2016 */ -@Path("/api/hwvnfm/v1") +@Path("/api/huaweivnfmdriver/v1") @Produces({MediaType.APPLICATION_JSON}) public class SwaggerRoa { + /** * API doc. + * * @param filename * @return * @throws IOException */ @GET @Path("/swagger.json") - public String apidoc() throws IOException{ + public String apidoc() throws IOException { ClassLoader classLoader = getClass().getClassLoader(); return IOUtils.toString(classLoader.getResourceAsStream("swagger.json")); } diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/VnfRoa.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/VnfRoa.java index 35f7ceaa..4867ace7 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/VnfRoa.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/VnfRoa.java @@ -51,7 +51,7 @@ import net.sf.json.JSONObject; * @version VFC 1.0 Aug 24, 2016 */ @SuppressWarnings("unchecked") -@Path("/api/hwvnfm/v1") +@Path("/api/huaweivnfmdriver/v1") @Consumes(MediaType.APPLICATION_JSON) @Produces(MediaType.APPLICATION_JSON) public class VnfRoa { |