Bug 2204: pcc-mock now allows zero LSPs per PCC.

Also, 127.0.0.1 is new default remote address,
and condition on number of command line arguments is removed.

Change-Id: I78491a52d60df954b35a2689a5746bcb59eb2ebd
Signed-off-by: Vratko Polak <vrpolak@cisco.com>

diff --git a/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/Main.java b/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/Main.java
index 721732d4edff239e54087712b6adc19fc8406f55..d7d17178cd44d0411c255a695fdff1ac2be6a6b4 100644 (file)
--- a/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/Main.java
+++ b/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/Main.java
@@ -10,7 +10,6 @@ package org.opendaylight.protocol.pcep.pcc.mock;
 
 import ch.qos.logback.classic.Level;
 import ch.qos.logback.classic.LoggerContext;
-import com.google.common.base.Preconditions;
 import com.google.common.base.Predicate;
 import com.google.common.collect.Iterables;
 import com.google.common.net.InetAddresses;
@@ -44,14 +43,8 @@ public final class Main {
     private static final int RECONNECT_STRATEGY_TIMEOUT = 2000;
 
     public static void main(String[] args) throws InterruptedException, ExecutionException, UnknownHostException {
-
-        if (args.length < 2) {
-            LOG.error("Insufficient number of arguments {}.", args.length);
-            return;
-        }
-
         InetAddress localAddress = InetAddress.getByName("127.0.0.1");
-        InetAddress remoteAddress = null;
+        InetAddress remoteAddress = InetAddress.getByName("127.0.0.1");
         int pccCount = 1;
         int lsps = 1;
         boolean pcError = false;
@@ -77,7 +70,6 @@ public final class Main {
             }
             argIdx++;
         }
-        Preconditions.checkState(remoteAddress != null, "Missing mandatory remote-address parameter.");
         createPCCs(lsps, pcError, pccCount, localAddress, remoteAddress);
     }
 

diff --git a/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/SimpleSessionListener.java b/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/SimpleSessionListener.java
index 21e8052e16e2247199a115a412539c22e699705a..393d4e441c6cf17c04fd90ebe3e6f56764c88bda 100644 (file)
--- a/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/SimpleSessionListener.java
+++ b/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/SimpleSessionListener.java
@@ -47,7 +47,7 @@ public class SimpleSessionListener implements PCEPSessionListener {
     private final InetAddress address;
 
     public SimpleSessionListener(final int lspsCount, final boolean pcError, final InetAddress address) {
-        Preconditions.checkArgument(lspsCount > 0);
+        Preconditions.checkArgument(lspsCount >= 0);
         this.lspsCount = lspsCount;
         this.pcError = pcError;
         this.address = address;