Support OTN Domain Management

Change-Id: I6c3cb7f2fcb6432857346281cfaab3a2e11724f8
Issue-ID: USECASEUI-178
Signed-off-by: guochuyicmri <guochuyi@chinamobile.com>

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 976942b..d787f87 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
@@ -94,6 +94,11 @@ public class SotnController {
        return sotnService.getHostUrl(aaiId);
     }
     
+    @RequestMapping(value = {"/getExtAaiId/{aaiId:.+}"}, method = RequestMethod.GET)
+    public String getExtAaiId(@PathVariable(value="aaiId") String aaiId){
+       return sotnService.getExtAaiId(aaiId);
+    }
+    
     @RequestMapping(value = {"/createHostUrl/{aaiId:.+}"}, method = RequestMethod.PUT)
     public String createHostUrl(HttpServletRequest request,@PathVariable(value="aaiId") String aaiId){
        return sotnService.createHostUrl(request, aaiId);

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 84b5622..81ee6ef 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
@@ -147,6 +147,15 @@ public interface AAIService {
     @PUT("/api/aai-network/v13/ext-aai-networks/ext-aai-network/{aai-id}")
     Call<ResponseBody> createHostUrl(@Body RequestBody body,@Path("aai-id") String aaiId);
     
+    @Headers({
+        "X-TransactionId: 7777",
+        "X-FromAppId: uui",
+        "Authorization: Basic QUFJOkFBSQ==",
+        "Accept: application/json"
+    })
+       @GET("/api/aai-network/v13/ext-aai-networks/ext-aai-network/{aai-id}")
+       Call<ResponseBody> getExtAaiId(@Path("aai-id") String aaiId);
+    
     @Headers({
         "X-TransactionId: 7777",
         "X-FromAppId: uui",

diff --git a/server/src/main/java/org/onap/usecaseui/server/service/sotn/SOTNService.java b/server/src/main/java/org/onap/usecaseui/server/service/sotn/SOTNService.java
index 3bef80b..08094a6 100644 (file)
--- a/server/src/main/java/org/onap/usecaseui/server/service/sotn/SOTNService.java
+++ b/server/src/main/java/org/onap/usecaseui/server/service/sotn/SOTNService.java
@@ -33,6 +33,8 @@ public interface SOTNService {
        
        public String getHostUrl(String aaiId);
        
+       public String getExtAaiId(String aaiId);
+       
        public String createHostUrl(HttpServletRequest request,String aaiId);
        
        public String createTopoNetwork(HttpServletRequest request,String networkId);

diff --git a/server/src/main/java/org/onap/usecaseui/server/service/sotn/impl/SOTNServiceImpl.java b/server/src/main/java/org/onap/usecaseui/server/service/sotn/impl/SOTNServiceImpl.java
index a65aa90..a70bb07 100644 (file)
--- a/server/src/main/java/org/onap/usecaseui/server/service/sotn/impl/SOTNServiceImpl.java
+++ b/server/src/main/java/org/onap/usecaseui/server/service/sotn/impl/SOTNServiceImpl.java
@@ -156,6 +156,26 @@ public class SOTNServiceImpl implements SOTNService{
         return result;
        }
        
+       @Override
+       public String getExtAaiId(String aaiId) {
+               String result="";
+        try {
+               logger.info("aai getExtAaiId is starting!");
+            Response<ResponseBody> response = this.aaiService.getExtAaiId(aaiId).execute();
+            logger.info("aai getExtAaiId has finished!");
+            if (response.isSuccessful()) {
+               result=new String(response.body().bytes());
+            } else {
+                logger.info(String.format("Can not get getExtAaiId[code=%s, message=%s]", response.code(), response.message()));
+                result=Constant.CONSTANT_FAILED;
+            }
+        } catch (IOException e) {
+            logger.error("getExtAaiId occur exception:"+e);
+            result=Constant.CONSTANT_FAILED;;
+        }
+        return result;
+       }
+       
        @Override
        public String createHostUrl(HttpServletRequest request,String aaiId) {
                String result = "";