From: Zhang Yali <zhangyali369@huawei.com>
Date: Wed, 13 Jan 2016 03:41:41 +0000 (+0800)
Subject: Modify update intent.
X-Git-Tag: release/beryllium~21
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=nemo.git;a=commitdiff_plain;h=1918790ba2562827fe17ce5906e08a8e22b14d18

Modify update intent.

Change-Id: I2eec20fdcffef04e62e56fab099f4d5111634069
Signed-off-by: Zhang Yali <zhangyali369@huawei.com>
---

diff --git a/nemo-impl/src/main/java/org/opendaylight/nemo/user/vnspacemanager/structurestyle/updateintent/UpdateConnection.java b/nemo-impl/src/main/java/org/opendaylight/nemo/user/vnspacemanager/structurestyle/updateintent/UpdateConnection.java
index 494e01d..a43bea3 100644
--- a/nemo-impl/src/main/java/org/opendaylight/nemo/user/vnspacemanager/structurestyle/updateintent/UpdateConnection.java
+++ b/nemo-impl/src/main/java/org/opendaylight/nemo/user/vnspacemanager/structurestyle/updateintent/UpdateConnection.java
@@ -82,21 +82,23 @@ public class UpdateConnection {
             }
         }
 
-        List<EndNode> endNodeList = connection.getEndNode();
-        for (EndNode endNode : endNodeList){
-            Boolean endNodeExist = false;
-            if (tenantManage.getNode(userId)!=null){
-                if (tenantManage.getNode(userId).containsKey(endNode.getNodeId())){
-                    endNodeExist = true;
+        if (connection.getEndNode()!=null){
+            List<EndNode> endNodeList = connection.getEndNode();
+            for (EndNode endNode : endNodeList){
+                Boolean endNodeExist = false;
+                if (tenantManage.getNode(userId)!=null){
+                    if (tenantManage.getNode(userId).containsKey(endNode.getNodeId())){
+                        endNodeExist = true;
+                    }
                 }
-            }
-            if (tenantManage.getNodeDataStore(userId)!=null){
-                if (tenantManage.getNodeDataStore(userId).containsKey(endNode.getNodeId())){
-                    endNodeExist = true;
+                if (tenantManage.getNodeDataStore(userId)!=null){
+                    if (tenantManage.getNodeDataStore(userId).containsKey(endNode.getNodeId())){
+                        endNodeExist = true;
+                    }
+                }
+                if (!endNodeExist){
+                    return "The endnode "+ endNode.getNodeId().getValue() +" is not exist;";
                 }
-            }
-            if (!endNodeExist){
-                return "The endnode "+ endNode.getNodeId().getValue() +" is not exist;";
             }
         }
         return null;
diff --git a/nemo-impl/src/main/java/org/opendaylight/nemo/user/vnspacemanager/structurestyle/updateintent/UpdateNode.java b/nemo-impl/src/main/java/org/opendaylight/nemo/user/vnspacemanager/structurestyle/updateintent/UpdateNode.java
index d478f75..22a91a0 100644
--- a/nemo-impl/src/main/java/org/opendaylight/nemo/user/vnspacemanager/structurestyle/updateintent/UpdateNode.java
+++ b/nemo-impl/src/main/java/org/opendaylight/nemo/user/vnspacemanager/structurestyle/updateintent/UpdateNode.java
@@ -18,6 +18,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.nemo.int
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.nemo.intent.rev151010.users.User;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.nemo.object.rev151010.node.definitions.NodeDefinition;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.nemo.object.rev151010.node.instance.Property;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.nemo.object.rev151010.node.instance.SubNode;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.nemo.object.rev151010.property.definitions.PropertyDefinition;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.nemo.object.rev151010.property.instance.PropertyValues;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.nemo.object.rev151010.property.instance.property.values.StringValue;
@@ -174,6 +175,28 @@ public class UpdateNode {
                 }
             }
         }
+
+        if (node.getSubNode()!=null){
+            List<SubNode> subNodeList = node.getSubNode();
+            Boolean subNodeExist = false;
+            for (SubNode subNode : subNodeList){
+                if (tenantManage.getNode(userId)!=null){
+                    if (tenantManage.getNode(userId).containsKey(subNode.getNodeId())){
+                        subNodeExist = true;
+                    }
+                }
+                if (tenantManage.getNodeDataStore(userId)!=null){
+                    if (tenantManage.getNodeDataStore(userId)!=null){
+                        if (tenantManage.getNodeDataStore(userId).containsKey(subNode.getNodeId())){
+                            subNodeExist = true;
+                        }
+                    }
+                }
+                if (!subNodeExist){
+                    return "The sub-node " + subNode.getNodeId().getValue() + " is not exist.";
+                }
+            }
+        }
         return null;
     }