| commit | c1e4e4c67a0642a6c315c65c2efb7552fb5698b9 | [log] [tgz] |
|---|---|---|
| author | Priyanka B <priyanka.b@huawei.com> | Fri Jul 01 14:57:19 2016 +0530 |
| committer | Priyanka B <priyanka.b@huawei.com> | Tue Jul 05 13:00:55 2016 +0530 |
| tree | 775652e73935450756aa04b61bce3ea2fd75fa2d | |
| parent | 4bf9f2d369424b943e74abf0e8fde0816782362c [diff] |
[ONOS] cherry picked from 1.6, bandwidth, CR and resilency fix Change-Id: Ifd7bf886d2725db1f5e2f7a1eac739d9a446f868
diff --git a/providers/bgp/topology/src/main/java/org/onosproject/provider/bgp/topology/impl/BgpTopologyProvider.java b/providers/bgp/topology/src/main/java/org/onosproject/provider/bgp/topology/impl/BgpTopologyProvider.java index e95eba09..e50e820 100644 --- a/providers/bgp/topology/src/main/java/org/onosproject/provider/bgp/topology/impl/BgpTopologyProvider.java +++ b/providers/bgp/topology/src/main/java/org/onosproject/provider/bgp/topology/impl/BgpTopologyProvider.java
@@ -491,6 +491,8 @@ switch (tlv.getType()) { case LinkStateAttributes.ATTR_LINK_MAX_RES_BANDWIDTH: maxReservableBw = ((BgpLinkAttrMaxLinkBandwidth) tlv).linkAttrMaxLinkBandwidth(); + //will get in bits/second , convert to MBPS to store in network config service + maxReservableBw = maxReservableBw / 1000000; break; default: // do nothing }
diff --git a/providers/bgp/topology/src/test/java/org/onosproject/provider/bgp/topology/impl/BgpTopologyProviderTest.java b/providers/bgp/topology/src/test/java/org/onosproject/provider/bgp/topology/impl/BgpTopologyProviderTest.java index 276bfb5..15a51de 100644 --- a/providers/bgp/topology/src/test/java/org/onosproject/provider/bgp/topology/impl/BgpTopologyProviderTest.java +++ b/providers/bgp/topology/src/test/java/org/onosproject/provider/bgp/topology/impl/BgpTopologyProviderTest.java
@@ -1005,7 +1005,8 @@ linkStateAttr.add(tlv); tlv = BgpLinkAttrTeDefaultMetric.of(20); linkStateAttr.add(tlv); - tlv = BgpLinkAttrMaxLinkBandwidth.of(70, LinkStateAttributes.ATTR_LINK_MAX_RES_BANDWIDTH); + tlv = BgpLinkAttrMaxLinkBandwidth.of((float) 70 * 1_000_000L, + LinkStateAttributes.ATTR_LINK_MAX_RES_BANDWIDTH); linkStateAttr.add(tlv); linkPathAttributes.add(new LinkStateAttributes(linkStateAttr)); details.setPathAttribute(linkPathAttributes);