[ONOS] cherry picked from 1.6, bandwidth, CR and resilency fix

Change-Id: Ifd7bf886d2725db1f5e2f7a1eac739d9a446f868
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);