From fad9e25d9be9e144509f545841197ddc7aee9065 Mon Sep 17 00:00:00 2001 From: Dana Kutenicsova Date: Wed, 20 Nov 2013 08:32:04 +0100 Subject: [PATCH] Fixed broken tests. Change-Id: I90ae9c32ab7601ac6cef2482ebe29c848936bb83 Signed-off-by: Dana Kutenicsova --- .../pcep/impl/PCEPSessionProposalFactoryImpl.java | 11 +++++++++-- .../protocol/pcep/impl/PCEPObjectParserTest.java | 6 +++--- .../resources/PCEPGlobalConstraintsObject.1.bin | Bin 4 -> 4 bytes .../test/resources/PCEPSvecObject1_10ReqIDs.bin | Bin 44 -> 44 bytes 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/PCEPSessionProposalFactoryImpl.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/PCEPSessionProposalFactoryImpl.java index e11b0a01bd..f51d9fc8a1 100644 --- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/PCEPSessionProposalFactoryImpl.java +++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/PCEPSessionProposalFactoryImpl.java @@ -41,8 +41,15 @@ public class PCEPSessionProposalFactoryImpl implements PCEPSessionProposalFactor if (PCEPSessionProposalFactoryImpl.this.stateful) { builder.setStateful((new StatefulBuilder().setFlags(new Flags(PCEPSessionProposalFactoryImpl.this.versioned, PCEPSessionProposalFactoryImpl.this.instant, PCEPSessionProposalFactoryImpl.this.active)).build())); } - return new OpenBuilder().setKeepalive((short) PCEPSessionProposalFactoryImpl.this.keepAlive).setDeadTimer( - (short) PCEPSessionProposalFactoryImpl.this.deadTimer).setSessionId((short) sessionId).setTlvs(tlvs).build(); + final OpenBuilder oBuilder = new OpenBuilder(); + oBuilder.setSessionId((short) sessionId); + if (PCEPSessionProposalFactoryImpl.this.keepAlive != 0) { + oBuilder.setKeepalive((short) PCEPSessionProposalFactoryImpl.this.keepAlive); + } + if (PCEPSessionProposalFactoryImpl.this.deadTimer != 0) { + oBuilder.setDeadTimer((short) PCEPSessionProposalFactoryImpl.this.deadTimer); + } + return oBuilder.setTlvs(tlvs).build(); } public int getKeepAlive() { diff --git a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPObjectParserTest.java b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPObjectParserTest.java index 51cb965b6e..2dd08288d5 100644 --- a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPObjectParserTest.java +++ b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPObjectParserTest.java @@ -265,7 +265,7 @@ public class PCEPObjectParserTest { subs.add(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.reported.route.object.rro.SubobjectsBuilder().setSubobjectType( new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev130820.record.route.subobjects.subobject.type.IpPrefixBuilder().setIpPrefix( new IpPrefix(Ipv6Util.prefixForBytes(ip6PrefixBytes, 22))).build()).setProtectionAvailable(false).setProtectionInUse( - false).build()); + false).build()); subs.add(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.reported.route.object.rro.SubobjectsBuilder().setSubobjectType( new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev130820.record.route.subobjects.subobject.type.UnnumberedBuilder().setRouterId( 0x1245678L).setInterfaceId(0x9abcdef0L).build()).setProtectionAvailable(false).setProtectionInUse(false).build()); @@ -546,7 +546,7 @@ public class PCEPObjectParserTest { final List requestIDs = Lists.newArrayList(); requestIDs.add(new RequestId(0xFFFFFFFFL)); - requestIDs.add(new RequestId(0x00000000L)); + requestIDs.add(new RequestId(0x00000001L)); requestIDs.add(new RequestId(0x01234567L)); requestIDs.add(new RequestId(0x89ABCDEFL)); requestIDs.add(new RequestId(0xFEDCBA98L)); @@ -652,7 +652,7 @@ public class PCEPObjectParserTest { builder.setMaxHop((short) 1); builder.setMaxUtilization((short) 0); builder.setMinUtilization((short) 100); - builder.setOverBookingFactor((short) 0xFF); + builder.setOverBookingFactor((short) 99); assertEquals(builder.build(), parser.parseObject(new ObjectHeaderImpl(true, false), result)); assertArrayEquals(result, parser.serializeObject(builder.build())); diff --git a/pcep/impl/src/test/resources/PCEPGlobalConstraintsObject.1.bin b/pcep/impl/src/test/resources/PCEPGlobalConstraintsObject.1.bin index 22dd98779ba497f78b65cadecfcfbffddae7314b..af26de8a9a8103aa73eee8c7e6910f5fd3b565ba 100644 GIT binary patch literal 4 LcmZQ%NJ$0&0W$!} literal 4 LcmZQ%Ncj%{0nY(t diff --git a/pcep/impl/src/test/resources/PCEPSvecObject1_10ReqIDs.bin b/pcep/impl/src/test/resources/PCEPSvecObject1_10ReqIDs.bin index 012710f6ac768414697d32b6b7ccbba175f7675c..315d6ae45230c2ca03e5e27f29517bf50a64b41c 100644 GIT binary patch delta 18 WcmdPV;bCB4VEqpSK$>wPj{*QL+XW;5 delta 18 WcmdPV;bCB4VEqpSK$>A9j{*QL*99X0 -- 2.36.6