diff options
Diffstat (limited to 'huawei/vnfmadapter/VnfmadapterService/service/src/main')
6 files changed, 14 insertions, 14 deletions
diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/constant/ParamConstants.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/constant/ParamConstants.java index af486093..957a581d 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/constant/ParamConstants.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/constant/ParamConstants.java @@ -105,15 +105,15 @@ public class ParamConstants { public static final String VNF_GET_VMINFO = "/v2/vapps/instances/%s/vm"; - public static final String MSB_REGISTER_URL = "/openoapi/microservices/v1/services"; + public static final String MSB_REGISTER_URL = "/api/microservices/v1/services"; - public static final String MSB_UNREGISTER_URL = "/openoapi/microservices/v1/services/hw-vnfm"; + public static final String MSB_UNREGISTER_URL = "/api/microservices/v1/services/hw-vnfm"; - public static final String ESR_GET_VNFM_URL = "/openoapi/extsys/v1/vnfms/%s"; + public static final String ESR_GET_VNFM_URL = "/api/extsys/v1/vnfms/%s"; - public static final String ESR_GET_VNFMS_URL = "/openoapi/extsys/v1/vnfms"; + public static final String ESR_GET_VNFMS_URL = "/api/extsys/v1/vnfms"; - public static final String GRANT_RES_URL = "/openoapi/resmgr/v1/resource/grant"; + public static final String GRANT_RES_URL = "/api/resmgr/v1/resource/grant"; public static final String HEAL_VNF = "/v2/vapps/instances/vm/%s/action"; diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/constant/UrlConstant.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/constant/UrlConstant.java index 8b906a14..0f09ddbb 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/constant/UrlConstant.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/constant/UrlConstant.java @@ -24,13 +24,13 @@ package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.constant; */ public class UrlConstant { - public static final String REST_MSB_REGISTER = "/openoapi/microservices/v1/services"; + public static final String REST_MSB_REGISTER = "/api/microservices/v1/services"; - public static final String REST_DRIVERMGR_REGISTER = "/openoapi/drivermgr/v1/drivers"; + public static final String REST_DRIVERMGR_REGISTER = "/api/drivermgr/v1/drivers"; - public static final String REST_CSARINFO_GET = "/openoapi/catalog/v1/csars/%s"; + public static final String REST_CSARINFO_GET = "/api/catalog/v1/csars/%s"; - public static final String REST_VNFMINFO_GET = "/openoapi/extsys/v1/vnfms/%s"; + public static final String REST_VNFMINFO_GET = "/api/extsys/v1/vnfms/%s"; public static final String URL_ALLCLOUD_GET = "/rest/vnfm/vnfmvim/v2/computeservice/getAllCloud"; 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 7ff1e2ca..d6ef28f6 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 @@ -1,5 +1,5 @@ /* - * Copyright 2016 Huawei Technologies Co., Ltd. + * Copyright 2016-2017 Huawei Technologies Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,7 +31,7 @@ import org.apache.commons.io.IOUtils; * @author * @version NFVO 0.5 Oct 24, 2016 */ -@Path("/openoapi/hwvnfm/v1") +@Path("/api/hwvnfm/v1") @Produces({MediaType.APPLICATION_JSON}) public class SwaggerRoa { /** 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 fafd3e53..870875c4 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 NFVO 0.5 Aug 24, 2016 */ @SuppressWarnings("unchecked") -@Path("/openoapi/hwvnfm/v1") +@Path("/api/hwvnfm/v1") @Consumes(MediaType.APPLICATION_JSON) @Produces(MediaType.APPLICATION_JSON) public class VnfRoa { diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/resources/registerService.properties b/huawei/vnfmadapter/VnfmadapterService/service/src/main/resources/registerService.properties index b7520c0f..df20f4e4 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/resources/registerService.properties +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/resources/registerService.properties @@ -15,7 +15,7 @@ ############################################################################### serviceName=hw-vnfm version=v1 -url=/openoapi/hw-vnfm/v1 +url=/api/hw-vnfm/v1 protocol=REST visualRange=1 ip=10.229.33.207 diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/resources/swagger.json b/huawei/vnfmadapter/VnfmadapterService/service/src/main/resources/swagger.json index aa3bf1f6..7ed27184 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/resources/swagger.json +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/resources/swagger.json @@ -10,7 +10,7 @@ "name": "Huawei VNFM Driver services" } ], - "basePath": "/openoapi", + "basePath": "/api", "paths": { "/{vnfmtype}/v1/{vnfmid}/vnfs": { "post": { |