diff options
author | Jan Srnicek <jsrnicek@cisco.com> | 2017-01-12 10:46:28 +0100 |
---|---|---|
committer | Jan Srnicek <jsrnicek@cisco.com> | 2017-01-12 14:07:40 +0000 |
commit | 765cb29e4c12c48fca6326c434b985e655bafc1a (patch) | |
tree | a30c03a4530826ae82e7fdfd73f1d45c117026b8 /routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/factory/MultipathHopRequestFactoryIpv4Test.java | |
parent | 7cf98fe610c2912873bdf5fe5fea353adb9d2cbf (diff) |
HONEYCOMB-325 - Null pointer while routing attr not defined
Fixes multiple null pointers
Change-Id: Iaa1df9a8b0a886d1835fe7cb87bcf7cf5130c6f5
Signed-off-by: Jan Srnicek <jsrnicek@cisco.com>
Diffstat (limited to 'routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/factory/MultipathHopRequestFactoryIpv4Test.java')
-rw-r--r-- | routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/factory/MultipathHopRequestFactoryIpv4Test.java | 31 |
1 files changed, 28 insertions, 3 deletions
diff --git a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/factory/MultipathHopRequestFactoryIpv4Test.java b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/factory/MultipathHopRequestFactoryIpv4Test.java index 43d01abbf..1eb91aa37 100644 --- a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/factory/MultipathHopRequestFactoryIpv4Test.java +++ b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/factory/MultipathHopRequestFactoryIpv4Test.java @@ -51,18 +51,24 @@ public class MultipathHopRequestFactoryIpv4Test @Mock private MappingContext mappingContext; - @InjectTestData(resourcePath = "/ipv4/multiHopRouteWithClassifier.json", id = STATIC_ROUTE_PATH) + @InjectTestData(resourcePath = "/ipv4/multihop/multiHopRouteWithClassifier.json", id = STATIC_ROUTE_PATH) private StaticRoutes ipv4StaticRoutesWithClassifier; - @InjectTestData(resourcePath = "/ipv4/multiHopRouteWithoutClassifier.json", id = STATIC_ROUTE_PATH) + @InjectTestData(resourcePath = "/ipv4/multihop/multiHopRouteWithoutClassifier.json", id = STATIC_ROUTE_PATH) private StaticRoutes ipv4StaticRoutesWithoutClassifier; + @InjectTestData(resourcePath = "/ipv4/multihop/multiHopRouteWithNoRouteAttrs.json", id = STATIC_ROUTE_PATH) + private StaticRoutes ipv4StaticRoutesWithoutRouteAttrs; + private Route ipv4MutlipathRouteWithClassifier; private NextHop ipv4nextHopWithClassifier; private Route ipv4MutlipathRouteWithoutClassifier; private NextHop ipv4nextHopWithoutClassifier; + private Route ipv4MutlipathRouteWithoutRouteAtts; + private NextHop ipv4nextHopWithoutRouteAtts; + private NamingContext interfaceContext; private NamingContext routingProtocolContext; private MultipathHopRequestFactory factory; @@ -88,10 +94,17 @@ public class MultipathHopRequestFactoryIpv4Test ipv4MutlipathRouteWithoutClassifier = getIpv4RouteWithId(ipv4StaticRoutesWithoutClassifier, 1L); final List<NextHop> ipv4HopsNonClassified = - NextHopList.class.cast(ipv4MutlipathRouteWithClassifier.getNextHopOptions()).getNextHopList() + NextHopList.class.cast(ipv4MutlipathRouteWithoutClassifier.getNextHopOptions()).getNextHopList() .getNextHop(); ipv4nextHopWithoutClassifier = ipv4HopsNonClassified.stream().filter(nextHop -> nextHop.getId() == 1L).findFirst().get(); + + ipv4MutlipathRouteWithoutRouteAtts = getIpv4RouteWithId(ipv4StaticRoutesWithoutRouteAttrs, 1L); + final List<NextHop> ipv4HopsNonRouteAttrs = + NextHopList.class.cast(ipv4MutlipathRouteWithoutRouteAtts.getNextHopOptions()).getNextHopList() + .getNextHop(); + ipv4nextHopWithoutRouteAtts = + ipv4HopsNonClassified.stream().filter(nextHop -> nextHop.getId() == 1L).findFirst().get(); } @Test @@ -116,4 +129,16 @@ public class MultipathHopRequestFactoryIpv4Test desiredFlaglessResult(0, 0, 1, Ipv4RouteData.FIRST_ADDRESS_AS_ARRAY, 24, Ipv4RouteData.FIRST_ADDRESS_AS_ARRAY, INTERFACE_INDEX, 2, 1, 1, 0, 0, 0), request); } + + @Test + public void testIpv4WithoutRouteAttrs() { + final IpAddDelRoute request = + factory.createIpv4MultipathHopRequest(false, ROUTE_PROTOCOL_NAME, ipv4MutlipathRouteWithoutRouteAtts, + ipv4nextHopWithoutRouteAtts, + mappingContext); + + assertEquals( + desiredFlaglessResult(0, 0, 1, Ipv4RouteData.FIRST_ADDRESS_AS_ARRAY, 24, + Ipv4RouteData.FIRST_ADDRESS_AS_ARRAY, INTERFACE_INDEX, 2, 1, 1, 0, 0, 0), request); + } } |