BUG-6857: Network Topology Config Loader

- Create NetworkTopologyConfigFileProcessors
  Serialize Topology normalized node to BI
  and notifies Deployer, loading new configuration.
- network-topology-config.xml Contains Ipv4 topology,
  Ipv6 topology, Linkstate Topology.

Change-Id: I7f0a607f43586e54952ff623ac1250bb55e33b54
Signed-off-by: Claudio D. Gasparini <cgaspari@cisco.com>

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 12d74811cf0f757f8591326cccb46e6c6175a68c..5276d94a2e08109d717d372f6d35613a7f96f24b 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -212,6 +212,13 @@
                 <type>xml</type>
                 <classifier>bgp-initial-config</classifier>
             </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>bgp-controller-config</artifactId>
+                <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>network-topology-initial-config</classifier>
+            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>bgp-benchmark-app</artifactId>

diff --git a/bgp/controller-config/pom.xml b/bgp/controller-config/pom.xml
index c8d33a2b2037f006eb9384cad1a681a2a7278a0e..49df93ec25dd74ea43083699f4bc21cc1e2f01b5 100644 (file)
--- a/bgp/controller-config/pom.xml
+++ b/bgp/controller-config/pom.xml
@@ -70,6 +70,11 @@
                                     <type>xml</type>
                                     <classifier>bgp-initial-config</classifier>
                                 </artifact>
+                                <artifact>
+                                    <file>${project.build.directory}/classes/initial/network-topology-config.xml</file>
+                                    <type>xml</type>
+                                    <classifier>network-topology-initial-config</classifier>
+                                </artifact>
                             </artifacts>
                         </configuration>
                     </execution>

diff --git a/bgp/controller-config/src/main/resources/initial/network-topology-config.xml b/bgp/controller-config/src/main/resources/initial/network-topology-config.xml
new file mode 100644 (file)
index 0000000..c79adae
--- /dev/null
+++ b/bgp/controller-config/src/main/resources/initial/network-topology-config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?><!--
+  ~ Copyright (c) 2016 Cisco 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
+  -->
+<network-topology xmlns="urn:TBD:params:xml:ns:yang:network-topology">
+    <topology>
+        <topology-id>example-bgp-rib-ipv4-topology</topology-id>
+        <topology-types>
+            <bgp-ipv4-reachability-topology xmlns="urn:opendaylight:params:xml:ns:yang:odl-bgp-topology-types"/>
+        </topology-types>
+        <rib-id xmlns="urn:opendaylight:params:xml:ns:yang:odl-bgp-topology-config">example-bgp-rib</rib-id>
+    </topology>
+    <topology>
+        <topology-id>example-bgp-rib-ipv6-topology</topology-id>
+        <topology-types>
+            <bgp-ipv6-reachability-topology xmlns="urn:opendaylight:params:xml:ns:yang:odl-bgp-topology-types"/>
+        </topology-types>
+        <rib-id xmlns="urn:opendaylight:params:xml:ns:yang:odl-bgp-topology-config">example-bgp-rib</rib-id>
+    </topology>
+    <topology>
+        <topology-id>example-bgp-rib-linkstate-topology</topology-id>
+        <topology-types>
+            <bgp-linkstate-topology xmlns="urn:opendaylight:params:xml:ns:yang:odl-bgp-topology-types"/>
+        </topology-types>
+        <rib-id xmlns="urn:opendaylight:params:xml:ns:yang:odl-bgp-topology-config">example-bgp-rib</rib-id>
+    </topology>
+</network-topology>
\ No newline at end of file

diff --git a/bgp/topology-provider/pom.xml b/bgp/topology-provider/pom.xml
index 5dff68d30d6dc76f41b52a8b56d748b9c645248f..f443e407a724fd0ed7e67324c28028eaac09f17b 100644 (file)
--- a/bgp/topology-provider/pom.xml
+++ b/bgp/topology-provider/pom.xml
@@ -100,7 +100,10 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
-
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>bgp-config-loader-spi</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.model</groupId>
             <artifactId>ietf-ted</artifactId>
@@ -158,15 +161,6 @@
         </dependency>
 
         <!-- Test dependencies -->
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>config-manager</artifactId>
@@ -181,10 +175,7 @@
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>config-util</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>mockito-configuration</artifactId>
-        </dependency>
+
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>bgp-rib-impl</artifactId>
@@ -199,26 +190,41 @@
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-binding-broker-impl</artifactId>
             <scope>test</scope>
+            <type>test-jar</type>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
-            <artifactId>netty-event-executor-config</artifactId>
+            <artifactId>sal-dom-broker-config</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-broker-impl</artifactId>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>bgp-controller-config</artifactId>
             <scope>test</scope>
-            <type>test-jar</type>
         </dependency>
+        <!-- junit/mockito default -->
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>mockito-configuration</artifactId>
+        </dependency>
+        <!-- netty -->
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
-            <artifactId>netty-threadgroup-config</artifactId>
+            <artifactId>netty-event-executor-config</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-dom-broker-config</artifactId>
+            <artifactId>netty-threadgroup-config</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/NetworkTopologyConfigFileProcessor.java b/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/NetworkTopologyConfigFileProcessor.java
new file mode 100644 (file)
index 0000000..f79cb5f
--- /dev/null
+++ b/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/NetworkTopologyConfigFileProcessor.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2016 Cisco 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
+ */
+
+package org.opendaylight.bgpcep.bgp.topology.provider;
+
+import com.google.common.base.Preconditions;
+import java.util.Collection;
+import java.util.Map;
+import javax.annotation.Nonnull;
+import org.opendaylight.bgpcep.bgp.topology.provider.spi.BgpTopologyDeployer;
+import org.opendaylight.protocol.bgp.config.loader.spi.ConfigFileProcessor;
+import org.opendaylight.protocol.bgp.config.loader.spi.ConfigLoader;
+import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NetworkTopology;
+import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.Topology;
+import org.opendaylight.yangtools.binding.data.codec.api.BindingNormalizedNodeSerializer;
+import org.opendaylight.yangtools.concepts.AbstractRegistration;
+import org.opendaylight.yangtools.yang.binding.DataObject;
+import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
+import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode;
+import org.opendaylight.yangtools.yang.data.api.schema.MapNode;
+import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
+import org.opendaylight.yangtools.yang.model.api.SchemaPath;
+
+public final class NetworkTopologyConfigFileProcessor implements ConfigFileProcessor, AutoCloseable {
+    private static final SchemaPath TOPOLOGY_SCHEMA_PATH = SchemaPath.create(true, NetworkTopology.QNAME);
+    private final BindingNormalizedNodeSerializer bindingSerializer;
+    private final BgpTopologyDeployer deployer;
+    private final AbstractRegistration registration;
+    private final YangInstanceIdentifier topologyYii;
+
+    public NetworkTopologyConfigFileProcessor(final ConfigLoader configLoader, final BgpTopologyDeployer deployer) {
+        Preconditions.checkNotNull(configLoader);
+        this.deployer = Preconditions.checkNotNull(deployer);
+        this.bindingSerializer = configLoader.getBindingNormalizedNodeSerializer();
+        this.topologyYii = this.bindingSerializer.toYangInstanceIdentifier(deployer.getInstanceIdentifier());
+        this.registration = configLoader.registerConfigFile(this);
+    }
+
+    @Override
+    public void close() throws Exception {
+        this.registration.close();
+    }
+
+    @Nonnull
+    @Override
+    public SchemaPath getSchemaPath() {
+        return TOPOLOGY_SCHEMA_PATH;
+    }
+
+    @Override
+    public void loadConfiguration(@Nonnull final NormalizedNode<?, ?> dto) {
+        final Collection<MapEntryNode> networkTopology = ((MapNode) dto).getValue();
+        for (final MapEntryNode topology : networkTopology) {
+            final Map.Entry<InstanceIdentifier<?>, DataObject> bi = this.bindingSerializer.fromNormalizedNode(this.topologyYii , topology);
+            if (bi != null) {
+                this.deployer.createInstance((Topology) bi.getValue());
+            }
+        }
+    }
+}

diff --git a/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/config/BackwardsCssTopologyProvider.java b/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/config/BackwardsCssTopologyProvider.java
index 4071d6eaefd54ec727456538a0b120edb68ee9c8..5961ab01e211a72d22a8b3865ea7410f329d868a 100644 (file)
--- a/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/config/BackwardsCssTopologyProvider.java
+++ b/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/config/BackwardsCssTopologyProvider.java
@@ -11,26 +11,21 @@ package org.opendaylight.bgpcep.bgp.topology.provider.config;
 import com.google.common.reflect.AbstractInvocationHandler;
 import com.google.common.reflect.Reflection;
 import java.lang.reflect.Method;
-import java.util.function.Function;
 import org.opendaylight.bgpcep.bgp.topology.provider.spi.BgpTopologyDeployer;
 import org.opendaylight.bgpcep.bgp.topology.provider.spi.TopologyReferenceSingletonService;
 import org.opendaylight.bgpcep.topology.TopologyReference;
 import org.opendaylight.controller.config.api.osgi.WaitingServiceTracker;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev130925.RibId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev130925.bgp.rib.Rib;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev130925.bgp.rib.RibKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.odl.bgp.topology.config.rev160726.Topology1;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.odl.bgp.topology.config.rev160726.Topology1Builder;
-import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NetworkTopology;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.TopologyId;
 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.TopologyBuilder;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.TopologyKey;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.TopologyTypes;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier;
 import org.osgi.framework.BundleContext;
 
@@ -43,13 +38,7 @@ public final class BackwardsCssTopologyProvider {
         //create instance
         final WaitingServiceTracker<BgpTopologyDeployer> deployerTracker = WaitingServiceTracker.create(BgpTopologyDeployer.class, bundleContext);
         final BgpTopologyDeployer topologyDeployer = deployerTracker.waitForService(WaitingServiceTracker.FIVE_MINUTES);
-        topologyDeployer.createInstance(topology, new Function<Topology, Void>() {
-            @Override
-            public Void apply(final Topology topology) {
-                writeConfiguration(dataBroker, topology);
-                return null;
-            }
-        });
+        topologyDeployer.createInstance(topology);
         //get topology service, use filter
         final WaitingServiceTracker<TopologyReference> topologyTracker = WaitingServiceTracker.create(TopologyReference.class,
                 bundleContext, "(" + "topology-id" + "=" + topology.getTopologyId().getValue() + ")");
@@ -69,14 +58,6 @@ public final class BackwardsCssTopologyProvider {
         });
     }
 
-    private static void writeConfiguration(final DataBroker dataBroker, final Topology topology) {
-        final KeyedInstanceIdentifier<Topology, TopologyKey> topologyIId = InstanceIdentifier.create(NetworkTopology.class).child(Topology.class,
-                topology.getKey());
-        final WriteTransaction wTx = dataBroker.newWriteOnlyTransaction();
-        wTx.put(LogicalDatastoreType.CONFIGURATION, topologyIId, topology, true);
-        wTx.submit();
-    }
-
     private static Topology createConfiguration(final TopologyTypes topologyTypes, final TopologyId topologyId, final RibId ribId) {
         final TopologyBuilder topologyBuilder = new TopologyBuilder();
         topologyBuilder.setTopologyId(topologyId);

diff --git a/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/config/BgpTopologyDeployerImpl.java b/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/config/BgpTopologyDeployerImpl.java
index e0ffead293d36302d6b1307d17ce1674dd42a7b1..3b89b16b4e4e01cb8a730bfceff34c5abeea4c30 100644 (file)
--- a/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/config/BgpTopologyDeployerImpl.java
+++ b/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/config/BgpTopologyDeployerImpl.java
@@ -26,6 +26,7 @@ import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.DataObjectModification;
 import org.opendaylight.controller.md.sal.binding.api.DataTreeIdentifier;
 import org.opendaylight.controller.md.sal.binding.api.DataTreeModification;
+import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonService;
 import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider;
@@ -33,9 +34,11 @@ import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceRegist
 import org.opendaylight.protocol.bgp.rib.spi.util.ClusterSingletonServiceRegistrationHelper;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NetworkTopology;
 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.TopologyKey;
 import org.opendaylight.yangtools.concepts.AbstractRegistration;
 import org.opendaylight.yangtools.concepts.ListenerRegistration;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceRegistration;
 import org.slf4j.Logger;
@@ -44,7 +47,7 @@ import org.slf4j.LoggerFactory;
 public final class BgpTopologyDeployerImpl implements AutoCloseable, ClusteredDataTreeChangeListener<Topology>, BgpTopologyDeployer {
 
     private static final Logger LOG = LoggerFactory.getLogger(BgpTopologyDeployerImpl.class);
-
+    private static final InstanceIdentifier<Topology> TOPOLOGY_IID = InstanceIdentifier.create(NetworkTopology.class).child(Topology.class);
     private static final int MAX_REGISTRATION_ATTEMPTS = 10;
     private static final int SLEEP_TIME = MAX_REGISTRATION_ATTEMPTS;
 
@@ -62,7 +65,7 @@ public final class BgpTopologyDeployerImpl implements AutoCloseable, ClusteredDa
         this.dataBroker = Preconditions.checkNotNull(dataBroker);
         this.singletonProvider = Preconditions.checkNotNull(singletonProvider);
         this.registration =
-                this.dataBroker.registerDataTreeChangeListener(new DataTreeIdentifier<>(LogicalDatastoreType.CONFIGURATION, InstanceIdentifier.create(NetworkTopology.class).child(Topology.class)), this);
+            this.dataBroker.registerDataTreeChangeListener(new DataTreeIdentifier<>(LogicalDatastoreType.CONFIGURATION, InstanceIdentifier.create(NetworkTopology.class).child(Topology.class)), this);
         LOG.info("BGP topology deployer started.");
     }
 
@@ -107,27 +110,16 @@ public final class BgpTopologyDeployerImpl implements AutoCloseable, ClusteredDa
         };
     }
 
-    @Override
-    public synchronized void close() throws Exception {
-        this.registration.close();
-        LOG.info("BGP topology deployer stopped.");
-        this.closed = true;
-    }
-
     @Override
     public DataBroker getDataBroker() {
         return this.dataBroker;
     }
 
-    private Iterable<BgpTopologyProvider> filterTopologyBuilders(final Topology topology) {
-        return Iterables.filter(this.topologyProviders, input -> input.topologyTypeFilter(topology));
-    }
-
     @Override
     public AbstractRegistration registerService(final TopologyReferenceSingletonService topologyProviderService) {
         final Dictionary<String, String> properties = new Hashtable<>();
         properties.put("topology-id", topologyProviderService.getInstanceIdentifier().firstKeyOf(Topology.class).getTopologyId().getValue());
-        final ServiceRegistration<?> registerService = this.context.registerService(new String[] {TopologyReference.class.getName()}, topologyProviderService, properties);
+        final ServiceRegistration<?> registerService = this.context.registerService(new String[]{TopologyReference.class.getName()}, topologyProviderService, properties);
         final ClusterSingletonServiceRegistration registerClusterSingletonService = registerSingletonService(topologyProviderService);
         return new AbstractRegistration() {
             @Override
@@ -136,7 +128,7 @@ public final class BgpTopologyDeployerImpl implements AutoCloseable, ClusteredDa
                     registerClusterSingletonService.close();
                 } catch (final Exception e) {
                     LOG.warn("Failed to close ClusterSingletonServiceRegistration {} for TopologyBuilder {}",
-                            registerClusterSingletonService, topologyProviderService.getInstanceIdentifier(), e);
+                        registerClusterSingletonService, topologyProviderService.getInstanceIdentifier(), e);
                 }
                 registerService.unregister();
             }
@@ -144,7 +136,16 @@ public final class BgpTopologyDeployerImpl implements AutoCloseable, ClusteredDa
     }
 
     @Override
-    public void createInstance(final Topology topology, final Function<Topology, Void> writeFunction) {
+    public void createInstance(final Topology topology) {
+        final Function<Topology, Void> writeFunction = topology1 -> {
+            final WriteTransaction wTx = this.dataBroker.newWriteOnlyTransaction();
+            final KeyedInstanceIdentifier<Topology, TopologyKey> topologyIIdKeyed =
+                InstanceIdentifier.create(NetworkTopology.class).child(Topology.class, topology1.getKey());
+            wTx.put(LogicalDatastoreType.CONFIGURATION, topologyIIdKeyed, topology1, true);
+            wTx.submit();
+            return null;
+        };
+
         filterTopologyBuilders(topology).forEach(provider -> provider.onTopologyBuilderCreated(topology, writeFunction));
     }
 
@@ -153,6 +154,22 @@ public final class BgpTopologyDeployerImpl implements AutoCloseable, ClusteredDa
         filterTopologyBuilders(topology).forEach(provider -> provider.onTopologyBuilderRemoved(topology));
     }
 
+    @Override
+    public InstanceIdentifier<Topology> getInstanceIdentifier() {
+        return TOPOLOGY_IID;
+    }
+
+    @Override
+    public synchronized void close() throws Exception {
+        this.registration.close();
+        LOG.info("BGP topology deployer stopped.");
+        this.closed = true;
+    }
+
+    private Iterable<BgpTopologyProvider> filterTopologyBuilders(final Topology topology) {
+        return Iterables.filter(this.topologyProviders, input -> input.topologyTypeFilter(topology));
+    }
+
     private ClusterSingletonServiceRegistration registerSingletonService(final ClusterSingletonService clusterSingletonService) {
         return ClusterSingletonServiceRegistrationHelper.registerSingletonService(this.singletonProvider, clusterSingletonService, MAX_REGISTRATION_ATTEMPTS, SLEEP_TIME);
     }

diff --git a/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/spi/BgpTopologyDeployer.java b/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/spi/BgpTopologyDeployer.java
index 3233f5d649b4cd206a44cff325d9248e8922aaca..7605ff1732b6229ffe261fd2e25c1668efa4eac9 100644 (file)
--- a/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/spi/BgpTopologyDeployer.java
+++ b/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/spi/BgpTopologyDeployer.java
@@ -8,10 +8,10 @@
 
 package org.opendaylight.bgpcep.bgp.topology.provider.spi;
 
-import java.util.function.Function;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.Topology;
 import org.opendaylight.yangtools.concepts.AbstractRegistration;
+import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
 public interface BgpTopologyDeployer {
 
@@ -21,8 +21,9 @@ public interface BgpTopologyDeployer {
 
     AbstractRegistration registerService(TopologyReferenceSingletonService topologyProviderService);
 
-    void createInstance(Topology topology, Function<Topology, Void> writeFunction);
+    void createInstance(Topology topology);
 
     void removeInstance(Topology topology);
 
+    InstanceIdentifier<Topology> getInstanceIdentifier();
 }

diff --git a/bgp/topology-provider/src/main/resources/org/opendaylight/blueprint/bgp-topology-provider.xml b/bgp/topology-provider/src/main/resources/org/opendaylight/blueprint/bgp-topology-provider.xml
index 713e6b5cd9cb883aa7630d59b261ce1579e40624..a33123d6182bf662e981cd1a184be6a7fc7bd865 100644 (file)
--- a/bgp/topology-provider/src/main/resources/org/opendaylight/blueprint/bgp-topology-provider.xml
+++ b/bgp/topology-provider/src/main/resources/org/opendaylight/blueprint/bgp-topology-provider.xml
@@ -25,4 +25,10 @@
     <argument ref="bgpTopologyDeployer"/>
   </bean>
 
+  <reference id="bgpConfigLoader" interface="org.opendaylight.protocol.bgp.config.loader.spi.ConfigLoader"/>
+
+  <bean id="topologyInitialConfig" class="org.opendaylight.bgpcep.bgp.topology.provider.NetworkTopologyConfigFileProcessor" destroy-method="close">
+    <argument ref="bgpConfigLoader"/>
+    <argument ref="bgpTopologyDeployer"/>
+  </bean>
 </blueprint>
\ No newline at end of file

diff --git a/bgp/topology-provider/src/test/java/org/opendaylight/controller/config/yang/bgp/topology/provider/Ipv4ReachabilityTopologyBuilderModuleTest.java b/bgp/topology-provider/src/test/java/org/opendaylight/controller/config/yang/bgp/topology/provider/Ipv4ReachabilityTopologyBuilderModuleTest.java
index 5bf7a6b5ac5601d13fa0a568b24412d215d8f15b..2ddec8baba2396ceade98e56b3cc03daf8d608e2 100644 (file)
--- a/bgp/topology-provider/src/test/java/org/opendaylight/controller/config/yang/bgp/topology/provider/Ipv4ReachabilityTopologyBuilderModuleTest.java
+++ b/bgp/topology-provider/src/test/java/org/opendaylight/controller/config/yang/bgp/topology/provider/Ipv4ReachabilityTopologyBuilderModuleTest.java
@@ -11,7 +11,6 @@ import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 import java.util.List;
-import java.util.function.Function;
 import javax.management.ObjectName;
 import org.junit.Test;
 import org.opendaylight.bgpcep.bgp.topology.provider.spi.BgpTopologyDeployer;
@@ -58,15 +57,21 @@ public class Ipv4ReachabilityTopologyBuilderModuleTest extends AbstractRIBImplMo
             public AbstractRegistration registerService(final TopologyReferenceSingletonService topologyProviderService) {
                 return null;
             }
+
             @Override
-            public void createInstance(final Topology topology, final Function<Topology, Void> writeFunction) {
-                return;
+            public void createInstance(final Topology topology) {
+
             }
 
             @Override
             public void removeInstance(final Topology topology) {
                 return;
             }
+
+            @Override
+            public InstanceIdentifier<Topology> getInstanceIdentifier() {
+                return null;
+            }
         });
     }
 

diff --git a/bgp/topology-provider/src/test/java/org/opendaylight/controller/config/yang/bgp/topology/provider/Ipv6ReachabilityTopologyBuilderModuleTest.java b/bgp/topology-provider/src/test/java/org/opendaylight/controller/config/yang/bgp/topology/provider/Ipv6ReachabilityTopologyBuilderModuleTest.java
index b4ab507ece4d82d7e268ce14a3ad940e5d13d398..f66aab44f69d16ec1bee9d2102cc95d5340c6c6c 100644 (file)
--- a/bgp/topology-provider/src/test/java/org/opendaylight/controller/config/yang/bgp/topology/provider/Ipv6ReachabilityTopologyBuilderModuleTest.java
+++ b/bgp/topology-provider/src/test/java/org/opendaylight/controller/config/yang/bgp/topology/provider/Ipv6ReachabilityTopologyBuilderModuleTest.java
@@ -11,7 +11,6 @@ import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 import java.util.List;
-import java.util.function.Function;
 import javax.management.ObjectName;
 import org.junit.Test;
 import org.opendaylight.bgpcep.bgp.topology.provider.spi.BgpTopologyDeployer;
@@ -58,15 +57,21 @@ public class Ipv6ReachabilityTopologyBuilderModuleTest extends AbstractRIBImplMo
             public AbstractRegistration registerService(final TopologyReferenceSingletonService topologyProviderService) {
                 return null;
             }
+
             @Override
-            public void createInstance(final Topology topology, final Function<Topology, Void> writeFunction) {
-                return;
+            public void createInstance(final Topology topology) {
+
             }
 
             @Override
             public void removeInstance(final Topology topology) {
                 return;
             }
+
+            @Override
+            public InstanceIdentifier<Topology> getInstanceIdentifier() {
+                return null;
+            }
         });
     }
 

diff --git a/bgp/topology-provider/src/test/java/org/opendaylight/controller/config/yang/bgp/topology/provider/LinkstateTopologyBuilderModuleTest.java b/bgp/topology-provider/src/test/java/org/opendaylight/controller/config/yang/bgp/topology/provider/LinkstateTopologyBuilderModuleTest.java
index 3fa6433372a2f28dda9ebe5858e18f0c61552648..eb6678a9010f039604c858f78b0d6ed6cbb012ef 100644 (file)
--- a/bgp/topology-provider/src/test/java/org/opendaylight/controller/config/yang/bgp/topology/provider/LinkstateTopologyBuilderModuleTest.java
+++ b/bgp/topology-provider/src/test/java/org/opendaylight/controller/config/yang/bgp/topology/provider/LinkstateTopologyBuilderModuleTest.java
@@ -56,8 +56,13 @@ public class LinkstateTopologyBuilderModuleTest extends AbstractRIBImplModuleTes
             public AbstractRegistration registerService(final TopologyReferenceSingletonService topologyProviderService) {
                 return null;
             }
+
             @Override
-            public void createInstance(final Topology topology, final Function<Topology, Void> writeFunction) {
+            public void createInstance(final Topology topology) {
+
+            }
+
+            void createInstance(final Topology topology, final Function<Topology, Void> writeFunction) {
                 return;
             }
 
@@ -65,6 +70,11 @@ public class LinkstateTopologyBuilderModuleTest extends AbstractRIBImplModuleTes
             public void removeInstance(final Topology topology) {
                 return;
             }
+
+            @Override
+            public InstanceIdentifier<Topology> getInstanceIdentifier() {
+                return null;
+            }
         });
     }
 

diff --git a/features/bgp/pom.xml b/features/bgp/pom.xml
index 61c6165d51f75a78485b33e49ca0cd451f82568c..05be511b49e5b598d7ff8237d68788627890b97b 100644 (file)
--- a/features/bgp/pom.xml
+++ b/features/bgp/pom.xml
@@ -246,6 +246,12 @@
           <artifactId>bgp-controller-config</artifactId>
           <type>xml</type>
           <classifier>bgp-initial-config</classifier>
+      </dependency>
+        <dependency>
+          <groupId>${project.groupId}</groupId>
+          <artifactId>bgp-controller-config</artifactId>
+          <type>xml</type>
+          <classifier>network-topology-initial-config</classifier>
       </dependency>
       <dependency>
           <groupId>${project.groupId}</groupId>

diff --git a/features/bgp/src/main/features/features.xml b/features/bgp/src/main/features/features.xml
index da63a21f9d1947ffd6563a353217a730cccc9553..00983ec365921cf23f4850d469f7cebe46373fde 100644 (file)
--- a/features/bgp/src/main/features/features.xml
+++ b/features/bgp/src/main/features/features.xml
@@ -41,6 +41,7 @@
         <configfile finalname="etc/opendaylight/karaf/31-bgp.xml">mvn:org.opendaylight.bgpcep/bgp-controller-config/{{VERSION}}/xml/config</configfile>
         <configfile finalname="etc/opendaylight/karaf/41-bgp-example.xml">mvn:org.opendaylight.bgpcep/bgp-controller-config/{{VERSION}}/xml/config-example</configfile>
         <configfile finalname="etc/opendaylight/bgp/protocols-config.xml">mvn:org.opendaylight.bgpcep/bgp-controller-config/{{VERSION}}/xml/bgp-initial-config</configfile>
+        <configfile finalname="etc/opendaylight/bgp/network-topology-config.xml">mvn:org.opendaylight.bgpcep/bgp-controller-config/{{VERSION}}/xml/network-topology-initial-config</configfile>
     </feature>
 
     <feature name="odl-bgpcep-bgp-openconfig" version='${project.version}'>
@@ -158,6 +159,7 @@
         <feature version='${project.version}'>odl-bgpcep-bgp-linkstate</feature>
         <bundle>mvn:org.opendaylight.bgpcep/topology-api/{{VERSION}}</bundle>
         <feature version='${mdsal.version}'>odl-mdsal-broker</feature>
+        <feature version='${project.version}'>odl-bgpcep-bgp-config-loader</feature>
         <bundle>mvn:org.opendaylight.bgpcep/bgp-topology-provider/{{VERSION}}</bundle>
     </feature>