commit 79475496b2fb28a782a223b3d36556b522399e1f
author Priyanka B <priyanka.b@huawei.com> Sat Dec 05 21:42:15 2015 +0530
committer Gerrit Code Review <gerrit@onlab.us> Tue Dec 08 08:06:52 2015 +0000
tree 1749bd2b02d8ce60f1d94a730bbf602f48cf0c16
parent 41615e52a0d278686ee0d5416fc7ecf34a34629c

PrefixTed code fix

Change-Id: I857ceb2b04e3af479fed769501c5a6bd5704e4b3

apps/iptopology-api/src/main/java/org/onosproject/iptopology/api/PrefixTed.java

diff --git a/apps/iptopology-api/src/main/java/org/onosproject/iptopology/api/PrefixTed.java b/apps/iptopology-api/src/main/java/org/onosproject/iptopology/api/PrefixTed.java
index 9f1c40a..934cab3 100644
--- a/apps/iptopology-api/src/main/java/org/onosproject/iptopology/api/PrefixTed.java
+++ b/apps/iptopology-api/src/main/java/org/onosproject/iptopology/api/PrefixTed.java
@@ -17,6 +17,8 @@
 
 import static com.google.common.base.MoreObjects.toStringHelper;
 
+import java.util.Iterator;
+import java.util.List;
 import java.util.Objects;
 
 import org.onlab.packet.IpAddress;
@@ -26,22 +28,13 @@
  */
 public class PrefixTed {
     private final IgpFlags igpFlags;
-    private final RouteTag routeTag;
-    private final ExtendedRouteTag extendedRouteTag;
+    private final List<RouteTag> routeTag;
+    private final List<ExtendedRouteTag> extendedRouteTag;
     private final Metric metric;
     private final IpAddress fwdingAddress;
 
     /**
-     * Constructor to initialize its parameters.
-     *
-     * @param igpFlags igp flags
-     * @param routeTag ospf route tag
-     * @param extendedRouteTag isis route tag
-     * @param metric prefix metric
-     * @param fwdingAddress forwarding address
-     */
-    /**
-     * Constructor to initialize its parameters.
+     * Constructor to initialize its fields.
      *
      * @param igpFlags IS-IS and OSPF flags assigned to the prefix
      * @param routeTag IGP (ISIS or OSPF) tags of the prefix
@@ -49,7 +42,7 @@
      * @param metric metric of the prefix
      * @param fwdingAddress OSPF forwarding address
      */
-    public PrefixTed(IgpFlags igpFlags, RouteTag routeTag, ExtendedRouteTag extendedRouteTag,
+    public PrefixTed(IgpFlags igpFlags, List<RouteTag> routeTag, List<ExtendedRouteTag> extendedRouteTag,
             Metric metric, IpAddress fwdingAddress) {
         this.igpFlags = igpFlags;
         this.routeTag = routeTag;
@@ -72,7 +65,7 @@
      *
      * @return IGP route tag.
      */
-    public RouteTag routeTag() {
+    public List<RouteTag> routeTag() {
         return routeTag;
     }
 
@@ -81,7 +74,7 @@
      *
      * @return extended IS-IS route tag
      */
-    public ExtendedRouteTag extendedRouteTag() {
+    public List<ExtendedRouteTag> extendedRouteTag() {
         return extendedRouteTag;
     }
 
@@ -103,7 +96,6 @@
         return fwdingAddress;
     }
 
-
     @Override
     public int hashCode() {
         return Objects.hash(igpFlags, routeTag, extendedRouteTag, metric, fwdingAddress);
@@ -117,9 +109,41 @@
 
         if (obj instanceof PrefixTed) {
             PrefixTed other = (PrefixTed) obj;
-            return Objects.equals(igpFlags, other.igpFlags) && Objects.equals(extendedRouteTag, other.extendedRouteTag)
-                   && Objects.equals(routeTag, other.routeTag) && Objects.equals(metric, other.metric)
-                   && Objects.equals(fwdingAddress, other.fwdingAddress);
+            Iterator<RouteTag> objListIterator = other.routeTag.iterator();
+            int countOtherCommonRouteTag = other.routeTag.size();
+            int countCommonRouteTag = routeTag.size();
+
+            Iterator<ExtendedRouteTag> objListIterator1 = other.extendedRouteTag.iterator();
+            int countOtherCommonExtRouteTag = other.extendedRouteTag.size();
+            int countCommonExtRouteTag = extendedRouteTag.size();
+
+            boolean isCommonRouteType = true;
+            boolean isCommonExtRouteType = true;
+            if (countOtherCommonRouteTag != countCommonRouteTag
+                    || countOtherCommonExtRouteTag != countCommonExtRouteTag) {
+                return false;
+            } else {
+                while (objListIterator.hasNext() && isCommonRouteType) {
+                    RouteTag subTlv = objListIterator.next();
+                    if (routeTag.contains(subTlv) && other.routeTag.contains(subTlv)) {
+                        isCommonRouteType = Objects.equals(routeTag.get(routeTag.indexOf(subTlv)),
+                                other.routeTag.get(other.routeTag.indexOf(subTlv)));
+                    } else {
+                        isCommonRouteType = false;
+                    }
+                }
+                while (objListIterator1.hasNext() && isCommonExtRouteType) {
+                    ExtendedRouteTag subTlv = objListIterator1.next();
+                    if (extendedRouteTag.contains(subTlv) && other.extendedRouteTag.contains(subTlv)) {
+                        isCommonExtRouteType = Objects.equals(extendedRouteTag.get(extendedRouteTag.indexOf(subTlv)),
+                                other.extendedRouteTag.get(other.extendedRouteTag.indexOf(subTlv)));
+                    } else {
+                        isCommonExtRouteType = false;
+                    }
+                }
+                return isCommonRouteType && isCommonExtRouteType && Objects.equals(igpFlags, other.igpFlags)
+                        && Objects.equals(metric, other.metric) && Objects.equals(fwdingAddress, other.fwdingAddress);
+            }
         }
         return false;
     }
@@ -135,4 +159,4 @@
                 .add("fwdingAddress", fwdingAddress)
                 .toString();
     }
-}
\ No newline at end of file
+}