X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=renderers%2Fvpp%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fgroupbasedpolicy%2Frenderer%2Fvpp%2Fpolicy%2FBridgeDomainManagerImplTest.java;h=867584f40b2e31179c8bc9e961d699e622384f69;hb=50785a21344238128ade8b19ce229200df4b1ef6;hp=541f2acddde214e1f9ab253729a58bfeaa7f0451;hpb=f22d7c705e3915c97979083b91e2be2c2ed8999e;p=groupbasedpolicy.git diff --git a/renderers/vpp/src/test/java/org/opendaylight/groupbasedpolicy/renderer/vpp/policy/BridgeDomainManagerImplTest.java b/renderers/vpp/src/test/java/org/opendaylight/groupbasedpolicy/renderer/vpp/policy/BridgeDomainManagerImplTest.java index 541f2acdd..867584f40 100644 --- a/renderers/vpp/src/test/java/org/opendaylight/groupbasedpolicy/renderer/vpp/policy/BridgeDomainManagerImplTest.java +++ b/renderers/vpp/src/test/java/org/opendaylight/groupbasedpolicy/renderer/vpp/policy/BridgeDomainManagerImplTest.java @@ -22,16 +22,18 @@ import org.mockito.Mockito; import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.md.sal.binding.api.WriteTransaction; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; +import org.opendaylight.groupbasedpolicy.renderer.vpp.dhcp.DhcpRelayHandler; import org.opendaylight.groupbasedpolicy.renderer.vpp.iface.InterfaceManager; import org.opendaylight.groupbasedpolicy.renderer.vpp.lisp.LispStateManager; -import org.opendaylight.groupbasedpolicy.renderer.vpp.lisp.bvi.BviManager; +import org.opendaylight.groupbasedpolicy.renderer.vpp.lisp.loopback.LoopbackManager; +import org.opendaylight.groupbasedpolicy.renderer.vpp.lisp.flat.overlay.FlatOverlayManager; import org.opendaylight.groupbasedpolicy.renderer.vpp.nat.NatManager; import org.opendaylight.groupbasedpolicy.renderer.vpp.policy.acl.AclManager; import org.opendaylight.groupbasedpolicy.renderer.vpp.routing.RoutingManager; import org.opendaylight.groupbasedpolicy.renderer.vpp.util.VppIidFactory; import org.opendaylight.groupbasedpolicy.test.CustomDataBrokerTest; import org.opendaylight.groupbasedpolicy.util.DataStoreHelper; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev170315.VxlanVni; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev170607.VxlanVni; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vbridge.topology.rev160129.NodeVbridgeAugment; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vbridge.topology.rev160129.NodeVbridgeAugmentBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vbridge.topology.rev160129.TopologyTypesVbridgeAugment; @@ -109,10 +111,12 @@ public class BridgeDomainManagerImplTest extends CustomDataBrokerTest { final NatManager natManager = Mockito.mock(NatManager.class); final RoutingManager routingManager = Mockito.mock(RoutingManager.class); final LispStateManager lispStateManager = Mockito.mock(LispStateManager.class); - final BviManager bviManager = Mockito.mock(BviManager.class); + final FlatOverlayManager flatOverlayManager = Mockito.mock(FlatOverlayManager.class); + final LoopbackManager loopbackManager = Mockito.mock(LoopbackManager.class); + final DhcpRelayHandler dhcpRelayHandler = Mockito.mock(DhcpRelayHandler.class); final ForwardingManager fwManager = new ForwardingManager(interfaceManager, aclManager, natManager, routingManager, bridgeDomainManager, - lispStateManager, bviManager, dataBroker); + lispStateManager, loopbackManager, flatOverlayManager, dhcpRelayHandler, dataBroker); fwManager.setTimer((byte) 1); }