| commit | 9bee080617c723a10de27bf0680aa0a8759e9206 | [log] [tgz] |
|---|---|---|
| author | Priyanka B <priyanka.b@huawei.com> | Wed Apr 27 22:06:02 2016 +0530 |
| committer | Gerrit Code Review <gerrit@onlab.us> | Thu Apr 28 20:55:12 2016 +0000 |
| tree | 043fb91f7613906a02334e46630d9c5717f3b671 | |
| parent | 90bfa6a30c99c4537b59e0b6fca676046f786fb4 [diff] |
[ONOS-4171] Merge PCEP and BGP providers into common BGPCEP provider. Change-Id: Ia87f0898e51704ce8d02d877e9f0d57219099a53
diff --git a/providers/bgp/topology/src/main/java/org/onosproject/provider/bgp/topology/impl/BgpTopologyProvider.java b/providers/bgp/topology/src/main/java/org/onosproject/provider/bgp/topology/impl/BgpTopologyProvider.java old mode 100755 new mode 100644 index 82af9a9..0ac494c --- a/providers/bgp/topology/src/main/java/org/onosproject/provider/bgp/topology/impl/BgpTopologyProvider.java +++ b/providers/bgp/topology/src/main/java/org/onosproject/provider/bgp/topology/impl/BgpTopologyProvider.java
@@ -79,8 +79,11 @@ @Component(immediate = true) public class BgpTopologyProvider extends AbstractProvider implements DeviceProvider, LinkProvider { + /** + * Creates an instance of BGP topology provider. + */ public BgpTopologyProvider() { - super(new ProviderId("bgp", "org.onosproject.provider.bgp")); + super(new ProviderId("l3", "org.onosproject.provider.bgp")); } private static final Logger log = LoggerFactory.getLogger(BgpTopologyProvider.class);
diff --git a/providers/bgp/topology/src/test/java/org/onosproject/provider/bgp/topology/impl/BgpTopologyProviderTest.java b/providers/bgp/topology/src/test/java/org/onosproject/provider/bgp/topology/impl/BgpTopologyProviderTest.java old mode 100755 new mode 100644 index d212fb4..7401fa5 --- a/providers/bgp/topology/src/test/java/org/onosproject/provider/bgp/topology/impl/BgpTopologyProviderTest.java +++ b/providers/bgp/topology/src/test/java/org/onosproject/provider/bgp/topology/impl/BgpTopologyProviderTest.java
@@ -70,9 +70,9 @@ * Test for BGP topology provider. */ public class BgpTopologyProviderTest { - private static final DeviceId DID2 = DeviceId.deviceId("bgp:rd=0::routinguniverse=0:asn=10"); + private static final DeviceId DID2 = DeviceId.deviceId("l3:rd=0::routinguniverse=0:asn=10"); private static final String UNKNOWN = new String("unknown"); - public static ProviderId providerId = new ProviderId("bgp", "foo"); + public static ProviderId providerId = new ProviderId("l3", "foo"); private final BgpTopologyProvider provider = new BgpTopologyProvider(); private final TestDeviceRegistry nodeRegistry = new TestDeviceRegistry();