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 fd5a017f46..fddd895bd0 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 @@ public class AsPathTest { 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 @@ public class AsPathTest { 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)); } } 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 d1ad3d4508..318008fb95 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 @@ public class BgpRouteEntryTest { 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 @@ public class BgpRouteEntryTest { 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)); } 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 f11d668706..27579de14a 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 @@ public class PathSegmentTest { 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 @@ public class PathSegmentTest { 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)); } }