Add bundle activator and use it

  - Bumped yang-binding to 0.6.0-SNAPSHOT
  - Added OSGI imports to bgp-concepts

Change-Id: Ibab95dde98d348b9a828a0c1f2118347485e9474
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/bgp/concepts/pom.xml b/bgp/concepts/pom.xml
index a93c7e59868c0d696713da10500f0d48fad65343..94f8467910185414e5d7f59cded08cb77e75d62c 100644 (file)
--- a/bgp/concepts/pom.xml
+++ b/bgp/concepts/pom.xml
@@ -36,7 +36,7 @@
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-binding</artifactId>
-            <version>${yangtools.version}</version>
+            <version>${code.generator.version}</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
@@ -107,6 +107,8 @@
                                                <Import-Package>
                                                        com.google.common.base,
                                                        org.opendaylight.protocol.concepts,
+                            org.opendaylight.yang.gen.v1.*,
+                            org.opendaylight.yangtools.yang.binding
                                                </Import-Package>
                                        </instructions>
                                </configuration>

diff --git a/bgp/rib-api/pom.xml b/bgp/rib-api/pom.xml
index 5e4c229f04ffb3125a4240796ecd8fe233b8977c..57f34cc4d1508d041ea5b5a6d38b63c6b749d6fb 100644 (file)
--- a/bgp/rib-api/pom.xml
+++ b/bgp/rib-api/pom.xml
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-binding</artifactId>
-            <version>${yangtools.version}</version>
+            <version>${code.generator.version}</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>

diff --git a/bgp/rib-impl/pom.xml b/bgp/rib-impl/pom.xml
index 2f09b9d59cfec9388d1df4adea44df3f705cbf78..8e8fb3d393540c775335516c43daee7b931358f7 100644 (file)
--- a/bgp/rib-impl/pom.xml
+++ b/bgp/rib-impl/pom.xml
@@ -98,6 +98,11 @@
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-binding-api</artifactId>
             <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-binding</artifactId>
+            <version>${code.generator.version}</version>
         </dependency>
                <dependency>
                        <groupId>org.mockito</groupId>
@@ -135,27 +140,11 @@
                                <configuration>
                                        <instructions>
                                                <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
-                        <Import-Package>
-                            org.opendaylight.protocol.concepts,
-                            org.opendaylight.protocol.framework,
-                                                       com.google.common.base,
-                            com.google.common.collect,
-                            com.google.common.eventbus,
-                            javax.annotation,
-                            javax.management,
-                            org.opendaylight.protocol.bgp.concepts,
-                            org.opendaylight.protocol.bgp.parser,
-                            org.opendaylight.protocol.bgp.parser.impl,
-                            org.opendaylight.protocol.bgp.util,
-                            org.opendaylight.protocol.util,
-                                                       org.slf4j,
-                                                       io.netty.channel, 
-                                                       io.netty.util.concurrent,
-                                               </Import-Package>
                                                <Export-Package>
                                                        org.opendaylight.protocol.bgp.rib.impl,
                                                        org.opendaylight.protocol.bgp.rib.impl.spi
-                                               </Export-Package>
+                        </Export-Package>
+                        <Bundle-Activator>org.opendaylight.protocol.bgp.rib.impl.Activator</Bundle-Activator>
                                        </instructions>
                                </configuration>
                        </plugin>

diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/Activator.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/Activator.java
new file mode 100644 (file)
index 0000000..3c87f8e
--- /dev/null
+++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/Activator.java
@@ -0,0 +1,16 @@
+package org.opendaylight.protocol.bgp.rib.impl;
+
+import org.opendaylight.controller.sal.binding.api.AbstractBindingAwareProvider;
+import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ConsumerContext;
+import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext;
+import org.opendaylight.controller.sal.binding.api.data.DataProviderService;
+
+public final class Activator extends AbstractBindingAwareProvider {
+       private RIBImpl rib;
+
+
+       @Override
+       public void onSessionInitiated(final ProviderContext session) {
+               rib = new RIBImpl(session.getSALService(DataProviderService.class));
+       }
+}

diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AdjRIBsInFactoryRegistryImpl.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AdjRIBsInFactoryRegistryImpl.java
index a771072034d0a042306705cacdfc5fc1149eee26..740db8204edc8f07391abe9ea0ae093c5819efec 100644 (file)
--- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AdjRIBsInFactoryRegistryImpl.java
+++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AdjRIBsInFactoryRegistryImpl.java
@@ -11,7 +11,7 @@ import java.util.Comparator;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.opendaylight.controller.sal.binding.api.data.DataModification;
+import org.opendaylight.controller.sal.binding.api.data.DataModificationTransaction  ;
 import org.opendaylight.protocol.bgp.rib.spi.AbstractAdjRIBsIn;
 import org.opendaylight.protocol.bgp.rib.spi.AdjRIBsIn;
 import org.opendaylight.protocol.bgp.rib.spi.AdjRIBsInFactory;
@@ -53,9 +53,9 @@ public final class AdjRIBsInFactoryRegistryImpl implements AdjRIBsInFactoryRegis
                }
 
                @Override
-               public InstanceIdentifier identifierForKey(final InstanceIdentifier basePath,
+               public InstanceIdentifier<?> identifierForKey(final InstanceIdentifier<?> basePath,
                                final Ipv4Prefix key) {
-                       final InstanceIdentifierBuilder builder = InstanceIdentifier.builder(basePath);
+                       final InstanceIdentifierBuilder<?> builder = InstanceIdentifier.builder(basePath);
 
                        builder.node(org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev130925.loc.rib.tables.routes.Ipv4Routes.class);
                        builder.node(Ipv4Routes.class, new Ipv4RoutesKey(key));
@@ -65,7 +65,7 @@ public final class AdjRIBsInFactoryRegistryImpl implements AdjRIBsInFactoryRegis
 
                @Override
                public void addRoutes(
-                               final DataModification trans,
+                               final DataModificationTransaction   trans,
                                final Peer peer,
                                final MpReachNlri nlri,
                                final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130918.update.PathAttributes attributes) {
@@ -83,7 +83,7 @@ public final class AdjRIBsInFactoryRegistryImpl implements AdjRIBsInFactoryRegis
                }
 
                @Override
-               public void removeRoutes(final DataModification trans, final Peer peer,
+               public void removeRoutes(final DataModificationTransaction   trans, final Peer peer,
                                final MpUnreachNlri nlri) {
                        for (Ipv4Prefix id : ((org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev130918.update.path.attributes.mp.unreach.nlri.withdrawn.routes.nlri.Ipv4)nlri.getWithdrawnRoutes().getNlri()).getIpv4Prefixes()) {
                                super.remove(trans, peer, id);
@@ -97,9 +97,9 @@ public final class AdjRIBsInFactoryRegistryImpl implements AdjRIBsInFactoryRegis
                }
 
                @Override
-               public InstanceIdentifier identifierForKey(final InstanceIdentifier basePath,
+               public InstanceIdentifier<?> identifierForKey(final InstanceIdentifier<?> basePath,
                                final Ipv6Prefix key) {
-                       final InstanceIdentifierBuilder builder = InstanceIdentifier.builder(basePath);
+                       final InstanceIdentifierBuilder<?> builder = InstanceIdentifier.builder(basePath);
 
                        builder.node(org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev130925.loc.rib.tables.routes.Ipv6Routes.class);
                        builder.node(Ipv6Routes.class, new Ipv6RoutesKey(key));
@@ -109,7 +109,7 @@ public final class AdjRIBsInFactoryRegistryImpl implements AdjRIBsInFactoryRegis
 
                @Override
                public void addRoutes(
-                               final DataModification trans,
+                               final DataModificationTransaction   trans,
                                final Peer peer,
                                final MpReachNlri nlri,
                                final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130918.update.PathAttributes attributes) {
@@ -127,7 +127,7 @@ public final class AdjRIBsInFactoryRegistryImpl implements AdjRIBsInFactoryRegis
                }
 
                @Override
-               public void removeRoutes(final DataModification trans, final Peer peer,
+               public void removeRoutes(final DataModificationTransaction   trans, final Peer peer,
                                final MpUnreachNlri nlri) {
                        for (Ipv6Prefix id : ((org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev130918.update.path.attributes.mp.unreach.nlri.withdrawn.routes.nlri.Ipv6)nlri.getWithdrawnRoutes().getNlri()).getIpv6Prefixes()) {
                                super.remove(trans, peer, id);
@@ -141,9 +141,9 @@ public final class AdjRIBsInFactoryRegistryImpl implements AdjRIBsInFactoryRegis
                }
 
                @Override
-               public InstanceIdentifier identifierForKey(final InstanceIdentifier basePath,
+               public InstanceIdentifier<?> identifierForKey(final InstanceIdentifier<?> basePath,
                                final CLinkstateDestination key) {
-                       final InstanceIdentifierBuilder builder = InstanceIdentifier.builder(basePath);
+                       final InstanceIdentifierBuilder<?> builder = InstanceIdentifier.builder(basePath);
 
                        switch (key.getNlriType()) {
                        case Ipv4Prefix:
@@ -165,7 +165,7 @@ public final class AdjRIBsInFactoryRegistryImpl implements AdjRIBsInFactoryRegis
 
                @Override
                public void addRoutes(
-                               final DataModification trans,
+                               final DataModificationTransaction   trans,
                                final Peer peer,
                                final MpReachNlri nlri,
                                final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130918.update.PathAttributes attributes) {
@@ -220,7 +220,7 @@ public final class AdjRIBsInFactoryRegistryImpl implements AdjRIBsInFactoryRegis
                }
 
                @Override
-               public void removeRoutes(final DataModification trans, final Peer peer,
+               public void removeRoutes(final DataModificationTransaction   trans, final Peer peer,
                                final MpUnreachNlri nlri) {
                        final CLinkstateDestination key =
                                        ((org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev130918.

diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPObjectComparator.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPObjectComparator.java
index 0be37b9fbe4073848f0813b59a8c6837455b1004..33fcf0e2614027168ce5258a6aa736ec7f12be38 100644 (file)
--- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPObjectComparator.java
+++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPObjectComparator.java
@@ -20,6 +20,11 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mess
  * @param <T> Actual object state reference
  */
 final class BGPObjectComparator implements Comparator<PathAttributes> {
+       public static final BGPObjectComparator INSTANCE = new BGPObjectComparator();
+
+       private BGPObjectComparator() {
+       }
+
        @Override
        public int compare(final PathAttributes o1, final PathAttributes o2) {
                if (o1 == o2) {

diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/RIBImpl.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/RIBImpl.java
index aa53da9b816721a7641fa1691e051c971944a751..b06b2a0045f1ae8f80e1f0006c417399845fbebf 100644 (file)
--- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/RIBImpl.java
+++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/RIBImpl.java
@@ -11,9 +11,10 @@ import java.util.concurrent.Future;
 
 import javax.annotation.concurrent.ThreadSafe;
 
-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext;
-import org.opendaylight.controller.sal.binding.api.data.DataModification;
-import org.opendaylight.controller.sal.binding.api.data.DataModification.TransactionStatus;
+
+
+import org.opendaylight.controller.md.sal.common.api.TransactionStatus;
+import org.opendaylight.controller.sal.binding.api.data.DataModificationTransaction;
 import org.opendaylight.controller.sal.binding.api.data.DataProviderService;
 import org.opendaylight.protocol.bgp.rib.spi.AdjRIBsIn;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130918.Update;
@@ -32,20 +33,18 @@ import com.google.common.base.Objects.ToStringHelper;
 import com.google.common.base.Preconditions;
 
 @ThreadSafe
-public final class RIBImpl {
+final class RIBImpl {
        private static final Logger logger = LoggerFactory.getLogger(RIBImpl.class);
        private final DataProviderService dps;
        private final RIBTables tables;
-       private final String name;
 
-       public RIBImpl(final String name, final ProviderContext context) {
-               this.name = Preconditions.checkNotNull(name);
-               this.dps = context.getSALService(DataProviderService.class);
-               this.tables = new RIBTables(new BGPObjectComparator(), AdjRIBsInFactoryRegistryImpl.INSTANCE);
+       RIBImpl(final DataProviderService dps) {
+               this.dps = Preconditions.checkNotNull(dps);
+               this.tables = new RIBTables(BGPObjectComparator.INSTANCE, AdjRIBsInFactoryRegistryImpl.INSTANCE);
        }
 
        synchronized void updateTables(final BGPPeer peer, final Update message) {
-               final DataModification trans = dps.beginTransaction();
+               final DataModificationTransaction trans = dps.beginTransaction();
 
                // FIXME: detect and handle end-of-RIB markers
 
@@ -87,7 +86,7 @@ public final class RIBImpl {
        synchronized void clearTable(final BGPPeer peer, final TablesKey key) {
                final AdjRIBsIn ari = tables.get(key);
                if (ari != null) {
-                       final DataModification trans = dps.beginTransaction();
+                       final DataModificationTransaction trans = dps.beginTransaction();
                        ari.clear(trans, peer);
 
                        // FIXME: we need to attach to this future for failures
@@ -101,7 +100,6 @@ public final class RIBImpl {
        }
 
        protected ToStringHelper addToStringAttributes(final ToStringHelper toStringHelper) {
-               toStringHelper.add("name", this.name);
                return toStringHelper;
        }
 }

diff --git a/bgp/rib-spi/pom.xml b/bgp/rib-spi/pom.xml
index 1b7468b0413812f099b258f7f8738305a89e75c4..0d6f406f629202d1d95e3337355854c159ac80cb 100644 (file)
--- a/bgp/rib-spi/pom.xml
+++ b/bgp/rib-spi/pom.xml
@@ -34,6 +34,12 @@
             <artifactId>sal-binding-api</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-binding</artifactId>
+            <version>${code.generator.version}</version>
+        </dependency>
+        
                <dependency>
                        <groupId>org.mockito</groupId>
                        <artifactId>mockito-core</artifactId>

diff --git a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/AbstractAdjRIBsIn.java b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/AbstractAdjRIBsIn.java
index 6f06a80df10023c8ca31d4da5a311d006f082059..626185a8e4ee955bd2e0bb19b86f7e5e92ba5d52 100644 (file)
--- a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/AbstractAdjRIBsIn.java
+++ b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/AbstractAdjRIBsIn.java
@@ -15,7 +15,7 @@ import java.util.Map;
 import javax.annotation.concurrent.GuardedBy;
 import javax.annotation.concurrent.ThreadSafe;
 
-import org.opendaylight.controller.sal.binding.api.data.DataModification;
+import org.opendaylight.controller.sal.binding.api.data.DataModificationTransaction;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130918.PathAttributes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev130925.LocRib;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev130925.rib.Tables;
@@ -52,7 +52,7 @@ public abstract class AbstractAdjRIBsIn<ID, DATA extends DataObject> implements
                private final ID key;
 
                @GuardedBy("this")
-               private InstanceIdentifier name;
+               private InstanceIdentifier<?> name;
                @GuardedBy("this")
                private RIBEntryData currentState;
 
@@ -60,7 +60,7 @@ public abstract class AbstractAdjRIBsIn<ID, DATA extends DataObject> implements
                        this.key = Preconditions.checkNotNull(key);
                }
 
-               private InstanceIdentifier getName() {
+               private InstanceIdentifier<?> getName() {
                        if (name == null) {
                                name = identifierForKey(basePath, key);
                        }
@@ -78,14 +78,14 @@ public abstract class AbstractAdjRIBsIn<ID, DATA extends DataObject> implements
                        return newState;
                }
 
-               private void electCandidate(final DataModification transaction, final RIBEntryData candidate) {
+               private void electCandidate(final DataModificationTransaction transaction, final RIBEntryData candidate) {
                        if (this.currentState == null || !this.currentState.equals(candidate)) {
                                transaction.putRuntimeData(getName(), candidate.getDataObject(key));
                                this.currentState = candidate;
                        }
                }
 
-               synchronized boolean removeState(final DataModification transaction, final Peer peer) {
+               synchronized boolean removeState(final DataModificationTransaction transaction, final Peer peer) {
                        this.candidates.remove(peer);
 
                        final RIBEntryData candidate = findCandidate(null);
@@ -98,14 +98,14 @@ public abstract class AbstractAdjRIBsIn<ID, DATA extends DataObject> implements
                        }
                }
 
-               synchronized void setState(final DataModification transaction, final Peer peer, final RIBEntryData state) {
+               synchronized void setState(final DataModificationTransaction  transaction, final Peer peer, final RIBEntryData state) {
                        this.candidates.put(peer, state);
                        electCandidate(transaction, findCandidate(state));
                }
        }
 
        private final Comparator<PathAttributes> comparator;
-       private final InstanceIdentifier basePath;
+       private final InstanceIdentifier<?> basePath;
        @GuardedBy("this")
        private final Map<ID, RIBEntry> entries = new HashMap<>();
 
@@ -115,7 +115,7 @@ public abstract class AbstractAdjRIBsIn<ID, DATA extends DataObject> implements
        }
 
        @Override
-       public synchronized void clear(final DataModification trans, final Peer peer) {
+       public synchronized void clear(final DataModificationTransaction trans, final Peer peer) {
                final Iterator<Map.Entry<ID, RIBEntry>> i = this.entries.entrySet().iterator();
                while (i.hasNext()) {
                        final Map.Entry<ID, RIBEntry> e = i.next();
@@ -126,9 +126,9 @@ public abstract class AbstractAdjRIBsIn<ID, DATA extends DataObject> implements
                }
        }
 
-       protected abstract InstanceIdentifier identifierForKey(final InstanceIdentifier basePath, final ID id);
+       protected abstract InstanceIdentifier<?> identifierForKey(final InstanceIdentifier<?> basePath, final ID id);
 
-       protected synchronized void add(final DataModification trans, final Peer peer, final ID id, final RIBEntryData data) {
+       protected synchronized void add(final DataModificationTransaction  trans, final Peer peer, final ID id, final RIBEntryData data) {
                RIBEntry e = this.entries.get(id);
                if (e == null) {
                        e = new RIBEntry(id);
@@ -138,7 +138,7 @@ public abstract class AbstractAdjRIBsIn<ID, DATA extends DataObject> implements
                e.setState(trans, peer, data);
        }
 
-       protected synchronized void remove(final DataModification trans, final Peer peer, final ID id) {
+       protected synchronized void remove(final DataModificationTransaction  trans, final Peer peer, final ID id) {
                final RIBEntry e = this.entries.get(id);
                if (e != null && e.removeState(trans, peer)) {
                        this.entries.remove(id);

diff --git a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/AdjRIBsIn.java b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/AdjRIBsIn.java
index ea77e0c5be84c66dd108147cf3a0b1056a2efa16..f544b3cf9361b695eef2f2b060283b94dca4410e 100644 (file)
--- a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/AdjRIBsIn.java
+++ b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/AdjRIBsIn.java
@@ -7,13 +7,13 @@
  */
 package org.opendaylight.protocol.bgp.rib.spi;
 
-import org.opendaylight.controller.sal.binding.api.data.DataModification;
+import org.opendaylight.controller.sal.binding.api.data.DataModificationTransaction;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130918.update.PathAttributes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev130918.update.path.attributes.MpReachNlri;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev130918.update.path.attributes.MpUnreachNlri;
 
 public interface AdjRIBsIn {
-       public void addRoutes(DataModification trans, Peer peer, MpReachNlri nlri, PathAttributes attributes);
-       public void removeRoutes(DataModification trans, Peer peer, MpUnreachNlri nlri);
-       public void clear(DataModification trans, Peer peer);
+       public void addRoutes(DataModificationTransaction trans, Peer peer, MpReachNlri nlri, PathAttributes attributes);
+       public void removeRoutes(DataModificationTransaction trans, Peer peer, MpUnreachNlri nlri);
+       public void clear(DataModificationTransaction trans, Peer peer);
 }

diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 482f8f33094dcb86001c9ae33fcf8bd338c6df66..63d01bf08401fc99203048ddb15cf61f10f36db2 100644 (file)
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -38,6 +38,12 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>sal-binding-broker-impl</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>concepts</artifactId>
@@ -47,7 +53,7 @@
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-binding</artifactId>
-            <version>${yangtools.version}</version>
+            <version>${code.generator.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/integration-tests/src/test/java/org/opendaylight/protocol/integration/AbstractBundleTest.java b/integration-tests/src/test/java/org/opendaylight/protocol/integration/AbstractBundleTest.java
index f7686c47bced389c671180af17d58c3417edb07c..576f05ee4c869c1de0b436a1b8937a7a0bc4183c 100644 (file)
--- a/integration-tests/src/test/java/org/opendaylight/protocol/integration/AbstractBundleTest.java
+++ b/integration-tests/src/test/java/org/opendaylight/protocol/integration/AbstractBundleTest.java
@@ -55,11 +55,17 @@ public abstract class AbstractBundleTest {
                ret.add(mavenBundle("io.netty", "netty-transport", "4.0.9.Final"));
                ret.add(mavenBundle("org.slf4j", "slf4j-api", "1.7.2"));
 
-               ret.add(mavenBundle("org.opendaylight.yangtools", "concepts", "0.5-SNAPSHOT"));
-               ret.add(mavenBundle("org.opendaylight.yangtools", "yang-binding", "0.5.9-SNAPSHOT"));
+               ret.add(mavenBundle("org.opendaylight.yangtools", "concepts", "0.1.1-SNAPSHOT"));
+               ret.add(mavenBundle("org.opendaylight.yangtools", "yang-binding", "0.6.0-SNAPSHOT"));
                ret.add(mavenBundle("org.opendaylight.yangtools", "yang-common", "0.5.9-SNAPSHOT"));
                ret.add(mavenBundle("org.opendaylight.yangtools.model", "ietf-inet-types", "2010.09.24.1"));
 
+               ret.add(mavenBundle("org.javassist", "javassist", "3.17.1-GA"));
+               ret.add(mavenBundle("org.opendaylight.controller", "sal-common-api", "1.0-SNAPSHOT"));
+               ret.add(mavenBundle("org.opendaylight.controller", "sal-binding-api", "1.0-SNAPSHOT"));
+               ret.add(mavenBundle("org.opendaylight.controller", "sal-binding-broker-impl", "1.0-SNAPSHOT"));
+               ret.add(mavenBundle("org.opendaylight.controller", "sal-common", "1.0-SNAPSHOT"));
+
                return ret;
        }
 

diff --git a/integration-tests/src/test/java/org/opendaylight/protocol/integration/BgpRibImplBundleTest.java b/integration-tests/src/test/java/org/opendaylight/protocol/integration/BgpRibImplBundleTest.java
index 3ef47d3e607ecddf312c212ecfe94ee14bff09e3..800a380e38e9e0a2136351fd7f5b4576f4d3c891 100644 (file)
--- a/integration-tests/src/test/java/org/opendaylight/protocol/integration/BgpRibImplBundleTest.java
+++ b/integration-tests/src/test/java/org/opendaylight/protocol/integration/BgpRibImplBundleTest.java
@@ -15,7 +15,7 @@ public final class BgpRibImplBundleTest extends AbstractBundleTest {
        @Override
        protected Collection<String> prerequisiteBundles() {
                return Lists.newArrayList("concepts", "bgp-concepts", "bgp-linkstate", "bgp-parser-api",
-                               "bgp-parser-impl", "bgp-rib-api", "bgp-util", "framework", "util");
+                               "bgp-parser-impl", "bgp-rib-api", "bgp-rib-spi", "bgp-util", "framework", "util");
        }
 
        @Override

diff --git a/integration-tests/src/test/java/org/opendaylight/protocol/integration/BgpRibMockBundleTest.java b/integration-tests/src/test/java/org/opendaylight/protocol/integration/BgpRibMockBundleTest.java
index 4791208761467373e7d2948419d828e97c5008ef..ca330574a38b1fd12fc38243048853a326b73114 100644 (file)
--- a/integration-tests/src/test/java/org/opendaylight/protocol/integration/BgpRibMockBundleTest.java
+++ b/integration-tests/src/test/java/org/opendaylight/protocol/integration/BgpRibMockBundleTest.java
@@ -15,7 +15,7 @@ public final class BgpRibMockBundleTest extends AbstractBundleTest {
        @Override
        protected Collection<String> prerequisiteBundles() {
                return Lists.newArrayList("concepts", "bgp-concepts", "bgp-linkstate", "bgp-parser-api",
-                               "bgp-parser-impl", "bgp-rib-api", "bgp-rib-impl", "bgp-util", "framework", "util");
+                               "bgp-parser-impl", "bgp-rib-api", "bgp-rib-impl", "bgp-rib-spi", "bgp-util", "framework", "util");
        }
 
        @Override

diff --git a/pcep/api/pom.xml b/pcep/api/pom.xml
index 1298f5081003aa94064156c3bffbc5dc9b37fcce..0e41eb30cf7f483134473b45c44dbf05f1624be2 100644 (file)
--- a/pcep/api/pom.xml
+++ b/pcep/api/pom.xml
@@ -63,7 +63,7 @@
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-binding</artifactId>
-            <version>${yangtools.version}</version>
+            <version>${code.generator.version}</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>