commit bf3e9ad3b32113d22e8d3ebb41e6e3bd7d5d8cb9
author Simon Hunt <simon@onlab.us> Fri Nov 07 14:46:29 2014 -0800
committer Gerrit Code Review <gerrit@onlab.us> Fri Nov 07 14:46:29 2014 -0800
tree 652d4a0b366f838b8a5a85ceebf62083ba469dab
parent e6015265a2051aeea06b33d63bb46a5afb7808e2
parent 1a9eff99ee104cb30d3386330f995a9c18c588a8

Merge "GUI -- Test events: unpinned the first node; increased a few link widths.  - added alerts pane to framework.  - added library registration mechanism to framework.  - created d3Utils library  - reimplemented drag behavior of nodes."

apps/sdnip/src/test/java/org/onlab/onos/sdnip/bgp/AsPathTest.java

diff --git a/apps/sdnip/src/test/java/org/onlab/onos/sdnip/bgp/AsPathTest.java b/apps/sdnip/src/test/java/org/onlab/onos/sdnip/bgp/AsPathTest.java
index fd5a017..fddd895 100644
--- a/apps/sdnip/src/test/java/org/onlab/onos/sdnip/bgp/AsPathTest.java
+++ b/apps/sdnip/src/test/java/org/onlab/onos/sdnip/bgp/AsPathTest.java
@@ -66,8 +66,8 @@
 
         String expectedString =
             "AsPath{pathSegments=" +
-            "[PathSegment{type=2, segmentAsNumbers=[1, 2, 3]}, " +
-            "PathSegment{type=1, segmentAsNumbers=[4, 5, 6]}]}";
+            "[PathSegment{type=AS_SEQUENCE, segmentAsNumbers=[1, 2, 3]}, " +
+            "PathSegment{type=AS_SET, segmentAsNumbers=[4, 5, 6]}]}";
         assertThat(asPath.toString(), is(expectedString));
     }
 
@@ -177,8 +177,8 @@
 
         String expectedString =
             "AsPath{pathSegments=" +
-            "[PathSegment{type=2, segmentAsNumbers=[1, 2, 3]}, " +
-            "PathSegment{type=1, segmentAsNumbers=[4, 5, 6]}]}";
+            "[PathSegment{type=AS_SEQUENCE, segmentAsNumbers=[1, 2, 3]}, " +
+            "PathSegment{type=AS_SET, segmentAsNumbers=[4, 5, 6]}]}";
         assertThat(asPath.toString(), is(expectedString));
     }
 }

apps/sdnip/src/test/java/org/onlab/onos/sdnip/bgp/BgpRouteEntryTest.java

diff --git a/apps/sdnip/src/test/java/org/onlab/onos/sdnip/bgp/BgpRouteEntryTest.java b/apps/sdnip/src/test/java/org/onlab/onos/sdnip/bgp/BgpRouteEntryTest.java
index d1ad3d4..318008f 100644
--- a/apps/sdnip/src/test/java/org/onlab/onos/sdnip/bgp/BgpRouteEntryTest.java
+++ b/apps/sdnip/src/test/java/org/onlab/onos/sdnip/bgp/BgpRouteEntryTest.java
@@ -130,9 +130,9 @@
 
         String expectedString =
             "BgpRouteEntry{prefix=1.2.3.0/24, nextHop=5.6.7.8, " +
-            "bgpId=10.0.0.1, origin=0, asPath=AsPath{pathSegments=" +
-            "[PathSegment{type=2, segmentAsNumbers=[1, 2, 3]}, " +
-            "PathSegment{type=1, segmentAsNumbers=[4, 5, 6]}]}, " +
+            "bgpId=10.0.0.1, origin=IGP, asPath=AsPath{pathSegments=" +
+            "[PathSegment{type=AS_SEQUENCE, segmentAsNumbers=[1, 2, 3]}, " +
+            "PathSegment{type=AS_SET, segmentAsNumbers=[4, 5, 6]}]}, " +
             "localPref=100, multiExitDisc=20}";
         assertThat(bgpRouteEntry.toString(), is(expectedString));
     }
@@ -504,9 +504,9 @@
 
         String expectedString =
             "BgpRouteEntry{prefix=1.2.3.0/24, nextHop=5.6.7.8, " +
-            "bgpId=10.0.0.1, origin=0, asPath=AsPath{pathSegments=" +
-            "[PathSegment{type=2, segmentAsNumbers=[1, 2, 3]}, " +
-            "PathSegment{type=1, segmentAsNumbers=[4, 5, 6]}]}, " +
+            "bgpId=10.0.0.1, origin=IGP, asPath=AsPath{pathSegments=" +
+            "[PathSegment{type=AS_SEQUENCE, segmentAsNumbers=[1, 2, 3]}, " +
+            "PathSegment{type=AS_SET, segmentAsNumbers=[4, 5, 6]}]}, " +
             "localPref=100, multiExitDisc=20}";
         assertThat(bgpRouteEntry.toString(), is(expectedString));
     }

apps/sdnip/src/test/java/org/onlab/onos/sdnip/bgp/PathSegmentTest.java

diff --git a/apps/sdnip/src/test/java/org/onlab/onos/sdnip/bgp/PathSegmentTest.java b/apps/sdnip/src/test/java/org/onlab/onos/sdnip/bgp/PathSegmentTest.java
index f11d668..27579de 100644
--- a/apps/sdnip/src/test/java/org/onlab/onos/sdnip/bgp/PathSegmentTest.java
+++ b/apps/sdnip/src/test/java/org/onlab/onos/sdnip/bgp/PathSegmentTest.java
@@ -52,7 +52,7 @@
         BgpRouteEntry.PathSegment pathSegment = generatePathSegment();
 
         String expectedString =
-            "PathSegment{type=2, segmentAsNumbers=[1, 2, 3]}";
+            "PathSegment{type=AS_SEQUENCE, segmentAsNumbers=[1, 2, 3]}";
         assertThat(pathSegment.toString(), is(expectedString));
     }
 
@@ -124,7 +124,7 @@
         BgpRouteEntry.PathSegment pathSegment = generatePathSegment();
 
         String expectedString =
-            "PathSegment{type=2, segmentAsNumbers=[1, 2, 3]}";
+            "PathSegment{type=AS_SEQUENCE, segmentAsNumbers=[1, 2, 3]}";
         assertThat(pathSegment.toString(), is(expectedString));
     }
 }