commit 29f063356c962616a712d6c0af6f28fd8ba64e62
author Yixiao Chen <yixiao.chen@huawei.com> Wed Dec 07 16:14:29 2016 -0500
committer Henry Yu <henry.yu1@huawei.com> Tue Jan 03 18:40:38 2017 +0000
tree cb654f8e699b39913e588280d233c07fec0e9342
parent bacea91117aa96d2c62122c13cee98055a68b58d

Bug fixes for raising TE Topology events.

and config TE Topology mode in MDSC or not.

Change-Id: Iddaba1176ed428efc3028df05d0bb1fa7cf7c3d5

apps/tetopology/app/src/test/java/org/onosproject/tetopology/management/SimpleTeTopologyStore.java

diff --git a/apps/tetopology/app/src/test/java/org/onosproject/tetopology/management/SimpleTeTopologyStore.java b/apps/tetopology/app/src/test/java/org/onosproject/tetopology/management/SimpleTeTopologyStore.java
index 3abaddc..7f4bb80 100644
--- a/apps/tetopology/app/src/test/java/org/onosproject/tetopology/management/SimpleTeTopologyStore.java
+++ b/apps/tetopology/app/src/test/java/org/onosproject/tetopology/management/SimpleTeTopologyStore.java
@@ -77,7 +77,6 @@
 import org.onosproject.tetopology.management.impl.InternalTeTopology;
 import org.onosproject.tetopology.management.impl.InternalTerminationPoint;
 import org.onosproject.tetopology.management.impl.TeMgrUtil;
-import org.onosproject.tetopology.management.impl.TeTopologyManager;
 import org.onosproject.tetopology.management.impl.TeTopologyMapEvent;
 import org.onosproject.tetopology.management.impl.TeTopologyStore;
 import org.onosproject.tetopology.management.impl.TeTopologyStoreDelegate;
@@ -125,6 +124,7 @@
     // Track termination point keys by TE termination point Key
     private Map<TeLinkTpGlobalKey, TerminationPointKey> tpKeyMap = Maps
             .newConcurrentMap();
+    private long providerId;
 
     @Activate
     public void activate() {
@@ -404,8 +404,7 @@
             intTopo.setTeLinkKeys(teLinkKeys);
             BitSet flags = new BitSet(TeConstants.FLAG_MAX_BITS);
             flags.set(TeTopology.BIT_LEARNT);
-            if (network.teTopologyId()
-                    .clientId() == TeTopologyManager.DEFAULT_PROVIDER_ID) {
+            if (network.teTopologyId().clientId() == providerId) {
                 // Hard rule for now
                 flags.set(TeTopology.BIT_CUSTOMIZED);
             }
@@ -1029,5 +1028,10 @@
     @Override
     public void setMapEventQueue(BlockingQueue<TeTopologyMapEvent> queue) {
     }
+
+    @Override
+    public void setProviderId(long providerId) {
+        this.providerId = providerId;
+    }
 }