Use pcep to use Bandwidth concept

Change-Id: Icea40cdcacda45fb161e99ed795e294d50d33aea
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/pcep/api/src/main/yang/pcep-types.yang b/pcep/api/src/main/yang/pcep-types.yang
index 0cb61ef61cb0a97f4b7ca08b20be1e4342dd6a0f..033bc8f92dbb2d0a0775a35913006745e2d5cdba 100644 (file)
--- a/pcep/api/src/main/yang/pcep-types.yang
+++ b/pcep/api/src/main/yang/pcep-types.yang
@@ -5,6 +5,7 @@ module pcep-types {
 
        import ieee754 { prefix ieee754; revision-date 2013-08-19; }
        import ietf-inet-types { prefix inet; revision-date 2010-09-24; }
+       import nps-concepts { prefix nps-c; }
        import rsvp { prefix rsvp; revision-date 2013-08-20; }
 
        organization "Cisco Systems, Inc.";
@@ -538,7 +539,7 @@ module pcep-types {
        
                        // No possibility to carry TLVs
                        leaf bandwidth {
-                               type ieee754:float32;
+                               type nps-c:bandwidth;
                        }
                }
        }
@@ -769,7 +770,7 @@ module pcep-types {
                        }
        
                        leaf min-bandwidth {
-                               type ieee754:float32;
+                               type nps-c:bandwidth;
                        }
                }
        }

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPBandwidthObjectParser.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPBandwidthObjectParser.java
index 01de4822ac401621992108bf4cbffb176d116f4e..0583d56900e287296d818996ed965f22f2439ef6 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPBandwidthObjectParser.java
+++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPBandwidthObjectParser.java
@@ -10,7 +10,6 @@ package org.opendaylight.protocol.pcep.impl.object;
 import org.opendaylight.protocol.pcep.PCEPDeserializerException;
 import org.opendaylight.protocol.pcep.PCEPDocumentedException;
 import org.opendaylight.protocol.pcep.spi.TlvHandlerRegistry;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ieee754.rev130819.Float32;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.Object;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.ObjectHeader;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.Tlv;
@@ -48,7 +47,7 @@ public class PCEPBandwidthObjectParser extends AbstractObjectWithTlvsParser<Band
                final BandwidthBuilder builder = new BandwidthBuilder();
                builder.setIgnore(header.isIgnore());
                builder.setProcessingRule(header.isProcessingRule());
-               builder.setBandwidth(new Float32(bytes));
+               builder.setBandwidth(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.nps.concepts.rev130930.Bandwidth(bytes));
                return builder.build();
        }
 

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPLoadBalancingObjectParser.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPLoadBalancingObjectParser.java
index c614dee9cd16f9c9a06adf4908f23b9419f8a03c..4012e2554d5deec510767a07905d2506a009da45 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPLoadBalancingObjectParser.java
+++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPLoadBalancingObjectParser.java
@@ -11,7 +11,7 @@ import org.opendaylight.protocol.pcep.PCEPDeserializerException;
 import org.opendaylight.protocol.pcep.PCEPDocumentedException;
 import org.opendaylight.protocol.pcep.spi.TlvHandlerRegistry;
 import org.opendaylight.protocol.util.ByteArray;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ieee754.rev130819.Float32;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.nps.concepts.rev130930.Bandwidth;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.Object;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.ObjectHeader;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.Tlv;
@@ -45,7 +45,7 @@ public class PCEPLoadBalancingObjectParser extends AbstractObjectWithTlvsParser<
 
        @Override
        public LoadBalancing parseObject(final ObjectHeader header, final byte[] bytes) throws PCEPDeserializerException,
-                       PCEPDocumentedException {
+       PCEPDocumentedException {
                if (bytes == null || bytes.length == 0) {
                        throw new IllegalArgumentException("Byte array is mandatory. Can't be null or empty.");
                }
@@ -56,7 +56,7 @@ public class PCEPLoadBalancingObjectParser extends AbstractObjectWithTlvsParser<
                builder.setIgnore(header.isIgnore());
                builder.setProcessingRule(header.isProcessingRule());
                builder.setMaxLsp((short) UnsignedBytes.toInt(bytes[MAX_LSP_F_OFFSET]));
-               builder.setMinBandwidth(new Float32(ByteArray.subByte(bytes, MIN_BAND_F_OFFSET, MIN_BAND_F_LENGTH)));
+               builder.setMinBandwidth(new Bandwidth(ByteArray.subByte(bytes, MIN_BAND_F_OFFSET, MIN_BAND_F_LENGTH)));
                return builder.build();
        }
 

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 d82ec9f6b22be80e34c8a91ffc5449ceb039b4fe..51cb965b6efaaff49c1de41521dd51d2da19a742 100644 (file)
--- 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
@@ -50,6 +50,7 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.IpPrefix;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Ipv4Prefix;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ieee754.rev130819.Float32;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.nps.concepts.rev130930.Bandwidth;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.ClassType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.OfId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.OperationalStatus;
@@ -170,7 +171,7 @@ public class PCEPObjectParserTest {
                builder.setProcessingRule(true);
                builder.setIgnore(false);
                builder.setMaxLsp((short) UnsignedBytes.toInt((byte) 0xf1));
-               builder.setMinBandwidth(new Float32(new byte[] { (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF }));
+               builder.setMinBandwidth(new Bandwidth(new byte[] { (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF }));
 
                assertEquals(builder.build(), parser.parseObject(new ObjectHeaderImpl(true, false), result));
                assertArrayEquals(result, parser.serializeObject(builder.build()));
@@ -264,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());
@@ -283,14 +284,14 @@ public class PCEPObjectParserTest {
                final BandwidthBuilder builder = new BandwidthBuilder();
                builder.setProcessingRule(true);
                builder.setIgnore(true);
-               builder.setBandwidth(new Float32(result));
+               builder.setBandwidth(new Bandwidth(result));
 
                assertEquals(builder.build(), parser.parseObject(new ObjectHeaderImpl(true, true), result));
                assertArrayEquals(result, parser.serializeObject(builder.build()));
 
                result = ByteArray.fileToBytes("src/test/resources/PCEPBandwidthObject2UpperBounds.bin");
 
-               builder.setBandwidth(new Float32(result));
+               builder.setBandwidth(new Bandwidth(result));
 
                assertEquals(builder.build(), parser.parseObject(new ObjectHeaderImpl(true, true), result));
                assertArrayEquals(result, parser.serializeObject(builder.build()));