Add blueprint wiring for neutron renderer

[netvirt.git] / netvirt / renderers / neutron / src / test / java / org / opendaylight / netvirt / netvirt / renderers / neutron / NeutronPortDataProcessorTest.java

diff --git a/netvirt/renderers/neutron/src/test/java/org/opendaylight/netvirt/netvirt/renderers/neutron/NeutronPortDataProcessorTest.java b/netvirt/renderers/neutron/src/test/java/org/opendaylight/netvirt/netvirt/renderers/neutron/NeutronPortDataProcessorTest.java
index 345dbca47f4af0472a12ada80c1ec11532c60cfe..f63f1d6556b936d208935469c9a883500fb3fd85 100644 (file)
--- a/netvirt/renderers/neutron/src/test/java/org/opendaylight/netvirt/netvirt/renderers/neutron/NeutronPortDataProcessorTest.java
+++ b/netvirt/renderers/neutron/src/test/java/org/opendaylight/netvirt/netvirt/renderers/neutron/NeutronPortDataProcessorTest.java
@@ -1,9 +1,12 @@
 package org.opendaylight.netvirt.netvirt.renderers.neutron;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import com.google.common.base.Optional;
 import java.util.ArrayList;
 import java.util.List;
 import org.junit.Test;
@@ -12,14 +15,14 @@ import org.opendaylight.controller.md.sal.binding.test.AbstractDataBrokerTest;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.IpAddress;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.MacAddress;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.ports.rev150712.port.attributes.FixedIps;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.ports.rev150712.port.attributes.FixedIpsBuilder;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.ports.rev150712.ports.attributes.Ports;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.ports.rev150712.ports.attributes.ports.Port;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.ports.rev150712.ports.attributes.ports.PortBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.ports.rev150712.ports.attributes.Ports;
-import com.google.common.base.Optional;
+import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
 /**
  * Unit test for {@link NeutronPortDataProcessor}
@@ -36,7 +39,6 @@ public class NeutronPortDataProcessorTest extends AbstractDataBrokerTest {
         InstanceIdentifier<org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.ports.rev151227.ports.Port> portIid =
                 MdsalHelper.createPortInstanceIdentifier(uuid);
 
-        org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.ports.rev151227.ports.Port netvirtPort = null;
         Optional<org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.ports.rev151227.ports.Port> data =
             getDataBroker()
             .newReadOnlyTransaction()
@@ -61,7 +63,7 @@ public class NeutronPortDataProcessorTest extends AbstractDataBrokerTest {
                 .setDeviceOwner("compute:nova")
                 .setDeviceId("12345678-1234-1234-1234-123456789012")
                 .setUuid(uuid)
-                .setMacAddress("00:00:01:02:03:04")
+                .setMacAddress(new MacAddress("00:00:01:02:03:04"))
                 .setFixedIps(ips)
                 .build());
     }
@@ -70,7 +72,7 @@ public class NeutronPortDataProcessorTest extends AbstractDataBrokerTest {
         if (!initialized) {
             session = mock(ProviderContext.class);
             when(session.getSALService(DataBroker.class)).thenReturn(getDataBroker());
-            neutronPortDataProcessor = new NeutronPortDataProcessor(new NeutronProvider(), session.getSALService(DataBroker.class));
+            neutronPortDataProcessor = new NeutronPortDataProcessor(getDataBroker());
             initialized = true;
         }
     }