Eliminate pcep-impl.xml

Migrate configuration and wiring bits to pcep-topology-provider, so that
configuration updates are applied through a well-defined set of rules.
This allows us to make further improvements in the future.

JIRA: NETCONF-962
Change-Id: I7cb6d4d94a8880349af1ffa0207d8f212427a579
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/pcep/api/src/main/java/org/opendaylight/protocol/pcep/PCEPSessionNegotiatorFactory.java b/pcep/api/src/main/java/org/opendaylight/protocol/pcep/PCEPSessionNegotiatorFactory.java
index d7d1a98fd2086ad706ebbdcc2c3159c120cd6538..4171610404b8cdbc4f1c022f325a2edd3cb607e7 100644 (file)
--- a/pcep/api/src/main/java/org/opendaylight/protocol/pcep/PCEPSessionNegotiatorFactory.java
+++ b/pcep/api/src/main/java/org/opendaylight/protocol/pcep/PCEPSessionNegotiatorFactory.java
@@ -9,7 +9,6 @@ package org.opendaylight.protocol.pcep;
 
 import io.netty.channel.Channel;
 import io.netty.util.concurrent.Promise;
-import java.util.List;
 import org.eclipse.jdt.annotation.NonNull;
 
 /**
@@ -27,12 +26,4 @@ public interface PCEPSessionNegotiatorFactory {
     @NonNull SessionNegotiator getSessionNegotiator(
             @NonNull PCEPSessionNegotiatorFactoryDependencies sessionNegotiatorDependencies,
             @NonNull Channel channel, @NonNull Promise<PCEPSession> promise);
-
-    /**
-     * Returns list containing PCEP Capabilities.
-     *
-     * @return PCEPCapabilities
-     */
-    @Deprecated(forRemoval = true)
-    @NonNull List<PCEPCapability> getCapabilities();
 }

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/DefaultPCEPSessionNegotiator.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/DefaultPCEPSessionNegotiator.java
index 4c32f42c9d1d8cf2642ed4c29591d287202c9b73..34f82f996374eb506e9a74a8db7b5e3df97013a6 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/DefaultPCEPSessionNegotiator.java
+++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/DefaultPCEPSessionNegotiator.java
@@ -14,22 +14,22 @@ import io.netty.channel.Channel;
 import io.netty.util.concurrent.Promise;
 import org.opendaylight.protocol.pcep.PCEPSession;
 import org.opendaylight.protocol.pcep.PCEPSessionListener;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.config.rev230112.PcepSessionErrorPolicy;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.config.rev230112.PcepSessionTls;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.open.object.Open;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.open.object.OpenBuilder;
+import org.opendaylight.yangtools.yang.common.Uint16;
 import org.opendaylight.yangtools.yang.common.Uint8;
 
 public final class DefaultPCEPSessionNegotiator extends AbstractPCEPSessionNegotiator {
-    private final PcepSessionErrorPolicy errorPolicy;
     private final PCEPSessionListener listener;
+    private final int maxUnknownMessages;
 
     public DefaultPCEPSessionNegotiator(final Promise<PCEPSession> promise, final Channel channel,
             final PCEPSessionListener listener, final Uint8 sessionId, final Open localPrefs,
-            final PcepSessionErrorPolicy errorPolicy, final PcepSessionTls tlsConfiguration) {
+            final Uint16 maxUnknownMessages, final PcepSessionTls tlsConfiguration) {
         super(promise, channel, tlsConfiguration);
         this.listener = requireNonNull(listener);
-        this.errorPolicy = requireNonNull(errorPolicy);
+        this.maxUnknownMessages = maxUnknownMessages.toJava();
         myLocalPrefs = new OpenBuilder()
                 .setKeepalive(localPrefs.getKeepalive())
                 .setDeadTimer(localPrefs.getDeadTimer())
@@ -40,8 +40,8 @@ public final class DefaultPCEPSessionNegotiator extends AbstractPCEPSessionNegot
 
     public DefaultPCEPSessionNegotiator(final Promise<PCEPSession> promise, final Channel channel,
             final PCEPSessionListener listener, final Uint8 sessionId, final Open localPrefs,
-            final PcepSessionErrorPolicy errorPolicy) {
-        this(promise, channel, listener, sessionId, localPrefs, errorPolicy, null);
+            final Uint16 maxUnknownMessages) {
+        this(promise, channel, listener, sessionId, localPrefs, maxUnknownMessages, null);
     }
 
     private final Open myLocalPrefs;
@@ -54,8 +54,7 @@ public final class DefaultPCEPSessionNegotiator extends AbstractPCEPSessionNegot
     @Override
     @VisibleForTesting
     public PCEPSessionImpl createSession(final Channel channel, final Open localPrefs, final Open remotePrefs) {
-        return new PCEPSessionImpl(listener, errorPolicy.requireMaxUnknownMessages().toJava(), channel, localPrefs,
-            remotePrefs);
+        return new PCEPSessionImpl(listener, maxUnknownMessages, channel, localPrefs, remotePrefs);
     }
 
     @Override

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/DefaultPCEPSessionNegotiatorFactory.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/DefaultPCEPSessionNegotiatorFactory.java
index 862384f70392f0437b1e2e6b7a4b85e8b6a6783e..f836fb67e8ff8734f4695593fc5c189ff6a3569f 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/DefaultPCEPSessionNegotiatorFactory.java
+++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/DefaultPCEPSessionNegotiatorFactory.java
@@ -18,61 +18,61 @@ import org.opendaylight.protocol.pcep.PCEPCapability;
 import org.opendaylight.protocol.pcep.PCEPSession;
 import org.opendaylight.protocol.pcep.PCEPSessionNegotiatorFactoryDependencies;
 import org.opendaylight.protocol.pcep.PCEPTimerProposal;
-import org.opendaylight.protocol.pcep.impl.spi.Util;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.app.config.rev160707.PcepDispatcherConfig;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.config.rev230112.PcepSessionErrorPolicy;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.config.rev230112.PcepSessionTimers;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.config.rev230112.PcepSessionTls;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.open.object.Open;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.open.object.OpenBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.open.object.open.TlvsBuilder;
+import org.opendaylight.yangtools.yang.common.Uint16;
 import org.opendaylight.yangtools.yang.common.Uint8;
 
 public final class DefaultPCEPSessionNegotiatorFactory extends AbstractPCEPSessionNegotiatorFactory {
-    private final PCEPTimerProposal timers;
+    private final @NonNull PCEPTimerProposal timers;
     private final @NonNull List<PCEPCapability> capabilities;
-    private final PcepSessionErrorPolicy errorPolicy;
+    private final @NonNull Uint16 maxUnknownMessages;
     private final PcepSessionTls tlsConfiguration;
 
     public DefaultPCEPSessionNegotiatorFactory(final PcepSessionTimers timers, final List<PCEPCapability> capabilities,
-            final PcepSessionErrorPolicy errorPolicy) {
-        this(timers, capabilities, errorPolicy, errorPolicy instanceof PcepDispatcherConfig dc ? dc.getTls() : null);
+            final Uint16 maxUnknownMessages) {
+        this(timers, capabilities, maxUnknownMessages, null);
     }
 
     public DefaultPCEPSessionNegotiatorFactory(final PcepSessionTimers timers, final List<PCEPCapability> capabilities,
-            final PcepSessionErrorPolicy errorPolicy, final PcepSessionTls tlsConfiguration) {
-        this(new PCEPTimerProposal(timers), capabilities, errorPolicy, tlsConfiguration);
+            final Uint16 maxUnknownMessages, final PcepSessionTls tlsConfiguration) {
+        this(new PCEPTimerProposal(timers), capabilities, maxUnknownMessages, tlsConfiguration);
     }
 
     public DefaultPCEPSessionNegotiatorFactory(final PCEPTimerProposal timers, final List<PCEPCapability> capabilities,
-            final PcepSessionErrorPolicy errorPolicy, final PcepSessionTls tlsConfiguration) {
+            final Uint16 maxUnknownMessages, final PcepSessionTls tlsConfiguration) {
         this.timers = requireNonNull(timers);
         this.capabilities = requireNonNull(capabilities);
-        this.errorPolicy = requireNonNull(errorPolicy);
+        this.maxUnknownMessages = requireNonNull(maxUnknownMessages);
         this.tlsConfiguration = tlsConfiguration;
     }
 
-    @Deprecated(forRemoval = true)
-    @Override
-    public List<PCEPCapability> getCapabilities() {
-        return capabilities;
-    }
-
     @Override
     protected AbstractPCEPSessionNegotiator createNegotiator(
             final PCEPSessionNegotiatorFactoryDependencies sessionNegotiatorDependencies,
             final Promise<PCEPSession> promise,
             final Channel channel,
             final Uint8 sessionId) {
+        final var address = (InetSocketAddress) channel.remoteAddress();
+        final var peerProposal = sessionNegotiatorDependencies.getPeerProposal();
+
+        final var builder = new TlvsBuilder();
+        for (final var capability : capabilities) {
+            capability.setCapabilityProposal(address, builder);
+        }
 
-        final Open proposal = Util.createOpenObject((InetSocketAddress) channel.remoteAddress(), sessionId, timers,
-            capabilities, sessionNegotiatorDependencies.getPeerProposal());
+        if (peerProposal != null) {
+            peerProposal.setPeerSpecificProposal(address, builder);
+        }
 
-        return new DefaultPCEPSessionNegotiator(
-                promise,
-                channel,
-                sessionNegotiatorDependencies.getListenerFactory().getSessionListener(),
-                sessionId,
-                proposal,
-                errorPolicy,
-                tlsConfiguration);
+        return new DefaultPCEPSessionNegotiator(promise, channel,
+            sessionNegotiatorDependencies.getListenerFactory().getSessionListener(), sessionId, new OpenBuilder()
+                .setSessionId(sessionId)
+                .setKeepalive(timers.keepAlive())
+                .setDeadTimer(timers.deadTimer())
+                .setTlvs(builder.build())
+                .build(), maxUnknownMessages, tlsConfiguration);
     }
 }

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/spi/Util.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/spi/Util.java
index 40d306ea69acd8c6ad5f85e05717d0bba18b9eff..44af319972fd1d211135341f2a1a66f436eab5a2 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/spi/Util.java
+++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/spi/Util.java
@@ -7,19 +7,11 @@
  */
 package org.opendaylight.protocol.pcep.impl.spi;
 
-import java.net.InetSocketAddress;
 import java.util.Collections;
-import java.util.List;
-import org.eclipse.jdt.annotation.Nullable;
-import org.opendaylight.protocol.pcep.PCEPCapability;
-import org.opendaylight.protocol.pcep.PCEPPeerProposal;
-import org.opendaylight.protocol.pcep.PCEPTimerProposal;
 import org.opendaylight.protocol.pcep.spi.PCEPErrors;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.message.rev181109.Pcerr;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.message.rev181109.PcerrBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.open.object.Open;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.open.object.OpenBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.open.object.open.TlvsBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.pcep.error.object.ErrorObject;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.pcep.error.object.ErrorObjectBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.pcerr.message.PcerrMessageBuilder;
@@ -27,7 +19,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.typ
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.pcerr.message.pcerr.message.ErrorsBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.pcerr.message.pcerr.message.error.type.SessionCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.pcerr.message.pcerr.message.error.type.session._case.SessionBuilder;
-import org.opendaylight.yangtools.yang.common.Uint8;
 
 /**
  * Utilities used in pcep-impl.
@@ -54,24 +45,4 @@ public final class Util {
                 .setErrorType(type).build())
             .build();
     }
-
-    public static Open createOpenObject(final InetSocketAddress address, final Uint8 sessionId,
-            final PCEPTimerProposal timers, final List<PCEPCapability> capabilities,
-            final @Nullable PCEPPeerProposal peerProposal) {
-        final var builder = new TlvsBuilder();
-        for (final var capability : capabilities) {
-            capability.setCapabilityProposal(address, builder);
-        }
-
-        if (peerProposal != null) {
-            peerProposal.setPeerSpecificProposal(address, builder);
-        }
-
-        return new OpenBuilder()
-            .setSessionId(sessionId)
-            .setKeepalive(timers.keepAlive())
-            .setDeadTimer(timers.deadTimer())
-            .setTlvs(builder.build())
-            .build();
-    }
 }

diff --git a/pcep/impl/src/main/resources/OSGI-INF/blueprint/pcep-impl.xml b/pcep/impl/src/main/resources/OSGI-INF/blueprint/pcep-impl.xml
deleted file mode 100644 (file)
index eda75e5..0000000
--- a/pcep/impl/src/main/resources/OSGI-INF/blueprint/pcep-impl.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright (c) 2016 Brocade Communications Systems, Inc. and others.  All rights reserved.
-
-  This program and the accompanying materials are made available under the
-  terms of the Eclipse Public License v1.0 which accompanies this distribution,
-  and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
-           xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0">
-
-  <!-- Obtains the specific list of PCEPCapability OSGi services announced via
-       META-INF/services/org.opendaylight.protocol.pcep.PCEPCapability resources.
-  -->
-  <odl:specific-reference-list id="pcepCapabilities" interface="org.opendaylight.protocol.pcep.PCEPCapability"/>
-
-  <odl:clustered-app-config id="pcepSessionConfig"
-      binding-class="org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.app.config.rev160707.PcepSessionConfig"/>
-
-  <odl:clustered-app-config id="pcepDispatcherConfig"
-      binding-class="org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.app.config.rev160707.PcepDispatcherConfig"/>
-
-  <bean id="pcepSessionNegotiatorFactory" class="org.opendaylight.protocol.pcep.impl.DefaultPCEPSessionNegotiatorFactory">
-    <argument ref="pcepSessionConfig"/>
-    <argument ref="pcepCapabilities"/>
-    <argument ref="pcepDispatcherConfig"/>
-  </bean>
-
-  <service ref="pcepSessionNegotiatorFactory" interface="org.opendaylight.protocol.pcep.PCEPSessionNegotiatorFactory"/>
-</blueprint>
\ No newline at end of file

diff --git a/pcep/impl/src/main/yang/pcep-app-config.yang b/pcep/impl/src/main/yang/pcep-app-config.yang
deleted file mode 100644 (file)
index b27d81e..0000000
--- a/pcep/impl/src/main/yang/pcep-app-config.yang
+++ /dev/null
@@ -1,37 +0,0 @@
-module pcep-app-config {
-    namespace "urn:opendaylight:params:xml:ns:yang:controller:pcep:app-config";
-    prefix "pcep-app-config";
-
-    description
-        "Configuration for the PCEP implementation.
-
-         Copyright (c) 2016 Brocade Communications Systems, Inc. All rights reserved.
-
-         This program and the accompanying materials are made available
-         under the terms of the Eclipse Public License v1.0 which
-         accompanies this distribution, and is available at
-         http://www.eclipse.org/legal/epl-v10.html";
-
-    revision "2016-07-07" {
-        description
-            "Initial revision.";
-    }
-
-    import pcep-config { prefix pc; }
-
-    container pcep-session-config {
-        // FIXME: BGPCEP-962: remove this container
-        uses pc:pcep-session-timers;
-    }
-
-    container pcep-dispatcher-config {
-        // FIXME: BGPCEP-962: remove this container
-
-        uses pc:pcep-session-error-policy;
-
-        container tls {
-            presence true;
-            uses pc:pcep-session-tls;
-        }
-    }
-}

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 2bec24136916df3e29037414bcc87588d3b5b38e..2415e83317fec2b3efab2899b582af4eef005748 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
@@ -20,17 +20,16 @@ import static org.opendaylight.protocol.util.CheckTestUtil.checkEquals;
 import com.google.common.base.Ticker;
 import io.netty.util.concurrent.DefaultPromise;
 import io.netty.util.concurrent.GlobalEventExecutor;
+import org.eclipse.jdt.annotation.NonNull;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
-import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 import org.opendaylight.protocol.pcep.PCEPSessionListener;
 import org.opendaylight.protocol.pcep.PCEPTerminationReason;
 import org.opendaylight.protocol.pcep.impl.spi.Util;
 import org.opendaylight.protocol.pcep.spi.PCEPErrors;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.config.rev230112.PcepSessionErrorPolicy;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.config.rev230112.pcep.config.session.config.TlsBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.message.rev181109.Keepalive;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.message.rev181109.Open;
@@ -45,21 +44,18 @@ import org.opendaylight.yangtools.yang.common.Uint8;
 
 @RunWith(MockitoJUnitRunner.Silent.class)
 public class FiniteStateMachineTest extends AbstractPCEPSessionTest {
-    @Mock
-    private PcepSessionErrorPolicy errorPolicy;
+    private static final @NonNull Uint16 MAX_UNKNOWN_MESSAGES = Uint16.valueOf(20);
 
     private DefaultPCEPSessionNegotiator serverSession;
     private DefaultPCEPSessionNegotiator tlsSessionNegotiator;
 
     @Before
     public void setup() {
-        doReturn(Uint16.valueOf(20)).when(errorPolicy).requireMaxUnknownMessages();
-
         final var localPrefs = new OpenBuilder().setKeepalive(Uint8.ONE).build();
         serverSession = new DefaultPCEPSessionNegotiator(new DefaultPromise<>(GlobalEventExecutor.INSTANCE),
-                channel, listener, Uint8.ONE, localPrefs, errorPolicy);
+                channel, listener, Uint8.ONE, localPrefs, MAX_UNKNOWN_MESSAGES);
         tlsSessionNegotiator = new DefaultPCEPSessionNegotiator(new DefaultPromise<>(GlobalEventExecutor.INSTANCE),
-                channel, listener, Uint8.ONE, localPrefs, errorPolicy, new TlsBuilder().build());
+                channel, listener, Uint8.ONE, localPrefs, MAX_UNKNOWN_MESSAGES, new TlsBuilder().build());
     }
 
     /**
@@ -86,7 +82,7 @@ public class FiniteStateMachineTest extends AbstractPCEPSessionTest {
         final DefaultPCEPSessionNegotiator negotiator =
             new DefaultPCEPSessionNegotiator(new DefaultPromise<>(GlobalEventExecutor.INSTANCE),
                 channel, listener, Uint8.ONE, new OpenBuilder().setKeepalive(Uint8.ONE).build(),
-                errorPolicy, SslContextFactoryTest.createTlsConfig());
+                MAX_UNKNOWN_MESSAGES, SslContextFactoryTest.createTlsConfig());
         negotiator.channelActive(null);
         assertEquals(1, msgsSend.size());
         assertTrue(msgsSend.get(0) instanceof Starttls);
@@ -168,8 +164,8 @@ public class FiniteStateMachineTest extends AbstractPCEPSessionTest {
         serverSession.handleMessage(kaMsg);
         checkEquals(() -> {
             for (final Notification<?> m : msgsSend) {
-                if (m instanceof Pcerr) {
-                    final Errors obj = ((Pcerr) m).getPcerrMessage().getErrors().get(0);
+                if (m instanceof Pcerr pcErr) {
+                    final Errors obj = pcErr.getPcerrMessage().getErrors().get(0);
                     assertEquals(Uint8.ONE, obj.getErrorObject().getType());
                     assertEquals(Uint8.ONE, obj.getErrorObject().getValue());
                 }

diff --git a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPDispatcherImplTest.java b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPDispatcherImplTest.java
index 460e601f2bf76eaf9c641b75ecde7d3f7d41edf0..a6571a81ff3fdecc4cf40f05f829bb4b677039c6 100644 (file)
--- a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPDispatcherImplTest.java
+++ b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPDispatcherImplTest.java
@@ -53,7 +53,6 @@ import org.opendaylight.protocol.pcep.PCEPSessionNegotiatorFactoryDependencies;
 import org.opendaylight.protocol.pcep.PCEPTimerProposal;
 import org.opendaylight.protocol.pcep.spi.pojo.DefaultPCEPExtensionConsumerContext;
 import org.opendaylight.protocol.util.InetSocketAddressUtil;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.config.rev230112.PcepSessionErrorPolicy;
 import org.opendaylight.yangtools.yang.common.Uint16;
 import org.opendaylight.yangtools.yang.common.Uint8;
 
@@ -73,8 +72,6 @@ public class PCEPDispatcherImplTest {
     private PCEPSessionNegotiatorFactoryDependencies negotiatorDependencies;
     @Mock
     private PCEPSessionListenerFactory listenerFactory;
-    @Mock
-    private PcepSessionErrorPolicy errorPolicy;
 
     private MessageRegistry msgReg;
     private PCEPSessionNegotiatorFactory negotiatorFactory;
@@ -82,11 +79,10 @@ public class PCEPDispatcherImplTest {
 
     @Before
     public void setUp() {
-        doReturn(Uint16.ZERO).when(errorPolicy).requireMaxUnknownMessages();
 
         msgReg = new DefaultPCEPExtensionConsumerContext().getMessageHandlerRegistry();
         negotiatorFactory = new DefaultPCEPSessionNegotiatorFactory(new PCEPTimerProposal(KEEP_ALIVE, DEAD_TIMER),
-            List.of(), errorPolicy, null);
+            List.of(), Uint16.ZERO, null);
 
         dispatcher = new PCEPDispatcherImpl();
 

diff --git a/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/PCCsBuilder.java b/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/PCCsBuilder.java
index a30ac105598b31204d66c17b61e95524d8ba513b..1897f0cb2abd3c7f49a65a7785c2ed3b3a9ac54d 100644 (file)
--- a/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/PCCsBuilder.java
+++ b/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/PCCsBuilder.java
@@ -25,10 +25,10 @@ import org.opendaylight.protocol.pcep.PCEPSessionNegotiatorFactory;
 import org.opendaylight.protocol.pcep.PCEPTimerProposal;
 import org.opendaylight.protocol.pcep.impl.DefaultPCEPSessionNegotiatorFactory;
 import org.opendaylight.protocol.pcep.pcc.mock.api.PCCTunnelManager;
-import org.opendaylight.protocol.pcep.pcc.mock.protocol.MockPcepSessionErrorPolicy;
 import org.opendaylight.protocol.pcep.pcc.mock.protocol.PCCDispatcherImpl;
 import org.opendaylight.protocol.pcep.pcc.mock.protocol.PCCSessionListener;
 import org.opendaylight.protocol.pcep.spi.pojo.DefaultPCEPExtensionConsumerContext;
+import org.opendaylight.yangtools.yang.common.Uint16;
 import org.opendaylight.yangtools.yang.common.Uint64;
 import org.opendaylight.yangtools.yang.common.Uint8;
 
@@ -98,6 +98,6 @@ final class PCCsBuilder {
 
     private PCEPSessionNegotiatorFactory getSessionNegotiatorFactory() {
         return new DefaultPCEPSessionNegotiatorFactory(new PCEPTimerProposal(keepAlive, deadTimer),
-            List.of(pcepCapabilities), MockPcepSessionErrorPolicy.ZERO, null);
+            List.of(pcepCapabilities), Uint16.ZERO, null);
     }
 }

diff --git a/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/protocol/MockPcepSessionErrorPolicy.java b/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/protocol/MockPcepSessionErrorPolicy.java
deleted file mode 100644 (file)
index 6a67e7e..0000000
--- a/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/protocol/MockPcepSessionErrorPolicy.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2023 PANTHEON.tech, s.r.o. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.protocol.pcep.pcc.mock.protocol;
-
-import static java.util.Objects.requireNonNull;
-
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.config.rev230112.PcepSessionErrorPolicy;
-import org.opendaylight.yangtools.yang.common.Uint16;
-
-public record MockPcepSessionErrorPolicy(Uint16 maxUnknownMessages) implements PcepSessionErrorPolicy {
-    public static final MockPcepSessionErrorPolicy ZERO = new MockPcepSessionErrorPolicy(Uint16.ZERO);
-
-    public MockPcepSessionErrorPolicy {
-        requireNonNull(maxUnknownMessages);
-    }
-
-    @Override
-    public Uint16 getMaxUnknownMessages() {
-        return maxUnknownMessages;
-    }
-
-    @Override
-    public Class<? extends PcepSessionErrorPolicy> implementedInterface() {
-        throw new UnsupportedOperationException();
-    }
-}

diff --git a/pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/PCCDispatcherImplTest.java b/pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/PCCDispatcherImplTest.java
index f6c60c00333ba547687d2e30bb372414e774edd0..42a111cb22505d0b118f38890d24ac12e02057ad 100644 (file)
--- a/pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/PCCDispatcherImplTest.java
+++ b/pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/PCCDispatcherImplTest.java
@@ -30,16 +30,16 @@ import org.opendaylight.protocol.pcep.PCEPSessionNegotiatorFactoryDependencies;
 import org.opendaylight.protocol.pcep.PCEPTimerProposal;
 import org.opendaylight.protocol.pcep.impl.DefaultPCEPSessionNegotiatorFactory;
 import org.opendaylight.protocol.pcep.impl.PCEPDispatcherImpl;
-import org.opendaylight.protocol.pcep.pcc.mock.protocol.MockPcepSessionErrorPolicy;
 import org.opendaylight.protocol.pcep.pcc.mock.protocol.PCCDispatcherImpl;
 import org.opendaylight.protocol.pcep.spi.pojo.DefaultPCEPExtensionConsumerContext;
 import org.opendaylight.protocol.util.InetSocketAddressUtil;
+import org.opendaylight.yangtools.yang.common.Uint16;
 import org.opendaylight.yangtools.yang.common.Uint8;
 
 @RunWith(MockitoJUnitRunner.StrictStubs.class)
 public class PCCDispatcherImplTest {
     private final DefaultPCEPSessionNegotiatorFactory nf = new DefaultPCEPSessionNegotiatorFactory(
-        new PCEPTimerProposal(Uint8.TEN, Uint8.valueOf(40)), List.of(), MockPcepSessionErrorPolicy.ZERO, null);
+        new PCEPTimerProposal(Uint8.TEN, Uint8.valueOf(40)), List.of(), Uint16.ZERO, null);
 
     private PCCDispatcherImpl dispatcher;
     private PCEPDispatcherImpl pcepDispatcher;

diff --git a/pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/PCCMockCommon.java b/pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/PCCMockCommon.java
index e35cf7361d76fb5abe710e58587324c3791168e7..7af2785186ce88a0b6cddcea3b51fd74d81556d4 100644 (file)
--- a/pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/PCCMockCommon.java
+++ b/pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/PCCMockCommon.java
@@ -43,7 +43,6 @@ import org.opendaylight.protocol.pcep.ietf.stateful.StatefulActivator;
 import org.opendaylight.protocol.pcep.impl.DefaultPCEPSessionNegotiatorFactory;
 import org.opendaylight.protocol.pcep.impl.PCEPDispatcherImpl;
 import org.opendaylight.protocol.pcep.pcc.mock.api.PCCTunnelManager;
-import org.opendaylight.protocol.pcep.pcc.mock.protocol.MockPcepSessionErrorPolicy;
 import org.opendaylight.protocol.pcep.pcc.mock.protocol.PCCDispatcherImpl;
 import org.opendaylight.protocol.pcep.pcc.mock.protocol.PCCSessionListener;
 import org.opendaylight.protocol.pcep.spi.PCEPExtensionProviderActivator;
@@ -58,6 +57,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.iet
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev200720.lsp.object.Lsp;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev200720.pcrpt.message.pcrpt.message.Reports;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.Message;
+import org.opendaylight.yangtools.yang.common.Uint16;
 import org.opendaylight.yangtools.yang.common.Uint64;
 import org.opendaylight.yangtools.yang.common.Uint8;
 
@@ -225,7 +225,7 @@ public abstract class PCCMockCommon {
 
     private PCEPSessionNegotiatorFactory getSessionNegotiatorFactory() {
         return new DefaultPCEPSessionNegotiatorFactory(new PCEPTimerProposal(KEEP_ALIVE, DEAD_TIMER),
-            getCapabilities(), MockPcepSessionErrorPolicy.ZERO, null);
+            getCapabilities(), Uint16.ZERO, null);
     }
 
     TestingSessionListener getListener(final TestingSessionListenerFactory factory) {

diff --git a/pcep/testtool/src/main/java/org/opendaylight/protocol/pcep/testtool/Main.java b/pcep/testtool/src/main/java/org/opendaylight/protocol/pcep/testtool/Main.java
index db41e167a646965f36628af770ad4c39a775acfc..86b7f95fa05c893c1771e340d25bf45060f506bb 100644 (file)
--- a/pcep/testtool/src/main/java/org/opendaylight/protocol/pcep/testtool/Main.java
+++ b/pcep/testtool/src/main/java/org/opendaylight/protocol/pcep/testtool/Main.java
@@ -20,16 +20,15 @@ import org.opendaylight.protocol.pcep.ietf.stateful.PCEPStatefulCapability;
 import org.opendaylight.protocol.pcep.impl.DefaultPCEPSessionNegotiatorFactory;
 import org.opendaylight.protocol.pcep.impl.PCEPDispatcherImpl;
 import org.opendaylight.protocol.pcep.spi.PCEPExtensionConsumerContext;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.config.rev230112.PcepSessionErrorPolicy;
 import org.opendaylight.yangtools.yang.common.Uint16;
 import org.opendaylight.yangtools.yang.common.Uint8;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public final class Main {
-
     private static final Logger LOG = LoggerFactory.getLogger(Main.class);
 
+    // FIXME: inline as a text block
     private static final String USAGE = "DESCRIPTION:\n"
             + "\tCreates a server with given parameters. As long as it runs, it accepts connections "
             + "from PCCs.\n" + "USAGE:\n"
@@ -69,18 +68,6 @@ public final class Main {
 
             + "With no parameters, this help is printed.";
     private static final int KA_TO_DEADTIMER_RATIO = 4;
-    private static final Uint8 KA_DEFAULT = Uint8.valueOf(30);
-    private static final PcepSessionErrorPolicy ERROR_POLICY = new PcepSessionErrorPolicy() {
-        @Override
-        public Uint16 getMaxUnknownMessages() {
-            return Uint16.valueOf(5);
-        }
-
-        @Override
-        public Class<? extends PcepSessionErrorPolicy> implementedInterface() {
-            throw new UnsupportedOperationException();
-        }
-    };
 
     private Main() {
 
@@ -93,8 +80,10 @@ public final class Main {
         }
 
         InetSocketAddress address = null;
-        Uint8 keepAliveValue = KA_DEFAULT;
+        Uint8 keepAliveValue = Uint8.valueOf(30);
         Uint8 deadTimerValue = Uint8.ZERO;
+        // FIXME: add a command-line option for this
+        Uint16 maxUnknownMessages = Uint16.valueOf(5);
         boolean stateful = false;
         boolean active = false;
         boolean instant = false;
@@ -138,6 +127,6 @@ public final class Main {
         dispatcher.createServer(address, KeyMapping.of(), handlerRegistry,
             new DefaultPCEPSessionNegotiatorFactory(new PCEPTimerProposal(keepAliveValue, deadTimerValue),
                 List.of(new PCEPStatefulCapability(stateful, active, instant, false, false, false, false)),
-                ERROR_POLICY, null), new TestToolPCEPNegotiatorDependencies()).get();
+                maxUnknownMessages, null), new TestToolPCEPNegotiatorDependencies()).get();
     }
 }

diff --git a/pcep/testtool/src/test/java/org/opendaylight/protocol/pcep/testtool/PCCMock.java b/pcep/testtool/src/test/java/org/opendaylight/protocol/pcep/testtool/PCCMock.java
index 6d457065c77e088fc51efa3064766de01a5f5595..c8c43da8fba84ad00361c9e40ce484052532df58 100644 (file)
--- a/pcep/testtool/src/test/java/org/opendaylight/protocol/pcep/testtool/PCCMock.java
+++ b/pcep/testtool/src/test/java/org/opendaylight/protocol/pcep/testtool/PCCMock.java
@@ -19,23 +19,10 @@ import org.opendaylight.protocol.pcep.impl.DefaultPCEPSessionNegotiatorFactory;
 import org.opendaylight.protocol.pcep.pcc.mock.protocol.PCCDispatcherImpl;
 import org.opendaylight.protocol.pcep.spi.pojo.DefaultPCEPExtensionConsumerContext;
 import org.opendaylight.protocol.util.InetSocketAddressUtil;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.config.rev230112.PcepSessionErrorPolicy;
 import org.opendaylight.yangtools.yang.common.Uint16;
 import org.opendaylight.yangtools.yang.common.Uint8;
 
 public final class PCCMock {
-    private static final PcepSessionErrorPolicy ERROR_POLICY = new PcepSessionErrorPolicy() {
-        @Override
-        public Uint16 getMaxUnknownMessages() {
-            return Uint16.ZERO;
-        }
-
-        @Override
-        public Class<? extends PcepSessionErrorPolicy> implementedInterface() {
-            throw new UnsupportedOperationException();
-        }
-    };
-
     private PCCMock() {
         // Hidden on purpose
     }
@@ -43,7 +30,7 @@ public final class PCCMock {
     public static void main(final String[] args) throws InterruptedException, ExecutionException {
         checkArgument(args.length > 0, "Host and port of server must be provided.");
         final var snf = new DefaultPCEPSessionNegotiatorFactory(
-            new PCEPTimerProposal(Uint8.valueOf(30), Uint8.valueOf(120)), List.of(), ERROR_POLICY, null);
+            new PCEPTimerProposal(Uint8.valueOf(30), Uint8.valueOf(120)), List.of(), Uint16.ZERO, null);
         final var serverHostAndPort = HostAndPort.fromString(args[0]);
         final var serverAddr = new InetSocketAddress(serverHostAndPort.getHost(),
             serverHostAndPort.getPortOrDefault(12345));

diff --git a/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPTopologyConfiguration.java b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPTopologyConfiguration.java
index 0692fa79c345cd82129a8b197a3a2abbae423628..065840a5d28c3db7a314b0886bd40e11489e8f47 100644 (file)
--- a/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPTopologyConfiguration.java
+++ b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPTopologyConfiguration.java
@@ -18,17 +18,20 @@ import java.util.concurrent.TimeUnit;
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.protocol.concepts.KeyMapping;
+import org.opendaylight.protocol.pcep.PCEPTimerProposal;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IetfInetUtil;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddressNoZone;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.graph.rev220720.graph.topology.GraphKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.odl.pcep.stats.provider.config.rev220730.TopologyPcep1;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.config.rev230112.PcepSessionTls;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev220730.Node1;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev220730.TopologyTypes1;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.Topology;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.NodeKey;
 import org.opendaylight.yangtools.concepts.Immutable;
+import org.opendaylight.yangtools.yang.common.Uint16;
 
 final class PCEPTopologyConfiguration implements Immutable {
     private static final long DEFAULT_UPDATE_INTERVAL = TimeUnit.SECONDS.toNanos(5);
@@ -36,16 +39,23 @@ final class PCEPTopologyConfiguration implements Immutable {
     private final @NonNull InetSocketAddress address;
     private final @NonNull GraphKey graphKey;
     private final @NonNull KeyMapping keys;
+    private final @NonNull PCEPTimerProposal timerProposal;
+    private final @NonNull Uint16 maxUnknownMessages;
+    private final @Nullable PcepSessionTls tls;
     private final long updateIntervalNanos;
     private final short rpcTimeout;
 
-    PCEPTopologyConfiguration(final @NonNull InetSocketAddress address, final @NonNull KeyMapping keys,
-            final @NonNull GraphKey graphKey, final short rpcTimeout, final long updateIntervalNanos) {
+    PCEPTopologyConfiguration(final InetSocketAddress address, final KeyMapping keys, final GraphKey graphKey,
+            final short rpcTimeout, final long updateIntervalNanos, final PCEPTimerProposal timerProposal,
+            final Uint16 maxUnknownMessages, final @Nullable PcepSessionTls tls) {
         this.address = requireNonNull(address);
         this.keys = requireNonNull(keys);
         this.graphKey = requireNonNull(graphKey);
         this.rpcTimeout = rpcTimeout;
         this.updateIntervalNanos = updateIntervalNanos;
+        this.timerProposal = requireNonNull(timerProposal);
+        this.maxUnknownMessages = requireNonNull(maxUnknownMessages);
+        this.tls = tls;
     }
 
     static @Nullable PCEPTopologyConfiguration of(final @NonNull Topology topology) {
@@ -73,7 +83,8 @@ final class PCEPTopologyConfiguration implements Immutable {
         return new PCEPTopologyConfiguration(
             getInetSocketAddress(sessionConfig.getListenAddress(), sessionConfig.getListenPort()),
             constructKeys(topology.getNode()), constructGraphKey(sessionConfig.getTedName()),
-            sessionConfig.getRpcTimeout(), updateInterval);
+            sessionConfig.getRpcTimeout(), updateInterval, new PCEPTimerProposal(sessionConfig),
+            sessionConfig.requireMaxUnknownMessages(), sessionConfig.getTls());
     }
 
     short getRpcTimeout() {
@@ -96,6 +107,18 @@ final class PCEPTopologyConfiguration implements Immutable {
         return graphKey;
     }
 
+    @NonNull PCEPTimerProposal getTimerProposal() {
+        return timerProposal;
+    }
+
+    @NonNull Uint16 getMaxUnknownMessages() {
+        return maxUnknownMessages;
+    }
+
+    @Nullable PcepSessionTls getTls() {
+        return tls;
+    }
+
     private static @NonNull KeyMapping constructKeys(final @Nullable Map<NodeKey, Node> nodes) {
         if (nodes == null) {
             return KeyMapping.of();

diff --git a/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPTopologyProvider.java b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPTopologyProvider.java
index 81707f69191f8a17dc2c3be4634467e59f51d7f7..4dc8565a04eab34356cc7f3dddcdf2d2afa3db2c 100644 (file)
--- a/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPTopologyProvider.java
+++ b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPTopologyProvider.java
@@ -18,6 +18,7 @@ import io.netty.channel.Channel;
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.epoll.EpollChannelOption;
 import java.util.Arrays;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -30,6 +31,7 @@ import org.opendaylight.bgpcep.programming.spi.InstructionScheduler;
 import org.opendaylight.bgpcep.topology.DefaultTopologyReference;
 import org.opendaylight.mdsal.binding.api.RpcProviderService;
 import org.opendaylight.protocol.pcep.PCEPCapability;
+import org.opendaylight.protocol.pcep.impl.DefaultPCEPSessionNegotiatorFactory;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.programming.rev181109.NetworkTopologyPcepProgrammingService;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev220730.NetworkTopologyPcepService;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.Topology;
@@ -96,8 +98,8 @@ final class PCEPTopologyProvider extends DefaultTopologyReference {
 
     synchronized void updateConfiguration(final @Nullable PCEPTopologyConfiguration newConfiguration) {
         // FIXME: BGPCEP-960: this check should be a one-time thing in PCEPTopologyTracker startup once we have OSGi DS
-        final var effectiveConfig = dependencies.getPCEPSessionNegotiatorFactory().getCapabilities().stream()
-            .anyMatch(PCEPCapability::isStateful) ? newConfiguration : null;
+        final var effectiveConfig = dependencies.getCapabilities().stream().anyMatch(PCEPCapability::isStateful)
+            ? newConfiguration : null;
 
         applyConfiguration(effectiveConfig);
     }
@@ -141,6 +143,38 @@ final class PCEPTopologyProvider extends DefaultTopologyReference {
             return;
         }
 
+        // FIXME: can we apply this less aggressively to just routing it through manager to the negotiator factory?
+        final var currentTimerProposal = currentConfig.getTimerProposal();
+        final var newTimerProposal = newConfiguration.getTimerProposal();
+        if (!currentTimerProposal.equals(newTimerProposal)) {
+            LOG.info("Topology Provider {} timer proposal changed from {} to {}, restarting", topologyId(),
+                currentTimerProposal, newTimerProposal);
+            applyConfiguration(null);
+            applyConfiguration(newConfiguration);
+            return;
+        }
+
+        // FIXME: can we apply this less aggressively to just routing it through manager to the negotiator factory?
+        final var currentMaxUnkownMessages = currentConfig.getMaxUnknownMessages();
+        final var newMaxUnknownMessages = newConfiguration.getMaxUnknownMessages();
+        if (!currentMaxUnkownMessages.equals(newMaxUnknownMessages)) {
+            LOG.info("Topology Provider {} max-unknown-messages changed from {} to {}, restarting", topologyId(),
+                currentMaxUnkownMessages, newMaxUnknownMessages);
+            applyConfiguration(null);
+            applyConfiguration(newConfiguration);
+            return;
+        }
+
+        // FIXME: can we apply this less aggressively to just routing it through manager to the negotiator factory?
+        final var currentTls = currentConfig.getTls();
+        final var newTls = newConfiguration.getTls();
+        if (!Objects.equals(currentTls, newTls)) {
+            LOG.info("Topology Provider {} TLS changed from {} to {}, restarting", topologyId(), currentTls, newTls);
+            applyConfiguration(null);
+            applyConfiguration(newConfiguration);
+            return;
+        }
+
         // TCP-MD5 configuration is propagated from the server channel to individual channels. For any node that has
         // changed this configuration we need to tear down any existing session.
         final var currentKeys = currentConfig.getKeys().asMap();
@@ -192,7 +226,8 @@ final class PCEPTopologyProvider extends DefaultTopologyReference {
         LOG.info("PCEP Topology Provider {} starting server channel", topologyId());
         final var channelFuture = dependencies.getPCEPDispatcher().createServer(currentConfig.getAddress(),
             currentConfig.getKeys(), dependencies.getMessageRegistry(),
-            dependencies.getPCEPSessionNegotiatorFactory(),
+            new DefaultPCEPSessionNegotiatorFactory(currentConfig.getTimerProposal(), dependencies.getCapabilities(),
+                currentConfig.getMaxUnknownMessages(), currentConfig.getTls()),
             new PCEPSessionNegotiatorFactoryDependenciesImpl(manager, proposal));
         channelFuture.addListener(ignored -> enableRPCs(future, channelFuture));
     }

diff --git a/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPTopologyProviderDependencies.java b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPTopologyProviderDependencies.java
index fc6f50075086fffeeba9440a3c0d58c0bda23287..f96bb22def8e5b6aeabb207b3ffd0e63db8f764f 100644 (file)
--- a/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPTopologyProviderDependencies.java
+++ b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPTopologyProviderDependencies.java
@@ -8,13 +8,14 @@
 package org.opendaylight.bgpcep.pcep.topology.provider;
 
 import io.netty.util.Timer;
+import java.util.List;
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.opendaylight.bgpcep.pcep.server.PceServerProvider;
 import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.opendaylight.mdsal.binding.api.RpcProviderService;
 import org.opendaylight.protocol.pcep.MessageRegistry;
+import org.opendaylight.protocol.pcep.PCEPCapability;
 import org.opendaylight.protocol.pcep.PCEPDispatcher;
-import org.opendaylight.protocol.pcep.PCEPSessionNegotiatorFactory;
 
 /**
  * Provides required dependencies for PCEPTopologyProviderProvider instantiation.
@@ -29,11 +30,11 @@ interface PCEPTopologyProviderDependencies {
     MessageRegistry getMessageRegistry();
 
     /**
-     * PCEP Session Negotiator Factory.
+     * Returns list containing PCEP Capabilities.
      *
-     * @return Negotiator factory
+     * @return PCEPCapabilities
      */
-    PCEPSessionNegotiatorFactory getPCEPSessionNegotiatorFactory();
+    List<PCEPCapability> getCapabilities();
 
     /**
      * PCEP Dispatcher.

diff --git a/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPTopologyTracker.java b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPTopologyTracker.java
index 9895b0f8f9133eb8330693655b8b982d743a349a..b098a6652e94a61b3578889331ef40104346b3b7 100644 (file)
--- a/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPTopologyTracker.java
+++ b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPTopologyTracker.java
@@ -11,11 +11,13 @@ import static com.google.common.base.Verify.verifyNotNull;
 import static java.util.Objects.requireNonNull;
 import static org.opendaylight.bgpcep.pcep.topology.provider.TopologyUtils.friendlyId;
 
+import com.google.common.collect.ImmutableList;
 import io.netty.util.HashedWheelTimer;
 import io.netty.util.Timeout;
 import io.netty.util.Timer;
 import io.netty.util.TimerTask;
 import java.util.Collection;
+import java.util.List;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
@@ -32,8 +34,8 @@ import org.opendaylight.mdsal.binding.api.RpcProviderService;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider;
 import org.opendaylight.protocol.pcep.MessageRegistry;
+import org.opendaylight.protocol.pcep.PCEPCapability;
 import org.opendaylight.protocol.pcep.PCEPDispatcher;
-import org.opendaylight.protocol.pcep.PCEPSessionNegotiatorFactory;
 import org.opendaylight.protocol.pcep.spi.PCEPExtensionConsumerContext;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.topology.stats.rpc.rev190321.PcepTopologyStatsRpcService;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev220730.TopologyTypes1;
@@ -59,7 +61,6 @@ public final class PCEPTopologyTracker
     // Services we are using
     final @NonNull InstructionSchedulerFactory instructionSchedulerFactory;
     final @NonNull ClusterSingletonServiceProvider singletonService;
-    private final @NonNull PCEPSessionNegotiatorFactory sessionNegotiatorFactory;
     private final @NonNull RpcProviderService rpcProviderRegistry;
     private final @NonNull PceServerProvider pceServerProvider;
     private final @NonNull MessageRegistry messageRegistry;
@@ -86,6 +87,9 @@ public final class PCEPTopologyTracker
     // Statistics RPCs
     private final @NonNull TopologyStatsRpcServiceImpl statsRpcs;
 
+    // FIXME: route to org.opendaylight.protocol.pcep.impl.BasePCEPSessionProposalFactory
+    private final @NonNull ImmutableList<PCEPCapability> capabilities;
+
     // We are reusing our monitor as the universal lock. We have to account for three distinct threads competing for
     // our state:
     //   1) the typical DTCL callback thread invoking onDataTreeChanged()
@@ -111,17 +115,16 @@ public final class PCEPTopologyTracker
 
     public PCEPTopologyTracker(final DataBroker dataBroker, final ClusterSingletonServiceProvider singletonService,
             final RpcProviderService rpcProviderRegistry, final PCEPExtensionConsumerContext extensions,
-            final PCEPSessionNegotiatorFactory sessionNegotiatorFactory,
-            final PCEPDispatcher pcepDispatcher, final InstructionSchedulerFactory instructionSchedulerFactory,
-            final PceServerProvider pceServerProvider) {
+            final List<PCEPCapability> capabilities, final PCEPDispatcher pcepDispatcher,
+            final InstructionSchedulerFactory instructionSchedulerFactory, final PceServerProvider pceServerProvider) {
         this.dataBroker = requireNonNull(dataBroker);
         this.singletonService = requireNonNull(singletonService);
         this.rpcProviderRegistry = requireNonNull(rpcProviderRegistry);
         messageRegistry = extensions.getMessageHandlerRegistry();
-        this.sessionNegotiatorFactory = requireNonNull(sessionNegotiatorFactory);
         this.pcepDispatcher = requireNonNull(pcepDispatcher);
         this.instructionSchedulerFactory = requireNonNull(instructionSchedulerFactory);
         this.pceServerProvider = requireNonNull(pceServerProvider);
+        this.capabilities = ImmutableList.copyOf(capabilities);
         statsProvider = new TopologyStatsProvider(timer);
         statsRpcs = new TopologyStatsRpcServiceImpl(dataBroker);
         statsReg = rpcProviderRegistry.registerRpcImplementation(PcepTopologyStatsRpcService.class, statsRpcs);
@@ -138,8 +141,8 @@ public final class PCEPTopologyTracker
     }
 
     @Override
-    public PCEPSessionNegotiatorFactory getPCEPSessionNegotiatorFactory() {
-        return sessionNegotiatorFactory;
+    public List<PCEPCapability> getCapabilities() {
+        return capabilities;
     }
 
     @Override

diff --git a/pcep/topology/topology-provider/src/main/resources/OSGI-INF/blueprint/pcep-topology.xml b/pcep/topology/topology-provider/src/main/resources/OSGI-INF/blueprint/pcep-topology.xml
index 6ec199d6539a9dd36b7f926a53e9666dade0d0ae..4b4ac99f0f127d38dd9a077b5e14908c62278ca2 100644 (file)
--- a/pcep/topology/topology-provider/src/main/resources/OSGI-INF/blueprint/pcep-topology.xml
+++ b/pcep/topology/topology-provider/src/main/resources/OSGI-INF/blueprint/pcep-topology.xml
@@ -6,11 +6,17 @@
   terms of the Eclipse Public License v1.0 which accompanies this distribution,
   and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+           xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0">
+    <!--
+         Obtains the specific list of PCEPCapability OSGi services announced via
+         META-INF/services/org.opendaylight.protocol.pcep.PCEPCapability resources.
+     -->
+    <odl:specific-reference-list id="pcepCapabilities" interface="org.opendaylight.protocol.pcep.PCEPCapability"/>
+
     <reference id="dataBroker" interface="org.opendaylight.mdsal.binding.api.DataBroker"/>
     <reference id="rpcProviderService" interface="org.opendaylight.mdsal.binding.api.RpcProviderService"/>
     <reference id="pcepExtensionContext" interface="org.opendaylight.protocol.pcep.spi.PCEPExtensionConsumerContext"/>
-    <reference id="sessionNegotiatorFactory" interface="org.opendaylight.protocol.pcep.PCEPSessionNegotiatorFactory"/>
     <reference id="pcepDispatcher" interface="org.opendaylight.protocol.pcep.PCEPDispatcher"/>
     <reference id="clusterSingletonServiceProvider"
                interface="org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider"/>
@@ -24,7 +30,7 @@
         <argument ref="clusterSingletonServiceProvider"/>
         <argument ref="rpcProviderService"/>
         <argument ref="pcepExtensionContext"/>
-        <argument ref="sessionNegotiatorFactory"/>
+        <argument ref="pcepCapabilities"/>
         <argument ref="pcepDispatcher"/>
         <argument ref="intructionFactory"/>
         <argument ref="pceServerProvider"/>

diff --git a/pcep/topology/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/AbstractPCEPSessionTest.java b/pcep/topology/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/AbstractPCEPSessionTest.java
index 9071281801fccf84e342ee416c01add5313911d1..828e1ff9a86f6c2926819feed23f3e456bf1864b 100644 (file)
--- a/pcep/topology/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/AbstractPCEPSessionTest.java
+++ b/pcep/topology/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/AbstractPCEPSessionTest.java
@@ -38,7 +38,6 @@ import org.opendaylight.protocol.util.InetSocketAddressUtil;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpPrefix;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Prefix;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.graph.rev220720.graph.topology.GraphKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.config.rev230112.PcepSessionErrorPolicy;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.explicit.route.object.Ero;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.explicit.route.object.EroBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.explicit.route.object.ero.Subobject;
@@ -106,8 +105,6 @@ public abstract class AbstractPCEPSessionTest extends AbstractConcurrentDataBrok
     private PCEPTopologyProviderDependencies topologyDependencies;
     @Mock
     private Promise<PCEPSession> promise;
-    @Mock
-    private PcepSessionErrorPolicy errorPolicy;
 
     private final Timer timer = new HashedWheelTimer();
     private DefaultPCEPSessionNegotiator neg;
@@ -142,13 +139,11 @@ public abstract class AbstractPCEPSessionTest extends AbstractConcurrentDataBrok
         doReturn(timer).when(topologyDependencies).getTimer();
         doReturn(null).when(topologyDependencies).getPceServerProvider();
 
-        doReturn(Uint16.valueOf(5)).when(errorPolicy).requireMaxUnknownMessages();
-
         manager = customizeSessionManager(new ServerSessionManager(TOPO_IID, topologyDependencies,
                 new GraphKey("graph-test"), RPC_TIMEOUT, TimeUnit.SECONDS.toNanos(5)));
         startSessionManager();
         neg = new DefaultPCEPSessionNegotiator(promise, clientListener, manager.getSessionListener(), Uint8.ONE,
-            localPrefs, errorPolicy);
+            localPrefs, Uint16.valueOf(5));
         topologyRpcs = new TopologyRPCs(manager);
     }