From: Dana Kutenicsova Date: Wed, 20 Nov 2013 07:32:04 +0000 (+0100) Subject: Fixed broken tests. X-Git-Tag: jenkins-bgpcep-bulk-release-prepare-only-1~237^2~14 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=fad9e25d9be9e144509f545841197ddc7aee9065;p=bgpcep.git Fixed broken tests. Change-Id: I90ae9c32ab7601ac6cef2482ebe29c848936bb83 Signed-off-by: Dana Kutenicsova --- 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 22dd98779b..af26de8a9a 100644 Binary files a/pcep/impl/src/test/resources/PCEPGlobalConstraintsObject.1.bin and b/pcep/impl/src/test/resources/PCEPGlobalConstraintsObject.1.bin differ diff --git a/pcep/impl/src/test/resources/PCEPSvecObject1_10ReqIDs.bin b/pcep/impl/src/test/resources/PCEPSvecObject1_10ReqIDs.bin index 012710f6ac..315d6ae452 100644 Binary files a/pcep/impl/src/test/resources/PCEPSvecObject1_10ReqIDs.bin and b/pcep/impl/src/test/resources/PCEPSvecObject1_10ReqIDs.bin differ