CCVPN-usecase (REQ-719) requirements: adding getConnectivityInfo endpoint

and update AAIService AAI schema version for specific api endpoint

Issue-ID: USECASEUI-606
Signed-off-by: decheng zhang <decheng.zhang@huawei.com>
Change-Id: I09a1150bde5e03f727515d6daee0cea7c5bfd8f3

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 f062aea..c24619e 100644 (file)
--- 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 ccf3d95..66e0e1f 100644 (file)
--- 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({