From 5bbd9feb84660d06fe635a0cd4cbdf45b110665c Mon Sep 17 00:00:00 2001 From: Michal Cmarada Date: Tue, 25 Sep 2018 11:21:09 +0200 Subject: Fix bugs after bumping to Fluorine ODL dependencies (HONEYCOMB-433) Change-Id: I99b630f97144770849679a04efccaf7fc9868cb6 Signed-off-by: Michal Cmarada --- .../io/fd/hc2vpp/srv6/read/policy/NamedSegmentCustomizerTest.java | 2 +- .../test/java/io/fd/hc2vpp/srv6/read/policy/PolicyCustomizerTest.java | 2 +- .../test/java/io/fd/hc2vpp/srv6/read/sid/LocatorCustomizerTest.java | 2 +- .../src/test/java/io/fd/hc2vpp/srv6/read/sid/SidCustomizerTest.java | 2 +- .../io/fd/hc2vpp/srv6/read/sid/request/LocatorReadRequestTest.java | 2 +- .../java/io/fd/hc2vpp/srv6/read/steering/InterfaceCustomizerTest.java | 2 +- .../java/io/fd/hc2vpp/srv6/read/steering/PrefixCustomizerTest.java | 2 +- .../srv6/util/function/LocalSidFunctionBindingRegistryTest.java | 4 ++-- .../java/io/fd/hc2vpp/srv6/write/policy/PolicyCustomizerTest.java | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) (limited to 'srv6/srv6-impl/src/test') diff --git a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/read/policy/NamedSegmentCustomizerTest.java b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/read/policy/NamedSegmentCustomizerTest.java index 6cc2f555d..d75477e94 100644 --- a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/read/policy/NamedSegmentCustomizerTest.java +++ b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/read/policy/NamedSegmentCustomizerTest.java @@ -53,7 +53,7 @@ public class NamedSegmentCustomizerTest extends PoliciesTest { key = Srv6PolicyIIds.SR_TE_NSLS.child(NamedSegmentList.class, SEGMENT_KEY_1); customizer.readCurrentAttributes(key, segmentListBuilder, readCtx); - Assert.assertEquals(SEGMENT_KEY_1, segmentListBuilder.getKey()); + Assert.assertEquals(SEGMENT_KEY_1, segmentListBuilder.key()); Assert.assertEquals(SEGMENT_KEY_1.getName(), segmentListBuilder.getName()); Assert.assertNotNull(customizer.getBuilder(key)); diff --git a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/read/policy/PolicyCustomizerTest.java b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/read/policy/PolicyCustomizerTest.java index 49c3942c5..f7ea33281 100644 --- a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/read/policy/PolicyCustomizerTest.java +++ b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/read/policy/PolicyCustomizerTest.java @@ -87,7 +87,7 @@ public class PolicyCustomizerTest extends PoliciesTest { KeyedInstanceIdentifier key = Srv6PolicyIIds.SR_TE_PLS.child(Policy.class, POLICY_KEY); customizer.readCurrentAttributes(key, policyBuilder, readCtx); - Assert.assertEquals(POLICY_KEY, policyBuilder.getKey()); + Assert.assertEquals(POLICY_KEY, policyBuilder.key()); Assert.assertEquals(BSID_ADR.getValue(), policyBuilder.getName()); Assert.assertNotNull(customizer.getBuilder(key)); diff --git a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/read/sid/LocatorCustomizerTest.java b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/read/sid/LocatorCustomizerTest.java index 3f2a74fd7..963bc664d 100644 --- a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/read/sid/LocatorCustomizerTest.java +++ b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/read/sid/LocatorCustomizerTest.java @@ -89,7 +89,7 @@ public class LocatorCustomizerTest extends LocalSidRequestTest { LocatorCustomizer customizer = new LocatorCustomizer(api, locatorContext); LocatorBuilder builder = new LocatorBuilder(); customizer.readCurrentAttributes(SID_A_101.firstIdentifierOf(Locator.class), builder, readCtx); - Assert.assertEquals(SID_A_101.firstKeyOf(Locator.class), builder.getKey()); + Assert.assertEquals(SID_A_101.firstKeyOf(Locator.class), builder.key()); Assert.assertNotNull(customizer.getBuilder(SID_A_101.firstIdentifierOf(Locator.class))); LocatorsBuilder parentBuilder = new LocatorsBuilder(); diff --git a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/read/sid/SidCustomizerTest.java b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/read/sid/SidCustomizerTest.java index 419c431ed..237a158dc 100644 --- a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/read/sid/SidCustomizerTest.java +++ b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/read/sid/SidCustomizerTest.java @@ -96,7 +96,7 @@ public class SidCustomizerTest extends LocalSidRequestTest { SidCustomizer customizer = new SidCustomizer(api, READ_REGISTRY, locatorContext); SidBuilder builder = new SidBuilder(); customizer.readCurrentAttributes(SID_A_101, builder, readCtx); - Assert.assertEquals(SID_A_101.firstKeyOf(Sid.class), builder.getKey()); + Assert.assertEquals(SID_A_101.firstKeyOf(Sid.class), builder.key()); Assert.assertNotNull(builder.getEnd()); Assert.assertNotNull(customizer.getBuilder(SID_A_101)); diff --git a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/read/sid/request/LocatorReadRequestTest.java b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/read/sid/request/LocatorReadRequestTest.java index 404aa6b9d..68806c2af 100644 --- a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/read/sid/request/LocatorReadRequestTest.java +++ b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/read/sid/request/LocatorReadRequestTest.java @@ -136,6 +136,6 @@ public class LocatorReadRequestTest extends LocalSidRequestTest { LocatorBuilder builder = new LocatorBuilder(); request.readSpecific(ID_LOC, readCtx, builder); - Assert.assertEquals(new LocatorKey("a::"), builder.getKey()); + Assert.assertEquals(new LocatorKey("a::"), builder.key()); } } diff --git a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/read/steering/InterfaceCustomizerTest.java b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/read/steering/InterfaceCustomizerTest.java index bc5ad681f..e97b3f800 100644 --- a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/read/steering/InterfaceCustomizerTest.java +++ b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/read/steering/InterfaceCustomizerTest.java @@ -67,7 +67,7 @@ public class InterfaceCustomizerTest extends SteeringTest { InterfaceBuilder builder = customizer.getBuilder(key); customizer.readCurrentAttributes(key, builder, readCtx); - Assert.assertEquals(L2_KEY, builder.getKey()); + Assert.assertEquals(L2_KEY, builder.key()); Assert.assertEquals(LOCAL_0, builder.getInputInterface()); InterfacesBuilder policyBuilder = new InterfacesBuilder(); diff --git a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/read/steering/PrefixCustomizerTest.java b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/read/steering/PrefixCustomizerTest.java index 56850078f..ab0ceea86 100644 --- a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/read/steering/PrefixCustomizerTest.java +++ b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/read/steering/PrefixCustomizerTest.java @@ -55,7 +55,7 @@ public class PrefixCustomizerTest extends SteeringTest { customizer.readCurrentAttributes(key, builder, readCtx); - Assert.assertEquals(L3_KEY, builder.getKey()); + Assert.assertEquals(L3_KEY, builder.key()); Assert.assertEquals(IPV6_PREFIX, builder.getIpPrefix()); PrefixesBuilder policyBuilder = new PrefixesBuilder(); diff --git a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/util/function/LocalSidFunctionBindingRegistryTest.java b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/util/function/LocalSidFunctionBindingRegistryTest.java index 998916ee1..b6162a7a5 100644 --- a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/util/function/LocalSidFunctionBindingRegistryTest.java +++ b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/util/function/LocalSidFunctionBindingRegistryTest.java @@ -94,11 +94,11 @@ public class LocalSidFunctionBindingRegistryTest extends JvppRequestTest { when(readCtx.getMappingContext()).thenReturn(mappingContext); when(ctx.readAfter(FibManagementIIds.FM_FIB_TABLES.child(Table.class, TABLE_4_IPV6_KEY))) .thenReturn(Optional.of( - new TableBuilder().setTableId(TABLE_4_IPV6_KEY.getTableId()).setKey(TABLE_4_IPV6_KEY) + new TableBuilder().setTableId(TABLE_4_IPV6_KEY.getTableId()).withKey(TABLE_4_IPV6_KEY) .setAddressFamily(TABLE_4_IPV6_KEY.getAddressFamily()).build())); when(ctx.readAfter(FibManagementIIds.FM_FIB_TABLES.child(Table.class, TABLE_4_IPV4_KEY))) .thenReturn(Optional.of( - new TableBuilder().setTableId(TABLE_4_IPV4_KEY.getTableId()).setKey(TABLE_4_IPV4_KEY) + new TableBuilder().setTableId(TABLE_4_IPV4_KEY.getTableId()).withKey(TABLE_4_IPV4_KEY) .setAddressFamily(TABLE_4_IPV4_KEY.getAddressFamily()).build())); } diff --git a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/write/policy/PolicyCustomizerTest.java b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/write/policy/PolicyCustomizerTest.java index 80a3149e2..846478ddf 100644 --- a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/write/policy/PolicyCustomizerTest.java +++ b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/write/policy/PolicyCustomizerTest.java @@ -71,7 +71,7 @@ public class PolicyCustomizerTest extends JvppRequestTest { private static final PolicyKey POLICY_KEY = new PolicyKey(1L, new IpAddress(new Ipv6Address("e::1"))); private static final KeyedInstanceIdentifier VRF_IID = FibManagementIIds.FM_FIB_TABLES.child(Table.class, new TableKey(Ipv6.class, TABLE_ID)); - private static final Table VRF_TABLE = new TableBuilder().setKey(VRF_IID.getKey()).setAddressFamily(Ipv6.class) + private static final Table VRF_TABLE = new TableBuilder().withKey(VRF_IID.getKey()).setAddressFamily(Ipv6.class) .setTableId(TABLE_ID).setName("VRF-0").build(); @InjectTestData(resourcePath = "/named-segments.json", id = NAMED_SEG_LISTS_PATH) -- cgit 1.2.3-korg