commit 9bee080617c723a10de27bf0680aa0a8759e9206
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

[ONOS-4171] Merge PCEP and BGP providers into common BGPCEP provider.

Change-Id: Ia87f0898e51704ce8d02d877e9f0d57219099a53

protocols/bgp/api/src/main/java/org/onosproject/bgp/controller/BgpDpid.java

diff --git a/protocols/bgp/api/src/main/java/org/onosproject/bgp/controller/BgpDpid.java b/protocols/bgp/api/src/main/java/org/onosproject/bgp/controller/BgpDpid.java
index aadbee1..8baa5f0 100644
--- a/protocols/bgp/api/src/main/java/org/onosproject/bgp/controller/BgpDpid.java
+++ b/protocols/bgp/api/src/main/java/org/onosproject/bgp/controller/BgpDpid.java
@@ -39,7 +39,7 @@
 public final class BgpDpid {
     private static final Logger log = LoggerFactory.getLogger(BgpDpid.class);
 
-    private static final String SCHEME = "bgp";
+    private static final String SCHEME = "l3";
     private static final long UNKNOWN = 0;
     private StringBuilder stringBuilder;
     public static final int NODE_DESCRIPTOR_LOCAL = 1;

protocols/bgp/api/src/main/java/org/onosproject/bgp/controller/BgpId.java

diff --git a/protocols/bgp/api/src/main/java/org/onosproject/bgp/controller/BgpId.java b/protocols/bgp/api/src/main/java/org/onosproject/bgp/controller/BgpId.java
index 557beed..2d5ebba 100644
--- a/protocols/bgp/api/src/main/java/org/onosproject/bgp/controller/BgpId.java
+++ b/protocols/bgp/api/src/main/java/org/onosproject/bgp/controller/BgpId.java
@@ -30,7 +30,7 @@
  */
 public final class BgpId extends Identifier<IpAddress> {
 
-    private static final String SCHEME = "bgp";
+    private static final String SCHEME = "l3";
     private static final long UNKNOWN = 0;
 
     /**

protocols/pcep/api/src/main/java/org/onosproject/pcep/controller/PccId.java

diff --git a/protocols/pcep/api/src/main/java/org/onosproject/pcep/controller/PccId.java b/protocols/pcep/api/src/main/java/org/onosproject/pcep/controller/PccId.java
old mode 100755
new mode 100644
index 278b82d..7af4261
--- a/protocols/pcep/api/src/main/java/org/onosproject/pcep/controller/PccId.java
+++ b/protocols/pcep/api/src/main/java/org/onosproject/pcep/controller/PccId.java
@@ -29,7 +29,7 @@
  */
 public final class PccId extends Identifier<IpAddress> {
 
-    private static final String SCHEME = "pcep";
+    private static final String SCHEME = "l3";
     private static final long UNKNOWN = 0;
 
     /**