From 2cdf4dece347e8570241fbc78638f7a7ba577bbf Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 31 Aug 2016 23:41:05 +0200 Subject: [PATCH 1/1] BUG-6497: fixup augmentation lookup This fixes the augmentations being looked up so they correspond to the model. It also makes sure we squash them to minimum required interface, as that is all we require. Change-Id: I227e35a3cba596d41bcedaddf3b0196c18b0874b Signed-off-by: Robert Varga --- .../impl/BGPOpenConfigMappingServiceImpl.java | 15 ++++++++------- .../protocol/bgp/rib/impl/config/BgpPeer.java | 1 - 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/bgp/openconfig-impl/src/main/java/org/opendaylight/protocol/bgp/openconfig/impl/BGPOpenConfigMappingServiceImpl.java b/bgp/openconfig-impl/src/main/java/org/opendaylight/protocol/bgp/openconfig/impl/BGPOpenConfigMappingServiceImpl.java index 9e1ecb9d1c..b33c722c55 100644 --- a/bgp/openconfig-impl/src/main/java/org/opendaylight/protocol/bgp/openconfig/impl/BGPOpenConfigMappingServiceImpl.java +++ b/bgp/openconfig-impl/src/main/java/org/opendaylight/protocol/bgp/openconfig/impl/BGPOpenConfigMappingServiceImpl.java @@ -24,6 +24,7 @@ import org.opendaylight.protocol.bgp.mode.impl.add.n.paths.AddPathBestNPathSelec import org.opendaylight.protocol.bgp.openconfig.impl.util.OpenConfigUtil; import org.opendaylight.protocol.bgp.openconfig.spi.BGPOpenConfigMappingService; import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.multiprotocol.rev151009.bgp.common.afi.safi.list.AfiSafi; +import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.rev151009.BgpNeighborAddPathsConfig; import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.rev151009.bgp.global.base.AfiSafisBuilder; import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.rev151009.bgp.global.base.ConfigBuilder; import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.rev151009.bgp.neighbor.group.RouteReflectorBuilder; @@ -92,10 +93,10 @@ public final class BGPOpenConfigMappingServiceImpl implements BGPOpenConfigMappi public Map toPathSelectionMode(final List afiSafis) { final Map pathSelectionModes = new HashMap<>(); for (final AfiSafi afiSafi : afiSafis) { - final AfiSafi1 afiSafi1 = afiSafi.getAugmentation(AfiSafi1.class); + final BgpNeighborAddPathsConfig afiSafi2 = afiSafi.getAugmentation(AfiSafi2.class); final Optional bgpTableType = OpenConfigUtil.toBgpTableType(afiSafi.getAfiSafiName()); - if (afiSafi1 != null && bgpTableType.isPresent()) { - final Short sendMax = afiSafi1.getSendMax(); + if (afiSafi2 != null && bgpTableType.isPresent()) { + final Short sendMax = afiSafi2.getSendMax(); final PathSelectionMode selectionMode; if (sendMax > 1) { selectionMode = new AddPathBestNPathSelection(sendMax.longValue()); @@ -122,18 +123,18 @@ public final class BGPOpenConfigMappingServiceImpl implements BGPOpenConfigMappi public List toAddPathCapability(final List afiSafis) { final List addPathCapability = new ArrayList<>(); for (final AfiSafi afiSafi : afiSafis) { - final AfiSafi2 afiSafi2 = afiSafi.getAugmentation(AfiSafi2.class); + final BgpNeighborAddPathsConfig afiSafi1 = afiSafi.getAugmentation(AfiSafi1.class); final Optional bgpTableType = OpenConfigUtil.toBgpTableType(afiSafi.getAfiSafiName()); - if (afiSafi2 != null && bgpTableType.isPresent()) { + if (afiSafi1 != null && bgpTableType.isPresent()) { final AddressFamiliesBuilder builder = new AddressFamiliesBuilder(bgpTableType.get()); - builder.setSendReceive(toSendReceiveMode(afiSafi2)); + builder.setSendReceive(toSendReceiveMode(afiSafi1)); addPathCapability.add(builder.build()); } } return addPathCapability; } - private static SendReceive toSendReceiveMode(final AfiSafi2 addPath) { + private static SendReceive toSendReceiveMode(final BgpNeighborAddPathsConfig addPath) { if (addPath.isReceive() && addPath.getSendMax() != null) { return SendReceive.Both; } diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/BgpPeer.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/BgpPeer.java index cc6a802e31..97247230c9 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/BgpPeer.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/BgpPeer.java @@ -56,7 +56,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mult import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev130919.mp.capabilities.AddPathCapabilityBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev130919.mp.capabilities.MultiprotocolCapabilityBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev130919.mp.capabilities.add.path.capability.AddressFamilies; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.openconfig.extensions.rev160614.AfiSafi2; import org.osgi.framework.ServiceRegistration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -- 2.36.6