Change the way of fetching data from datastore and write user's intents into datastor...

[nemo.git] / nemo-impl / src / main / java / org / opendaylight / nemo / user / vnspacemanager / languagestyle / deleteintentlang / DeleteOperationLang.java

diff --git a/nemo-impl/src/main/java/org/opendaylight/nemo/user/vnspacemanager/languagestyle/deleteintentlang/DeleteOperationLang.java b/nemo-impl/src/main/java/org/opendaylight/nemo/user/vnspacemanager/languagestyle/deleteintentlang/DeleteOperationLang.java
index 028c1c539cd1dfb6206c0bbe8358f7a0432f69b4..8606e54baf04c38f0863e5126b3be515e6fbe58a 100644 (file)
--- a/nemo-impl/src/main/java/org/opendaylight/nemo/user/vnspacemanager/languagestyle/deleteintentlang/DeleteOperationLang.java
+++ b/nemo-impl/src/main/java/org/opendaylight/nemo/user/vnspacemanager/languagestyle/deleteintentlang/DeleteOperationLang.java
@@ -7,14 +7,11 @@
  */\r
 package org.opendaylight.nemo.user.vnspacemanager.languagestyle.deleteintentlang;\r
 \r
+import org.opendaylight.controller.md.sal.binding.api.DataBroker;\r
 import org.opendaylight.nemo.user.tenantmanager.TenantManage;\r
 import org.opendaylight.nemo.user.vnspacemanager.structurestyle.deleteintent.DeleteOperation;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.nemo.common.rev151010.OperationId;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.nemo.common.rev151010.UserId;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.nemo.intent.rev151010.user.intent.operations.Operation;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.nemo.intent.rev151010.users.User;\r
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;\r
-\r
-import java.util.List;\r
 \r
 /**\r
  * Created by z00293636 on 2015/11/6.\r
@@ -29,30 +26,13 @@ public class DeleteOperationLang {
     }\r
 \r
     public String DeleteOperationHandling(UserId userId, String operationname){\r
-        String errorInfo = null;\r
-        tenantManage.fetchVNSpace(userId);\r
-        User user = tenantManage.getUser();\r
-        if (user.getOperations()!=null){\r
-            if (!user.getOperations().getOperation().isEmpty()){\r
-                List<Operation> operationList = user.getOperations().getOperation();\r
-                Boolean operationExist = false;\r
-                for (Operation operation : operationList){\r
-                    if (operation.getOperationName().getValue().equals(operationname)){\r
-                        operationExist = true;\r
-                        errorInfo = deleteOperation.DeleteOperationhandling(userId,operation.getOperationId());\r
-                    }\r
-                }\r
-                if (!operationExist) {\r
-                    errorInfo = "The operation "+operationname + " is not exist in this user vn space.";\r
-                }\r
-            }\r
-            else{\r
-                errorInfo = "The operation "+operationname + " is not exist in this user vn space.";\r
-            }\r
+        if (tenantManage.getObjectId(userId,operationname)!=null){\r
+            OperationId operationId = new OperationId(tenantManage.getObjectId(userId,operationname));\r
+            return deleteOperation.DeleteOperationhandling(userId,operationId);\r
         }\r
-        else{\r
-            errorInfo = "The operation "+operationname + " is not exist in this user vn space.";\r
+        else {\r
+            return "The operation " + operationname + " is not exist.";\r
         }\r
-        return errorInfo;\r
     }\r
+\r
 }\r