WIP choosing L3 node by ODL for VPP

[groupbasedpolicy.git] / neutron-vpp-mapper / src / test / java / org / opendaylight / groupbasedpolicy / neutron / vpp / mapper / processors / NeutronListenerTest.java

diff --git a/neutron-vpp-mapper/src/test/java/org/opendaylight/groupbasedpolicy/neutron/vpp/mapper/processors/NeutronListenerTest.java b/neutron-vpp-mapper/src/test/java/org/opendaylight/groupbasedpolicy/neutron/vpp/mapper/processors/NeutronListenerTest.java
index 1ed99947e658506df20d745b1b12e4f1d35d0822..3d202801336bdc927d6e005b8615ea003fc788ed 100644 (file)
--- a/neutron-vpp-mapper/src/test/java/org/opendaylight/groupbasedpolicy/neutron/vpp/mapper/processors/NeutronListenerTest.java
+++ b/neutron-vpp-mapper/src/test/java/org/opendaylight/groupbasedpolicy/neutron/vpp/mapper/processors/NeutronListenerTest.java
@@ -22,7 +22,6 @@ import org.opendaylight.controller.md.sal.binding.api.DataTreeIdentifier;
 import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;\r
 import org.opendaylight.controller.md.sal.binding.test.AbstractDataBrokerTest;\r
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;\r
-import org.opendaylight.groupbasedpolicy.neutron.vpp.mapper.SocketInfo;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.neutron.gbp.mapper.rev150513.Mappings;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.neutron.gbp.mapper.rev150513.mappings.GbpByNeutronMappings;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.neutron.gbp.mapper.rev150513.mappings.gbp.by.neutron.mappings.BaseEndpointsByPorts;\r
@@ -30,13 +29,14 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.neutron.gb
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.ports.rev150712.ports.attributes.ports.Port;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.ports.rev150712.ports.attributes.ports.PortBuilder;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.rev150712.Neutron;\r
+import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId;\r
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;\r
 \r
 public class NeutronListenerTest extends AbstractDataBrokerTest {\r
 \r
     private DataBroker dataBroker;\r
 \r
-    private SocketInfo socketInfo;\r
+    private NodeId routingNode;\r
     private Port port;\r
     private BaseEndpointByPort bebp;\r
     private NeutronListener neutronListener;\r
@@ -47,17 +47,17 @@ public class NeutronListenerTest extends AbstractDataBrokerTest {
         port = TestUtils.createValidVppPort();\r
         bebp = TestUtils.createBaseEndpointByPortForPort();\r
         dataBroker = getDataBroker();\r
-        neutronListener = new NeutronListener(dataBroker);\r
+        neutronListener = new NeutronListener(dataBroker, routingNode);\r
         neutronListener.clearDataChangeProviders();\r
         baseEpByPortListener = Mockito.spy(new PortAware(new PortHandler(\r
-                dataBroker), dataBroker));\r
+                dataBroker, routingNode), dataBroker));\r
         neutronListener.addDataChangeProvider(baseEpByPortListener);\r
     }\r
 \r
     @Test\r
     public void constructorTest() {\r
         dataBroker = Mockito.spy(dataBroker);\r
-        NeutronListener neutronListener = new NeutronListener(dataBroker);\r
+        NeutronListener neutronListener = new NeutronListener(dataBroker, routingNode);\r
         verify(dataBroker).registerDataTreeChangeListener(\r
                 eq(new DataTreeIdentifier<>(LogicalDatastoreType.CONFIGURATION,\r
                         InstanceIdentifier.builder(Neutron.class)\r