Fixed unstable tests after yangtools update.

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

diff --git a/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/LinkstateAttributeParser.java b/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/LinkstateAttributeParser.java
index 767dd9da0eba0f86a0f8fc17b0a53ae305e09732..ce835ff5fc3855a93f21f02e3efc1f028b8bddca 100644 (file)
--- a/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/LinkstateAttributeParser.java
+++ b/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/LinkstateAttributeParser.java
@@ -182,19 +182,25 @@ public class LinkstateAttributeParser implements AttributeParser {
                                        logger.debug("Parsed Administrative Group {}", builder.getAdminGroup());
                                        break;
                                case 1089:
-                                       builder.setMaxLinkBandwidth(new Bandwidth(value));
+                                       final byte[] b = new byte[8];
+                                       System.arraycopy(value, 0, b, 8 - value.length, value.length);
+                                       builder.setMaxLinkBandwidth(new Bandwidth(b));
                                        logger.debug("Parsed Max Bandwidth {}", builder.getMaxLinkBandwidth());
                                        break;
                                case 1090:
-                                       builder.setMaxReservableBandwidth(new Bandwidth(value));
+                                       final byte[] mrb = new byte[8];
+                                       System.arraycopy(value, 0, mrb, 8 - value.length, value.length);
+                                       builder.setMaxReservableBandwidth(new Bandwidth(mrb));
                                        logger.debug("Parsed Max Reservable Bandwidth {}", builder.getMaxReservableBandwidth());
                                        break;
                                case 1091:
                                        int index = 0;
                                        final List<org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev130918.link.state.UnreservedBandwidth> unreservedBandwidth = Lists.newArrayList();
                                        for (int i = 0; i < 8; i++) {
-                                               unreservedBandwidth.add(new UnreservedBandwidthBuilder().setBandwidth(
-                                                               new Bandwidth(ByteArray.subByte(value, index, 4))).setPriority((short) i).build());
+                                               final byte[] dest = new byte[8];
+                                               final byte[] v = ByteArray.subByte(value, index, 4);
+                                               System.arraycopy(v, 0, dest, 8 - v.length, v.length);
+                                               unreservedBandwidth.add(new UnreservedBandwidthBuilder().setBandwidth(new Bandwidth(dest)).setPriority((short) i).build());
                                                index += 4;
                                        }
                                        builder.setUnreservedBandwidth(unreservedBandwidth);
@@ -286,7 +292,9 @@ public class LinkstateAttributeParser implements AttributeParser {
                                        logger.debug("Parsed Node Name {}", builder.getDynamicHostname());
                                        break;
                                case 1027:
-                                       final IsisAreaIdentifier ai = new IsisAreaIdentifier(value);
+                                       final byte[] dest = new byte[20];
+                                       System.arraycopy(value, 0, dest, 20 - value.length, value.length);
+                                       final IsisAreaIdentifier ai = new IsisAreaIdentifier(dest);
                                        areaMembership.add(ai);
                                        logger.debug("Parsed AreaIdentifier {}", ai);
                                        break;

diff --git a/bgp/linkstate/src/test/java/org/opendaylight/protocol/bgp/linkstate/LinkstateAttributeParserTest.java b/bgp/linkstate/src/test/java/org/opendaylight/protocol/bgp/linkstate/LinkstateAttributeParserTest.java
index 5b68935dbf73ff35842f727d17ad554354d5d6d8..d0a8684d12174fccd689a021da48979d69a9de52 100644 (file)
--- a/bgp/linkstate/src/test/java/org/opendaylight/protocol/bgp/linkstate/LinkstateAttributeParserTest.java
+++ b/bgp/linkstate/src/test/java/org/opendaylight/protocol/bgp/linkstate/LinkstateAttributeParserTest.java
@@ -55,8 +55,10 @@ public class LinkstateAttributeParserTest {
                assertEquals(new Long(10), ls.getMetric().getValue());
                assertEquals(new Long(0), ls.getAdminGroup().getValue());
                assertEquals("43.43.43.43", ls.getRemoteIpv4RouterId().getValue());
-               assertArrayEquals(new byte[] { (byte) 0x49, (byte) 0x98, (byte) 0x96, (byte) 0x80 }, ls.getMaxLinkBandwidth().getValue());
-               assertArrayEquals(new byte[] { (byte) 0x46, (byte) 0x43, (byte) 0x50, (byte) 0x00 }, ls.getMaxReservableBandwidth().getValue());
+               assertArrayEquals(new byte[] { 0, 0, 0, 0, (byte) 0x49, (byte) 0x98, (byte) 0x96, (byte) 0x80 },
+                               ls.getMaxLinkBandwidth().getValue());
+               assertArrayEquals(new byte[] { 0, 0, 0, 0, (byte) 0x46, (byte) 0x43, (byte) 0x50, (byte) 0x00 },
+                               ls.getMaxReservableBandwidth().getValue());
                assertNotNull(ls.getUnreservedBandwidth());
                assertEquals(8, ls.getUnreservedBandwidth().size());
        }
@@ -75,7 +77,7 @@ public class LinkstateAttributeParserTest {
 
                assertEquals("12K-2", ls.getDynamicHostname());
                assertEquals(1, ls.getIsisAreaId().size());
-               assertArrayEquals(new byte[] { 114 }, ls.getIsisAreaId().get(0).getValue());
+               assertArrayEquals(new byte[] { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 114 }, ls.getIsisAreaId().get(0).getValue());
                assertEquals("41.41.41.41", ls.getIpv4RouterId().getValue());
        }
 }