From 7117ab0c12c54e40c3bcfdb999260224cfe01181 Mon Sep 17 00:00:00 2001 From: fujinhua Date: Wed, 13 Sep 2017 09:03:14 +0800 Subject: Change openoapi to api for sfc-driver Change-Id: I215513c16a9ef1f96e2ed5a02974c9464d77cbbd Issue-Id: VFC-342 Signed-off-by: fujinhua --- zte/sfc-driver/plugin-standalone/src/main/assembly/conf/console.yml | 4 ++-- zte/sfc-driver/plugin-standalone/src/main/assembly/run.bat | 2 +- .../sfc-driver/src/main/java/org/openo/sfc/service/MsbService.java | 2 +- .../sfc-driver/src/main/java/org/openo/sfc/utils/SfcConst.java | 2 +- .../sfc-driver/src/main/java/org/openo/sfc/utils/SfcDriverUtil.java | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/zte/sfc-driver/plugin-standalone/src/main/assembly/conf/console.yml b/zte/sfc-driver/plugin-standalone/src/main/assembly/conf/console.yml index 4860afd..c6851cd 100644 --- a/zte/sfc-driver/plugin-standalone/src/main/assembly/conf/console.yml +++ b/zte/sfc-driver/plugin-standalone/src/main/assembly/conf/console.yml @@ -1,5 +1,5 @@ # -# Copyright 2016 [ZTE] and others. +# Copyright 2016 ZTE Corporation. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -29,7 +29,7 @@ msbServiceUrl: http://127.0.0.1:80 server: type: simple - rootPath: '/openoapi/ztesdncdriver/v1/*' + rootPath: '/api/ztesdncdriver/v1/*' applicationContextPath: / adminContextPath: /admin connector: diff --git a/zte/sfc-driver/plugin-standalone/src/main/assembly/run.bat b/zte/sfc-driver/plugin-standalone/src/main/assembly/run.bat index 46e88bb..8b33246 100644 --- a/zte/sfc-driver/plugin-standalone/src/main/assembly/run.bat +++ b/zte/sfc-driver/plugin-standalone/src/main/assembly/run.bat @@ -1,5 +1,5 @@ @REM -@REM Copyright 2016 [ZTE] and others. +@REM Copyright 2016 ZTE Corporation. @REM @REM Licensed under the Apache License, Version 2.0 (the "License"); @REM you may not use this file except in compliance with the License. diff --git a/zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/service/MsbService.java b/zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/service/MsbService.java index f8d544b..6aaff1f 100644 --- a/zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/service/MsbService.java +++ b/zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/service/MsbService.java @@ -24,7 +24,7 @@ import javax.ws.rs.Produces; import javax.ws.rs.QueryParam; import javax.ws.rs.core.MediaType; -@Path("/openoapi/microservices/v1/services") +@Path("/api/microservices/v1/services") public interface MsbService { @Path("") @POST diff --git a/zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/utils/SfcConst.java b/zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/utils/SfcConst.java index a330853..2ddd5bd 100644 --- a/zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/utils/SfcConst.java +++ b/zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/utils/SfcConst.java @@ -19,6 +19,6 @@ public interface SfcConst { public static final int HTTP_OK = 200; public static final int HTTP_POST_OK = 204; public static final String SERVICE_NAME = "ztesdncdriver"; - public static final String SERVICE_URL="/openoapi/ztesdncdriver/v1"; + public static final String SERVICE_URL="/api/ztesdncdriver/v1"; } diff --git a/zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/utils/SfcDriverUtil.java b/zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/utils/SfcDriverUtil.java index da45aa7..5752092 100644 --- a/zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/utils/SfcDriverUtil.java +++ b/zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/utils/SfcDriverUtil.java @@ -78,7 +78,7 @@ public class SfcDriverUtil { entity.setServiceName(SfcConst.SERVICE_NAME); entity.setVersion("v1"); //entity.setUrl(SfcConst.SERVICE_URL); - entity.setUrl("/openoapi/ztesdncdriver/v1"); + entity.setUrl("/api/ztesdncdriver/v1"); entity.setProtocol("REST"); entity.setVisualRange("1"); ArrayList nodes = new ArrayList(); -- cgit 1.2.3-korg