Code Review / bgpcep.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Revert "BUG-47 : unfinished PCEP migration to generated DTOs."
[bgpcep.git] / pcep / impl / src / test / java / org / opendaylight / protocol / pcep / impl / FiniteStateMachineTest.java
diff --git a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/FiniteStateMachineTest.java b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/FiniteStateMachineTest.java
index 358be3d533b134e082eed4c14eddef34ce2b49a9..713e984f17d537825535b7a9548241537d3fbf0c 100644 (file)
--- a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/FiniteStateMachineTest.java
+++ b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/FiniteStateMachineTest.java
@@ -10,14 +10,22 @@ package org.opendaylight.protocol.pcep.impl;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
+import java.util.ArrayList;
+
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.opendaylight.protocol.pcep.PCEPErrors;
+import org.opendaylight.protocol.pcep.message.PCEPErrorMessage;
+import org.opendaylight.protocol.pcep.message.PCEPNotificationMessage;
+import org.opendaylight.protocol.pcep.message.PCEPOpenMessage;
+import org.opendaylight.protocol.pcep.object.CompositeNotifyObject;
+import org.opendaylight.protocol.pcep.object.PCEPErrorObject;
+import org.opendaylight.protocol.pcep.object.PCEPNotificationObject;
+import org.opendaylight.protocol.pcep.object.PCEPOpenObject;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.KeepaliveMessage;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.Message;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.OpenMessage;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.keepalive.message.KeepaliveMessageBuilder;
 
 public class FiniteStateMachineTest {
@@ -46,8 +54,8 @@ public class FiniteStateMachineTest {
        public void testSessionCharsAccBoth() throws InterruptedException {
                // this.serverSession.startSession();
                assertEquals(1, this.client.getListMsg().size());
-               assertTrue(this.client.getListMsg().get(0) instanceof OpenMessage);
-               // this.client.sendMessage(new PCEPOpenMessage(new PCEPOpenObject(3, 9, 2)));
+               assertTrue(this.client.getListMsg().get(0) instanceof PCEPOpenMessage);
+               this.client.sendMessage(new PCEPOpenMessage(new PCEPOpenObject(3, 9, 2)));
                assertEquals(2, this.client.getListMsg().size());
                assertTrue(this.client.getListMsg().get(1) instanceof KeepaliveMessage);
                this.client.sendMessage((Message) new KeepaliveMessageBuilder().build());
@@ -64,15 +72,15 @@ public class FiniteStateMachineTest {
                // Thread.sleep(PCEPSessionImpl.KEEP_ALIVE_TIMER_VALUE * 1000);
                // assertEquals(3, this.client.getListMsg().size());
                // assertTrue(this.client.getListMsg().get(2) instanceof PCEPKeepAliveMessage); // test of keepalive timer
-               // this.client.sendMessage(new PCEPOpenMessage(new PCEPOpenObject(1, 1, 1)));
-               // assertEquals(3, this.client.getListMsg().size());
-               // assertTrue(this.client.getListMsg().get(2) instanceof PCEPErrorMessage);
-               // for (final Message m : this.client.getListMsg()) {
-               // if (m instanceof PCEPErrorMessage) {
-               // final PCEPErrorObject obj = ((PCEPErrorMessage) m).getErrorObjects().get(0);
-               // assertEquals(PCEPErrors.ATTEMPT_2ND_SESSION, obj.getError()); // test of error type 9
-               // }
-               // }
+               this.client.sendMessage(new PCEPOpenMessage(new PCEPOpenObject(1, 1, 1)));
+               assertEquals(3, this.client.getListMsg().size());
+               assertTrue(this.client.getListMsg().get(2) instanceof PCEPErrorMessage);
+               for (final Message m : this.client.getListMsg()) {
+                       if (m instanceof PCEPErrorMessage) {
+                               final PCEPErrorObject obj = ((PCEPErrorMessage) m).getErrorObjects().get(0);
+                               assertEquals(PCEPErrors.ATTEMPT_2ND_SESSION, obj.getError()); // test of error type 9
+                       }
+               }
        }
 
        /**
@@ -84,13 +92,13 @@ public class FiniteStateMachineTest {
        @Ignore
        public void testSessionCharsAccMe() throws InterruptedException {
                // this.serverSession.startSession();
-               // this.client.sendMessage(new PCEPOpenMessage(new PCEPOpenObject(4, 9, 2)));
+               this.client.sendMessage(new PCEPOpenMessage(new PCEPOpenObject(4, 9, 2)));
                assertEquals(2, this.client.getListMsg().size());
-               assertTrue(this.client.getListMsg().get(0) instanceof OpenMessage);
+               assertTrue(this.client.getListMsg().get(0) instanceof PCEPOpenMessage);
                assertTrue(this.client.getListMsg().get(1) instanceof KeepaliveMessage);
-               // this.client.sendErrorMessage(PCEPErrors.NON_ACC_NEG_SESSION_CHAR, new PCEPOpenObject(3, 7, 2, null));
+               this.client.sendErrorMessage(PCEPErrors.NON_ACC_NEG_SESSION_CHAR, new PCEPOpenObject(3, 7, 2, null));
                assertEquals(3, this.client.getListMsg().size());
-               assertTrue(this.client.getListMsg().get(2) instanceof OpenMessage);
+               assertTrue(this.client.getListMsg().get(2) instanceof PCEPOpenMessage);
                this.client.sendMessage((Message) new KeepaliveMessageBuilder().build());
                synchronized (this.serverListener) {
                        while (!this.serverListener.up) {
@@ -114,26 +122,26 @@ public class FiniteStateMachineTest {
        public void testErrorOneOne() throws InterruptedException {
                // this.serverSession.startSession();
                assertEquals(1, this.client.getListMsg().size());
-               // assertTrue(this.client.getListMsg().get(0) instanceof OpenMessage);
-               // this.client.sendMessage(new PCEPNotificationMessage(new ArrayList<CompositeNotifyObject>() {
-               // private static final long serialVersionUID = 1L;
-               //
-               // {
-               // this.add(new CompositeNotifyObject(new ArrayList<PCEPNotificationObject>() {
-               // private static final long serialVersionUID = 1L;
-               //
-               // {
-               // this.add(new PCEPNotificationObject((short) 1, (short) 1));
-               // }
-               // }));
-               // }
-               // }));
-               // for (final Message m : this.client.getListMsg()) {
-               // if (m instanceof PCEPErrorMessage) {
-               // final PCEPErrorObject obj = ((PCEPErrorMessage) m).getErrorObjects().get(0);
-               // assertEquals(PCEPErrors.NON_OR_INVALID_OPEN_MSG, obj.getError());
-               // }
-               // }
+               assertTrue(this.client.getListMsg().get(0) instanceof PCEPOpenMessage);
+               this.client.sendMessage(new PCEPNotificationMessage(new ArrayList<CompositeNotifyObject>() {
+                       private static final long serialVersionUID = 1L;
+
+                       {
+                               this.add(new CompositeNotifyObject(new ArrayList<PCEPNotificationObject>() {
+                                       private static final long serialVersionUID = 1L;
+
+                                       {
+                                               this.add(new PCEPNotificationObject((short) 1, (short) 1));
+                                       }
+                               }));
+                       }
+               }));
+               for (final Message m : this.client.getListMsg()) {
+                       if (m instanceof PCEPErrorMessage) {
+                               final PCEPErrorObject obj = ((PCEPErrorMessage) m).getErrorObjects().get(0);
+                               assertEquals(PCEPErrors.NON_OR_INVALID_OPEN_MSG, obj.getError());
+                       }
+               }
        }
 
        /************* Tests commented because of their long duration (tested timers) **************/
@@ -148,14 +156,14 @@ public class FiniteStateMachineTest {
        public void testErrorOneTwo() throws InterruptedException {
                // this.serverSession.startSession();
                assertEquals(1, this.client.getListMsg().size());
-               assertTrue(this.client.getListMsg().get(0) instanceof OpenMessage);
-               // Thread.sleep(60 * 1000);
-               // for (final Message m : this.client.getListMsg()) {
-               // if (m instanceof PcerrMessage) {
-               // final PCEPErrorObject obj = ((PCEPErrorMessage) m).getErrorObjects().get(0);
-               // assertEquals(PCEPErrors.NO_OPEN_BEFORE_EXP_OPENWAIT, obj.getError());
-               // }
-               // }
+               assertTrue(this.client.getListMsg().get(0) instanceof PCEPOpenMessage);
+               Thread.sleep(60 * 1000);
+               for (final Message m : this.client.getListMsg()) {
+                       if (m instanceof PCEPErrorMessage) {
+                               final PCEPErrorObject obj = ((PCEPErrorMessage) m).getErrorObjects().get(0);
+                               assertEquals(PCEPErrors.NO_OPEN_BEFORE_EXP_OPENWAIT, obj.getError());
+                       }
+               }
        }
 
        /**
@@ -166,17 +174,17 @@ public class FiniteStateMachineTest {
        @Test
        @Ignore
        public void testErrorOneSeven() throws InterruptedException {
-               // // this.serverSession.startSession();
-               // assertEquals(1, this.client.getListMsg().size());
-               // assertTrue(this.client.getListMsg().get(0) instanceof OpenMessage);
-               // this.client.sendMessage(new PCEPOpenMessage(new OpenObject(3, 9, 2)));
-               // Thread.sleep(this.serverSession.getKeepAliveTimerValue() * 1000);
-               // for (final Message m : this.client.getListMsg()) {
-               // if (m instanceof PcerrMessage) {
-               // final PCEPErrorObject obj = ((PCEPErrorMessage) m).getErrorObjects().get(0);
-               // assertEquals(PCEPErrors.NO_MSG_BEFORE_EXP_KEEPWAIT, obj.getError());
-               // }
-               // }
+               // this.serverSession.startSession();
+               assertEquals(1, this.client.getListMsg().size());
+               assertTrue(this.client.getListMsg().get(0) instanceof PCEPOpenMessage);
+               this.client.sendMessage(new PCEPOpenMessage(new PCEPOpenObject(3, 9, 2)));
+               Thread.sleep(this.serverSession.getKeepAliveTimerValue() * 1000);
+               for (final Message m : this.client.getListMsg()) {
+                       if (m instanceof PCEPErrorMessage) {
+                               final PCEPErrorObject obj = ((PCEPErrorMessage) m).getErrorObjects().get(0);
+                               assertEquals(PCEPErrors.NO_MSG_BEFORE_EXP_KEEPWAIT, obj.getError());
+                       }
+               }
        }
 
        @Test
BGP/PCEP protocol library