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 494e01d45f196d44c006d467823500f5698abb1d..a43bea3951810c464e66504cef34fbbfa09588b3 100644 (file)
--- 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 {
             }\r
         }\r
 \r
-        List<EndNode> endNodeList = connection.getEndNode();\r
-        for (EndNode endNode : endNodeList){\r
-            Boolean endNodeExist = false;\r
-            if (tenantManage.getNode(userId)!=null){\r
-                if (tenantManage.getNode(userId).containsKey(endNode.getNodeId())){\r
-                    endNodeExist = true;\r
+        if (connection.getEndNode()!=null){\r
+            List<EndNode> endNodeList = connection.getEndNode();\r
+            for (EndNode endNode : endNodeList){\r
+                Boolean endNodeExist = false;\r
+                if (tenantManage.getNode(userId)!=null){\r
+                    if (tenantManage.getNode(userId).containsKey(endNode.getNodeId())){\r
+                        endNodeExist = true;\r
+                    }\r
                 }\r
-            }\r
-            if (tenantManage.getNodeDataStore(userId)!=null){\r
-                if (tenantManage.getNodeDataStore(userId).containsKey(endNode.getNodeId())){\r
-                    endNodeExist = true;\r
+                if (tenantManage.getNodeDataStore(userId)!=null){\r
+                    if (tenantManage.getNodeDataStore(userId).containsKey(endNode.getNodeId())){\r
+                        endNodeExist = true;\r
+                    }\r
+                }\r
+                if (!endNodeExist){\r
+                    return "The endnode "+ endNode.getNodeId().getValue() +" is not exist;";\r
                 }\r
-            }\r
-            if (!endNodeExist){\r
-                return "The endnode "+ endNode.getNodeId().getValue() +" is not exist;";\r
             }\r
         }\r
         return null;\r

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 d478f75564ab18dc52d0006c9dd7b20bb2e883ec..22a91a085bd9928e80a4e7fe0c035a1de8f5c6c7 100644 (file)
--- 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;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.nemo.object.rev151010.node.definitions.NodeDefinition;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.nemo.object.rev151010.node.instance.Property;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.nemo.object.rev151010.node.instance.SubNode;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.nemo.object.rev151010.property.definitions.PropertyDefinition;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.nemo.object.rev151010.property.instance.PropertyValues;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.nemo.object.rev151010.property.instance.property.values.StringValue;\r
@@ -174,6 +175,28 @@ public class UpdateNode {
                 }\r
             }\r
         }\r
+\r
+        if (node.getSubNode()!=null){\r
+            List<SubNode> subNodeList = node.getSubNode();\r
+            Boolean subNodeExist = false;\r
+            for (SubNode subNode : subNodeList){\r
+                if (tenantManage.getNode(userId)!=null){\r
+                    if (tenantManage.getNode(userId).containsKey(subNode.getNodeId())){\r
+                        subNodeExist = true;\r
+                    }\r
+                }\r
+                if (tenantManage.getNodeDataStore(userId)!=null){\r
+                    if (tenantManage.getNodeDataStore(userId)!=null){\r
+                        if (tenantManage.getNodeDataStore(userId).containsKey(subNode.getNodeId())){\r
+                            subNodeExist = true;\r
+                        }\r
+                    }\r
+                }\r
+                if (!subNodeExist){\r
+                    return "The sub-node " + subNode.getNodeId().getValue() + " is not exist.";\r
+                }\r
+            }\r
+        }\r
         return null;\r
     }\r
 \r