From 1e1547b7c39f8081ac3621264d0e27d88ba3ffc8 Mon Sep 17 00:00:00 2001
From: Michal Cmarada <michal.cmarada@pantheon.tech>
Date: Thu, 10 May 2018 10:14:07 +0200
Subject: HC2VPP-317 - Add FibService and FibTableService

VPP doesn`t support auto create for Fib tables anymore,
when adding a new route.
Adding FibService to check if table exists and
FibTableService to add or delete ipv4/6 fib tables.

Note: Need to implement full support for Fib Table management later.

Change-Id: I15bd1b62357ab24a5eac970113bfcd2a52d29491
Signed-off-by: Michal Cmarada <michal.cmarada@pantheon.tech>
---
 .../routing/read/Ipv4RouteCustomizerTest.java      |   3 +-
 .../routing/read/Ipv6RouteCustomizerTest.java      |   3 +-
 .../routing/services/FibTableServiceImplTest.java  | 110 +++++++++++++++++++++
 .../write/ControlPlaneProtocolCustomizerTest.java  |   7 +-
 4 files changed, 120 insertions(+), 3 deletions(-)
 create mode 100644 routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/services/FibTableServiceImplTest.java

(limited to 'routing/routing-impl/src/test')

diff --git a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/read/Ipv4RouteCustomizerTest.java b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/read/Ipv4RouteCustomizerTest.java
index 5e319e370..0ba1fe576 100644
--- a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/read/Ipv4RouteCustomizerTest.java
+++ b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/read/Ipv4RouteCustomizerTest.java
@@ -139,6 +139,7 @@ public class Ipv4RouteCustomizerTest extends ListReaderCustomizerTest<Route, Rou
                 mappingContext)).thenReturn(0);
         when(routeHopContext.getChildIndex(listRouteName, factory.uniqueRouteHopName(listRoute.path[1], mappingContext),
                 mappingContext)).thenReturn(1);
+        when(configuration.getLearnedRouteNamePrefix()).thenReturn("learned-route");
     }
 
     private IpFibDetailsReplyDump replyDump() {
@@ -278,4 +279,4 @@ public class Ipv4RouteCustomizerTest extends ListReaderCustomizerTest<Route, Rou
         return new Ipv4RouteCustomizer(manager, configuration, routeHopContext, interfaceContext,
                                        routesContext, routingProtocolContext);
     }
-}
\ No newline at end of file
+}
diff --git a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/read/Ipv6RouteCustomizerTest.java b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/read/Ipv6RouteCustomizerTest.java
index 503c01914..81dae7bfd 100644
--- a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/read/Ipv6RouteCustomizerTest.java
+++ b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/read/Ipv6RouteCustomizerTest.java
@@ -159,6 +159,7 @@ public class Ipv6RouteCustomizerTest extends ListReaderCustomizerTest<Route, Rou
         when(routeHopContext.getChildIndex(listRouteName, factory.uniqueRouteHopName(listRoute.path[1], mappingContext),
                 mappingContext))
                 .thenReturn(1);
+        when(configuration.getLearnedRouteNamePrefix()).thenReturn("learned-route");
     }
 
     private Ip6FibDetailsReplyDump replyDump() {
@@ -303,4 +304,4 @@ public class Ipv6RouteCustomizerTest extends ListReaderCustomizerTest<Route, Rou
         return new Ipv6RouteCustomizer(manager, configuration, routeHopContext,
                                        interfaceContext, routesContext, routingProtocolContext);
     }
-}
\ No newline at end of file
+}
diff --git a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/services/FibTableServiceImplTest.java b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/services/FibTableServiceImplTest.java
new file mode 100644
index 000000000..2edd70ce5
--- /dev/null
+++ b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/services/FibTableServiceImplTest.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright (c) 2018 Bell Canada, Pantheon and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.fd.hc2vpp.routing.services;
+
+import static io.fd.vpp.jvpp.Assertions.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import com.google.inject.Inject;
+import io.fd.hc2vpp.common.translate.util.ByteDataTranslator;
+import io.fd.hc2vpp.routing.RoutingIIds;
+import io.fd.hc2vpp.routing.helpers.RoutingRequestTestHelper;
+import io.fd.hc2vpp.routing.helpers.SchemaContextTestHelper;
+import io.fd.honeycomb.translate.ModificationCache;
+import io.fd.honeycomb.translate.read.ReadFailedException;
+import io.fd.honeycomb.translate.write.WriteContext;
+import io.fd.honeycomb.translate.write.WriteFailedException;
+import io.fd.vpp.jvpp.core.dto.Ip6FibDetailsReplyDump;
+import io.fd.vpp.jvpp.core.dto.IpFibDetailsReplyDump;
+import io.fd.vpp.jvpp.core.dto.IpTableAddDel;
+import io.fd.vpp.jvpp.core.dto.IpTableAddDelReply;
+import io.fd.vpp.jvpp.core.future.FutureJVppCore;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+public class FibTableServiceImplTest implements RoutingRequestTestHelper, SchemaContextTestHelper {
+
+    private static final int FIB_TABLE_ID = 123456;
+    private static final String FIB_TABLE_NAME = "VRF123456";
+
+    @Inject
+    @Mock
+    private static FutureJVppCore api;
+
+    @Mock
+    private static WriteContext ctx;
+
+    @Mock
+    private ModificationCache modificationCache;
+
+    @Captor
+    private ArgumentCaptor<IpTableAddDel> argumentCaptor;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        when(api.ipTableAddDel(any())).thenReturn(future(new IpTableAddDelReply()));
+        when(api.ipFibDump(any())).thenReturn(future(new IpFibDetailsReplyDump()));
+        when(api.ip6FibDump(any())).thenReturn(future(new Ip6FibDetailsReplyDump()));
+        when(modificationCache.get(any())).thenReturn(null);
+
+    }
+
+    @Test(expected = FibTableService.FibTableDoesNotExistException.class)
+    public void checkTableExistTest() throws ReadFailedException, FibTableService.FibTableDoesNotExistException {
+        FibTableServiceImpl fibService = new FibTableServiceImpl(api, ctx.getModificationCache());
+
+        fibService.checkTableExist(FIB_TABLE_ID, modificationCache);
+    }
+
+    @Test
+    public void writeIpv4Test() throws WriteFailedException {
+        FibTableServiceImpl fibTableService = new FibTableServiceImpl(api, ctx.getModificationCache());
+        fibTableService.write(RoutingIIds.ROUTING, FIB_TABLE_ID, FIB_TABLE_NAME, false);
+
+        verify(api, times(1)).ipTableAddDel(argumentCaptor.capture());
+
+        final IpTableAddDel jvppRequest = argumentCaptor.getValue();
+        assertTableAddDelRequest(jvppRequest, true, false);
+    }
+
+    @Test
+    public void writeIpv6Test() throws WriteFailedException {
+        FibTableServiceImpl fibTableService = new FibTableServiceImpl(api, ctx.getModificationCache());
+        fibTableService.write(RoutingIIds.ROUTING, FIB_TABLE_ID, FIB_TABLE_NAME, true);
+
+        verify(api, times(1)).ipTableAddDel(argumentCaptor.capture());
+
+        final IpTableAddDel jvppRequest = argumentCaptor.getValue();
+        assertTableAddDelRequest(jvppRequest, true, true);
+    }
+
+    private void assertTableAddDelRequest(IpTableAddDel jvppRequest, boolean isAdd, boolean isIpv6) {
+        assertEquals(ByteDataTranslator.INSTANCE.booleanToByte(isAdd), jvppRequest.isAdd);
+        assertEquals(ByteDataTranslator.INSTANCE.booleanToByte(isIpv6), jvppRequest.isIpv6);
+        assertEquals(FIB_TABLE_ID, jvppRequest.tableId);
+        Assert.assertArrayEquals(FIB_TABLE_NAME.getBytes(), jvppRequest.name);
+    }
+}
diff --git a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/ControlPlaneProtocolCustomizerTest.java b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/ControlPlaneProtocolCustomizerTest.java
index fa25520ca..b4cf64ead 100644
--- a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/ControlPlaneProtocolCustomizerTest.java
+++ b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/ControlPlaneProtocolCustomizerTest.java
@@ -23,9 +23,11 @@ import static org.junit.Assert.fail;
 
 import io.fd.hc2vpp.common.test.write.WriterCustomizerTest;
 import io.fd.hc2vpp.common.translate.util.NamingContext;
+import io.fd.hc2vpp.routing.services.FibTableService;
 import io.fd.honeycomb.translate.write.WriteFailedException;
 import org.junit.Before;
 import org.junit.Test;
+import org.mockito.Mock;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.routing.rev180313.Direct;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.routing.rev180313.Static;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.routing.rev180313.routing.control.plane.protocols.ControlPlaneProtocol;
@@ -45,6 +47,9 @@ public class ControlPlaneProtocolCustomizerTest extends WriterCustomizerTest {
     private ControlPlaneProtocolCustomizer customizer;
     private NamingContext routingProtocolContext;
 
+    @Mock
+    protected FibTableService fibTableService;
+
     @Before
     public void init() {
         validId = InstanceIdentifier.create(ControlPlaneProtocol.class);
@@ -73,7 +78,7 @@ public class ControlPlaneProtocolCustomizerTest extends WriterCustomizerTest {
                 .build();
 
         routingProtocolContext = new NamingContext("routing-protocol", "routing-protocol-context");
-        customizer = new ControlPlaneProtocolCustomizer(routingProtocolContext);
+        customizer = new ControlPlaneProtocolCustomizer(routingProtocolContext, fibTableService);
     }
 
     @Test
-- 
cgit 1.2.3-korg