diff options
author | CNlucius <lukai1@huawei.com> | 2016-09-13 11:40:12 +0800 |
---|---|---|
committer | CNlucius <lukai1@huawei.com> | 2016-09-13 11:41:53 +0800 |
commit | b731e2f1dd0972409b136aebc7b463dd72c9cfad (patch) | |
tree | 5107d7d80c19ad8076c2c97c2b5ef8d1cf3ab903 /framework/src/onos/core/store/dist/src/test/java/org/onosproject/store/cluster | |
parent | ee93993458266114c29271a481ef9ce7ce621b2a (diff) |
ONOSFW-171
O/S-SFC-ONOS scenario documentation
Change-Id: I51ae1cf736ea24ab6680f8edca1b2bf5dd598365
Signed-off-by: CNlucius <lukai1@huawei.com>
Diffstat (limited to 'framework/src/onos/core/store/dist/src/test/java/org/onosproject/store/cluster')
2 files changed, 0 insertions, 197 deletions
diff --git a/framework/src/onos/core/store/dist/src/test/java/org/onosproject/store/cluster/StaticClusterService.java b/framework/src/onos/core/store/dist/src/test/java/org/onosproject/store/cluster/StaticClusterService.java deleted file mode 100644 index faaf2978..00000000 --- a/framework/src/onos/core/store/dist/src/test/java/org/onosproject/store/cluster/StaticClusterService.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright 2014-2015 Open Networking Laboratory - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.onosproject.store.cluster; - -import java.util.HashMap; -import java.util.Map; -import java.util.Set; - -import org.onosproject.cluster.ClusterServiceAdapter; -import org.onosproject.cluster.ControllerNode; -import org.onosproject.cluster.ControllerNode.State; -import org.onosproject.cluster.NodeId; - -import com.google.common.collect.Sets; - -public abstract class StaticClusterService extends ClusterServiceAdapter { - - protected final Map<NodeId, ControllerNode> nodes = new HashMap<>(); - protected final Map<NodeId, ControllerNode.State> nodeStates = new HashMap<>(); - protected ControllerNode localNode; - - @Override - public ControllerNode getLocalNode() { - return localNode; - } - - @Override - public Set<ControllerNode> getNodes() { - return Sets.newHashSet(nodes.values()); - } - - @Override - public ControllerNode getNode(NodeId nodeId) { - return nodes.get(nodeId); - } - - @Override - public State getState(NodeId nodeId) { - return nodeStates.get(nodeId); - } - -} diff --git a/framework/src/onos/core/store/dist/src/test/java/org/onosproject/store/cluster/messaging/impl/ClusterCommunicationManagerTest.java b/framework/src/onos/core/store/dist/src/test/java/org/onosproject/store/cluster/messaging/impl/ClusterCommunicationManagerTest.java deleted file mode 100644 index daeaa12c..00000000 --- a/framework/src/onos/core/store/dist/src/test/java/org/onosproject/store/cluster/messaging/impl/ClusterCommunicationManagerTest.java +++ /dev/null @@ -1,142 +0,0 @@ -/* - * Copyright 2014 Open Networking Laboratory - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.onosproject.store.cluster.messaging.impl; - -import org.junit.After; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; -import org.onosproject.cluster.DefaultControllerNode; -import org.onosproject.cluster.NodeId; -import org.onosproject.store.cluster.impl.ClusterNodesDelegate; -import org.onlab.packet.IpAddress; - -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -/** - * Tests of the cluster communication manager. - */ -public class ClusterCommunicationManagerTest { - - private static final NodeId N1 = new NodeId("n1"); - private static final NodeId N2 = new NodeId("n2"); - - private static final int P1 = 9881; - private static final int P2 = 9882; - - private static final IpAddress IP = IpAddress.valueOf("127.0.0.1"); - - private ClusterCommunicationManager ccm1; - private ClusterCommunicationManager ccm2; - - private TestDelegate cnd1 = new TestDelegate(); - private TestDelegate cnd2 = new TestDelegate(); - - private DefaultControllerNode node1 = new DefaultControllerNode(N1, IP, P1); - private DefaultControllerNode node2 = new DefaultControllerNode(N2, IP, P2); - - @Before - public void setUp() throws Exception { - - NettyMessagingManager messagingService = new NettyMessagingManager(); - messagingService.activate(); - - ccm1 = new ClusterCommunicationManager(); - ccm1.activate(); - - ccm2 = new ClusterCommunicationManager(); - ccm2.activate(); - -// ccm1.initialize(node1, cnd1); -// ccm2.initialize(node2, cnd2); - } - - @After - public void tearDown() { - ccm1.deactivate(); - ccm2.deactivate(); - } - - @Ignore("FIXME: failing randomly?") - @Test - public void connect() throws Exception { - cnd1.latch = new CountDownLatch(1); - cnd2.latch = new CountDownLatch(1); - -// ccm1.addNode(node2); - validateDelegateEvent(cnd1, Op.DETECTED, node2.id()); - validateDelegateEvent(cnd2, Op.DETECTED, node1.id()); - } - - @Test - @Ignore - public void disconnect() throws Exception { - cnd1.latch = new CountDownLatch(1); - cnd2.latch = new CountDownLatch(1); - -// ccm1.addNode(node2); - validateDelegateEvent(cnd1, Op.DETECTED, node2.id()); - validateDelegateEvent(cnd2, Op.DETECTED, node1.id()); - - cnd1.latch = new CountDownLatch(1); - cnd2.latch = new CountDownLatch(1); - ccm1.deactivate(); -// -// validateDelegateEvent(cnd2, Op.VANISHED, node1.id()); - } - - private void validateDelegateEvent(TestDelegate delegate, Op op, NodeId nodeId) - throws InterruptedException { - assertTrue("did not connect in time", delegate.latch.await(2500, TimeUnit.MILLISECONDS)); - assertEquals("incorrect event", op, delegate.op); - assertEquals("incorrect event node", nodeId, delegate.nodeId); - } - - enum Op { DETECTED, VANISHED, REMOVED } - - private class TestDelegate implements ClusterNodesDelegate { - - Op op; - CountDownLatch latch; - NodeId nodeId; - - @Override - public DefaultControllerNode nodeDetected(NodeId nodeId, IpAddress ip, int tcpPort) { - latch(nodeId, Op.DETECTED); - return new DefaultControllerNode(nodeId, ip, tcpPort); - } - - @Override - public void nodeVanished(NodeId nodeId) { - latch(nodeId, Op.VANISHED); - } - - @Override - public void nodeRemoved(NodeId nodeId) { - latch(nodeId, Op.REMOVED); - } - - private void latch(NodeId nodeId, Op op) { - this.op = op; - this.nodeId = nodeId; - latch.countDown(); - } - } -} |