BUG-608 : fixed typo

- ip4 vs ipv4

Change-Id: Ib48cd1df3c6ad156f93a80639980e1f835dbc992
Signed-off-by: Dana Kutenicsova <dkutenic@cisco.com>

diff --git a/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/attribute/sr/SrNodeAttributesParser.java b/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/attribute/sr/SrNodeAttributesParser.java
index bc7eb960f876a4fe7f3645380e6ab64339cbf658..d776aaadf90ee5456249628ff05141b1473e77ee 100644 (file)
--- a/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/attribute/sr/SrNodeAttributesParser.java
+++ b/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/attribute/sr/SrNodeAttributesParser.java
@@ -35,10 +35,10 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.segm
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.segment.routing.rev150206.sid.sub.tlvs.SubtlvType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.segment.routing.rev150206.sid.sub.tlvs.subtlv.type.EroMetricCase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.segment.routing.rev150206.sid.sub.tlvs.subtlv.type.EroMetricCaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.segment.routing.rev150206.sid.sub.tlvs.subtlv.type.Ip4EroBackupCase;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.segment.routing.rev150206.sid.sub.tlvs.subtlv.type.Ip4EroBackupCaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.segment.routing.rev150206.sid.sub.tlvs.subtlv.type.Ip4EroCase;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.segment.routing.rev150206.sid.sub.tlvs.subtlv.type.Ip4EroCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.segment.routing.rev150206.sid.sub.tlvs.subtlv.type.Ipv4EroBackupCase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.segment.routing.rev150206.sid.sub.tlvs.subtlv.type.Ipv4EroBackupCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.segment.routing.rev150206.sid.sub.tlvs.subtlv.type.Ipv4EroCase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.segment.routing.rev150206.sid.sub.tlvs.subtlv.type.Ipv4EroCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.segment.routing.rev150206.sid.sub.tlvs.subtlv.type.Ipv6EroBackupCase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.segment.routing.rev150206.sid.sub.tlvs.subtlv.type.Ipv6EroBackupCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.segment.routing.rev150206.sid.sub.tlvs.subtlv.type.Ipv6EroCase;
@@ -100,7 +100,7 @@ public final class SrNodeAttributesParser {
                 sub = new EroMetricCaseBuilder().setEroMetric(new TeMetric(value.readUnsignedInt())).build();
                 break;
             case ERO_IPV4:
-                final Ip4EroCaseBuilder ero4 = new Ip4EroCaseBuilder().setLoose(value.readUnsignedByte() != 0);
+                final Ipv4EroCaseBuilder ero4 = new Ipv4EroCaseBuilder().setLoose(value.readUnsignedByte() != 0);
                 ero4.setAddress(new IpAddress(Ipv4Util.addressForByteBuf(value)));
                 sub = ero4.build();
                 break;
@@ -116,7 +116,7 @@ public final class SrNodeAttributesParser {
                 sub = un.build();
                 break;
             case BACKUP_IPV4:
-                final Ip4EroBackupCaseBuilder erob4 = new Ip4EroBackupCaseBuilder().setLoose(value.readUnsignedByte() != 0);
+                final Ipv4EroBackupCaseBuilder erob4 = new Ipv4EroBackupCaseBuilder().setLoose(value.readUnsignedByte() != 0);
                 erob4.setAddress(new IpAddress(Ipv4Util.addressForByteBuf(value)));
                 sub = erob4.build();
                 break;
@@ -179,9 +179,9 @@ public final class SrNodeAttributesParser {
                 final ByteBuf b = Unpooled.buffer();
                 ByteBufWriteUtil.writeUnsignedInt(((EroMetricCase)type).getEroMetric().getValue(), b);
                 TlvUtil.writeSrTLV(ERO_METRIC, b, buffer);
-            } else if (type instanceof Ip4EroCase) {
+            } else if (type instanceof Ipv4EroCase) {
                 final ByteBuf b = Unpooled.buffer(Ipv4Util.IP4_LENGTH + FLAGS_SIZE);
-                final Ip4EroCase ero = (Ip4EroCase)type;
+                final Ipv4EroCase ero = (Ipv4EroCase)type;
                 b.writeByte(serializeLoose(ero.isLoose()));
                 ByteBufWriteUtil.writeIpv4Address(ero.getAddress().getIpv4Address(), b);
                 TlvUtil.writeSrTLV(ERO_IPV4, b, buffer);
@@ -198,9 +198,9 @@ public final class SrNodeAttributesParser {
                 b.writeBytes(ero.getRouterId());
                 ByteBufWriteUtil.writeUnsignedInt(ero.getInterfaceId(), b);
                 TlvUtil.writeSrTLV(UNNUMBERED_ERO, b, buffer);
-            } else if (type instanceof Ip4EroBackupCase) {
+            } else if (type instanceof Ipv4EroBackupCase) {
                 final ByteBuf b = Unpooled.buffer(Ipv4Util.IP4_LENGTH + FLAGS_SIZE);
-                final Ip4EroBackupCase ero = (Ip4EroBackupCase)type;
+                final Ipv4EroBackupCase ero = (Ipv4EroBackupCase)type;
                 b.writeByte(serializeLoose(ero.isLoose()));
                 ByteBufWriteUtil.writeIpv4Address(ero.getAddress().getIpv4Address(), b);
                 TlvUtil.writeSrTLV(BACKUP_IPV4, b, buffer);

diff --git a/bgp/linkstate/src/main/yang/bgp-segment-routing.yang b/bgp/linkstate/src/main/yang/bgp-segment-routing.yang
index e7b9985fe837134eb0232f7abb2f8233922bb0df..dd16214e6d6478d395dcba96d0b4ef9fada52e6a 100644 (file)
--- a/bgp/linkstate/src/main/yang/bgp-segment-routing.yang
+++ b/bgp/linkstate/src/main/yang/bgp-segment-routing.yang
@@ -112,7 +112,7 @@ module bgp-segment-routing {
                     type netc:te-metric;
                 }
             }
-            case ip4-ero-case {
+            case ipv4-ero-case {
                 uses ero-ip-address;
             }
             case ipv6-ero-case {
@@ -121,7 +121,7 @@ module bgp-segment-routing {
             case unnumbered-ero-case {
                 uses ero-unnumbered;
             }
-            case ip4-ero-backup-case {
+            case ipv4-ero-backup-case {
                 uses ero-ip-address;
             }
             case ipv6-ero-backup-case {

diff --git a/bgp/linkstate/src/test/java/org/opendaylight/protocol/bgp/linkstate/SrAttributeParserTest.java b/bgp/linkstate/src/test/java/org/opendaylight/protocol/bgp/linkstate/SrAttributeParserTest.java
index 5c2128604ac47c68550ed7bcbbf73db461489ffe..6182118184fc220086a19981c2ed49a62e709b88 100644 (file)
--- a/bgp/linkstate/src/test/java/org/opendaylight/protocol/bgp/linkstate/SrAttributeParserTest.java
+++ b/bgp/linkstate/src/test/java/org/opendaylight/protocol/bgp/linkstate/SrAttributeParserTest.java
@@ -49,7 +49,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.segm
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.segment.routing.rev150206.sid.label.binding.SubTlvs;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.segment.routing.rev150206.sid.label.binding.SubTlvsBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.segment.routing.rev150206.sid.sub.tlvs.subtlv.type.EroMetricCaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.segment.routing.rev150206.sid.sub.tlvs.subtlv.type.Ip4EroCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.segment.routing.rev150206.sid.sub.tlvs.subtlv.type.Ipv4EroCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.segment.routing.rev150206.sid.sub.tlvs.subtlv.type.SidLabelCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.segment.routing.rev150206.sid.sub.tlvs.subtlv.type.UnnumberedEroCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.network.concepts.rev131125.IsoSystemIdentifier;
@@ -63,7 +63,7 @@ public class SrAttributeParserTest {
         final List<SubTlvs> subs = new ArrayList<>();
         subs.add(new SubTlvsBuilder().setSubtlvType(new SidLabelCaseBuilder().setSid(new SidLabel(new byte[] {1,2,3,4})).build()).build());
         subs.add(new SubTlvsBuilder().setSubtlvType(new EroMetricCaseBuilder().setEroMetric(new TeMetric((long) 8)).build()).build());
-        subs.add(new SubTlvsBuilder().setSubtlvType(new Ip4EroCaseBuilder().setLoose(true).setAddress(new IpAddress(new Ipv4Address("10.0.0.1"))).build()).build());
+        subs.add(new SubTlvsBuilder().setSubtlvType(new Ipv4EroCaseBuilder().setLoose(true).setAddress(new IpAddress(new Ipv4Address("10.0.0.1"))).build()).build());
         subs.add(new SubTlvsBuilder().setSubtlvType(new UnnumberedEroCaseBuilder().setLoose(true).setRouterId(new byte[] {1,2,3,4}).setInterfaceId((long)500).build()).build());
         final SrSidLabel b4 = new SrSidLabelBuilder().setSidLabelFlags(new SidLabelFlags(Boolean.TRUE, Boolean.TRUE))
             .setWeight(new Weight((short) 24)).setFecPrefix(new IpPrefix(new Ipv4Prefix("127.0.0.0/8"))).setValueRange(42).setSubTlvs(subs).build();