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/main/java/org/onosproject/tetopology/management/impl/TeMgrUtil.java

diff --git a/apps/tetopology/app/src/main/java/org/onosproject/tetopology/management/impl/TeMgrUtil.java b/apps/tetopology/app/src/main/java/org/onosproject/tetopology/management/impl/TeMgrUtil.java
index 5781663..dc4c165 100644
--- a/apps/tetopology/app/src/main/java/org/onosproject/tetopology/management/impl/TeMgrUtil.java
+++ b/apps/tetopology/app/src/main/java/org/onosproject/tetopology/management/impl/TeMgrUtil.java
@@ -112,7 +112,9 @@
      */
     public static NetworkNodeKey networkNodeKey(TeNodeKey teNodeKey) {
         return new NetworkNodeKey(toNetworkId(teNodeKey.teTopologyKey()),
-                                  KeyId.keyId(Long.toString(teNodeKey.teNodeId())));
+                                  KeyId.keyId(Ip4Address
+                                          .valueOf((int) teNodeKey.teNodeId())
+                                          .toString()));
     }
 
     /**
@@ -174,7 +176,8 @@
      * @return value of network node termination point key
      */
     public static NodeTpKey nodeTpKey(TeLinkTpKey teLinkKey) {
-        return new NodeTpKey(KeyId.keyId(Long.toString(teLinkKey.teNodeId())),
+        return new NodeTpKey(KeyId.keyId(Ip4Address
+                .valueOf((int) teLinkKey.teNodeId()).toString()),
                              KeyId.keyId(Long.toString(teLinkKey.teLinkTpId())));
     }
 
@@ -211,7 +214,8 @@
         if (MapUtils.isNotEmpty(teTopology.teNodes())) {
             nodes = Maps.newHashMap();
             for (TeNode tenode : teTopology.teNodes().values()) {
-                KeyId key = KeyId.keyId(Long.toString(tenode.teNodeId()));
+                KeyId key = KeyId.keyId(Ip4Address
+                        .valueOf((int) tenode.teNodeId()).toString());
                 nodes.put(key, nodeBuilder(key, tenode));
             }
         }
@@ -219,7 +223,7 @@
         if (MapUtils.isNotEmpty(teTopology.teLinks())) {
             links = Maps.newHashMap();
             for (TeLink telink : teTopology.teLinks().values()) {
-                KeyId key = TeMgrUtil.toNetworkLinkId(telink.teLinkKey());
+                KeyId key = toNetworkLinkId(telink.teLinkKey());
                 links.put(key, linkBuilder(key, telink));
 
             }