commit 265b3bbdf9617f66e7f9ce5b09a80a647fb97c9a
author Yixiao Chen <yixiao.chen@huawei.com> Fri Jan 13 10:17:03 2017 -0500
committer Aihua Guo <agva123@gmail.com> Tue Jan 31 17:10:27 2017 +0000
tree f5abd193d703c924439edc5b451ee484b51af3d0
parent 90163bab470630b6b92ec9072dbc9e9851d24ba7

TeTopology core and nbi bug fixes and improvements

Change-Id: I5f3dbcaa79b04c1b1b00b9df7ccae804953c3bae

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

diff --git a/apps/tetopology/app/src/test/java/org/onosproject/tetopology/management/DefaultBuilder.java b/apps/tetopology/app/src/test/java/org/onosproject/tetopology/management/DefaultBuilder.java
index 8ce1241..9ed72ba 100644
--- a/apps/tetopology/app/src/test/java/org/onosproject/tetopology/management/DefaultBuilder.java
+++ b/apps/tetopology/app/src/test/java/org/onosproject/tetopology/management/DefaultBuilder.java
@@ -113,7 +113,7 @@
                                                  EncodingType.LSP_ENCODING_ODUK,
                                                  new BitSet(TeConstants.FLAG_MAX_BITS),
                                                  null, null,
-                                                 ODU2BW); //10G for ODU2
+                                                 ODU2BW, null); //10G for ODU2
     }
 
     private static TerminationPoint tpBuilder(long teTpId) {

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 7f4bb80..f4ff72d 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
@@ -1026,12 +1026,13 @@
     }
 
     @Override
-    public void setMapEventQueue(BlockingQueue<TeTopologyMapEvent> queue) {
+    public void setProviderId(long providerId) {
+        this.providerId = providerId;
     }
 
     @Override
-    public void setProviderId(long providerId) {
-        this.providerId = providerId;
+    public BlockingQueue<TeTopologyMapEvent> mapEventQueue() {
+        return null;
     }
 }
 

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

diff --git a/apps/tetopology/app/src/test/java/org/onosproject/tetopology/management/TeTopologyManagerTest.java b/apps/tetopology/app/src/test/java/org/onosproject/tetopology/management/TeTopologyManagerTest.java
index 03d21fb..f6c0db0 100644
--- a/apps/tetopology/app/src/test/java/org/onosproject/tetopology/management/TeTopologyManagerTest.java
+++ b/apps/tetopology/app/src/test/java/org/onosproject/tetopology/management/TeTopologyManagerTest.java
@@ -128,6 +128,7 @@
                 .teNode(new TeNodeKey(DefaultBuilder.teTopologyKey(),
                                       DefaultBuilder.teNode().teNodeId()));
         assertNotNull("TeNode should be found", teNode);
+        assertTrue("TE node should be identical", teNode.equals(DefaultBuilder.teNode()));
         assertTrue("Number of TTPs should be 1",
                    teNode.tunnelTerminationPoints().size() == 1);
         TeLink teLink = service