modify sotn business

Change-Id: I1fedabd1e5be8c9bd6be52375d0eb769a4d594bf
Issue-ID: USECASEUI-142
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 9b24eb7..9ed5b65 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
@@ -55,6 +55,9 @@ public class SotnController {
        public List<NetWorkResource> getNetWorkResources(){
        List<NetWorkResource> result = new ArrayList<NetWorkResource>();
        String json  = sotnService.getNetWorkResources();
+       if("FAILED".equals(json)){
+               return result;
+       }
        createJson(json,result);
        for(NetWorkResource networks:result){
                List<Pinterface> pinterfaces = new ArrayList<Pinterface>();
@@ -80,6 +83,24 @@ public class SotnController {
        return sotnService.getLogicalLinks();
     }
     
+    @ResponseBody
+    @RequestMapping(value = {"/getSpecificLogicalLink/{linkName}"}, method = RequestMethod.GET , produces = "application/json")
+    public String getSpecificLogicalLink(@PathVariable(value="linkName") String linkName){
+       return sotnService.getSpecificLogicalLink(linkName);
+    }
+    
+    @ResponseBody
+    @RequestMapping(value = {"/getHostUrl/{aaiId}"}, method = RequestMethod.GET , produces = "application/json")
+    public String getHostUrl(@PathVariable(value="aaiId") String aaiId){
+       return sotnService.getHostUrl(aaiId);
+    }
+    
+    @ResponseBody
+    @RequestMapping(value = {"/createHostUrl/{aaiId}"}, method = RequestMethod.PUT , produces = "application/json")
+    public String createHostUrl(HttpServletRequest request,@PathVariable(value="aaiId") String aaiId){
+       return sotnService.createTopoNetwork(request,aaiId);
+    }
+    
     @ResponseBody
     @RequestMapping(value = {"/createTopoNetwork/{networkId}"}, method = RequestMethod.PUT , produces = "application/json")
     public String createTopoNetwork(HttpServletRequest request,@PathVariable(value="networkId") String networkId){

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 cdfe11e..0b21696 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
@@ -120,6 +120,15 @@ public interface AAIService {
        @GET("/api/aai-business/v13/network/logical-links")
        Call<ResponseBody> getLogicalLinks();
     
+    @Headers({
+       "X-TransactionId: 7777",
+       "X-FromAppId: uui",
+       "Authorization: Basic QUFJOkFBSQ==",
+       "Accept: application/json"
+    })
+    @GET("/aai/v14/network/logical-links")
+    Call<ResponseBody> getSpecificLogicalLink(@Query("link-name") String linkName);
+    
     @Headers({
         "X-TransactionId: 7777",
         "X-FromAppId: uui",
@@ -129,6 +138,24 @@ public interface AAIService {
     @PUT("/api/aai-business/v13/network/network-resources/network-resource/{networkId}")
     Call<ResponseBody> createTopoNetwork(@Body RequestBody body,@Path("networkId") String networkId);
     
+    @Headers({
+       "X-TransactionId: 7777",
+       "X-FromAppId: uui",
+       "Authorization: Basic QUFJOkFBSQ==",
+       "Accept: application/json"
+    })
+    @PUT("/api/aai-business/v13/network/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-business/v13/network/ext-aai-networks/ext-aai-network/{aai-id}/esr-system-info")
+       Call<ResponseBody> getHostUrl(@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 36262e3..c24b62c 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
@@ -29,6 +29,12 @@ public interface SOTNService {
        
        public String getLogicalLinks();
        
+       public String getSpecificLogicalLink(String linkName);
+       
+       public String getHostUrl(String aaiId);
+       
+       public String createHostUrl(HttpServletRequest request,String aaiId);
+       
        public String createTopoNetwork(HttpServletRequest request,String networkId);
        
        public String createTerminationPoint(HttpServletRequest request,String pnfName,String tpId);

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 c39b651..890d255 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
@@ -59,21 +59,22 @@ public class SOTNServiceImpl implements SOTNService{
 
        @Override
        public String getNetWorkResources() {
+               String result="";
         try {
                logger.info("aai getNetWorkResources is starting!");
             Response<ResponseBody> response = this.aaiService.listNetWorkResources().execute();
             logger.info("aai getNetWorkResources has finished!");
             if (response.isSuccessful()) {
-               String result=new String(response.body().bytes());
-                return result;
+               result=new String(response.body().bytes());
             } else {
                 logger.info(String.format("Can not get getNetWorkResources[code=%s, message=%s]", response.code(), response.message()));
-                return "";
+                result = Constant.CONSTANT_FAILED;
             }
         } catch (IOException e) {
             logger.error("getNetWorkResources occur exception:"+e);
-            throw new AAIException("AAI is not available.", e);
+            result = Constant.CONSTANT_FAILED;;
         }
+        return result;
        }
 
        @Override
@@ -96,23 +97,87 @@ public class SOTNServiceImpl implements SOTNService{
 
        @Override
        public String getLogicalLinks() {
+               String result="";
         try {
                logger.info("aai getLogicalLinks is starting!");
             Response<ResponseBody> response = this.aaiService.getLogicalLinks().execute();
             logger.info("aai getLogicalLinks has finished!");
             if (response.isSuccessful()) {
-               String result=new String(response.body().bytes());
-                return result;
+               result=new String(response.body().bytes());
             } else {
                 logger.info(String.format("Can not get getLogicalLinks[code=%s, message=%s]", response.code(), response.message()));
-                return "";
+                result=Constant.CONSTANT_FAILED;;
             }
         } catch (IOException e) {
             logger.error("getLogicalLinks occur exception:"+e);
-            throw new AAIException("AAI is not available.", e);
+            result=Constant.CONSTANT_FAILED;;
         }
+        return result;
        }
-
+       
+       @Override
+       public String getSpecificLogicalLink(String linkName) {
+               String result="";
+        try {
+               logger.info("aai getSpecificLogicalLink is starting!");
+            Response<ResponseBody> response = this.aaiService.getSpecificLogicalLink(linkName).execute();
+            logger.info("aai getSpecificLogicalLink has finished!");
+            if (response.isSuccessful()) {
+               result=new String(response.body().bytes());
+            } else {
+                logger.info(String.format("Can not get getSpecificLogicalLink[code=%s, message=%s]", response.code(), response.message()));
+                result=Constant.CONSTANT_FAILED;
+            }
+        } catch (IOException e) {
+            logger.error("getSpecificLogicalLink occur exception:"+e);
+            result=Constant.CONSTANT_FAILED;
+        }
+        return result;
+       }
+       
+       @Override
+       public String getHostUrl(String aaiId) {
+               String result="";
+        try {
+               logger.info("aai getHostUrl is starting!");
+            Response<ResponseBody> response = this.aaiService.getHostUrl(aaiId).execute();
+            logger.info("aai getHostUrl has finished!");
+            if (response.isSuccessful()) {
+               result=new String(response.body().bytes());
+            } else {
+                logger.info(String.format("Can not get getHostUrl[code=%s, message=%s]", response.code(), response.message()));
+                result=Constant.CONSTANT_FAILED;
+            }
+        } catch (IOException e) {
+            logger.error("getHostUrl occur exception:"+e);
+            result=Constant.CONSTANT_FAILED;;
+        }
+        return result;
+       }
+       
+       @Override
+       public String createHostUrl(HttpServletRequest request,String aaiId) {
+               String result = "";
+        try {
+               logger.info("aai createHostUrl is starting");
+               RequestBody requestBody = extractBody(request);
+            Response<ResponseBody> response = aaiService.createHostUrl(requestBody,aaiId).execute();
+                       logger.info("aai createHostUrl has finished");
+            if (response.isSuccessful()) {
+               result=Constant.CONSTANT_SUCCESS;
+            } else {
+               result=Constant.CONSTANT_FAILED;
+                logger.error(String.format("Can not createHostUrl[code=%s, message=%s]", response.code(), response.message()));
+                throw new SOException("aai createHostUrl failed!");
+            }
+        } catch (Exception e) {
+               result=Constant.CONSTANT_FAILED;
+               logger.error("createHostUrl occur exception:"+e);
+            throw new SOException("aai createHostUrl is not available!", e);
+        }
+        return result;
+       }
+       
        @Override
        public String createTopoNetwork(HttpServletRequest request,String networkId) {
                String result = "";
@@ -228,21 +293,22 @@ public class SOTNServiceImpl implements SOTNService{
 
        @Override
        public String getServiceInstances(String customerId, String serviceType) {
+               String result="";
         try {
                logger.info("aai getServiceInstances is starting");
             Response<ResponseBody> response = aaiService.getServiceInstances(customerId, serviceType).execute();
                        logger.info("aai getServiceInstances has finished");
             if (response.isSuccessful()) {
-               String result=new String(response.body().bytes());
-                return result;
+               result=new String(response.body().bytes());
             } else {
                 logger.error(String.format("Can not getServiceInstances[code=%s, message=%s]", response.code(), response.message()));
-                throw new SOException("aai getServiceInstances failed!");
+                result= Constant.CONSTANT_FAILED;
             }
         } catch (Exception e) {
                logger.error("getServiceInstances occur exception:"+e);
-            throw new SOException("aai getServiceInstances is not available!", e);
+                result= Constant.CONSTANT_FAILED;
         }
+        return result;
        }
 
        @Override

diff --git a/server/src/main/java/org/onap/usecaseui/server/util/DmaapSubscriber.java b/server/src/main/java/org/onap/usecaseui/server/util/DmaapSubscriber.java
index 3ecaee2..78b58b6 100644 (file)
--- a/server/src/main/java/org/onap/usecaseui/server/util/DmaapSubscriber.java
+++ b/server/src/main/java/org/onap/usecaseui/server/util/DmaapSubscriber.java
@@ -129,10 +129,10 @@ public class DmaapSubscriber implements Runnable {
     public void run() {
         try {
             initConfig();
-            while (isActive) {
+            while (isActive) {/*
                 subscribe(alarmTopic);
                 subscribe(performanceTopic);
-            }
+            */}
         } catch (Exception e) {
             logger.error("subscribe raise error :" + e.getCause());
         }