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 / DeleteFlowLang.java

diff --git a/nemo-impl/src/main/java/org/opendaylight/nemo/user/vnspacemanager/languagestyle/deleteintentlang/DeleteFlowLang.java b/nemo-impl/src/main/java/org/opendaylight/nemo/user/vnspacemanager/languagestyle/deleteintentlang/DeleteFlowLang.java
index a32d7bf7a34b9cb484886ea7c0abef0d479dc408..c4d1fa12c928b5ef8d7596dff77dc9a4ccebc1fd 100644 (file)
--- a/nemo-impl/src/main/java/org/opendaylight/nemo/user/vnspacemanager/languagestyle/deleteintentlang/DeleteFlowLang.java
+++ b/nemo-impl/src/main/java/org/opendaylight/nemo/user/vnspacemanager/languagestyle/deleteintentlang/DeleteFlowLang.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.DeleteFlow;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.nemo.common.rev151010.FlowId;\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.objects.Flow;\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,31 +26,12 @@ public class DeleteFlowLang {
     }\r
 \r
     public String DeleteFlowHandling(UserId userId, String flowname){\r
-        String errorInfo = null;\r
-        tenantManage.fetchVNSpace(userId);\r
-        User user = tenantManage.getUser();\r
-        if (user.getObjects()!=null){\r
-            if (!user.getObjects().getFlow().isEmpty()){\r
-                List<Flow> flowList = user.getObjects().getFlow();\r
-                Boolean flowExist = false;\r
-                for (Flow flow : flowList){\r
-                    if (flow.getFlowName().getValue().equals(flowname)){\r
-                        flowExist = true;\r
-                        errorInfo = deleteFlow.DeleteFlowHandling(userId,flow.getFlowId());\r
-                    }\r
-                }\r
-                if (!flowExist){\r
-                    errorInfo = "The flow "+flowname + " is not exist in this user vn space.";\r
-                }\r
-            }\r
-            else{\r
-                errorInfo = "The flow "+flowname + " is not exist in this user vn space.";\r
-            }\r
+        if (tenantManage.getObjectId(userId,flowname)!=null){\r
+            FlowId flowId = new FlowId(tenantManage.getObjectId(userId,flowname));\r
+            return deleteFlow.DeleteFlowHandling(userId,flowId);\r
         }\r
-        else\r
-        {\r
-            errorInfo = "The flow "+flowname + " is not exist in this user vn space.";\r
+        else {\r
+            return "The flow " + flowname + " is not exist.";\r
         }\r
-        return errorInfo;\r
     }\r
 }\r