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

diff --git a/nemo-impl/src/main/java/org/opendaylight/nemo/user/vnspacemanager/languagestyle/deleteintentlang/DeleteNodeLang.java b/nemo-impl/src/main/java/org/opendaylight/nemo/user/vnspacemanager/languagestyle/deleteintentlang/DeleteNodeLang.java
index cab3e14f3a5446514745ecf07676789ccb71c6a2..bc4af6b535cfee7435e6a05274ac1b8a9fff6095 100644 (file)
--- a/nemo-impl/src/main/java/org/opendaylight/nemo/user/vnspacemanager/languagestyle/deleteintentlang/DeleteNodeLang.java
+++ b/nemo-impl/src/main/java/org/opendaylight/nemo/user/vnspacemanager/languagestyle/deleteintentlang/DeleteNodeLang.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.DeleteNode;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.nemo.common.rev151010.NodeId;\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.Node;\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 DeleteNodeLang {
     }\r
 \r
     public String DeleteNodeHandling(UserId userId, String nodename){\r
-        String errorInfo = null;\r
-        tenantManage.fetchVNSpace(userId);\r
-        User user =tenantManage.getUser();\r
-        if (user.getObjects()!=null){\r
-            if (!user.getObjects().getNode().isEmpty()){\r
-                List<Node> nodeList = user.getObjects().getNode();\r
-                Boolean nodeExist = false;\r
-                for (Node node1 : nodeList){\r
-                    if (node1.getNodeName().getValue().equals(nodename)){\r
-                        nodeExist = true;\r
-                        errorInfo = deleteNode.DeleNodeHandling(userId,node1.getNodeId());\r
-                    }\r
-                }\r
-                if (!nodeExist){\r
-                    errorInfo = "The node "+nodename + " is not exist in this user vn space.";\r
-                }\r
-            }\r
-            else{\r
-                errorInfo = "The node "+nodename + " is not exist in this user vn space.";\r
-            }\r
+        if (tenantManage.getObjectId(userId,nodename)!=null){\r
+            NodeId nodeId = new NodeId(tenantManage.getObjectId(userId,nodename));\r
+            return deleteNode.DeleNodeHandling(userId,nodeId);\r
         }\r
-        else{\r
-            errorInfo = "The node "+nodename + " is not exist in this user vn space.";\r
+        else {\r
+            return "The node " + nodename + " is not exist.";\r
         }\r
-\r
-        return errorInfo;\r
     }\r
 }\r