diff options
3 files changed, 7 insertions, 7 deletions
diff --git a/server/src/main/java/org/onap/usecaseui/server/controller/AlarmController.java b/server/src/main/java/org/onap/usecaseui/server/controller/AlarmController.java index 63bce433..08978699 100755 --- a/server/src/main/java/org/onap/usecaseui/server/controller/AlarmController.java +++ b/server/src/main/java/org/onap/usecaseui/server/controller/AlarmController.java @@ -276,7 +276,7 @@ public class AlarmController return string;
}
- @RequestMapping(value="/listSortMasters",method=RequestMethod.GET,produces = "application/json")
+ @RequestMapping(value="/listSortMasters",method=RequestMethod.GET,produces = "application/json;charset=utf8")
public String getSortMasterInfo() throws JsonProcessingException{
Map<String,List<SortMaster>> map = new HashMap<>();
List<SortMaster> operationTypes = alarmsHeaderService.listSortMasters("operationType");
diff --git a/server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/aai/AAIService.java b/server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/aai/AAIService.java index fce94ba0..01640360 100644 --- a/server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/aai/AAIService.java +++ b/server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/aai/AAIService.java @@ -141,7 +141,7 @@ public interface AAIService { "Accept: application/json" }) //@GET("/api/aai-business/v11/customers/customer/{global-customer-id}/service-subscriptions") - @PUT("/api/aai-business/v11/customers/customer/{global-customer-id}/service-subscriptions/service-subscription/{service-type}") + @DELETE("/api/aai-business/v11/customers/customer/{global-customer-id}/service-subscriptions/service-subscription/{service-type}") Call<ResponseBody> deleteServiceType(@Path("global-customer-id") String customerId,@Path("service-type") String serviceType,@Query("resource-version") String resourceVersion); @Headers({ diff --git a/server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/so/SOService.java b/server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/so/SOService.java index 323329b6..494647ac 100644 --- a/server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/so/SOService.java +++ b/server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/so/SOService.java @@ -29,14 +29,14 @@ public interface SOService { "Authorization: Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA==", "Accept: application/json" }) - @POST("/api/so-serviceInstances/v5") + @POST("/api/so-serviceInstances/v3") Call<ServiceOperation> instantiateService(@Body RequestBody body); @Headers({ "Authorization: Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA==", "Accept: application/json" }) - @GET("/api/so-serviceInstances/v5/{serviceId}/operations/{operationId}") + @GET("/api/so-serviceInstances/v3/{serviceId}/operations/{operationId}") Call<OperationProgressInformation> queryOperationProgress(@Path("serviceId") String serviceId, @Path("operationId") String operationId); @Headers({ @@ -44,20 +44,20 @@ public interface SOService { "Accept: application/json" }) // @DELETE("/ecomp/mso/infra/e2eServiceInstances/v3/{serviceId}") - @HTTP(method="DELETE", path="/api/so-serviceInstances/v5/{serviceId}", hasBody = true) + @HTTP(method="DELETE", path="/api/so-serviceInstances/v3/{serviceId}", hasBody = true) Call<DeleteOperationRsp> terminateService(@Path("serviceId") String serviceId, @Body RequestBody body); @Headers({ "Authorization: Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA==", "Accept: application/json" }) - @POST("/api/so-serviceInstances/v5/{serviceId}/scale") + @POST("/api/so-serviceInstances/v3/{serviceId}/scale") Call<SaveOrUpdateOperationRsp> scaleService(@Path("serviceId") String serviceId, @Body RequestBody body); @Headers({ "Authorization: Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA==", "Accept: application/json" }) - @PUT("/api/so-serviceInstances/v5/{serviceId}") + @PUT("/api/so-serviceInstances/v3/{serviceId}") Call<SaveOrUpdateOperationRsp> updateService(@Path("serviceId") String serviceId, @Body RequestBody body); } |