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 --- .../java/io/fd/hc2vpp/v3po/interfaces/InterfaceRoutingCustomizer.java | 2 +- .../java/io/fd/hc2vpp/v3po/interfacesstate/RewriteCustomizer.java | 2 +- .../io/fd/hc2vpp/v3po/interfacesstate/SubInterfaceCustomizer.java | 4 ++-- .../interfacesstate/span/AbstractMirroredInterfacesCustomizer.java | 2 +- .../interfacesstate/span/InterfaceMirroredInterfacesCustomizer.java | 2 +- .../span/SubInterfaceMirroredInterfacesCustomizer.java | 2 +- .../src/main/java/io/fd/hc2vpp/v3po/l2/BridgeDomainCustomizer.java | 2 +- .../src/main/java/io/fd/hc2vpp/v3po/l2state/L2FibEntryCustomizer.java | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) (limited to 'v3po/v3po2vpp/src/main') diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/InterfaceRoutingCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/InterfaceRoutingCustomizer.java index 33bd2c841..35cbd9187 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/InterfaceRoutingCustomizer.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/InterfaceRoutingCustomizer.java @@ -89,7 +89,7 @@ public class InterfaceRoutingCustomizer extends RoutingCustomizer if (interfaceData.isPresent()) { final java.util.Optional augData = java.util.Optional.of(interfaceData.get()) - .map(iface -> iface.getAugmentation(Interface1.class)); + .map(iface -> iface.augmentation(Interface1.class)); final boolean v4NotPresent = augData.map(Interface1::getIpv4).map(Ipv4::getAddress).map(List::isEmpty).orElse(true); diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/RewriteCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/RewriteCustomizer.java index 7eeca2435..ea0506ca7 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/RewriteCustomizer.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/RewriteCustomizer.java @@ -132,7 +132,7 @@ public class RewriteCustomizer private PushTags buildTag(final short index, final Class tagType, final int vlanId) { final PushTagsBuilder tag = new PushTagsBuilder(); tag.setIndex(index); - tag.setKey(new PushTagsKey(index)); + tag.withKey(new PushTagsKey(index)); final Dot1qTagBuilder dtag = new Dot1qTagBuilder(); dtag.setTagType(tagType); dtag.setVlanId(new Dot1qVlanId(vlanId)); diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/SubInterfaceCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/SubInterfaceCustomizer.java index 50e866fa0..b6baf3407 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/SubInterfaceCustomizer.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/SubInterfaceCustomizer.java @@ -98,7 +98,7 @@ public class SubInterfaceCustomizer extends FutureJVppCustomizer final Dot1qTag.VlanId vlanId) { TagBuilder tag = new TagBuilder(); tag.setIndex(index); - tag.setKey(new TagKey(index)); + tag.withKey(new TagKey(index)); final Dot1qTagBuilder dtag = new Dot1qTagBuilder(); dtag.setTagType(tagType); dtag.setVlanId(vlanId); @@ -157,7 +157,7 @@ public class SubInterfaceCustomizer extends FutureJVppCustomizer checkState(isSubInterface(iface), "Interface returned by the VPP is not a sub-interface"); builder.setIdentifier((long) iface.subId); - builder.setKey(new SubInterfaceKey(builder.getIdentifier())); + builder.withKey(new SubInterfaceKey(builder.getIdentifier())); // sub-interface-base-attributes: builder.setTags(readTags(iface)); diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/span/AbstractMirroredInterfacesCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/span/AbstractMirroredInterfacesCustomizer.java index 0a6537bc0..de890e044 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/span/AbstractMirroredInterfacesCustomizer.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/span/AbstractMirroredInterfacesCustomizer.java @@ -88,7 +88,7 @@ abstract class AbstractMirroredInterfacesCustomizer ifcContext.getName(detail.swIfIndexFrom, ctx.getMappingContext()); return new MirroredInterfaceBuilder() .setIfaceRef(interfaceName) - .setKey(new MirroredInterfaceKey(interfaceName)) + .withKey(new MirroredInterfaceKey(interfaceName)) .setState(SpanState.forValue(detail.state)) .build(); } diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/span/InterfaceMirroredInterfacesCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/span/InterfaceMirroredInterfacesCustomizer.java index f70f4f5a1..5d84a8d7e 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/span/InterfaceMirroredInterfacesCustomizer.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/span/InterfaceMirroredInterfacesCustomizer.java @@ -63,7 +63,7 @@ public class InterfaceMirroredInterfacesCustomizer extends AbstractMirroredInter .stream() .map(mirroredInterface -> new MirroredInterfaceBuilder() .setState(mirroredInterface.getState()) - .setKey(new MirroredInterfaceKey(mirroredInterface.getKey().getIfaceRef())) + .withKey(new MirroredInterfaceKey(mirroredInterface.key().getIfaceRef())) .setIfaceRef(mirroredInterface.getIfaceRef()) .build()) .collect(Collectors.toList())) diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/span/SubInterfaceMirroredInterfacesCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/span/SubInterfaceMirroredInterfacesCustomizer.java index 3cbeceeb3..5b4315719 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/span/SubInterfaceMirroredInterfacesCustomizer.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/span/SubInterfaceMirroredInterfacesCustomizer.java @@ -65,7 +65,7 @@ public class SubInterfaceMirroredInterfacesCustomizer extends AbstractMirroredIn Optional.ofNullable(readValue.getMirroredInterface()).orElse(Collections.emptyList()) .stream() .map(mirroredInterface -> new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev180703.span.attributes.mirrored.interfaces.MirroredInterfaceBuilder() - .setKey(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev180703.span.attributes.mirrored.interfaces.MirroredInterfaceKey(mirroredInterface.getKey().getIfaceRef())) + .withKey(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev180703.span.attributes.mirrored.interfaces.MirroredInterfaceKey(mirroredInterface.key().getIfaceRef())) .setIfaceRef(mirroredInterface.getIfaceRef()) .setState(mirroredInterface.getState()) .build()) diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/l2/BridgeDomainCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/l2/BridgeDomainCustomizer.java index 0ae2a86fe..1723190af 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/l2/BridgeDomainCustomizer.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/l2/BridgeDomainCustomizer.java @@ -127,7 +127,7 @@ public class BridgeDomainCustomizer extends FutureJVppCustomizer checkReferenceExist(id, Optional.ofNullable(after.get().getInterface()) .orElse(Collections.emptyList()) .stream() - .map(iface -> Optional.ofNullable(iface.getAugmentation(VppInterfaceAugmentation.class)) + .map(iface -> Optional.ofNullable(iface.augmentation(VppInterfaceAugmentation.class)) .map(VppInterfaceAugmentation::getL2) .map(L2ConfigAttributes::getInterconnection) .orElse(null)) diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/l2state/L2FibEntryCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/l2state/L2FibEntryCustomizer.java index 772f6bf8e..ed286317b 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/l2state/L2FibEntryCustomizer.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/l2state/L2FibEntryCustomizer.java @@ -97,7 +97,7 @@ public final class L2FibEntryCustomizer extends FutureJVppCustomizer } builder.setStaticConfig(byteToBoolean(entry.staticMac)); builder.setPhysAddress(key.getPhysAddress()); - builder.setKey(key); + builder.withKey(key); } catch (Exception e) { throw new ReadFailedException(id, e); } -- cgit 1.2.3-korg