diff options
-rw-r--r-- | server/src/main/java/org/onap/usecaseui/server/controller/sotn/SotnController.java | 4 | ||||
-rw-r--r-- | server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/aai/AAIService.java | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/server/src/main/java/org/onap/usecaseui/server/controller/sotn/SotnController.java b/server/src/main/java/org/onap/usecaseui/server/controller/sotn/SotnController.java index f062aea5..c24619e3 100644 --- a/server/src/main/java/org/onap/usecaseui/server/controller/sotn/SotnController.java +++ b/server/src/main/java/org/onap/usecaseui/server/controller/sotn/SotnController.java @@ -151,8 +151,8 @@ public class SotnController { return sotnService.getAllottedResources(customerId, serviceType,serviceId); } - @GetMapping(value = {"/getConnectivityInfo/{connectivityId:.+}"}) - public String getConnectivityInfo(@PathVariable(value="connectivityId") String connectivityId){ + @GetMapping(value = {"/getConnectivityInfo", "/getConnectivityInfo/{connectivityId}"}) + public String getConnectivityInfo(@PathVariable(required = false) String connectivityId){ return sotnService.getConnectivityInfo(connectivityId); } 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 ccf3d957..66e0e1f2 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 @@ -197,7 +197,7 @@ public interface AAIService { "Authorization: Basic QUFJOkFBSQ==", "Accept: application/json" }) - @GET("/api/aai-network/v14/logical-links") + @GET("/api/aai-network/v24/logical-links") Call<ResponseBody> getLogicalLinks(); @Headers({ @@ -323,7 +323,7 @@ public interface AAIService { "Authorization: Basic QUFJOkFBSQ==", "Accept: application/json" }) - @GET("/api/aai-network/v14/connectivities") + @GET("/api/aai-network/v24/connectivities") Call<ResponseBody> getConnectivityInfo(@Query("connectivity-id") String connectivityId); @Headers({ |