Optimize DHCP relay processing for VPP

[groupbasedpolicy.git] / renderers / vpp / src / test / java / org / opendaylight / groupbasedpolicy / renderer / vpp / dhcp / DhcpRelayHandlerTest.java

diff --git a/renderers/vpp/src/test/java/org/opendaylight/groupbasedpolicy/renderer/vpp/dhcp/DhcpRelayHandlerTest.java b/renderers/vpp/src/test/java/org/opendaylight/groupbasedpolicy/renderer/vpp/dhcp/DhcpRelayHandlerTest.java
index 0679d46e970c4d17da65052e842ee5a5b7dc46f7..5f277d10a79c382b29475d025473ce8146581e31 100644 (file)
--- a/renderers/vpp/src/test/java/org/opendaylight/groupbasedpolicy/renderer/vpp/dhcp/DhcpRelayHandlerTest.java
+++ b/renderers/vpp/src/test/java/org/opendaylight/groupbasedpolicy/renderer/vpp/dhcp/DhcpRelayHandlerTest.java
@@ -112,9 +112,12 @@ public class DhcpRelayHandlerTest extends VppRendererDataBrokerTest {
 
     @Test
     public void createIpv4DhcpRelayTest() throws ExecutionException, InterruptedException {
-        DhcpRelayHandler dhcpRelayHandler = new DhcpRelayHandler(dataBroker, mountedDataProviderMock);
+        DhcpRelayHandler dhcpRelayHandler = new DhcpRelayHandler(dataBroker);
+
+        List<DhcpRelayCommand> createdIpv4DhcpRelays =
+            dhcpRelayHandler.getCreatedIpv4DhcpRelays(RX_VRF_ID, subnet, vppNodesByL2Fd);
+        createdIpv4DhcpRelays.forEach(dhcpRelayHandler::submitDhcpRelay);
 
-        dhcpRelayHandler.createIpv4DhcpRelay(RX_VRF_ID, subnet, vppNodesByL2Fd);
         Optional<Relay> relayOptional = DataStoreHelper.readFromDs(LogicalDatastoreType.CONFIGURATION,
             VppIidFactory.getDhcpRelayIid(DHCP_RELAY_COMMAND.getDhcpBuilder().getKey()),
             dataBroker.newReadOnlyTransaction());
@@ -124,11 +127,14 @@ public class DhcpRelayHandlerTest extends VppRendererDataBrokerTest {
 
     @Test
     public void createIpv4DhcpRelayTestWithNullServerIp() throws ExecutionException, InterruptedException {
-        DhcpRelayHandler dhcpRelayHandler = new DhcpRelayHandler(dataBroker, mountedDataProviderMock);
+        DhcpRelayHandler dhcpRelayHandler = new DhcpRelayHandler(dataBroker);
 
         Subnet subnet1 = new SubnetBuilder(subnet).setDefaultSubnetGatewayIp(null).build();
 
-        dhcpRelayHandler.createIpv4DhcpRelay(RX_VRF_ID, subnet1, vppNodesByL2Fd);
+        List<DhcpRelayCommand> createdIpv4DhcpRelays =
+        dhcpRelayHandler.getCreatedIpv4DhcpRelays(RX_VRF_ID, subnet1, vppNodesByL2Fd);
+        createdIpv4DhcpRelays.forEach(dhcpRelayHandler::submitDhcpRelay);
+
         Optional<Relay> relayOptional = DataStoreHelper.readFromDs(LogicalDatastoreType.CONFIGURATION,
             VppIidFactory.getDhcpRelayIid(DHCP_RELAY_COMMAND.getDhcpBuilder().getKey()),
             dataBroker.newReadOnlyTransaction());
@@ -137,7 +143,7 @@ public class DhcpRelayHandlerTest extends VppRendererDataBrokerTest {
 
     @Test
     public void deleteIpv4DhcpRelayTest() throws ExecutionException, InterruptedException {
-        DhcpRelayHandler dhcpRelayHandler = new DhcpRelayHandler(dataBroker, mountedDataProviderMock);
+        DhcpRelayHandler dhcpRelayHandler = new DhcpRelayHandler(dataBroker);
         writeBasicRelay();
 
         Optional<Relay> relayOptional = DataStoreHelper.readFromDs(LogicalDatastoreType.CONFIGURATION,
@@ -146,7 +152,10 @@ public class DhcpRelayHandlerTest extends VppRendererDataBrokerTest {
         Assert.assertTrue(relayOptional.isPresent());
         Assert.assertEquals(RELAY, relayOptional.get());
 
-        dhcpRelayHandler.deleteIpv4DhcpRelay(RX_VRF_ID, subnet, vppNodesByL2Fd);
+        List<DhcpRelayCommand> deletedIpv4DhcpRelays =
+            dhcpRelayHandler.getDeletedIpv4DhcpRelays(RX_VRF_ID, subnet, vppNodesByL2Fd);
+        deletedIpv4DhcpRelays.forEach(dhcpRelayHandler::submitDhcpRelay);
+
         relayOptional = DataStoreHelper.readFromDs(LogicalDatastoreType.CONFIGURATION,
             VppIidFactory.getDhcpRelayIid(DHCP_RELAY_COMMAND.getDhcpBuilder().getKey()),
             dataBroker.newReadOnlyTransaction());