-\r
- if (nodeList.isEmpty()){\r
- errorInfo = "The EndNode is not exist in the user vn space.";\r
- return errorInfo;\r
- }\r
- else{\r
- int order = 0;\r
- for (String endnode : endnodes){\r
- Boolean endnodeexist = false;\r
- for (Node node : nodeList) {\r
- if (node.getNodeName().getValue().equals(endnode)){\r
- endnodeexist = true;\r
- EndNodeBuilder endNodeBuilder = new EndNodeBuilder();\r
- endNodeBuilder.setKey(new EndNodeKey(node.getNodeId()));\r
- endNodeBuilder.setNodeId(node.getNodeId());\r
- endNodeBuilder.setOrder((long) order);\r
- endNodeList.add(endNodeBuilder.build());\r
- }\r
- }\r
- if (!endnodeexist) {\r
- errorInfo = "The EndNode is not exist in the user vn space.";\r
- return errorInfo;\r
- }\r
- order ++;\r
+ for (String nodeName : endnodes){\r
+ if (tenantManage.getObjectId(userId,nodeName)!=null){\r
+ Long order = 0L;\r
+ NodeId nodeId = new NodeId(tenantManage.getObjectId(userId,nodeName));\r
+ EndNodeBuilder endNodeBuilder = new EndNodeBuilder();\r
+ endNodeBuilder.setKey(new EndNodeKey(nodeId))\r
+ .setNodeId(nodeId)\r
+ .setOrder(order);\r
+ order++;\r
+ endNodeList.add(endNodeBuilder.build());\r
+ }\r
+ else {\r
+ return "The end node " + nodeName + " is not exist.";\r