}
@ResponseBody
- @RequestMapping(value = {"/onapapi/uui-lcm/v1/customers"}, method = RequestMethod.GET , produces = "application/json")
+ @RequestMapping(value = {"/uui-lcm/customers"}, method = RequestMethod.GET , produces = "application/json")
public List<AAICustomer> getCustomers(){
return customerService.listCustomer();
}
@ResponseBody
- @RequestMapping(value = {"/onapapi/uui-lcm/v1/customers/{customerId}/service-subscriptions"}, method = RequestMethod.GET , produces = "application/json")
+ @RequestMapping(value = {"/uui-lcm/customers/{customerId}/service-subscriptions"}, method = RequestMethod.GET , produces = "application/json")
public List<AAIServiceSubscription> getServiceSubscriptions(@PathVariable(value="customerId") String customerId){
return customerService.listServiceSubscriptions(customerId);
}
}
@ResponseBody
- @RequestMapping(value = {"/onapapi/uui-lcm/v1/vf-ns-packages"}, method = RequestMethod.GET , produces = "application/json")
+ @RequestMapping(value = {"/uui-lcm/vf-ns-packages"}, method = RequestMethod.GET , produces = "application/json")
public VfNsPackageInfo retrievePackageInfo(){
return packageDistributionService.retrievePackageInfo();
}
@ResponseBody
- @RequestMapping(value = {"/onapapi/uui-lcm/v1/ns-packages"}, method = RequestMethod.POST , produces = "application/json")
+ @RequestMapping(value = {"/uui-lcm/ns-packages"}, method = RequestMethod.POST , produces = "application/json")
public DistributionResult distributeNsPackage(@RequestBody Csar csar){
return packageDistributionService.postNsPackage(csar);
}
@ResponseBody
- @RequestMapping(value = {"/onapapi/uui-lcm/v1/vf-packages"}, method = RequestMethod.POST , produces = "application/json")
+ @RequestMapping(value = {"/uui-lcm/vf-packages"}, method = RequestMethod.POST , produces = "application/json")
public Job distributeVfPackage(@RequestBody Csar csar){
return packageDistributionService.postVfPackage(csar);
}
@ResponseBody
- @RequestMapping(value = {"/onapapi/uui-lcm/v1/jobs/{jobId}"}, method = RequestMethod.POST , produces = "application/json")
+ @RequestMapping(value = {"/uui-lcm/jobs/{jobId}"}, method = RequestMethod.POST , produces = "application/json")
public JobStatus getJobStatus(@PathVariable(value="jobId") String jobId){
return packageDistributionService.getJobStatus(jobId);
}
}
@ResponseBody
- @RequestMapping(value = {"/onapapi/uui-lcm/v1/service-instances"}, method = RequestMethod.GET , produces = "application/json")
+ @RequestMapping(value = {"/uui-lcm/service-instances"}, method = RequestMethod.GET , produces = "application/json")
public List<ServiceInstance> listServiceInstances(HttpServletRequest request){
String customerId = request.getParameter("customerId");
String serviceType = request.getParameter("serviceType");
}
@ResponseBody
- @RequestMapping(value = {"/onapapi/uui-lcm/v1/services/"}, method = RequestMethod.POST , produces = "application/json")
+ @RequestMapping(value = {"/uui-lcm/services/"}, method = RequestMethod.POST , produces = "application/json")
public ServiceOperation instantiateService(HttpServletRequest request){
return serviceLcmService.instantiateService(request);
}
@ResponseBody
- @RequestMapping(value = {"/onapapi/uui-lcm/v1/services/{serviceId}/operations/{operationId}"}, method = RequestMethod.GET , produces = "application/json")
+ @RequestMapping(value = {"/uui-lcm/services/{serviceId}/operations/{operationId}"}, method = RequestMethod.GET , produces = "application/json")
public OperationProgressInformation queryOperationProgress(@PathVariable(value="serviceId") String serviceId, @PathVariable(value="operationId") String operationId){
return serviceLcmService.queryOperationProgress(serviceId, operationId);
}
@ResponseBody
- @RequestMapping(value = {"/onapapi/uui-lcm/v1/services/{serviceId}"}, method = RequestMethod.DELETE , produces = "application/json")
+ @RequestMapping(value = {"/uui-lcm/services/{serviceId}"}, method = RequestMethod.DELETE , produces = "application/json")
public ServiceOperation terminateService(@PathVariable(value = "serviceId") String serviceId){
return serviceLcmService.terminateService(serviceId);
}
}
@ResponseBody
- @RequestMapping(value = {"/onapapi/uui-lcm/v1/service-templates"}, method = RequestMethod.GET , produces = "application/json")
+ @RequestMapping(value = {"/uui-lcm/service-templates"}, method = RequestMethod.GET , produces = "application/json")
public List<SDCServiceTemplate> getServiceTemplates(){
return serviceTemplateService.listDistributedServiceTemplate();
}
@ResponseBody
- @RequestMapping(value = {"/onapapi/uui-lcm/v1/service-templates/{uuid}"}, method = RequestMethod.GET , produces = "application/json")
+ @RequestMapping(value = {"/uui-lcm/service-templates/{uuid}"}, method = RequestMethod.GET , produces = "application/json")
public ServiceTemplateInput getServiceTemplateInput(@PathVariable("uuid") String uuid, @RequestParam("toscaModelPath") String toscaModelPath){
return serviceTemplateService.fetchServiceTemplateInput(uuid, toscaModelPath);
}
@ResponseBody
- @RequestMapping(value = {"/onapapi/uui-lcm/v1/locations/"}, method = RequestMethod.GET , produces = "application/json")
+ @RequestMapping(value = {"/uui-lcm/locations/"}, method = RequestMethod.GET , produces = "application/json")
public List<VimInfo> getLocations(){
return serviceTemplateService.listVim();
}
@Headers({
"X-ECOMP-InstanceID: 777",
- "authorization : Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU="
+ "Authorization: Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU="
})
- @GET("sdc/v1/catalog/services")
+ @GET("/sdc/v1/catalog/services")
Call<List<SDCServiceTemplate>> listServices(@Query("category")String category, @Query("distributionStatus") String distributionStatus);
@Headers({
"X-ECOMP-InstanceID: 777",
- "authorization : Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU="
+ "Authorization: Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU="
})
- @GET("sdc/v1/catalog/services/{uuid}/metadata")
+ @GET("/sdc/v1/catalog/services/{uuid}/metadata")
Call<SDCServiceTemplate> getService(@Path("uuid") String uuid);
@Headers({
"X-ECOMP-InstanceID: 777",
- "authorization : Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU="
+ "Authorization: Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU="
})
@GET
Call<ResponseBody> downloadCsar(@Url String fileUrl);
@Headers({
"X-ECOMP-InstanceID: 777",
- "authorization : Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU="
+ "Authorization: Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU="
})
- @GET("sdc/v1/catalog/resources")
+ @GET("/sdc/v1/catalog/resources")
Call<List<Vnf>> listResources(@Query("resourceType") String resourceType, @Query("distributionStatus") String distributionStatus);
}
\ No newline at end of file
@JsonCreator
public SDCServiceTemplate(
- @JsonProperty String uuid,
- @JsonProperty String invariantUUID,
- @JsonProperty String name,
- @JsonProperty String version,
- @JsonProperty String toscaModelURL,
- @JsonProperty String category) {
+ @JsonProperty("uuid") String uuid,
+ @JsonProperty("invariantUUID") String invariantUUID,
+ @JsonProperty("name") String name,
+ @JsonProperty("version") String version,
+ @JsonProperty("toscaModelURL") String toscaModelURL,
+ @JsonProperty("category") String category) {
this.uuid = uuid;
this.invariantUUID = invariantUUID;
this.name = name;
this.category = category;
}
+ @JsonProperty("uuid")
public String getUuid() {
return uuid;
}
+ @JsonProperty("invariantUUID")
public String getInvariantUUID() {
return invariantUUID;
}
+ @JsonProperty("name")
public String getName() {
return name;
}
+ @JsonProperty("version")
public String getVersion() {
return version;
}
+ @JsonProperty("toscaModelURL")
public String getToscaModelURL() {
return toscaModelURL;
}
+ @JsonProperty("category")
public String getCategory() {
return category;
}