public void readCurrentAttributes(@Nonnull final InstanceIdentifier<Acl> id, @Nonnull final AclBuilder builder,
@Nonnull final ReadContext ctx) throws ReadFailedException {
final AclKey key = id.firstKeyOf(Acl.class);
- builder.setKey(key);
+ builder.withKey(key);
final Class<? extends AclBase> aclType = key.getAclType();
final String name = key.getAclName();
final String aceName = macipAclContext.getAceName(aclName, i++, mappingContext);
ace.setRuleName(aceName);
- ace.setKey(new AceKey(aceName));
+ ace.withKey(new AceKey(aceName));
aces.add(ace.build());
}
final String aceName = standardAclContext.getAceName(aclName, i++, mappingContext);
ace.setRuleName(aceName);
- ace.setKey(new AceKey(aceName));
+ ace.withKey(new AceKey(aceName));
aces.add(ace.build());
}
return aces;
* Convert {@link Acl} tag to byte array in US_ASCII
*/
default byte[] getAclTag(@Nonnull final Acl acl) {
- final VppAclAugmentation augmentation = acl.getAugmentation(VppAclAugmentation.class);
+ final VppAclAugmentation augmentation = acl.augmentation(VppAclAugmentation.class);
if (augmentation != null && augmentation.getTag() != null) {
return augmentation.getTag().getBytes(StandardCharsets.US_ASCII);
}
if (aclType.equals(VppAcl.class)) {
return interfaces.stream()
- .filter(iface -> ofNullable(iface.getAugmentation(VppAclInterfaceAugmentation.class))
+ .filter(iface -> ofNullable(iface.augmentation(VppAclInterfaceAugmentation.class))
.map(InterfaceAclAttributes::getAcl)
.filter(references ->
checkVppAcls(references.getIngress(), aclName) ||
).collect(Collectors.toList());
} else if (aclType.equals(VppMacipAcl.class)) {
return interfaces.stream()
- .filter(iface -> ofNullable(iface.getAugmentation(VppAclInterfaceAugmentation.class))
+ .filter(iface -> ofNullable(iface.augmentation(VppAclInterfaceAugmentation.class))
.map(InterfaceAclAttributes::getAcl)
.map(aclAttr -> aclAttr.getIngress())
.map(VppMacipAclsBaseAttributes::getVppMacipAcl)
public void testReadStandardAcl() throws ReadFailedException {
final AclBuilder builder = new AclBuilder();
getCustomizer().readCurrentAttributes(ACL_IID, builder, ctx);
- assertEquals(ACL_IID.getKey(), builder.getKey());
+ assertEquals(ACL_IID.getKey(), builder.key());
final List<Ace> aces = builder.getAccessListEntries().getAce();
assertEquals(1, aces.size());
final Ace ace = aces.get(0);
- assertEquals(ACE_NAME, ace.getKey().getRuleName());
+ assertEquals(ACE_NAME, ace.key().getRuleName());
assertTrue(ace.getActions().getPacketHandling() instanceof Deny);
final VppAceNodes nodes = ((VppAce) (ace.getMatches().getAceType())).getVppAceNodes();
assertEquals(PROTOCOL, ((Other) nodes.getIpProtocol()).getOtherNodes().getProtocol().shortValue());
public void testReadMacipAcl() throws ReadFailedException {
final AclBuilder builder = new AclBuilder();
getCustomizer().readCurrentAttributes(MACIP_ACL_IID, builder, ctx);
- assertEquals(MACIP_ACL_IID.getKey(), builder.getKey());
+ assertEquals(MACIP_ACL_IID.getKey(), builder.key());
final List<Ace> aces = builder.getAccessListEntries().getAce();
assertEquals(1, aces.size());
final Ace ace = aces.get(0);
- assertEquals(MACIP_ACE_NAME, ace.getKey().getRuleName());
+ assertEquals(MACIP_ACE_NAME, ace.key().getRuleName());
assertTrue(ace.getActions().getPacketHandling() instanceof Deny);
}
}
\ No newline at end of file
import io.fd.vpp.jvpp.core.dto.MplsRouteAddDel;
import io.fd.vpp.jvpp.core.future.FutureJVppCore;
import javax.annotation.Nonnull;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.labeled.unicast.rev171207.labeled.unicast.routes.LabeledUnicastRoutes;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.labeled.unicast.rev171207.labeled.unicast.routes.list.LabeledUnicastRoute;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev171207.BgpRib;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev171207.bgp.rib.Rib;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev171207.bgp.rib.rib.LocRib;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev171207.rib.Tables;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.labeled.unicast.rev180329.labeled.unicast.routes.LabeledUnicastRoutes;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.labeled.unicast.rev180329.labeled.unicast.routes.list.LabeledUnicastRoute;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.BgpRib;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.bgp.rib.Rib;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.bgp.rib.rib.LocRib;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.rib.Tables;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpPrefix;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Prefix;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.labeled.unicast.rev171207.labeled.unicast.LabelStack;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.labeled.unicast.rev171207.labeled.unicast.routes.list.LabeledUnicastRoute;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.next.hop.CNextHop;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.next.hop.c.next.hop.Ipv4NextHopCase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.labeled.unicast.rev180329.labeled.unicast.LabelStack;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.labeled.unicast.rev180329.labeled.unicast.routes.list.LabeledUnicastRoute;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.next.hop.CNextHop;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.next.hop.c.next.hop.Ipv4NextHopCase;
interface IpRouteRequestProducer {
/**
import java.util.List;
import javax.annotation.Nonnull;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.labeled.unicast.rev171207.LabelIndexTlv;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.labeled.unicast.rev171207.OriginatorSrgbTlv;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.labeled.unicast.rev171207.labeled.unicast.LabelStack;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.labeled.unicast.rev171207.labeled.unicast.routes.list.LabeledUnicastRoute;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.labeled.unicast.rev171207.originator.srgb.tlv.SrgbValue;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev171207.path.attributes.attributes.BgpPrefixSid;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev171207.path.attributes.attributes.bgp.prefix.sid.BgpPrefixSidTlvs;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev171207.path.attributes.attributes.bgp.prefix.sid.bgp.prefix.sid.tlvs.BgpPrefixSidTlv;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.next.hop.CNextHop;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.next.hop.c.next.hop.Ipv4NextHopCase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.labeled.unicast.rev180329.LabelIndexTlv;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.labeled.unicast.rev180329.OriginatorSrgbTlv;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.labeled.unicast.rev180329.labeled.unicast.LabelStack;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.labeled.unicast.rev180329.labeled.unicast.routes.list.LabeledUnicastRoute;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.labeled.unicast.rev180329.originator.srgb.tlv.SrgbValue;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.attributes.BgpPrefixSid;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.attributes.bgp.prefix.sid.BgpPrefixSidTlvs;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.attributes.bgp.prefix.sid.bgp.prefix.sid.tlvs.BgpPrefixSidTlv;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.next.hop.CNextHop;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.next.hop.c.next.hop.Ipv4NextHopCase;
import org.slf4j.Logger;
interface MplsRouteRequestProducer extends Ipv4Translator {
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4AddressNoZone;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Prefix;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.labeled.unicast.rev171207.LabeledUnicastRoutes;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.labeled.unicast.rev171207.Srgb;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.labeled.unicast.rev171207.labeled.unicast.LabelStackBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.labeled.unicast.rev171207.labeled.unicast.routes.list.LabeledUnicastRoute;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.labeled.unicast.rev171207.labeled.unicast.routes.list.LabeledUnicastRouteBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.labeled.unicast.rev171207.labeled.unicast.routes.list.LabeledUnicastRouteKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.labeled.unicast.rev171207.labeled.unicast.routes.list.labeled.unicast.route.attributes.bgp.prefix.sid.bgp.prefix.sid.tlvs.bgp.prefix.sid.tlv.LuOriginatorSrgbTlvBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.labeled.unicast.rev171207.originator.srgb.tlv.SrgbValueBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.labeled.unicast.rev171207.update.attributes.bgp.prefix.sid.bgp.prefix.sid.tlvs.bgp.prefix.sid.tlv.LuLabelIndexTlvBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev171207.PathId;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev171207.path.attributes.AttributesBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev171207.path.attributes.attributes.BgpPrefixSid;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev171207.path.attributes.attributes.BgpPrefixSidBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev171207.path.attributes.attributes.bgp.prefix.sid.BgpPrefixSidTlvs;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev171207.path.attributes.attributes.bgp.prefix.sid.BgpPrefixSidTlvsBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev171207.BgpRib;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev171207.RibId;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev171207.bgp.rib.Rib;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev171207.bgp.rib.RibKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev171207.bgp.rib.rib.LocRib;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev171207.rib.Tables;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev171207.rib.TablesKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.Ipv4AddressFamily;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.UnicastSubsequentAddressFamily;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.next.hop.c.next.hop.Ipv4NextHopCase;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.next.hop.c.next.hop.Ipv4NextHopCaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.next.hop.c.next.hop.ipv4.next.hop._case.Ipv4NextHopBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.labeled.unicast.rev180329.LabeledUnicastRoutes;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.labeled.unicast.rev180329.Srgb;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.labeled.unicast.rev180329.labeled.unicast.LabelStackBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.labeled.unicast.rev180329.labeled.unicast.routes.list.LabeledUnicastRoute;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.labeled.unicast.rev180329.labeled.unicast.routes.list.LabeledUnicastRouteBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.labeled.unicast.rev180329.labeled.unicast.routes.list.LabeledUnicastRouteKey;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.labeled.unicast.rev180329.labeled.unicast.routes.list.labeled.unicast.route.attributes.bgp.prefix.sid.bgp.prefix.sid.tlvs.bgp.prefix.sid.tlv.LuOriginatorSrgbTlvBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.labeled.unicast.rev180329.originator.srgb.tlv.SrgbValueBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.labeled.unicast.rev180329.update.attributes.bgp.prefix.sid.bgp.prefix.sid.tlvs.bgp.prefix.sid.tlv.LuLabelIndexTlvBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.PathId;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.AttributesBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.attributes.BgpPrefixSid;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.attributes.BgpPrefixSidBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.attributes.bgp.prefix.sid.BgpPrefixSidTlvs;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.attributes.bgp.prefix.sid.BgpPrefixSidTlvsBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.BgpRib;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.RibId;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.bgp.rib.Rib;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.bgp.rib.RibKey;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.bgp.rib.rib.LocRib;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.rib.Tables;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.rib.TablesKey;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.Ipv4AddressFamily;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.UnicastSubsequentAddressFamily;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.next.hop.c.next.hop.Ipv4NextHopCase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.next.hop.c.next.hop.Ipv4NextHopCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.next.hop.c.next.hop.ipv4.next.hop._case.Ipv4NextHopBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.network.concepts.rev131125.MplsLabel;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
.build();
final IpPrefix prefix = new IpPrefix(new Ipv4Prefix("1.2.3.4/24"));
return new LabeledUnicastRouteBuilder()
- .setKey(new LabeledUnicastRouteKey(pathId, routeKey))
+ .withKey(new LabeledUnicastRouteKey(pathId, routeKey))
.setPathId(pathId)
.setPrefix(prefix)
.setAttributes(new AttributesBuilder()
],
"body": {
"mode": "raw",
- "raw": "<ipv4-route xmlns=\"urn:opendaylight:params:xml:ns:yang:bgp-inet\">\n <path-id>0</path-id>\n <prefix>10.0.0.11/32</prefix>\n <attributes>\n <as-path></as-path>\n <origin>\n <value>igp</value>\n </origin>\n <local-pref>\n <pref>100</pref>\n </local-pref>\n <ipv4-next-hop>\n <global>10.11.1.1</global>\n </ipv4-next-hop>\n </attributes>\n</ipv4-route>"
+ "raw": "<ipv4-route xmlns=\"urn:opendaylight:params:xml:ns:yang:bgp-inet\">\n <
route-key>10.0.0.11/32</route-key>\n <path-id>0</path-id>\n <prefix>10.0.0.11/32</prefix>\n <attributes>\n <as-path></as-path>\n <origin>\n <value>igp</value>\n </origin>\n <local-pref>\n <pref>100</pref>\n </local-pref>\n <ipv4-next-hop>\n <global>10.11.1.1</global>\n </ipv4-next-hop>\n </attributes>\n</ipv4-route>"
},
"url": {
"raw": "http://localhost:8183/restconf/config/bgp-rib:application-rib/10.25.1.9/tables/bgp-types:ipv4-address-family/bgp-types:unicast-subsequent-address-family/bgp-inet:ipv4-routes/ipv4-route/10.0.0.11%2F32/0",
],
"body": {
"mode": "raw",
- "raw": "<ipv4-route xmlns=\"urn:opendaylight:params:xml:ns:yang:bgp-inet\">\n <path-id>0</path-id>\n <prefix>10.0.0.12/32</prefix>\n <attributes>\n <as-path></as-path>\n <origin>\n <value>igp</value>\n </origin>\n <local-pref>\n <pref>100</pref>\n </local-pref>\n <ipv4-next-hop>\n <global>10.11.1.1</global>\n </ipv4-next-hop>\n </attributes>\n</ipv4-route>"
+ "raw": "<ipv4-route xmlns=\"urn:opendaylight:params:xml:ns:yang:bgp-inet\">\n <
route-key>10.0.0.12/32</route-key>\n <path-id>0</path-id>\n <prefix>10.0.0.12/32</prefix>\n <attributes>\n <as-path></as-path>\n <origin>\n <value>igp</value>\n </origin>\n <local-pref>\n <pref>100</pref>\n </local-pref>\n <ipv4-next-hop>\n <global>10.11.1.1</global>\n </ipv4-next-hop>\n </attributes>\n</ipv4-route>"
},
"url": {
"raw": "http://localhost:8183/restconf/config/bgp-rib:application-rib/10.25.1.9/tables/bgp-types:ipv4-address-family/bgp-types:unicast-subsequent-address-family/bgp-inet:ipv4-routes/ipv4-route/10.0.0.12%2F32/0",
],
"body": {
"mode": "raw",
- "raw": "<ipv4-route xmlns=\"urn:opendaylight:params:xml:ns:yang:bgp-inet\">\n <path-id>0</path-id>\n <prefix>10.0.0.12/32</prefix>\n <attributes>\n <as-path></as-path>\n <origin>\n <value>igp</value>\n </origin>\n <local-pref>\n <pref>102</pref>\n </local-pref>\n <ipv4-next-hop>\n <global>10.11.1.1</global>\n </ipv4-next-hop>\n </attributes>\n</ipv4-route>"
+ "raw": "<ipv4-route xmlns=\"urn:opendaylight:params:xml:ns:yang:bgp-inet\">\n <
route-key>10.0.0.12/32</route-key>\n <path-id>0</path-id>\n <prefix>10.0.0.12/32</prefix>\n <attributes>\n <as-path></as-path>\n <origin>\n <value>igp</value>\n </origin>\n <local-pref>\n <pref>102</pref>\n </local-pref>\n <ipv4-next-hop>\n <global>10.11.1.1</global>\n </ipv4-next-hop>\n </attributes>\n</ipv4-route>"
},
"url": {
"raw": "http://localhost:8183/restconf/config/bgp-rib:application-rib/10.25.1.9/tables/bgp-types:ipv4-address-family/bgp-types:unicast-subsequent-address-family/bgp-inet:ipv4-routes/ipv4-route/10.0.0.12%2F32/0",
import javax.annotation.Nonnull;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Prefix;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev171207.ipv4.routes.Ipv4Routes;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev171207.ipv4.routes.ipv4.routes.Ipv4Route;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev171207.BgpRib;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev171207.bgp.rib.Rib;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev171207.bgp.rib.rib.LocRib;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev171207.rib.Tables;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.next.hop.CNextHop;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.next.hop.c.next.hop.Ipv4NextHopCase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev180329.ipv4.routes.Ipv4Routes;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev180329.ipv4.routes.ipv4.routes.Ipv4Route;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.BgpRib;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.bgp.rib.Rib;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.bgp.rib.rib.LocRib;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.rib.Tables;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.next.hop.CNextHop;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.next.hop.c.next.hop.Ipv4NextHopCase;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.annotation.Nonnull;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Address;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Prefix;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev171207.ipv6.routes.Ipv6Routes;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev171207.ipv6.routes.ipv6.routes.Ipv6Route;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev171207.BgpRib;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev171207.bgp.rib.Rib;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev171207.bgp.rib.rib.LocRib;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev171207.rib.Tables;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.next.hop.CNextHop;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.next.hop.c.next.hop.Ipv6NextHopCase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev180329.ipv6.routes.Ipv6Routes;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev180329.ipv6.routes.ipv6.routes.Ipv6Route;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.BgpRib;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.bgp.rib.Rib;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.bgp.rib.rib.LocRib;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.rib.Tables;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.next.hop.CNextHop;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.next.hop.c.next.hop.Ipv6NextHopCase;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4AddressNoZone;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Prefix;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev171207.ipv4.routes.Ipv4Routes;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev171207.ipv4.routes.ipv4.routes.Ipv4Route;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev171207.ipv4.routes.ipv4.routes.Ipv4RouteBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev171207.ipv4.routes.ipv4.routes.Ipv4RouteKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev171207.path.attributes.AttributesBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev171207.PathId;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev171207.BgpRib;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev171207.RibId;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev171207.bgp.rib.Rib;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev171207.bgp.rib.RibKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev171207.bgp.rib.rib.LocRib;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev171207.rib.Tables;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev171207.rib.TablesKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.Ipv4AddressFamily;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.UnicastSubsequentAddressFamily;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.next.hop.c.next.hop.Ipv4NextHopCase;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.next.hop.c.next.hop.Ipv4NextHopCaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.next.hop.c.next.hop.ipv4.next.hop._case.Ipv4NextHopBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev180329.ipv4.routes.Ipv4Routes;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev180329.ipv4.routes.ipv4.routes.Ipv4Route;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev180329.ipv4.routes.ipv4.routes.Ipv4RouteBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev180329.ipv4.routes.ipv4.routes.Ipv4RouteKey;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.AttributesBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.PathId;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.BgpRib;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.RibId;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.bgp.rib.Rib;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.bgp.rib.RibKey;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.bgp.rib.rib.LocRib;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.rib.Tables;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.rib.TablesKey;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.Ipv4AddressFamily;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.UnicastSubsequentAddressFamily;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.next.hop.c.next.hop.Ipv4NextHopCase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.next.hop.c.next.hop.Ipv4NextHopCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.next.hop.c.next.hop.ipv4.next.hop._case.Ipv4NextHopBuilder;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
public class Ipv4WriterTest implements FutureProducer, ByteDataTranslator {
@SuppressWarnings("unchecked")
private static InstanceIdentifier<Ipv4Route> id(final Ipv4Prefix destination, final PathId pathId) {
return TABLE_ID.child((Class) Ipv4Routes.class)
- .child(Ipv4Route.class, new Ipv4RouteKey(pathId, destination));
+ .child(Ipv4Route.class, new Ipv4RouteKey(pathId, destination.getValue()));
}
private static Ipv4Route route(final Ipv4Prefix destination, final PathId pathId,
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Address;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6AddressNoZone;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Prefix;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev171207.ipv6.routes.Ipv6Routes;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev171207.ipv6.routes.ipv6.routes.Ipv6Route;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev171207.ipv6.routes.ipv6.routes.Ipv6RouteBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev171207.ipv6.routes.ipv6.routes.Ipv6RouteKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev171207.PathId;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev171207.path.attributes.AttributesBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev171207.BgpRib;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev171207.RibId;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev171207.bgp.rib.Rib;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev171207.bgp.rib.RibKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev171207.bgp.rib.rib.LocRib;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev171207.rib.Tables;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev171207.rib.TablesKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.Ipv6AddressFamily;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.UnicastSubsequentAddressFamily;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.next.hop.c.next.hop.Ipv6NextHopCase;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.next.hop.c.next.hop.Ipv6NextHopCaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.next.hop.c.next.hop.ipv6.next.hop._case.Ipv6NextHopBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev180329.ipv6.routes.Ipv6Routes;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev180329.ipv6.routes.ipv6.routes.Ipv6Route;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev180329.ipv6.routes.ipv6.routes.Ipv6RouteBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev180329.ipv6.routes.ipv6.routes.Ipv6RouteKey;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.PathId;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.AttributesBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.BgpRib;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.RibId;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.bgp.rib.Rib;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.bgp.rib.RibKey;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.bgp.rib.rib.LocRib;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.rib.Tables;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.rib.TablesKey;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.Ipv6AddressFamily;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.UnicastSubsequentAddressFamily;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.next.hop.c.next.hop.Ipv6NextHopCase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.next.hop.c.next.hop.Ipv6NextHopCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.next.hop.c.next.hop.ipv6.next.hop._case.Ipv6NextHopBuilder;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
public class Ipv6WriterTest implements FutureProducer, ByteDataTranslator {
@SuppressWarnings("unchecked")
private static InstanceIdentifier<Ipv6Route> id(final Ipv6Prefix destination, final PathId pathId) {
return TABLE_ID.child((Class) Ipv6Routes.class)
- .child(Ipv6Route.class, new Ipv6RouteKey(pathId, destination));
+ .child(Ipv6Route.class, new Ipv6RouteKey(pathId, destination.getValue()));
}
private static Ipv6Route route(final Ipv6Prefix destination, final PathId pathId,
<version>1.18.10-SNAPSHOT</version>
<packaging>pom</packaging>
+ <properties>
+ <javax.annotations.version>3.0.0</javax.annotations.version>
+ </properties>
+
<build>
<pluginManagement>
<plugins>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-common</artifactId>
</dependency>
+ <!-- Generated yang model classes use annotations -->
+ <dependency>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>annotations</artifactId>
+ <version>${javax.annotations.version}</version>
+ </dependency>
</dependencies>
</project>
getCustomizer().readCurrentAttributes(IP4_IID, builder, ctx);
assertEquals(IP4_IID.getKey().getAddressFamily(), builder.getAddressFamily());
assertEquals(IP4_IID.getKey().getRxVrfId(), builder.getRxVrfId());
- assertArrayEquals("1.2.3.4".toCharArray(), builder.getGatewayAddress().getValue());
+ assertEquals("1.2.3.4", builder.getGatewayAddress().stringValue());
final List<Server> server = builder.getServer();
assertEquals(2, server.size());
assertEquals(11L, server.get(0).getVrfId().longValue());
- assertArrayEquals("8.8.8.8".toCharArray(), server.get(0).getAddress().getValue());
+ assertEquals("8.8.8.8", server.get(0).getAddress().stringValue());
assertEquals(12L, server.get(1).getVrfId().longValue());
- assertArrayEquals("8.8.8.4".toCharArray(), server.get(1).getAddress().getValue());
+ assertEquals("8.8.8.4", server.get(1).getAddress().stringValue());
}
@Test
assertEquals(IP6_IID.getKey().getAddressFamily(), builder.getAddressFamily());
assertEquals(IP6_IID.getKey().getRxVrfId(), builder.getRxVrfId());
assertEquals(22L, builder.getServer().get(0).getVrfId().longValue());
- assertArrayEquals("2001:db8:a0b:12f0::1".toCharArray(), builder.getGatewayAddress().getValue());
- assertArrayEquals("2001:db8:a0b:12f0::2".toCharArray(), builder.getServer().get(0).getAddress().getValue());
+ assertEquals("2001:db8:a0b:12f0::1", builder.getGatewayAddress().stringValue());
+ assertEquals("2001:db8:a0b:12f0::2", builder.getServer().get(0).getAddress().stringValue());
}
@Test
final PotProfileListBuilder builder= new PotProfileListBuilder();
builder.setIndex(new ProfileIndexRange(1));
builder.setNumberOfBits((short)56);
- builder.setKey(new PotProfileListKey(new ProfileIndexRange(1)));
+ builder.withKey(new PotProfileListKey(new ProfileIndexRange(1)));
builder.setLpc(new BigInteger("1233"));
builder.setPrimeNumber(new BigInteger("1001"));
builder.setPublicPolynomial(new BigInteger("1234"));
private static TraceConfig generateTraceConfig(final String name) {
final TraceConfigBuilder builder = new TraceConfigBuilder();
builder.setTraceConfigName(name);
- builder.setKey(new TraceConfigKey(name));
+ builder.withKey(new TraceConfigKey(name));
builder.setAclName(name);
builder.setTraceType(Short.valueOf("31"));
builder.setTraceNumElt(Short.valueOf("4"));
.filter(ipNeighborDetails -> ip.equals(arrayToIpv4AddressNoZone(ipNeighborDetails.ipAddress)))
.findFirst()
.ifPresent(ipNeighborDetails -> builder.setIp(arrayToIpv4AddressNoZone(ipNeighborDetails.ipAddress))
- .setKey(keyMapper().apply(ipNeighborDetails))
+ .withKey(keyMapper().apply(ipNeighborDetails))
.setLinkLayerAddress(toPhysAddress(ipNeighborDetails.macAddress))
.setOrigin(ipNeighborDetails.isStatic == 0
? Dynamic
.filter(ipNeighborDetails -> ip.equals(arrayToIpv4AddressNoZone(ipNeighborDetails.ipAddress)))
.findFirst()
.ifPresent(ipNeighborDetails -> builder.setIp(arrayToIpv4AddressNoZone(ipNeighborDetails.ipAddress))
- .setKey(keyMapper().apply(ipNeighborDetails))
+ .withKey(keyMapper().apply(ipNeighborDetails))
.setLinkLayerAddress(toPhysAddress(ipNeighborDetails.macAddress)));
}
}
.filter(ipNeighborDetails -> ip.equals(arrayToIpv6AddressNoZone(ipNeighborDetails.ipAddress)))
.findFirst()
.ifPresent(ipNeighborDetails -> builder.setIp(arrayToIpv6AddressNoZone(ipNeighborDetails.ipAddress))
- .setKey(keyMapper().apply(ipNeighborDetails))
+ .withKey(keyMapper().apply(ipNeighborDetails))
.setLinkLayerAddress(toPhysAddress(ipNeighborDetails.macAddress))
.setOrigin(ipNeighborDetails.isStatic == 0
? Dynamic
.filter(ipNeighborDetails -> ip.equals(arrayToIpv6AddressNoZone(ipNeighborDetails.ipAddress)))
.findFirst()
.ifPresent(ipNeighborDetails -> builder.setIp(arrayToIpv6AddressNoZone(ipNeighborDetails.ipAddress))
- .setKey(keyMapper().apply(ipNeighborDetails))
+ .withKey(keyMapper().apply(ipNeighborDetails))
.setLinkLayerAddress(toPhysAddress(ipNeighborDetails.macAddress)));
}
}
cfgKey = InstanceIdentifier.create(NativeForwardPathsTables.class)
.child(org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170801._native.forward.paths.tables.NativeForwardPathsTable.class,
new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170801._native.forward.paths.tables.NativeForwardPathsTableKey(
- cfgValue.getKey()));
+ cfgValue.key()));
return Initialized.create(cfgKey, cfgValue);
}
if (optionalTable.isPresent()) {
final long existingTableId = optionalTable.getAsLong();
builder.setTableId(existingTableId);
- builder.setKey(new NativeForwardPathsTableKey(existingTableId));
+ builder.withKey(new NativeForwardPathsTableKey(existingTableId));
}
}
.collect(RWUtils.singleItemCollector());
builder.setId(currentAdjacencyId)
- .setKey(new AdjacencyKey(currentAdjacencyId))
+ .withKey(new AdjacencyKey(currentAdjacencyId))
.setLocalEid(getArrayAsLocalEid(
MappingsDumpParams.EidType.valueOf(currentAdjacency.eidType), currentAdjacency.leid,
currentAdjacency.leidPrefixLen, vni))
builder.setPriority((short) Byte.toUnsignedInt(details.priority));
builder.setWeight((short) Byte.toUnsignedInt(details.weight));
builder.setInterfaceRef(interfaceRef);
- builder.setKey(new InterfaceKey(interfaceRef));
+ builder.withKey(new InterfaceKey(interfaceRef));
}
@Override
checkState(locatorSetContext.containsName(details.locatorSetIndex, ctx.getMappingContext()),
"No Locator Set name found for index %s", details.locatorSetIndex);
builder.setLocatorSet(locatorSetContext.getName(details.locatorSetIndex, ctx.getMappingContext()));
- builder.setKey(new LocalMappingKey(new MappingId(id.firstKeyOf(LocalMapping.class).getId())));
+ builder.withKey(new LocalMappingKey(new MappingId(id.firstKeyOf(LocalMapping.class).getId())));
builder.setEid(getArrayAsEidLocal(valueOf(details.eidType), details.eid, details.eidPrefixLen, details.vni));
if (details.key != null) {
final String name = toString(details.get().lsName);
builder.setName(name);
- builder.setKey(new LocatorSetKey(name));
+ builder.withKey(new LocatorSetKey(name));
} else {
LOG.warn("Locator Set {} not found in dump", id);
}
arrayToIpAddress(byteToBoolean(a.isIpv6), a.ipAddress)))
.collect(RWUtils.singleItemCollector());
- builder.setKey(key);
+ builder.withKey(key);
builder.setIpAddress(
arrayToIpAddress(byteToBoolean(mapResolverDetails.isIpv6), mapResolverDetails.ipAddress));
}
final IpAddress currentAddress = instanceIdentifier.firstKeyOf(MapServer.class).getIpAddress();
final OneMapServerDetails currentDetail = dump.get().oneMapServerDetails.stream()
- .filter(detail -> Arrays.equals(currentAddress.getValue(),
- arrayToIpAddress(byteToBoolean(detail.isIpv6), detail.ipAddress).getValue()))
+ .filter(detail -> currentAddress.stringValue().equalsIgnoreCase(
+ arrayToIpAddress(byteToBoolean(detail.isIpv6), detail.ipAddress).stringValue()))
.collect(RWUtils.singleItemCollector());
mapServerBuilder
RWUtils.singleItemCollector());
builder.setEid(getArrayAsEidRemote(valueOf(details.eidType), details.eid, details.eidPrefixLen, details.vni));
- builder.setKey(new RemoteMappingKey(new MappingId(id.firstKeyOf(RemoteMapping.class).getId())));
+ builder.withKey(new RemoteMappingKey(new MappingId(id.firstKeyOf(RemoteMapping.class).getId())));
builder.setTtl(resolveTtl(details.ttl));
builder.setAuthoritative(
new RemoteMapping.Authoritative(byteToBoolean(details.authoritative)));
final IpAddress address = arrayToIpAddress(byteToBoolean(details.isIpv6), details.ipAddress);
return new LocatorBuilder()
.setAddress(address)
- .setKey(new LocatorKey(address))
+ .withKey(new LocatorKey(address))
.setPriority((short) details.priority)
.setWeight((short) details.weight)
.build();
.collect(RWUtils.singleItemCollector());
builder.setVirtualNetworkIdentifier((long) details.vni);
- builder.setKey(new VniTableKey(Long.valueOf(details.vni)));
+ builder.withKey(new VniTableKey(Long.valueOf(details.vni)));
}
@Nonnull
assertEquals(PARENT_4, key.getKey().getId());
assertEquals(PARENT_4, mapping.getId());
- assertEquals(PARENT_4, mapping.getKey().getId());
+ assertEquals(PARENT_4, mapping.key().getId());
final EidIdentificatorPair pair = mapping.getEidIdentificatorPair();
assertEquals(LOCAL_EID_ID_1, pair.getLocalEidId().getValue());
getCustomizer().readCurrentAttributes(validId, builder, ctx);
final long lTableId = TABLE_0_IDX;
assertEquals(lTableId, builder.getTableId().intValue());
- assertEquals(lTableId, builder.getKey().getTableId().intValue());
+ assertEquals(lTableId, builder.key().getTableId().intValue());
}
private IpFibDetailsReplyDump getReplyV4() {
getCustomizer().readCurrentAttributes(identifier, builder, ctx);
assertEquals("adj-one", builder.getId());
- assertEquals(new AdjacencyKey("adj-one"), builder.getKey());
+ assertEquals(new AdjacencyKey("adj-one"), builder.key());
assertEquals(ADDRESS_ONE.getValue(), Ipv4.class.cast(builder.getLocalEid().getAddress()).getIpv4().getValue());
assertEquals(ADDRESS_THREE.getValue(),
Ipv4.class.cast(builder.getRemoteEid().getAddress()).getIpv4().getValue());
getCustomizer().readCurrentAttributes(identifier, builder, ctx);
assertEquals("adj-one", builder.getId());
- assertEquals(new AdjacencyKey("adj-one"), builder.getKey());
+ assertEquals(new AdjacencyKey("adj-one"), builder.key());
assertEquals(NORMALIZED_PREFIX_ONE,
Ipv4Prefix.class.cast(builder.getLocalEid().getAddress()).getIpv4Prefix().getValue());
assertEquals(NORMALIZED_PREFIX_THREE,
final Interface iface = builder.build();
assertEquals("interface-1", iface.getInterfaceRef());
- assertEquals("interface-1", iface.getKey().getInterfaceRef());
+ assertEquals("interface-1", iface.key().getInterfaceRef());
}
assertNotNull(builder);
assertEquals("loc-set", builder.getName());
- assertEquals("loc-set", builder.getKey().getName());
+ assertEquals("loc-set", builder.key().getName());
}
@Test
final MapResolverKey key = keys.get(0);
assertNotNull(key);
- assertEquals("1.2.168.192", new String(key.getIpAddress().getValue()));
+ assertEquals("1.2.168.192", key.getIpAddress().stringValue());
}
request.mrIsAdd = booleanToByte(isAdd);
translate(config.getInSegment(), request);
- translate(config.getAugmentation(StaticLspVppLookupAugmentation.class), request);
+ translate(config.augmentation(StaticLspVppLookupAugmentation.class), request);
// default values based on inspecting VPP's CLI and make test code
request.mrClassifyTableIndex = -1;
request.mrIsAdd = booleanToByte(isAdd);
translate(config.getInSegment(), request);
- translate(config.getAugmentation(StaticLspVppLookupAugmentation.class), request);
+ translate(config.augmentation(StaticLspVppLookupAugmentation.class), request);
// default values based on inspecting VPP's CLI and make test code
request.mrClassifyTableIndex = -1;
if (ImposeAndForward.equals(operation)) {
imposeAndForward.write(id, data, ctx, isAdd);
} else if (PopAndLookup.equals(operation)) {
- final VppLabelLookupAttributes vppAttributes = config.getAugmentation(StaticLspVppLookupAugmentation.class);
+ final VppLabelLookupAttributes vppAttributes = config.augmentation(StaticLspVppLookupAugmentation.class);
checkArgument(vppAttributes != null && vppAttributes.getLabelLookup() != null,
"Configuring pop-and-lookup operation but label-lookup leaf is missing");
final LookupType type = vppAttributes.getLabelLookup().getType();
@Nonnull final org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.nat.rev180628.nat.instances.instance.mapping.table.MappingEntry entry,
final long entryId) {
return new MappingEntryBuilder()
- .setKey(entryToKey(entry))
+ .withKey(entryToKey(entry))
.setIndex(entryId)
.build();
}
private MappingEntry toCtxMapEntry(@Nonnull final Nat44StaticMappingDetails details, final long entryId) {
return new MappingEntryBuilder()
- .setKey(entryToKey(details))
+ .withKey(entryToKey(details))
.setIndex(entryId)
.build();
}
private MappingEntry toCtxMapEntry(@Nonnull final Nat64BibDetails details, final long entryId) {
return new MappingEntryBuilder()
- .setKey(entryToKey(details))
+ .withKey(entryToKey(details))
.setIndex(entryId)
.build();
}
final boolean isAdd) throws WriteFailedException {
boolean isNat64 = false;
final ExternalIpAddressPoolAugmentation augmentation =
- addressPool.getAugmentation(ExternalIpAddressPoolAugmentation.class);
+ addressPool.augmentation(ExternalIpAddressPoolAugmentation.class);
if (augmentation != null) {
isNat64 = Nat64.equals(augmentation.getPoolType());
}
assertEquals("192.168.44.3/32", builder.getExternalIpPool().getValue());
assertEquals(poolId, builder.getPoolId().longValue());
- assertEquals(Nat44, builder.getAugmentation(ExternalIpAddressPoolAugmentation.class).getPoolType());
+ assertEquals(Nat44, builder.augmentation(ExternalIpAddressPoolAugmentation.class).getPoolType());
}
@Test
assertEquals("192.168.64.3/32", builder.getExternalIpPool().getValue());
assertEquals(poolId, builder.getPoolId().longValue());
- assertEquals(Nat64, builder.getAugmentation(ExternalIpAddressPoolAugmentation.class).getPoolType());
+ assertEquals(Nat64, builder.augmentation(ExternalIpAddressPoolAugmentation.class).getPoolType());
}
@Test
assertEquals("192.168.64.3/32", builder.getExternalIpPool().getValue());
assertEquals(poolId, builder.getPoolId().longValue());
- assertEquals(Nat64, builder.getAugmentation(ExternalIpAddressPoolAugmentation.class).getPoolType());
+ assertEquals(Nat64, builder.augmentation(ExternalIpAddressPoolAugmentation.class).getPoolType());
}
@Test
private static MappingEntry getEntry(final long id, final String longernalIpv4, final String externalIpv4) {
return new MappingEntryBuilder()
- .setKey(new MappingEntryKey(id))
+ .withKey(new MappingEntryKey(id))
.setType(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.nat.rev180628.MappingEntry.Type.Static)
.setInternalSrcAddress(new IpPrefix(new Ipv4Prefix(longernalIpv4)))
.setExternalSrcAddress(new IpPrefix(new Ipv4Prefix(externalIpv4)))
private void getNshEntryMdType1Request(@Nonnull final NshEntry entry,
@Nonnull NshAddDelEntry request) {
- final NshMdType1Augment nshMdType1Augment = entry.getAugmentation(NshMdType1Augment.class);
+ final NshMdType1Augment nshMdType1Augment = entry.augmentation(NshMdType1Augment.class);
if (nshMdType1Augment != null) {
request.c1 = (int) nshMdType1Augment.getC1().longValue();
request.c2 = (int) nshMdType1Augment.getC2().longValue();
}
private void getNshEntryMdType2Request(@Nonnull final NshEntry entry, @Nonnull NshAddDelEntry request) {
- final List<Md2Data> md2Datas = entry.getAugmentation(NshMdType2Augment.class).getMd2Data();
+ final List<Md2Data> md2Datas = entry.augmentation(NshMdType2Augment.class).getMd2Data();
final byte md2_len = (byte) (entry.getLength() * 4 - 8);
byte cur_len = 0;
byte option_len;
final NshEntryDetails nshEntryDetails = reply.nshEntryDetails.get(0);
builder.setName(entryName);
- builder.setKey(key);
+ builder.withKey(key);
builder.setVersion((short) nshEntryDetails.verOC);
builder.setLength((short) nshEntryDetails.length);
final NshMapDetails nshMapDetails = reply.nshMapDetails.get(0);
builder.setName(mapName);
- builder.setKey(key);
+ builder.withKey(key);
builder.setNsp((long) ((nshMapDetails.nspNsi >> 8) & 0xFFFFFF));
builder.setNsi((short) (nshMapDetails.nspNsi & 0xFF));
private static NshEntry generateNshEntry(final String name) {
final NshEntryBuilder builder = new NshEntryBuilder();
builder.setName(name);
- builder.setKey(new NshEntryKey(name));
+ builder.withKey(new NshEntryKey(name));
builder.setVersion((short) 0);
builder.setLength((short) 6);
builder.setMdType(MdType1.class);
private static NshMap generateNshMap(final String name) {
final NshMapBuilder builder = new NshMapBuilder();
builder.setName(name);
- builder.setKey(new NshMapKey(name));
+ builder.withKey(new NshMapKey(name));
builder.setNsp(184L);
builder.setNsi((short) 255);
builder.setMappedNsp(183L);
assertEquals(Ethernet.class, builder.getNextProtocol());
assertEquals(123, builder.getNsp().intValue());
assertEquals(4, builder.getNsi().intValue());
- assertEquals(1, builder.getAugmentation(NshMdType1StateAugment.class).getC1().intValue());
- assertEquals(2, builder.getAugmentation(NshMdType1StateAugment.class).getC2().intValue());
- assertEquals(3, builder.getAugmentation(NshMdType1StateAugment.class).getC3().intValue());
- assertEquals(4, builder.getAugmentation(NshMdType1StateAugment.class).getC4().intValue());
+ assertEquals(1, builder.augmentation(NshMdType1StateAugment.class).getC1().intValue());
+ assertEquals(2, builder.augmentation(NshMdType1StateAugment.class).getC2().intValue());
+ assertEquals(3, builder.augmentation(NshMdType1StateAugment.class).getC3().intValue());
+ assertEquals(4, builder.augmentation(NshMdType1StateAugment.class).getC4().intValue());
verify(jvppNsh).nshEntryDump(any(NshEntryDump.class));
}
public String uniqueRouteHopName(@Nonnull final NextHop hop) {
return bindName(hop.getOutgoingInterface(),
- dotlessAddress(hop.getAugmentation(NextHop1.class).getNextHopAddress()),
- String.valueOf(hop.getAugmentation(VppIpv4NextHopAugmentation.class).getWeight()));
+ dotlessAddress(hop.augmentation(NextHop1.class).getNextHopAddress()),
+ String.valueOf(hop.augmentation(VppIpv4NextHopAugmentation.class).getWeight()));
}
public String uniqueRouteHopName(@Nonnull final FibPath path, @Nonnull final MappingContext mappingContext) {
public String uniqueRouteHopName(@Nonnull final NextHop hop) {
return bindName(hop.getOutgoingInterface(),
- doubleDotlessAddress(hop.getAugmentation(NextHop1.class).getNextHopAddress()),
- String.valueOf(hop.getAugmentation(VppIpv6NextHopAugmentation.class).getWeight()));
+ doubleDotlessAddress(hop.augmentation(NextHop1.class).getNextHopAddress()),
+ String.valueOf(hop.augmentation(VppIpv6NextHopAugmentation.class).getWeight()));
}
public String uniqueRouteHopName(@Nonnull final FibPath path, @Nonnull final MappingContext mappingContext) {
final ControlPlaneProtocolKey key = instanceIdentifier.firstKeyOf(ControlPlaneProtocol.class);
routingProtocolBuilder
.setName(key.getName())
- .setKey(key)
+ .withKey(key)
.setType(Static.class)
.addAugmentation(RoutingProtocolVppAttr.class, new RoutingProtocolVppAttrBuilder().setVppProtocolAttributes(
new VppProtocolAttributesBuilder()
routeBuilder.setNextHop(
resolveHopType(mappedName, Arrays.asList(detail.path), interfaceContext, routeHopContext,
readContext.getMappingContext(), namesFactory))
- .setKey(key)
+ .withKey(key)
.setDestinationPrefix(toIpv4Prefix(detail.address, toJavaByte(detail.addressLength)))
.addAugmentation(VppIpv4RouteAttributesAugmentation.class,
new VppIpv4RouteAttributesAugmentationBuilder()
routeBuilder.setNextHop(
resolveHopType(mappedName, Arrays.asList(detail.path), interfaceContext, routeHopContext,
readContext.getMappingContext(), namesFactory))
- .setKey(key)
+ .withKey(key)
.setDestinationPrefix(key.getDestinationPrefix())
.setDestinationPrefix(toIpv6Prefix(detail.address, toJavaByte(detail.addressLength)))
.addAugmentation(VppIpv6RouteAttributesAugmentation.class,
}
static Long extractTableId(final ControlPlaneProtocol protocol) {
- final RoutingProtocolVppAttr vppAttr = protocol.getAugmentation(RoutingProtocolVppAttr.class);
+ final RoutingProtocolVppAttr vppAttr = protocol.augmentation(RoutingProtocolVppAttr.class);
checkState(vppAttr != null && vppAttr.getVppProtocolAttributes() != null,
"Vpp routing protocol attributes not defined");
if (isDelete) {
request.isNo = 1;
} else {
- parseControlAdvPrefixes(request, prefix.getControlAdvPrefixes(), prefix.getAugmentation(
+ parseControlAdvPrefixes(request, prefix.getControlAdvPrefixes(), prefix.augmentation(
ControlAdvPrefixesVppAugmentation.class));
}
LOG.debug("Setting Prefix for interface {}(id={}): {}", ifcName, ifcIndex, request);
request.managed = booleanToByte(dataAfter.isManagedFlag());
request.other = booleanToByte(dataAfter.isOtherConfigFlag());
final Ipv6RouterAdvertisementsVppAugmentation vppAugmentation =
- dataAfter.getAugmentation(Ipv6RouterAdvertisementsVppAugmentation.class);
+ dataAfter.augmentation(Ipv6RouterAdvertisementsVppAugmentation.class);
if (vppAugmentation != null) {
request.llOption = booleanToByte(vppAugmentation.isSuppressLinkLayer());
request.sendUnicast = booleanToByte(vppAugmentation.isSendUnicast());
@Nonnull final NextHop hop,
@Nonnull final MappingContext mappingContext) {
- final VppIpv4Route routingAttributes = route.getAugmentation(VppIpv4RouteAttributesAugmentation.class) != null ?
- route.getAugmentation(VppIpv4RouteAttributesAugmentation.class).getVppIpv4Route() : null;
+ final VppIpv4Route routingAttributes = route.augmentation(VppIpv4RouteAttributesAugmentation.class) != null ?
+ route.augmentation(VppIpv4RouteAttributesAugmentation.class).getVppIpv4Route() : null;
final int nextHopInterfaceIndex =
getInterfaceNamingContext().getIndex(hop.getOutgoingInterface(), mappingContext);
return getMultipathHopRequest(add,
route.getDestinationPrefix(),
nextHopInterfaceIndex,
- hop.getAugmentation(NextHop1.class).getNextHopAddress(),
- hop.getAugmentation(VppIpv4NextHopAugmentation.class).getWeight().byteValue(),
+ hop.augmentation(NextHop1.class).getNextHopAddress(),
+ hop.augmentation(VppIpv4NextHopAugmentation.class).getWeight().byteValue(),
getRoutingProtocolContext().getIndex(parentProtocolName, mappingContext),
DEFAULT_VNI,
classifyTableIndex(routingAttributes.getClassifyTable(), getVppClassifierContextManager(),
return getMultipathHopRequest(add,
route.getDestinationPrefix(),
nextHopInterfaceIndex,
- hop.getAugmentation(NextHop1.class).getNextHopAddress(),
- hop.getAugmentation(VppIpv4NextHopAugmentation.class).getWeight().byteValue(),
+ hop.augmentation(NextHop1.class).getNextHopAddress(),
+ hop.augmentation(VppIpv4NextHopAugmentation.class).getWeight().byteValue(),
getRoutingProtocolContext().getIndex(parentProtocolName, mappingContext),
DEFAULT_VNI,
0,
@Nonnull final org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ipv6.unicast.routing.rev180313.routing.control.plane.protocols.control.plane.protocol._static.routes.ipv6.Route route,
@Nonnull final NextHop hop,
@Nonnull final MappingContext mappingContext) {
- final VppIpv6Route routingAttributes = route.getAugmentation(VppIpv6RouteAttributesAugmentation.class) != null ?
- route.getAugmentation(VppIpv6RouteAttributesAugmentation.class).getVppIpv6Route() : null;
+ final VppIpv6Route routingAttributes = route.augmentation(VppIpv6RouteAttributesAugmentation.class) != null ?
+ route.augmentation(VppIpv6RouteAttributesAugmentation.class).getVppIpv6Route() : null;
final int nextHopInterfaceIndex =
getInterfaceNamingContext().getIndex(hop.getOutgoingInterface(), mappingContext);
return getMultipathHopRequest(add,
route.getDestinationPrefix(),
nextHopInterfaceIndex,
- hop.getAugmentation(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ipv6.unicast.routing.rev180313.routing.control.plane.protocols.control.plane.protocol._static.routes.ipv6.route.next.hop.NextHop1.class).getNextHopAddress(),
- hop.getAugmentation(VppIpv6NextHopAugmentation.class).getWeight().byteValue(),
+ hop.augmentation(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ipv6.unicast.routing.rev180313.routing.control.plane.protocols.control.plane.protocol._static.routes.ipv6.route.next.hop.NextHop1.class).getNextHopAddress(),
+ hop.augmentation(VppIpv6NextHopAugmentation.class).getWeight().byteValue(),
getRoutingProtocolContext().getIndex(parentProtocolName, mappingContext),
DEFAULT_VNI,
classifyTableIndex(routingAttributes.getClassifyTable(), getVppClassifierContextManager(),
return getMultipathHopRequest(add,
route.getDestinationPrefix(),
nextHopInterfaceIndex,
- hop.getAugmentation(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ipv6.unicast.routing.rev180313.routing.control.plane.protocols.control.plane.protocol._static.routes.ipv6.route.next.hop.NextHop1.class).getNextHopAddress(),
- hop.getAugmentation(VppIpv6NextHopAugmentation.class).getWeight().byteValue(),
+ hop.augmentation(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ipv6.unicast.routing.rev180313.routing.control.plane.protocols.control.plane.protocol._static.routes.ipv6.route.next.hop.NextHop1.class).getNextHopAddress(),
+ hop.augmentation(VppIpv6NextHopAugmentation.class).getWeight().byteValue(),
getRoutingProtocolContext().getIndex(parentProtocolName, mappingContext),
DEFAULT_VNI,
0,
@Nonnull final Route route,
@Nonnull final MappingContext mappingContext) {
SimpleNextHop simpleNextHop = (SimpleNextHop) route.getNextHop().getNextHopOptions();
- SimpleNextHop1 hop = simpleNextHop.getAugmentation(SimpleNextHop1.class);
+ SimpleNextHop1 hop = simpleNextHop.augmentation(SimpleNextHop1.class);
final int nextHopInterfaceIndex =
getInterfaceNamingContext().getIndex(simpleNextHop.getOutgoingInterface(), mappingContext);
final VppIpv4Route routingAttributes =
- route.getAugmentation(VppIpv4RouteAttributesAugmentation.class) != null ?
- route.getAugmentation(VppIpv4RouteAttributesAugmentation.class).getVppIpv4Route() : null;
+ route.augmentation(VppIpv4RouteAttributesAugmentation.class) != null ?
+ route.augmentation(VppIpv4RouteAttributesAugmentation.class).getVppIpv4Route() : null;
if (routingAttributes != null &&
classifyTablePresent(routingAttributes.getClassifyTable(), getVppClassifierContextManager(),
@Nonnull final MappingContext mappingContext) {
SimpleNextHop simpleNextHop = (SimpleNextHop) route.getNextHop().getNextHopOptions();
final org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ipv6.unicast.routing.rev180313.routing.control.plane.protocols.control.plane.protocol._static.routes.ipv6.route.next.hop.SimpleNextHop1
- hop = simpleNextHop.getAugmentation(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ipv6.unicast.routing.rev180313.routing.control.plane.protocols.control.plane.protocol._static.routes.ipv6.route.next.hop.SimpleNextHop1.class);
+ hop = simpleNextHop.augmentation(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ipv6.unicast.routing.rev180313.routing.control.plane.protocols.control.plane.protocol._static.routes.ipv6.route.next.hop.SimpleNextHop1.class);
final int nextHopInterfaceIndex =
getInterfaceNamingContext().getIndex(simpleNextHop.getOutgoingInterface(), mappingContext);
VppIpv6Route routingAttributes =
- route.getAugmentation(VppIpv6RouteAttributesAugmentation.class) != null ? route.getAugmentation(
+ route.augmentation(VppIpv6RouteAttributesAugmentation.class) != null ? route.augmentation(
VppIpv6RouteAttributesAugmentation.class).getVppIpv6Route() : null;
if (routingAttributes != null &&
}
VppIpv4Route vppIpv4Route =
- route.getAugmentation(VppIpv4RouteAttributesAugmentation.class) != null ? route.getAugmentation(
+ route.augmentation(VppIpv4RouteAttributesAugmentation.class) != null ? route.augmentation(
VppIpv4RouteAttributesAugmentation.class).getVppIpv4Route() : null;
final Optional<String> optClassifyTable = Optional.ofNullable(vppIpv4Route)
String.format("Lookup table: %s not found for route: %s", secondaryTableId, route));
}
- VppIpv6Route vppIpv6Route = route.getAugmentation(VppIpv6RouteAttributesAugmentation.class) != null
- ? route.getAugmentation(VppIpv6RouteAttributesAugmentation.class).getVppIpv6Route() : null;
+ VppIpv6Route vppIpv6Route = route.augmentation(VppIpv6RouteAttributesAugmentation.class) != null
+ ? route.augmentation(VppIpv6RouteAttributesAugmentation.class).getVppIpv6Route() : null;
final Optional<String> optClassifyTable = Optional.ofNullable(vppIpv6Route)
.map(VppRouteAttributes::getClassifyTable);
}
default Route getIpv4RouteWithId(final StaticRoutes staticRoutes, final Ipv4Prefix id) {
- return staticRoutes.getAugmentation(StaticRoutes1.class)
+ return staticRoutes.augmentation(StaticRoutes1.class)
.getIpv4()
.getRoute()
.stream()
.cast(route.getNextHop().getNextHopOptions())
.getNextHopList().getNextHop()
.stream()
- .filter(nextHop -> Integer.valueOf(nextHop.getKey().getIndex()) == id)
+ .filter(nextHop -> Integer.valueOf(nextHop.key().getIndex()) == id)
.collect(RWUtils.singleItemCollector());
}
default org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ipv6.unicast.routing.rev180313.routing.control.plane.protocols.control.plane.protocol._static.routes.ipv6.Route getIpv6RouteWithId(
final StaticRoutes staticRoutes, final Ipv6Prefix id) {
- return staticRoutes.getAugmentation(
+ return staticRoutes.augmentation(
org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ipv6.unicast.routing.rev180313.StaticRoutes1.class)
.getIpv6()
.getRoute()
getCustomizer().readCurrentAttributes(identifier, builder, ctx);
assertEquals(ROUTE_PROTOCOL_NAME, builder.getName());
- assertEquals(ROUTE_PROTOCOL_NAME, builder.getKey().getName());
+ assertEquals(ROUTE_PROTOCOL_NAME, builder.key().getName());
assertEquals(Static.class, builder.getType());
}
assertTrue(hopOptions instanceof SimpleNextHop);
SimpleNextHop hop = SimpleNextHop.class.cast(hopOptions);
- assertEquals("192.168.2.1", hop.getAugmentation(SimpleNextHop1.class).getNextHopAddress().getValue());
+ assertEquals("192.168.2.1", hop.augmentation(SimpleNextHop1.class).getNextHopAddress().getValue());
assertEquals("iface-1", hop.getOutgoingInterface());
}
private boolean areEqual(final NextHop first, final NextHop second) {
return new EqualsBuilder()
- .append(true, first.getAugmentation(NextHop1.class).getNextHopAddress().getValue()
- .equals(second.getAugmentation(NextHop1.class).getNextHopAddress().getValue()))
+ .append(true, first.augmentation(NextHop1.class).getNextHopAddress().getValue()
+ .equals(second.augmentation(NextHop1.class).getNextHopAddress().getValue()))
.append(true, first.getIndex().equals(second.getIndex()))
- .append(true, first.getKey().equals(second.getKey()))
+ .append(true, first.key().equals(second.key()))
.append(true, first.getOutgoingInterface().equals(second.getOutgoingInterface()))
.isEquals();
}
return new NextHopBuilder()
.setOutgoingInterface(iface)
.setIndex(id)
- .setKey(new NextHopKey(id))
+ .withKey(new NextHopKey(id))
.addAugmentation(VppIpv4NextHopAugmentation.class,
new VppIpv4NextHopAugmentationBuilder().setWeight((short) weight).build())
.addAugmentation(NextHop1.class, new NextHop1Builder().setNextHopAddress(new Ipv4Address(address)).build())
assertTrue(hopOptions instanceof SimpleNextHop);
SimpleNextHop hop = SimpleNextHop.class.cast(hopOptions);
- assertEquals("2001:db8:a0b:12f0::1", hop.getAugmentation(SimpleNextHop1.class)
+ assertEquals("2001:db8:a0b:12f0::1", hop.augmentation(SimpleNextHop1.class)
.getNextHopAddress().getValue());
assertEquals("iface-1", hop.getOutgoingInterface());
}
assertTrue(hopOptions instanceof SimpleNextHop);
SimpleNextHop hop = SimpleNextHop.class.cast(hopOptions);
- assertEquals("2001:db8:a0b:12f0::1", hop.getAugmentation(SimpleNextHop1.class)
+ assertEquals("2001:db8:a0b:12f0::1", hop.augmentation(SimpleNextHop1.class)
.getNextHopAddress().getValue());
assertEquals("iface-1", hop.getOutgoingInterface());
}
private boolean areEqual(final NextHop first, final NextHop second) {
return new EqualsBuilder()
- .append(true, first.getAugmentation(NextHop1.class).getNextHopAddress().getValue()
- .equals(second.getAugmentation(NextHop1.class).getNextHopAddress().getValue()))
+ .append(true, first.augmentation(NextHop1.class).getNextHopAddress().getValue()
+ .equals(second.augmentation(NextHop1.class).getNextHopAddress().getValue()))
.append(true, first.getIndex().equals(second.getIndex()))
- .append(true, first.getKey().equals(second.getKey()))
+ .append(true, first.key().equals(second.key()))
.append(true, first.getOutgoingInterface().equals(second.getOutgoingInterface()))
.isEquals();
}
return new NextHopBuilder()
.setOutgoingInterface(iface)
.setIndex(id)
- .setKey(new NextHopKey(id))
+ .withKey(new NextHopKey(id))
.addAugmentation(NextHop1.class, new NextHop1Builder().setNextHopAddress(new Ipv6Address(address)).build())
.addAugmentation(VppIpv6NextHopAugmentation.class,
new VppIpv6NextHopAugmentationBuilder().setWeight((short) weight).build())
KeyedInstanceIdentifier<Table, TableKey> invalidVrfIidV6 =
FibManagementIIds.FM_FIB_TABLES.child(Table.class, invalidKeyV6);
when(writeContext.readAfter(vrfIidV4)).thenReturn(Optional.of(
- new TableBuilder().setKey(keyV4).setAddressFamily(keyV4.getAddressFamily())
+ new TableBuilder().withKey(keyV4).setAddressFamily(keyV4.getAddressFamily())
.setTableId(keyV4.getTableId()).setName("VRF-IPV4-1").build()));
when(writeContext.readAfter(vrfIidV6)).thenReturn(Optional.of(
- new TableBuilder().setKey(keyV6).setAddressFamily(keyV6.getAddressFamily())
+ new TableBuilder().withKey(keyV6).setAddressFamily(keyV6.getAddressFamily())
.setTableId(keyV6.getTableId()).setName("VRF-IPV6-1").build()));
when(writeContext.readAfter(invalidVrfIidV4)).thenReturn(Optional.absent());
when(writeContext.readAfter(invalidVrfIidV6)).thenReturn(Optional.absent());
SEC_TABLE_ID);
private static final Table
IPV4_TABLE = new TableBuilder().setName("VRF-IPV4-4")
- .setKey(SEC_TABLE_KEY).setTableId(SEC_TABLE_KEY.getTableId())
+ .withKey(SEC_TABLE_KEY).setTableId(SEC_TABLE_KEY.getTableId())
.setAddressFamily(SEC_TABLE_KEY.getAddressFamily()).build();
private static final InstanceIdentifier<Route> ROUTE_IID = CONTROL_PROTOCOL_IID
@Test
public void testWriteTableLookup() throws WriteFailedException {
final Route route = new RouteBuilder()
- .setKey(new RouteKey(new Ipv4Prefix("192.168.2.1/24")))
+ .withKey(new RouteKey(new Ipv4Prefix("192.168.2.1/24")))
.setDestinationPrefix(new Ipv4Prefix("192.168.2.1/24"))
.setNextHop(new NextHopBuilder().setNextHopOptions(
new TableLookupCaseBuilder()
SEC_TABLE_ID);
private static final Table
IPV6_TABLE = new TableBuilder().setName("VRF-IPV6-4")
- .setKey(SEC_TABLE_KEY).setTableId(SEC_TABLE_KEY.getTableId())
+ .withKey(SEC_TABLE_KEY).setTableId(SEC_TABLE_KEY.getTableId())
.setAddressFamily(SEC_TABLE_KEY.getAddressFamily()).build();
private static final Ipv6Prefix IPV_6_PREFIX = new Ipv6Prefix("2001:0db8:0a0b:12f0:0000:0000:0000:0001/64");
private static final Ipv6Prefix IPV_6_PREFIX_128 = new Ipv6Prefix("2001:0db8:0a0b:12f0:0000:0000:0000:0001/128");
@Test
public void testWriteTableLookup() throws WriteFailedException {
final Route route = new RouteBuilder()
- .setKey(new RouteKey(IPV_6_PREFIX))
+ .withKey(new RouteKey(IPV_6_PREFIX))
.setDestinationPrefix(IPV_6_PREFIX)
.setNextHop(new NextHopBuilder().setNextHopOptions(new TableLookupCaseBuilder()
.setSecondaryVrf(new VniReference(4L))
whenAddRouteThenSuccess(api);
when(writeContext.readAfter(CONTROL_PROTOCOL_IID)).thenReturn(Optional.of(new ControlPlaneProtocolBuilder()
- .setKey(CONTROL_PLANE_PROTOCOL_KEY).setName(ROUTE_PROTOCOL_NAME).setType(Static.class)
+ .withKey(CONTROL_PLANE_PROTOCOL_KEY).setName(ROUTE_PROTOCOL_NAME).setType(Static.class)
.addAugmentation(RoutingProtocolVppAttr.class, new RoutingProtocolVppAttrBuilder()
.setVppProtocolAttributes(new VppProtocolAttributesBuilder()
.setPrimaryVrf(new VniReference(TABLE_ID))
.build()));
when(writeContext.readAfter(CONTROL_PROTOCOL_INVALID_IID)).thenReturn(Optional.of(
- new ControlPlaneProtocolBuilder().setKey(CONTROL_PLANE_PROTOCOL_INVALID_KEY)
+ new ControlPlaneProtocolBuilder().withKey(CONTROL_PLANE_PROTOCOL_INVALID_KEY)
.setName(ROUTE_PROTOCOL_INVALID_NAME).setType(Static.class)
.addAugmentation(RoutingProtocolVppAttr.class, new RoutingProtocolVppAttrBuilder()
.setVppProtocolAttributes(new VppProtocolAttributesBuilder()
.build()));
when(writeContext.readAfter(TABLE_V4_IID)).thenReturn(Optional.of(
- new TableBuilder().setKey(IPV4_TABLE_KEY).setAddressFamily(Ipv4.class)
+ new TableBuilder().withKey(IPV4_TABLE_KEY).setAddressFamily(Ipv4.class)
.setTableId(IPV4_TABLE_KEY.getTableId()).build()));
when(writeContext.readAfter(TABLE_V6_IID)).thenReturn(Optional.of(
- new TableBuilder().setKey(IPV6_TABLE_KEY).setAddressFamily(Ipv6.class)
+ new TableBuilder().withKey(IPV6_TABLE_KEY).setAddressFamily(Ipv6.class)
.setTableId(IPV6_TABLE_KEY.getTableId()).build()));
when(writeContext.readAfter(INVALID_TABLE_V4_IID)).thenReturn(Optional.absent());
when(writeContext.readAfter(INVALID_TABLE_V6_IID)).thenReturn(Optional.absent());
private static Ipv6RouterAdvertisements getRA(final Interfaces ifc) {
return ifc.getInterface()
.get(0)
- .getAugmentation(Interface1.class)
+ .augmentation(Interface1.class)
.getIpv6()
- .getAugmentation(Ipv61.class)
+ .augmentation(Ipv61.class)
.getIpv6RouterAdvertisements();
}
}
StaticRoutes ipv4StaticRouteWithoutClassifier) {
final IpAddDelRoute request =
factory.createIpv4SimpleHopRequest(false, ROUTE_PROTOCOL_NAME,
- ipv4StaticRouteWithoutClassifier.getAugmentation(StaticRoutes1.class).getIpv4().getRoute()
+ ipv4StaticRouteWithoutClassifier.augmentation(StaticRoutes1.class).getIpv4().getRoute()
.get(0), mappingContext);
assertEquals(
StaticRoutes ipv4StaticRouteWithoutRouteAttrs) {
final IpAddDelRoute request =
factory.createIpv4SimpleHopRequest(false, ROUTE_PROTOCOL_NAME,
- ipv4StaticRouteWithoutRouteAttrs.getAugmentation(StaticRoutes1.class).getIpv4().getRoute()
+ ipv4StaticRouteWithoutRouteAttrs.augmentation(StaticRoutes1.class).getIpv4().getRoute()
.get(0), mappingContext);
assertEquals(
StaticRoutes ipv6StaticRouteWithClassifier) {
final IpAddDelRoute request =
factory.createIpv6SimpleHopRequest(false, ROUTE_PROTOCOL_NAME,
- ipv6StaticRouteWithClassifier.getAugmentation(StaticRoutes1.class).getIpv6().getRoute().get(0),
+ ipv6StaticRouteWithClassifier.augmentation(StaticRoutes1.class).getIpv6().getRoute().get(0),
mappingContext);
assertEquals(desiredFlaglessResult(0, 1, 0, Ipv6RouteData.FIRST_ADDRESS_AS_ARRAY, 64,
StaticRoutes ipv6StaticRouteWithoutClassifier) {
final IpAddDelRoute request =
factory.createIpv6SimpleHopRequest(false, ROUTE_PROTOCOL_NAME,
- ipv6StaticRouteWithoutClassifier.getAugmentation(StaticRoutes1.class).getIpv6().getRoute()
- .get(0),
+ ipv6StaticRouteWithoutClassifier.augmentation(StaticRoutes1.class).getIpv6().getRoute().get(0),
mappingContext);
assertEquals(desiredFlaglessResult(0, 1, 0, Ipv6RouteData.FIRST_ADDRESS_AS_ARRAY, 64,
StaticRoutes ipv6StaticRouteWithoutRouteAttrs) {
final IpAddDelRoute request =
factory.createIpv6SimpleHopRequest(false, ROUTE_PROTOCOL_NAME,
- ipv6StaticRouteWithoutRouteAttrs.getAugmentation(StaticRoutes1.class).getIpv6().getRoute()
- .get(0),
+ ipv6StaticRouteWithoutRouteAttrs.augmentation(StaticRoutes1.class).getIpv6().getRoute().get(0),
mappingContext);
assertEquals(desiredFlaglessResult(0, 1, 0, Ipv6RouteData.FIRST_ADDRESS_AS_ARRAY, 64,
}
private Route extractSingleRoute(final StaticRoutes staticRoutes, final Ipv4Prefix id) {
- return staticRoutes.getAugmentation(StaticRoutes1.class).getIpv4().getRoute().stream()
+ return staticRoutes.augmentation(StaticRoutes1.class).getIpv4().getRoute().stream()
.filter(route -> route.getDestinationPrefix().getValue().equals(id.getValue()))
.collect(RWUtils.singleItemCollector());
}
}
private Route extractSingleRoute(final StaticRoutes staticRoutes, final Ipv6Prefix id) {
- return staticRoutes.getAugmentation(StaticRoutes1.class).getIpv6().getRoute().stream()
+ return staticRoutes.augmentation(StaticRoutes1.class).getIpv6().getRoute().stream()
.filter(route -> route.getDestinationPrefix().getValue().equals(id.getValue())).collect(
RWUtils.singleItemCollector());
}
Srv6PolicyMapping policy = policyCtx.getPolicy(bsid, ctx.getMappingContext());
IpAddress endpoint = new IpAddress(policy.getEndpoint());
builder.setName(policy.getName()).setEndpoint(endpoint).setColor(policy.getColor());
- builder.setKey(new PolicyKey(policy.getColor(), endpoint));
+ builder.withKey(new PolicyKey(policy.getColor(), endpoint));
builder.setBindingSid(new BindingSidBuilder().setState(
new StateBuilder().setType(DataplaneType.Srv6).setAllocMode(BindingSidAllocMode.Explicit)
.setValue(new SidValueType(new IpAddress(bsid))).build()).build());
final ReadContext ctx)
throws ReadFailedException {
NamedSegmentListKey key = id.firstKeyOf(NamedSegmentList.class);
- builder.setKey(key)
+ builder.withKey(key)
.setName(key.getName())
.setState(
new org.opendaylight.yang.gen.v1.http.cisco.com.ns.yang.oc.srte.policy.rev170918.segment.list.properties.StateBuilder()
private Segment parseSrv6Sid(final long i, final Srv6Sid srv6Sid) {
// shifting index by 1 so it matches original indexing
long index = i + 1L;
- SegmentBuilder builder = new SegmentBuilder().setKey(new SegmentKey(index)).setState(
+ SegmentBuilder builder = new SegmentBuilder().withKey(new SegmentKey(index)).setState(
new org.opendaylight.yang.gen.v1.http.cisco.com.ns.yang.oc.srte.policy.rev170918.segment.properties.StateBuilder()
.setIndex(index)
.setType(SegmentType.Type2)
final Ipv6Address sidAddress, final SidBuilder builder) {
Class<? extends Srv6EndpointType> behaviorType = parseEndBehaviorType(detail.behavior);
Srv6FuncOpcodeUnreserved opcode = extractOpCode(sidAddress, readContext.getMappingContext(), locName);
- builder.setEndBehaviorType(behaviorType).setKey(new SidKey(opcode)).setOpcode(opcode);
+ builder.setEndBehaviorType(behaviorType).withKey(new SidKey(opcode)).setOpcode(opcode);
parseEndFunction(builder, detail, readContext);
}
Ipv6Address locator = extractLocator(arrayToIpv6AddressNoZone(detail.addr.addr), mappingContext, locName);
int locLength = LocatorContextManager.parseLength(locatorCtx.getLocator(locName, mappingContext));
- builder.setKey(new LocatorKey(locator.getValue()))
+ builder.withKey(new LocatorKey(locator.getValue()))
.setName(locator.getValue())
.setPrefix(
new PrefixBuilder()
private void parseL2Steering(SrSteeringPolDetails srSteeringPolDetails, final InterfaceBuilder builder,
ReadContext ctx) {
String name = ifcNamingContext.getName(srSteeringPolDetails.swIfIndex, ctx.getMappingContext());
- builder.setInputInterface(name).setKey(new InterfaceKey(name))
+ builder.setInputInterface(name).withKey(new InterfaceKey(name))
.setState(new StateBuilder().setInputInterface(name).build());
}
}
private void parseL3Steering(SrSteeringPolDetails srSteeringPolDetails, final PrefixBuilder builder) {
PrefixKey key = parseL3SteeringKey(srSteeringPolDetails);
- builder.setKey(key).setIpPrefix(key.getIpPrefix())
+ builder.withKey(key).setIpPrefix(key.getIpPrefix())
.setState(new StateBuilder().setIpPrefix(key.getIpPrefix()).build());
}
final KeyedInstanceIdentifier<Srv6CandidatePathMapping, Srv6CandidatePathMappingKey> mappingIid =
getCandidatePathIid(bsid);
final Srv6CandidatePathMappingBuilder builder =
- new Srv6CandidatePathMappingBuilder().setKey(new Srv6CandidatePathMappingKey(bsid))
+ new Srv6CandidatePathMappingBuilder().withKey(new Srv6CandidatePathMappingKey(bsid))
.setProvisioningMethod(provisioningMethod).setPreference(preference)
.setDistinguisher(distinguisher).setBsid(bsid).setName(name);
ctx.put(mappingIid, builder.build());
@Nonnull final MappingContext ctx) {
final KeyedInstanceIdentifier<Srv6LocatorMapping, Srv6LocatorMappingKey> mappingIid = getLocatorIid(name);
final Srv6LocatorMappingBuilder builder = new Srv6LocatorMappingBuilder()
- .setKey(new Srv6LocatorMappingKey(name)).setPrefix(ipv6Prefix).setName(name);
+ .withKey(new Srv6LocatorMappingKey(name)).setPrefix(ipv6Prefix).setName(name);
ctx.put(mappingIid, builder.build());
}
@Nonnull final Ipv6Address bsid, @Nonnull final MappingContext ctx) {
final KeyedInstanceIdentifier<Srv6PolicyMapping, Srv6PolicyMappingKey> mappingIid = getPolicyIid(bsid);
final Srv6PolicyMappingBuilder builder =
- new Srv6PolicyMappingBuilder().setKey(new Srv6PolicyMappingKey(bsid)).setColor(color)
+ new Srv6PolicyMappingBuilder().withKey(new Srv6PolicyMappingKey(bsid)).setColor(color)
.setEndpoint(endpoint).setBsid(bsid).setName(name);
ctx.put(mappingIid, builder.build());
}
? writeContext.readAfter(RWUtils.cutId(instanceIdentifier, Policy.class))
: writeContext.readBefore(RWUtils.cutId(instanceIdentifier, Policy.class));
- if (policyOptional.isPresent() && policyOptional.get().getAugmentation(VppSrPolicyAugmentation.class) != null &&
- policyOptional.get().getAugmentation(VppSrPolicyAugmentation.class).getVppSrPolicy() != null) {
+ if (policyOptional.isPresent() && policyOptional.get().augmentation(VppSrPolicyAugmentation.class) != null &&
+ policyOptional.get().augmentation(VppSrPolicyAugmentation.class).getVppSrPolicy() != null) {
VppSrPolicy vppSrPolicy =
- policyOptional.get().getAugmentation(VppSrPolicyAugmentation.class).getVppSrPolicy();
+ policyOptional.get().augmentation(VppSrPolicyAugmentation.class).getVppSrPolicy();
if (vppSrPolicy.getConfig() != null && vppSrPolicy.getConfig().getTableId() != null) {
return vppSrPolicy.getConfig().getTableId().getValue().intValue();
}
try {
// Fib table must be created beforehand. First we check if all data is present, then we verify the existence
// of FIB table in current configuration
- VppSrPolicyAugmentation policyAugmentation = policy.getAugmentation(VppSrPolicyAugmentation.class);
+ VppSrPolicyAugmentation policyAugmentation = policy.augmentation(VppSrPolicyAugmentation.class);
if (policyAugmentation != null && policyAugmentation.getVppSrPolicy() != null &&
policyAugmentation.getVppSrPolicy().getConfig() != null) {
private Table getVrfTable(final @Nonnull InstanceIdentifier<Sid> iid, final @Nonnull WriteContext writeContext,
final InstanceIdentifier<Locator> locatorIid, final Optional<Locator> locatorOpt) {
Preconditions.checkArgument(locatorOpt.isPresent(), "Locator: {} for SID: {} was not found.", locatorIid, iid);
- Preconditions.checkNotNull(locatorOpt.get().getAugmentation(VppSrv6FibLocatorAugment.class),
+ Preconditions.checkNotNull(locatorOpt.get().augmentation(VppSrv6FibLocatorAugment.class),
"Vpp FIB table augmentation was not found for SID: {}.", iid);
- FibTable fibTable = locatorOpt.get().getAugmentation(VppSrv6FibLocatorAugment.class).getFibTable();
+ FibTable fibTable = locatorOpt.get().augmentation(VppSrv6FibLocatorAugment.class).getFibTable();
Preconditions.checkNotNull(fibTable, "Vpp FIB table configuration was not found for SID: {}.", iid);
TableKey tableKey = new TableKey(fibTable.getAddressFamily(), fibTable.getTableId());
KeyedInstanceIdentifier<Table, TableKey> vrfIid = FibManagementIIds.FM_FIB_TABLES.child(Table.class, tableKey);
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));
KeyedInstanceIdentifier<Policy, PolicyKey> 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));
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();
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));
LocatorBuilder builder = new LocatorBuilder();
request.readSpecific(ID_LOC, readCtx, builder);
- Assert.assertEquals(new LocatorKey("a::"), builder.getKey());
+ Assert.assertEquals(new LocatorKey("a::"), builder.key());
}
}
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();
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();
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()));
}
private static final PolicyKey POLICY_KEY = new PolicyKey(1L, new IpAddress(new Ipv6Address("e::1")));
private static final KeyedInstanceIdentifier<Table, TableKey> 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)
],
"body": {
"mode": "raw",
- "raw": "{\r\n \"sub-interface\": [\r\n {\r\n \"identifier\": \"1\",\r\n \"vlan-type\": \"802dot1q\",\r\n \"tags\": {\r\n \"tag\": [\r\n {\r\n \"index\": \"0\",\r\n \"dot1q-tag\": {\r\n \"tag-type\": \"dot1q-types:s-vlan\",\r\n \"vlan-id\": \"100\"\r\n }\r\n },\r\n {\r\n \"index\": \"1\",\r\n \"dot1q-tag\": {\r\n \"tag-type\": \"dot1q-types:c-vlan\",\r\n \"vlan-id\": \"any\"\r\n }\r\n }\r\n ]\r\n },\r\n \"match\": {\r\n \"vlan-tagged\": {\r\n \"match-exact-tags\": \"true\"\r\n }\r\n },\r\n \"enabled\": \"false\"\r\n }\r\n ]\r\n}"
+ "raw": "{\r\n \"sub-interface\": [\r\n {\r\n \"identifier\": \"1\",\r\n \"vlan-type\": \"_802dot1q\",\r\n \"tags\": {\r\n \"tag\": [\r\n {\r\n \"index\": \"0\",\r\n \"dot1q-tag\": {\r\n \"tag-type\": \"dot1q-types:s-vlan\",\r\n \"vlan-id\": \"100\"\r\n }\r\n },\r\n {\r\n \"index\": \"1\",\r\n \"dot1q-tag\": {\r\n \"tag-type\": \"dot1q-types:c-vlan\",\r\n \"vlan-id\": \"any\"\r\n }\r\n }\r\n ]\r\n },\r\n \"match\": {\r\n \"vlan-tagged\": {\r\n \"match-exact-tags\": \"true\"\r\n }\r\n },\r\n \"enabled\": \"false\"\r\n }\r\n ]\r\n}"
},
"url": {
"raw": "http://localhost:8183/restconf/config/ietf-interfaces:interfaces/interface/GigabitEthernet0%2F9%2F0/vpp-vlan:sub-interfaces/sub-interface/1",
],
"body": {
"mode": "raw",
- "raw": "{\r\n \r\n \"interface\": [\r\n {\r\n \"name\": \"GigabitEthernet0/9/0\",\r\n \"type\": \"iana-if-type:ethernetCsmacd\",\r\n \"v3po:ethernet\": {\r\n \"mtu\": 9216\r\n },\r\n \"enabled\": true,\r\n \"vpp-vlan:sub-interfaces\": {\r\n \"sub-interface\": [\r\n {\r\n \"identifier\": 1,\r\n \"vlan-type\": \"802dot1q\",\r\n \"tags\": {\r\n \"tag\": [\r\n {\r\n \"index\": 1,\r\n \"dot1q-tag\": {\r\n \"tag-type\": \"dot1q-types:c-vlan\",\r\n \"vlan-id\": \"any\"\r\n }\r\n },\r\n {\r\n \"index\": 0,\r\n \"dot1q-tag\": {\r\n \"tag-type\": \"dot1q-types:s-vlan\",\r\n \"vlan-id\": \"100\"\r\n }\r\n }\r\n ]\r\n },\r\n \"match\": {\r\n \"vlan-tagged\": {\r\n \"match-exact-tags\": true\r\n }\r\n },\r\n \"enabled\": false\r\n }\r\n ]\r\n }\r\n }\r\n ]\r\n \r\n}"
+ "raw": "{\r\n \r\n \"interface\": [\r\n {\r\n \"name\": \"GigabitEthernet0/9/0\",\r\n \"type\": \"iana-if-type:ethernetCsmacd\",\r\n \"v3po:ethernet\": {\r\n \"mtu\": 9216\r\n },\r\n \"enabled\": true,\r\n \"vpp-vlan:sub-interfaces\": {\r\n \"sub-interface\": [\r\n {\r\n \"identifier\": 1,\r\n \"vlan-type\": \"_802dot1q\",\r\n \"tags\": {\r\n \"tag\": [\r\n {\r\n \"index\": 1,\r\n \"dot1q-tag\": {\r\n \"tag-type\": \"dot1q-types:c-vlan\",\r\n \"vlan-id\": \"any\"\r\n }\r\n },\r\n {\r\n \"index\": 0,\r\n \"dot1q-tag\": {\r\n \"tag-type\": \"dot1q-types:s-vlan\",\r\n \"vlan-id\": \"100\"\r\n }\r\n }\r\n ]\r\n },\r\n \"match\": {\r\n \"vlan-tagged\": {\r\n \"match-exact-tags\": true\r\n }\r\n },\r\n \"enabled\": false\r\n }\r\n ]\r\n }\r\n }\r\n ]\r\n \r\n}"
},
"url": {
"raw": "http://localhost:8183/restconf/config/ietf-interfaces:interfaces/interface/GigabitEthernet0%2F9%2F0",
],
"body": {
"mode": "raw",
- "raw": "{\r\n \"sub-interface\": [\r\n {\r\n \"identifier\": \"1\",\r\n \"vlan-type\": \"802dot1q\",\r\n \"tags\": {\r\n \"tag\": [\r\n {\r\n \"index\": \"0\",\r\n \"dot1q-tag\": {\r\n \"tag-type\": \"dot1q-types:s-vlan\",\r\n \"vlan-id\": \"100\"\r\n }\r\n },\r\n {\r\n \"index\": \"1\",\r\n \"dot1q-tag\": {\r\n \"tag-type\": \"dot1q-types:c-vlan\",\r\n \"vlan-id\": \"any\"\r\n }\r\n }\r\n ]\r\n },\r\n \"match\": {\r\n \"vlan-tagged\": {\r\n \"match-exact-tags\": \"true\"\r\n }\r\n },\r\n \"enabled\": \"true\"\r\n }\r\n ]\r\n}"
+ "raw": "{\r\n \"sub-interface\": [\r\n {\r\n \"identifier\": \"1\",\r\n \"vlan-type\": \"_802dot1q\",\r\n \"tags\": {\r\n \"tag\": [\r\n {\r\n \"index\": \"0\",\r\n \"dot1q-tag\": {\r\n \"tag-type\": \"dot1q-types:s-vlan\",\r\n \"vlan-id\": \"100\"\r\n }\r\n },\r\n {\r\n \"index\": \"1\",\r\n \"dot1q-tag\": {\r\n \"tag-type\": \"dot1q-types:c-vlan\",\r\n \"vlan-id\": \"any\"\r\n }\r\n }\r\n ]\r\n },\r\n \"match\": {\r\n \"vlan-tagged\": {\r\n \"match-exact-tags\": \"true\"\r\n }\r\n },\r\n \"enabled\": \"true\"\r\n }\r\n ]\r\n}"
},
"url": {
"raw": "http://localhost:8183/restconf/config/ietf-interfaces:interfaces/interface/GigabitEthernet0%2F9%2F0/vpp-vlan:sub-interfaces/sub-interface/1",
],
"body": {
"mode": "raw",
- "raw": "{\r\n \"rewrite\": {\r\n \"vlan-type\": \"vpp-vlan:802dot1q\",\r\n \"push-tags\": [\r\n {\r\n \"index\": 0,\r\n \"dot1q-tag\": {\r\n \"tag-type\": \"dot1q-types:s-vlan\",\r\n \"vlan-id\": 123\r\n }\r\n },\r\n {\r\n \"index\": 1,\r\n \"dot1q-tag\": {\r\n \"tag-type\": \"dot1q-types:c-vlan\",\r\n \"vlan-id\": 456\r\n }\r\n }\r\n ]\r\n }\r\n}"
+ "raw": "{\r\n \"rewrite\": {\r\n \"vlan-type\": \"vpp-vlan:_802dot1q\",\r\n \"push-tags\": [\r\n {\r\n \"index\": 0,\r\n \"dot1q-tag\": {\r\n \"tag-type\": \"dot1q-types:s-vlan\",\r\n \"vlan-id\": 123\r\n }\r\n },\r\n {\r\n \"index\": 1,\r\n \"dot1q-tag\": {\r\n \"tag-type\": \"dot1q-types:c-vlan\",\r\n \"vlan-id\": 456\r\n }\r\n }\r\n ]\r\n }\r\n}"
},
"url": {
"raw": "http://localhost:8183/restconf/config/ietf-interfaces:interfaces/interface/GigabitEthernet0%2F9%2F0/vpp-vlan:sub-interfaces/sub-interface/1/l2/rewrite",
],
"body": {
"mode": "raw",
- "raw": "{\r\n \"rewrite\": {\r\n \"vlan-type\": \"vpp-vlan:802dot1q\",\r\n \"pop-tags\": \"1\",\r\n \"push-tags\": [\r\n {\r\n \"index\": 0,\r\n \"dot1q-tag\": {\r\n \"tag-type\": \"dot1q-types:s-vlan\",\r\n \"vlan-id\": 111\r\n }\r\n },\r\n {\r\n \"index\": 1,\r\n \"dot1q-tag\": {\r\n \"tag-type\": \"dot1q-types:c-vlan\",\r\n \"vlan-id\": 222\r\n }\r\n }\r\n ]\r\n }\r\n}"
+ "raw": "{\r\n \"rewrite\": {\r\n \"vlan-type\": \"vpp-vlan:_802dot1q\",\r\n \"pop-tags\": \"1\",\r\n \"push-tags\": [\r\n {\r\n \"index\": 0,\r\n \"dot1q-tag\": {\r\n \"tag-type\": \"dot1q-types:s-vlan\",\r\n \"vlan-id\": 111\r\n }\r\n },\r\n {\r\n \"index\": 1,\r\n \"dot1q-tag\": {\r\n \"tag-type\": \"dot1q-types:c-vlan\",\r\n \"vlan-id\": 222\r\n }\r\n }\r\n ]\r\n }\r\n}"
},
"url": {
"raw": "http://localhost:8183/restconf/config/ietf-interfaces:interfaces/interface/GigabitEthernet0%2F9%2F0/vpp-vlan:sub-interfaces/sub-interface/1/l2/rewrite",
if (interfaceData.isPresent()) {
final java.util.Optional<Interface1> 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);
private PushTags buildTag(final short index, final Class<? extends Dot1qTagVlanType> 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));
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);
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));
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();
}
.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()))
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())
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))
}
builder.setStaticConfig(byteToBoolean(entry.staticMac));
builder.setPhysAddress(key.getPhysAddress());
- builder.setKey(key);
+ builder.withKey(key);
} catch (Exception e) {
throw new ReadFailedException(id, e);
}
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);
private MirroredInterface mirroredInterface(final String ifaceName, final SpanState state) {
return new MirroredInterfaceBuilder()
.setIfaceRef(ifaceName)
- .setKey(new MirroredInterfaceKey(ifaceName))
+ .withKey(new MirroredInterfaceKey(ifaceName))
.setState(state)
.build();
}
private ArpTerminationTableEntry generateArpEntry(final IpAddressNoZone ipAddress, final PhysAddress physAddress) {
final ArpTerminationTableEntryBuilder entry = new ArpTerminationTableEntryBuilder();
- entry.setKey(new ArpTerminationTableEntryKey(ipAddress, physAddress));
+ entry.withKey(new ArpTerminationTableEntryKey(ipAddress, physAddress));
entry.setPhysAddress(physAddress);
entry.setIpAddress(ipAddress);
return entry.build();
private L2FibEntry generateL2FibFilterEntry(final PhysAddress address) {
final L2FibEntryBuilder entry = new L2FibEntryBuilder();
- entry.setKey(new L2FibEntryKey(address));
+ entry.withKey(new L2FibEntryKey(address));
entry.setPhysAddress(address);
entry.setStaticConfig(true);
entry.setBridgedVirtualInterface(false);
private L2FibEntry generateL2FibForwardEntry(final PhysAddress address) {
final L2FibEntryBuilder entry = new L2FibEntryBuilder();
- entry.setKey(new L2FibEntryKey(address));
+ entry.withKey(new L2FibEntryKey(address));
entry.setPhysAddress(address);
entry.setStaticConfig(true);
entry.setBridgedVirtualInterface(false);
verify(builder).setOutgoingInterface(IFACE_NAME);
verify(builder).setStaticConfig(false);
verify(builder).setPhysAddress(address);
- verify(builder).setKey(new L2FibEntryKey(address));
+ verify(builder).withKey(new L2FibEntryKey(address));
}
private L2FibTableDetails generateL2FibEntry(final byte[] mac) {
assertTrue(read.isPresent());
assertEquals(readRoot.getBridgeDomain().stream().filter(
- input -> input.getKey().getName().equals(bdName)).findFirst().get(),
+ input -> input.key().getName().equals(bdName)).findFirst().get(),
read.get());
}
// mandatory values:
builder.setName(tableName);
- builder.setKey(key);
+ builder.withKey(key);
builder.setNbuckets(UnsignedInts.toLong(reply.nbuckets));
builder.setSkipNVectors(UnsignedInts.toLong(reply.skipNVectors));
final ClassifyTableBuilder builder = new ClassifyTableBuilder();
builder.setName(name);
builder.setClassifierNode(new VppNodeName("ip4-classifier"));
- builder.setKey(new ClassifyTableKey(name));
+ builder.withKey(new ClassifyTableKey(name));
builder.setSkipNVectors(0L);
builder.setNbuckets(2L);
builder.setMemorySize(2L << 20);
// safest way to compare addresses - prevents returning false while using different types from hierarchy
// Ex. Key for MapResolver contains Ipv4Address as value but we translate addresses from binary data to Ipv4AddressNoZone
default boolean addressesEqual(final IpAddress left, final IpAddress right) {
- return Arrays.equals(left.getValue(), right.getValue());
+ return left.stringValue().equalsIgnoreCase(right.stringValue());
}
/**
// overrides old data with new(without removed child)
mappingContext.put(getMappingIid(parentName), new MappingBuilder()
.setName(mapping.getName())
- .setKey(mapping.getKey())
+ .withKey(mapping.key())
.setValue(mapping.getValue()
.stream()
.filter(value -> !value.getName().equals(childName))
}
private Value valueFor(final String name, final int index) {
- return new ValueBuilder().setName(name).setIndex(index).setKey(new ValueKey(name)).build();
+ return new ValueBuilder().setName(name).setIndex(index).withKey(new ValueKey(name)).build();
}
}
<artifactId>translate-api</artifactId>
<version>${honeycomb.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.opendaylight.mdsal</groupId>
+ <artifactId>yang-binding</artifactId>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
ModelTypeIndex() throws IOException {
namespaceToModuleIndex = collectAllModules(this.getClass().getClassLoader())
.stream()
- .collect(toMap(YangModelKey::new, YangModuleInfo::getName));
+ .collect(toMap(YangModelKey::new, yangModuleInfo -> yangModuleInfo.getName().toString()));
}
private static YangModelBindingProvider getModuleBindingProviderInstance(final Class<?> aClass) {
* limitations under the License.
*/
-package io.fd.hc2vpp.docs.core;import org.opendaylight.yangtools.yang.binding.YangModuleInfo;
+package io.fd.hc2vpp.docs.core;
+
+import java.util.Optional;
+import org.opendaylight.yangtools.yang.binding.YangModuleInfo;
+import org.opendaylight.yangtools.yang.common.Revision;
final class YangModelKey {
private final String namespace;
private final String revision;
YangModelKey(final YangModuleInfo moduleInfo) {
- this.namespace = moduleInfo.getNamespace();
- this.revision = moduleInfo.getRevision();
+ this.namespace = moduleInfo.getName().getNamespace().toString();
+ Optional<Revision> optRevision = moduleInfo.getName().getRevision();
+ this.revision = optRevision.isPresent() ? optRevision.get().toString() : "";
}
YangModelKey(final String namespace, final String revision) {
Code Review / hc2vpp.git / commitdiff