Move SpeakerIdMapping to topology provider

Speaker identifiers are not something that should be visible on the
dispatcher level. Move them to pcep-topology-provider, as that is the
only component which cares about them.

JIRA: BGPCEP-983
Change-Id: Icfc7a572d79faa35904e45a6aadff73400d611db
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/pcep/api/src/main/java/org/opendaylight/protocol/pcep/PCEPDispatcherDependencies.java b/pcep/api/src/main/java/org/opendaylight/protocol/pcep/PCEPDispatcherDependencies.java
index 7b267b73648401788407ee6c0f72542caa19cbe8..0e33a9c536c623467fb921cb335968ea7a15575d 100644 (file)
--- a/pcep/api/src/main/java/org/opendaylight/protocol/pcep/PCEPDispatcherDependencies.java
+++ b/pcep/api/src/main/java/org/opendaylight/protocol/pcep/PCEPDispatcherDependencies.java
@@ -29,11 +29,4 @@ public interface PCEPDispatcherDependencies extends PCEPSessionNegotiatorFactory
      * @return map containing Keys
      */
     KeyMapping getKeys();
-
-    /**
-     * PCEP Speaker Id mapping.
-     *
-     * @return map containing Keys
-     */
-    SpeakerIdMapping getSpeakerIdMapping();
 }

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 3af3a83faaea6a74ee5efe22f45e8585825cab81..0962b836dde2c06dcb81f46b8a00b57e6e61cd79 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
@@ -38,7 +38,6 @@ import org.opendaylight.protocol.pcep.PCEPPeerProposal;
 import org.opendaylight.protocol.pcep.PCEPSession;
 import org.opendaylight.protocol.pcep.PCEPSessionListenerFactory;
 import org.opendaylight.protocol.pcep.PCEPSessionNegotiatorFactory;
-import org.opendaylight.protocol.pcep.SpeakerIdMapping;
 import org.opendaylight.protocol.pcep.ietf.stateful.StatefulActivator;
 import org.opendaylight.protocol.pcep.impl.BasePCEPSessionProposalFactory;
 import org.opendaylight.protocol.pcep.impl.DefaultPCEPSessionNegotiatorFactory;
@@ -257,11 +256,6 @@ public abstract class PCCMockCommon {
             return keys;
         }
 
-        @Override
-        public SpeakerIdMapping getSpeakerIdMapping() {
-            return SpeakerIdMapping.of();
-        }
-
         @Override
         public PCEPSessionListenerFactory getListenerFactory() {
             return listenerFactory;

diff --git a/pcep/testtool/src/main/java/org/opendaylight/protocol/pcep/testtool/TestToolPCEPDispatcherDependencies.java b/pcep/testtool/src/main/java/org/opendaylight/protocol/pcep/testtool/TestToolPCEPDispatcherDependencies.java
index 70aa5fb3912667dd1c263b0911b7fb300821b5f0..6c06411a878f9c874cc1410fc23434f812ac03ed 100644 (file)
--- a/pcep/testtool/src/main/java/org/opendaylight/protocol/pcep/testtool/TestToolPCEPDispatcherDependencies.java
+++ b/pcep/testtool/src/main/java/org/opendaylight/protocol/pcep/testtool/TestToolPCEPDispatcherDependencies.java
@@ -8,13 +8,13 @@
 package org.opendaylight.protocol.pcep.testtool;
 
 import java.net.InetSocketAddress;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.protocol.concepts.KeyMapping;
 import org.opendaylight.protocol.pcep.PCEPDispatcherDependencies;
 import org.opendaylight.protocol.pcep.PCEPSessionListenerFactory;
-import org.opendaylight.protocol.pcep.SpeakerIdMapping;
 
 public final class TestToolPCEPDispatcherDependencies implements PCEPDispatcherDependencies {
-    private final PCEPSessionListenerFactory listenerFactory = new TestingSessionListenerFactory();
+    private final @NonNull PCEPSessionListenerFactory listenerFactory = new TestingSessionListenerFactory();
     private final InetSocketAddress address;
 
     TestToolPCEPDispatcherDependencies(final InetSocketAddress address) {
@@ -31,11 +31,6 @@ public final class TestToolPCEPDispatcherDependencies implements PCEPDispatcherD
         return KeyMapping.of();
     }
 
-    @Override
-    public SpeakerIdMapping getSpeakerIdMapping() {
-        return SpeakerIdMapping.of();
-    }
-
     @Override
     public PCEPSessionListenerFactory getListenerFactory() {
         return listenerFactory;

diff --git a/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPDispatcherDependenciesImpl.java b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPDispatcherDependenciesImpl.java
index 6221530955004cddf25ae1e30fb962d5adcdd2b5..aa42bdec8fee12e6bec2265915667bb496800370 100644 (file)
--- a/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPDispatcherDependenciesImpl.java
+++ b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPDispatcherDependenciesImpl.java
@@ -16,40 +16,34 @@ import org.opendaylight.protocol.concepts.KeyMapping;
 import org.opendaylight.protocol.pcep.PCEPDispatcherDependencies;
 import org.opendaylight.protocol.pcep.PCEPPeerProposal;
 import org.opendaylight.protocol.pcep.PCEPSessionListenerFactory;
-import org.opendaylight.protocol.pcep.SpeakerIdMapping;
 
 public final class PCEPDispatcherDependenciesImpl implements PCEPDispatcherDependencies {
-    private final ServerSessionManager manager;
-    private final PCEPTopologyConfiguration topologyConfigDependencies;
+    private final @NonNull ServerSessionManager manager;
+    private final @NonNull PCEPTopologyConfiguration topologyConfig;
 
-    public PCEPDispatcherDependenciesImpl(final @NonNull ServerSessionManager manager,
-            final @NonNull PCEPTopologyConfiguration topologyConfigDependencies) {
+    public PCEPDispatcherDependenciesImpl(final ServerSessionManager manager,
+            final PCEPTopologyConfiguration topologyConfig) {
         this.manager = requireNonNull(manager);
-        this.topologyConfigDependencies = requireNonNull(topologyConfigDependencies);
+        this.topologyConfig = requireNonNull(topologyConfig);
     }
 
     @Override
     public InetSocketAddress getAddress() {
-        return this.topologyConfigDependencies.getAddress();
+        return topologyConfig.getAddress();
     }
 
     @Override
     public KeyMapping getKeys() {
-        return this.topologyConfigDependencies.getKeys();
-    }
-
-    @Override
-    public SpeakerIdMapping getSpeakerIdMapping() {
-        return this.topologyConfigDependencies.getSpeakerIds();
+        return topologyConfig.getKeys();
     }
 
     @Override
     public PCEPSessionListenerFactory getListenerFactory() {
-        return this.manager;
+        return manager;
     }
 
     @Override
     public PCEPPeerProposal getPeerProposal() {
-        return this.manager;
+        return manager;
     }
 }

diff --git a/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/ServerSessionManager.java b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/ServerSessionManager.java
index 977488735bff96d7d0e4b16b79ed23c325d924d5..cf1929b449948725a574fd961cc6d4f862fe11f6 100644 (file)
--- a/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/ServerSessionManager.java
+++ b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/ServerSessionManager.java
@@ -76,6 +76,7 @@ class ServerSessionManager implements PCEPSessionListenerFactory, TopologySessio
     private final short rpcTimeout;
     private final PCEPTopologyProviderDependencies dependenciesProvider;
     private final PCEPDispatcherDependencies pcepDispatcherDependencies;
+    private final SpeakerIdMapping speakerIds;
 
     ServerSessionManager(
             final PCEPTopologyProviderDependencies dependenciesProvider,
@@ -84,6 +85,7 @@ class ServerSessionManager implements PCEPSessionListenerFactory, TopologySessio
         topology = requireNonNull(configDependencies.getTopology());
         peerProposal = new PCEPStatefulPeerProposal(dependenciesProvider.getDataBroker(), topology);
         rpcTimeout = configDependencies.getRpcTimeout();
+        speakerIds = configDependencies.getSpeakerIds();
         pcepDispatcherDependencies = new PCEPDispatcherDependenciesImpl(this, configDependencies);
     }
 
@@ -256,7 +258,7 @@ class ServerSessionManager implements PCEPSessionListenerFactory, TopologySessio
     public final void setPeerSpecificProposal(final InetSocketAddress address, final TlvsBuilder openBuilder) {
         requireNonNull(address);
         peerProposal.setPeerProposal(createNodeId(address.getAddress()), openBuilder,
-            pcepDispatcherDependencies.getSpeakerIdMapping().speakerIdForAddress(address.getAddress()));
+            speakerIds.speakerIdForAddress(address.getAddress()));
     }
 
     final short getRpcTimeout() {

diff --git a/pcep/api/src/main/java/org/opendaylight/protocol/pcep/SpeakerIdMapping.java b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/SpeakerIdMapping.java
similarity index 96%
rename from pcep/api/src/main/java/org/opendaylight/protocol/pcep/SpeakerIdMapping.java
rename to pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/SpeakerIdMapping.java
index 23dbcb01cfdf4505e4897dea36e13a64ad7ca790..999e3f69abe38e53bb1cc49126bd1f6e7a62903d 100644 (file)
--- a/pcep/api/src/main/java/org/opendaylight/protocol/pcep/SpeakerIdMapping.java
+++ b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/SpeakerIdMapping.java
@@ -5,7 +5,7 @@
  * 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;
+package org.opendaylight.bgpcep.pcep.topology.provider;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Maps;

diff --git a/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/config/PCEPTopologyConfiguration.java b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/config/PCEPTopologyConfiguration.java
index 5073acff9fc3d07278aa07fd336f0420b78cbe0c..c6396fd2d8f927790a5c489974a5885677dfbfe4 100644 (file)
--- a/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/config/PCEPTopologyConfiguration.java
+++ b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/config/PCEPTopologyConfiguration.java
@@ -17,8 +17,8 @@ import java.util.HashMap;
 import java.util.Map;
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
+import org.opendaylight.bgpcep.pcep.topology.provider.SpeakerIdMapping;
 import org.opendaylight.protocol.concepts.KeyMapping;
-import org.opendaylight.protocol.pcep.SpeakerIdMapping;
 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;