Remove instancecheck from vnspacemanager. 13/31113/1
authorZhang Yali <zhangyali369@huawei.com>
Thu, 10 Dec 2015 06:46:00 +0000 (14:46 +0800)
committerZhang Yali <zhangyali369@huawei.com>
Thu, 10 Dec 2015 06:46:50 +0000 (14:46 +0800)
Change-Id: I44e63a95f9699331afb07032dcf4796655b77882
Signed-off-by: Zhang Yali <zhangyali369@huawei.com>
nemo-impl/src/main/java/org/opendaylight/nemo/user/vnspacemanager/instancecheck/ConnectionInstanceCheck.java [deleted file]
nemo-impl/src/main/java/org/opendaylight/nemo/user/vnspacemanager/instancecheck/FlowInstanceCheck.java [deleted file]
nemo-impl/src/main/java/org/opendaylight/nemo/user/vnspacemanager/instancecheck/NodeInstanceCheck.java [deleted file]
nemo-impl/src/main/java/org/opendaylight/nemo/user/vnspacemanager/instancecheck/OperationInstanceCheck.java [deleted file]
nemo-impl/src/main/java/org/opendaylight/nemo/user/vnspacemanager/instancecheck/ResultInstanceCheck.java [deleted file]

diff --git a/nemo-impl/src/main/java/org/opendaylight/nemo/user/vnspacemanager/instancecheck/ConnectionInstanceCheck.java b/nemo-impl/src/main/java/org/opendaylight/nemo/user/vnspacemanager/instancecheck/ConnectionInstanceCheck.java
deleted file mode 100644 (file)
index aec2430..0000000
+++ /dev/null
@@ -1,104 +0,0 @@
-/*\r
- * Copyright (c) 2015 Huawei, Inc. and others. All rights reserved.\r
- *\r
- * This program and the accompanying materials are made available under the\r
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
- * and is available at http://www.eclipse.org/legal/epl-v10.html\r
- */\r
-package org.opendaylight.nemo.user.vnspacemanager.instancecheck;\r
-\r
-import org.opendaylight.nemo.user.tenantmanager.TenantManage;\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.Connection;\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.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.nemo.object.rev151010.connection.instance.EndNode;\r
-\r
-import java.util.List;\r
-\r
-/**\r
- * Created by z00293636 on 2015/9/10.\r
- */\r
-public class ConnectionInstanceCheck {\r
-    private TenantManage tenantManage;\r
-\r
-    public ConnectionInstanceCheck(TenantManage tenantManage)\r
-    {\r
-        this.tenantManage = tenantManage;\r
-    }\r
-\r
-    public String checkConnInstance(UserId userId, Connection connection)\r
-    {\r
-        String errorInfo = null;\r
-        tenantManage.fetchVNSpace(userId);\r
-        User user = tenantManage.getUser();\r
-\r
-        if (user != null)\r
-        {\r
-            if (user.getObjects() != null)\r
-            {\r
-                if (user.getObjects().getConnection() != null)\r
-                {\r
-                    List<Connection> connectionList = tenantManage.getUser().getObjects().getConnection();\r
-\r
-                    for (Connection connection1 : connectionList)\r
-                    {\r
-                        if (connection1.getConnectionId().equals(connection.getConnectionId()))\r
-                        {\r
-                            if (!connection1.getConnectionType().equals(connection.getConnectionType()))\r
-                            {\r
-                                errorInfo = "The connection type should not be changed.";\r
-                                break;\r
-                            }\r
-                            if (!connection1.getConnectionName().equals(connection.getConnectionName()))\r
-                            {\r
-                                errorInfo = "The End node should not be changed.";\r
-                                break;\r
-                            }\r
-\r
-                        }\r
-                    }\r
-                }\r
-                if (user.getObjects().getNode() != null)\r
-                {\r
-                    List<EndNode> nodeList = connection.getEndNode();\r
-                    List<Node> nodeList1 = user.getObjects().getNode();\r
-\r
-                    for (EndNode endNode : nodeList)\r
-                    {\r
-                        Boolean EndNodeExist = false;\r
-                        for (Node node : nodeList1)\r
-                        {\r
-                            if (node.getNodeId().equals(endNode.getNodeId()))\r
-                            {\r
-                                EndNodeExist = true;\r
-                                break;\r
-                            }\r
-                        }\r
-                        if ( !EndNodeExist)\r
-                        {\r
-                            errorInfo = "There are no endnode" + endNode.getNodeId().toString() +" in this user vn space.";\r
-                            break;\r
-                        }\r
-                    }\r
-                }\r
-            }\r
-            else\r
-            {\r
-                if (connection.getEndNode() != null)\r
-                {\r
-                    errorInfo = "There are no nodes in user vn space.";\r
-                }\r
-            }\r
-        }\r
-        else\r
-        {\r
-            if (connection.getEndNode() != null)\r
-            {\r
-                errorInfo = "There are no nodes in user vn space.";\r
-            }\r
-        }\r
-\r
-        return errorInfo;\r
-    }\r
-}\r
diff --git a/nemo-impl/src/main/java/org/opendaylight/nemo/user/vnspacemanager/instancecheck/FlowInstanceCheck.java b/nemo-impl/src/main/java/org/opendaylight/nemo/user/vnspacemanager/instancecheck/FlowInstanceCheck.java
deleted file mode 100644 (file)
index 6ba1352..0000000
+++ /dev/null
@@ -1,59 +0,0 @@
-/*\r
- * Copyright (c) 2015 Huawei, Inc. and others. All rights reserved.\r
- *\r
- * This program and the accompanying materials are made available under the\r
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
- * and is available at http://www.eclipse.org/legal/epl-v10.html\r
- */\r
-package org.opendaylight.nemo.user.vnspacemanager.instancecheck;\r
-\r
-import org.opendaylight.nemo.user.tenantmanager.TenantManage;\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
-\r
-import java.util.List;\r
-\r
-/**\r
- * Created by z00293636 on 2015/9/10.\r
- */\r
-public class FlowInstanceCheck {\r
-    private TenantManage tenantManage;\r
-\r
-    public FlowInstanceCheck(TenantManage tenantManage)\r
-    {\r
-        this.tenantManage = tenantManage;\r
-    }\r
-\r
-    public String checkFlowInstance(UserId userId, Flow flow)\r
-    {\r
-        String errorInfo = null;\r
-\r
-        tenantManage.fetchVNSpace(userId);\r
-\r
-\r
-        User user = tenantManage.getUser();\r
-        if (user != null)\r
-        {\r
-            if (user.getObjects() != null)\r
-            {\r
-                if (user.getObjects().getFlow() != null)\r
-                {\r
-                    List<Flow> flowList = tenantManage.getUser().getObjects().getFlow();\r
-                    for (Flow flow1 : flowList)\r
-                    {\r
-                        if (flow1.getFlowId() == flow.getFlowId())\r
-                        {\r
-                            if (flow1.getFlowName() != flow.getFlowName())\r
-                            {\r
-                                errorInfo = "The flow name should not be changed.";\r
-                                break;\r
-                            }\r
-                        }\r
-                    }\r
-                }\r
-            }\r
-        }\r
-        return errorInfo;\r
-    }\r
-}\r
diff --git a/nemo-impl/src/main/java/org/opendaylight/nemo/user/vnspacemanager/instancecheck/NodeInstanceCheck.java b/nemo-impl/src/main/java/org/opendaylight/nemo/user/vnspacemanager/instancecheck/NodeInstanceCheck.java
deleted file mode 100644 (file)
index e1f17f6..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-/*\r
- * Copyright (c) 2015 Huawei, Inc. and others. All rights reserved.\r
- *\r
- * This program and the accompanying materials are made available under the\r
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
- * and is available at http://www.eclipse.org/legal/epl-v10.html\r
- */\r
-package org.opendaylight.nemo.user.vnspacemanager.instancecheck;\r
-\r
-import org.opendaylight.nemo.user.tenantmanager.TenantManage;\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;\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
-\r
-import java.util.List;\r
-\r
-/**\r
- * Created by z00293636 on 2015/9/10.\r
- */\r
-public class NodeInstanceCheck {\r
-\r
-    private TenantManage tenantManage;\r
-\r
-    public NodeInstanceCheck(TenantManage tenantManage)\r
-    {\r
-        this.tenantManage = tenantManage;\r
-    }\r
-\r
-    public String checkNodeInstance(UserId userId, Node node)\r
-    {\r
-        String errorInfo = null;\r
-        tenantManage.fetchVNSpace(userId);\r
-        User user = tenantManage.getUser();\r
-        if (user != null)\r
-        {\r
-            Objects objects = user.getObjects();\r
-            if (objects != null)\r
-            {\r
-                if (objects.getNode() != null)\r
-                {\r
-                    List<Node> nodeList = objects.getNode();\r
-\r
-                    for (Node node1 : nodeList)\r
-                    {\r
-                        if (node1.getNodeId().equals(node.getNodeId()))\r
-                        {\r
-                            if ( !node1.getNodeName().equals(node.getNodeName()))\r
-                            {\r
-                                errorInfo = "The node name should not be changed.";\r
-                                break;\r
-                            }\r
-                            if  (!node1.getNodeType().equals(node.getNodeType()))\r
-                            {\r
-                                errorInfo = "The node type should not be changed.";\r
-                                break;\r
-                            }\r
-                        }\r
-                    }\r
-                }\r
-            }\r
-        }\r
-        return errorInfo;\r
-    }\r
-}\r
diff --git a/nemo-impl/src/main/java/org/opendaylight/nemo/user/vnspacemanager/instancecheck/OperationInstanceCheck.java b/nemo-impl/src/main/java/org/opendaylight/nemo/user/vnspacemanager/instancecheck/OperationInstanceCheck.java
deleted file mode 100644 (file)
index b7603db..0000000
+++ /dev/null
@@ -1,122 +0,0 @@
-/*\r
- * Copyright (c) 2015 Huawei, Inc. and others. All rights reserved.\r
- *\r
- * This program and the accompanying materials are made available under the\r
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
- * and is available at http://www.eclipse.org/legal/epl-v10.html\r
- */\r
-package org.opendaylight.nemo.user.vnspacemanager.instancecheck;\r
-\r
-import org.opendaylight.nemo.user.tenantmanager.TenantManage;\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;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.nemo.intent.rev151010.user.intent.objects.Connection;\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.user.intent.objects.Node;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.nemo.intent.rev151010.user.intent.operations.Operation;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.nemo.intent.rev151010.users.User;\r
-\r
-import java.util.List;\r
-\r
-/**\r
- * Created by z00293636 on 2015/9/10.\r
- */\r
-public class OperationInstanceCheck {\r
-    private TenantManage tenantManage;\r
-\r
-    public OperationInstanceCheck(TenantManage tenantManage)\r
-    {\r
-        this.tenantManage = tenantManage;\r
-    }\r
-\r
-    public String checkOperationInstance(UserId userId, Operation operation)\r
-    {\r
-        String errorInfo = null;\r
-\r
-        tenantManage.fetchVNSpace(userId);\r
-\r
-        User user = tenantManage.getUser();\r
-        if (user != null)\r
-        {\r
-            if (operation.getTargetObject() != null && user.getObjects() == null)\r
-            {\r
-                errorInfo = "There are no objects in data store.";\r
-            }\r
-            if (operation.getTargetObject() != null && user.getObjects() != null)\r
-            {\r
-                Objects objects = user.getObjects();\r
-                Boolean targetExist = false;\r
-\r
-               if (objects.getNode() != null )\r
-               {\r
-                   List<Node> nodeList = objects.getNode();\r
-                   for (Node node:nodeList)\r
-                   {\r
-                       if (node.getNodeId().getValue().equals(operation.getTargetObject().getValue()))\r
-                       {\r
-                           targetExist = true;\r
-                           break;\r
-                       }\r
-                   }\r
-               }\r
-                if (objects.getConnection() != null)\r
-                {\r
-                    List<Connection> connectionList = objects.getConnection();\r
-                    for (Connection connection : connectionList)\r
-                    {\r
-                        if (connection.getConnectionId().getValue().equals(operation.getTargetObject().getValue()))\r
-                        {\r
-                            targetExist = true;\r
-                            break;\r
-                        }\r
-                    }\r
-                }\r
-                if (objects.getFlow() != null)\r
-                {\r
-                    List<Flow> flowList = objects.getFlow();\r
-                    for (Flow flow : flowList)\r
-                    {\r
-                        if (flow.getFlowId().getValue().equals(operation.getTargetObject().getValue()))\r
-                        {\r
-                            targetExist = true;\r
-                            break;\r
-                        }\r
-                    }\r
-                }\r
-                if (!targetExist)\r
-                {\r
-                    errorInfo ="The target object is not included in vn space.";\r
-                }\r
-            }\r
-            else\r
-            {\r
-                if (user.getOperations() != null)\r
-                {\r
-                    if (user.getOperations().getOperation() != null)\r
-                    {\r
-                        List<Operation> operationList = tenantManage.getUser().getOperations().getOperation();\r
-                        for (Operation operation1 : operationList)\r
-                        {\r
-                            if (operation1.getOperationId().equals(operation.getOperationId()))\r
-                            {\r
-                                if (!operation1.getOperationName().equals(operation.getOperationName()))\r
-                                {\r
-                                    errorInfo = "The operation name should not be changed.";\r
-                                    break;\r
-                                }\r
-                            }\r
-                        }\r
-                    }\r
-                }\r
-            }\r
-        }\r
-        else\r
-        {\r
-            if (operation.getTargetObject() != null)\r
-            {\r
-                errorInfo = "There are no objects in data store.";\r
-            }\r
-        }\r
-        return errorInfo;\r
-    }\r
-}\r
diff --git a/nemo-impl/src/main/java/org/opendaylight/nemo/user/vnspacemanager/instancecheck/ResultInstanceCheck.java b/nemo-impl/src/main/java/org/opendaylight/nemo/user/vnspacemanager/instancecheck/ResultInstanceCheck.java
deleted file mode 100644 (file)
index 62dac6f..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-/*\r
- * Copyright (c) 2015 Huawei, Inc. and others. All rights reserved.\r
- *\r
- * This program and the accompanying materials are made available under the\r
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
- * and is available at http://www.eclipse.org/legal/epl-v10.html\r
- */\r
-package org.opendaylight.nemo.user.vnspacemanager.instancecheck;\r
-\r
-import org.opendaylight.nemo.user.tenantmanager.TenantManage;\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.Results;\r
-\r
-\r
-/**\r
- * Created by z00293636 on 2015/9/10.\r
- */\r
-public class ResultInstanceCheck {\r
-    private TenantManage tenantManage;\r
-\r
-    public ResultInstanceCheck(TenantManage tenantManage)\r
-    {\r
-        this.tenantManage = tenantManage;\r
-    }\r
-\r
-    public String checkResultInstance(UserId userId,Results results)\r
-    {\r
-        return null;\r
-    }\r
-}\r