diff options
| author |   He Keguang <hekeguang@chinamobile.com> | 2021-10-12 03:02:24 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2021-10-12 03:02:24 +0000 |
| commit | c2d5901329931cb5973604be4ffae357737ec637 (patch) | |
| tree | 46b08b1bec06919855137642d4d26b878111c75f | |
| parent | d9dbfd2c0d0ed5918435de82f36d70c1ba06e575 (diff) | |
| parent | c7ce45e0daa1c03958d41734bf1ee4caf1758e5d (diff) | |
Merge "CCVPN-usecase (REQ-719) requirements: adding getConnectivityInfo endpoint and update AAIService AAI schema version for specific api endpoint"
| -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({ |