edit deleteLin function

Change-Id: I0ec45bde44cc5238d3d78956dabaece4cbb3d552
Issue-ID: USECASEUI-141
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 b8cf9d7..a8a9479 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
@@ -127,9 +127,9 @@ public class SotnController {
     }
     
     @ResponseBody
-    @RequestMapping(value = {"/deleteLink/{linkName}"}, method = RequestMethod.DELETE , produces = "application/json")
-    public String deleteLink(@PathVariable(value="linkName") String linkName){
-       return sotnService.deleteLink(linkName);
+    @RequestMapping(value = {"/deleteLink/{linkName}/{resourceVersion}"}, method = RequestMethod.DELETE , produces = "application/json")
+    public String deleteLink(@PathVariable(value="linkName") String linkName,@PathVariable(value="resourceVersion") String resourceVersion){
+       return sotnService.deleteLink(linkName,resourceVersion);
     }
     
     @ResponseBody

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 0612fc4..7192f46 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
@@ -190,7 +190,7 @@ public interface AAIService {
         "Accept: application/json"
     })
     @DELETE("/api/aai-network/v13/logical-links/logical-link/{linkName}")
-    Call<ResponseBody> deleteLink(@Path("linkName") String linkName);
+    Call<ResponseBody> deleteLink(@Path("linkName") String linkName,@Query("resource-version") String resourceVersion);
     
     @Headers({
         "X-TransactionId: 7777",

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 c24b62c..8a87645 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
@@ -43,7 +43,7 @@ public interface SOTNService {
        
        public String createPnf(HttpServletRequest request,String pnfName);
        
-       public String deleteLink(String linkName);
+       public String deleteLink(String linkName,String resourceVersion);
        
        public String getServiceInstances(String customerId,String serviceType);
        

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 9fad571..19dc76d 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
@@ -271,11 +271,11 @@ public class SOTNServiceImpl implements SOTNService{
        }
        
        @Override
-       public String deleteLink(String linkName) {
+       public String deleteLink(String linkName,String resourceVersion) {
                String result = "";
         try {
                logger.info("aai deleteLink is starting");
-            Response<ResponseBody> response = aaiService.deleteLink(linkName).execute();
+            Response<ResponseBody> response = aaiService.deleteLink(linkName,resourceVersion).execute();
                        logger.info("aai deleteLink has finished");
             if (response.isSuccessful()) {
                result=Constant.CONSTANT_SUCCESS;