Update unit tests

[openflowplugin.git] / openflowplugin-impl / src / main / java / org / opendaylight / openflowplugin / impl / device / initialization / OF10DeviceInitializer.java

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/initialization/OF10DeviceInitializer.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/initialization/OF10DeviceInitializer.java
index a9f7386e797de9bea78b68bc49d66120b6c09118..b6d1dcfcf4a876254a9487a66dd9633cc07efb64 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/initialization/OF10DeviceInitializer.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/initialization/OF10DeviceInitializer.java
@@ -57,6 +57,7 @@ public class OF10DeviceInitializer extends AbstractDeviceInitializer {
     @Override
     protected Future<Void> initializeNodeInformation(@Nonnull final DeviceContext deviceContext,
                                                      final boolean switchFeaturesMandatory,
+                                                     final boolean skipTableFeatures,
                                                      @Nullable final MultipartWriterProvider multipartWriterProvider,
                                                      @Nullable final ConvertorExecutor convertorExecutor) {
         final ConnectionContext connectionContext = Preconditions.checkNotNull(deviceContext.getPrimaryConnectionContext());
@@ -65,7 +66,7 @@ public class OF10DeviceInitializer extends AbstractDeviceInitializer {
         final CapabilitiesV10 capabilitiesV10 = connectionContext.getFeatures().getCapabilitiesV10();
 
         // Set capabilities for this device based on capabilities of connection context
-        LOG.debug("Setting capabilities for device {}", deviceInfo.getLOGValue());
+        LOG.debug("Setting capabilities for device {}", deviceInfo);
         DeviceStateUtil.setDeviceStateBasedOnV10Capabilities(deviceState, capabilitiesV10);
         final ListenableFuture<Boolean> future = requestMultipart(MultipartType.OFPMPDESC, deviceContext);
 
@@ -73,10 +74,10 @@ public class OF10DeviceInitializer extends AbstractDeviceInitializer {
             @Override
             public void onSuccess(@Nullable final Boolean result) {
                 if (Boolean.TRUE.equals(result)) {
-                    LOG.debug("Creating empty flow capable node: {}", deviceInfo.getLOGValue());
+                    LOG.debug("Creating empty flow capable node: {}", deviceInfo);
                     makeEmptyFlowCapableNode(deviceContext, deviceInfo);
 
-                    LOG.debug("Creating empty tables for {}", deviceInfo.getLOGValue());
+                    LOG.debug("Creating empty tables for {}", deviceInfo);
                     DeviceInitializationUtil.makeEmptyTables(
                         deviceContext,
                         deviceInfo,
@@ -86,8 +87,8 @@ public class OF10DeviceInitializer extends AbstractDeviceInitializer {
 
             @Override
             public void onFailure(@Nonnull final Throwable t) {
-                LOG.warn("Error occurred in preparation node {} for protocol 1.0", deviceInfo.getLOGValue());
-                LOG.trace("Error for node {} : ", deviceInfo.getLOGValue(), t);
+                LOG.warn("Error occurred in preparation node {} for protocol 1.0", deviceInfo);
+                LOG.trace("Error for node {} : ", deviceInfo, t);
             }
         });
 
@@ -95,6 +96,7 @@ public class OF10DeviceInitializer extends AbstractDeviceInitializer {
             @Nullable
             @Override
             public Void apply(@Nullable final Boolean input) {
+                LOG.debug("Writing physical port information for {}", deviceInfo);
                 writePhyPortInformation(deviceContext);
                 return null;
             }
@@ -129,7 +131,7 @@ public class OF10DeviceInitializer extends AbstractDeviceInitializer {
                             new FlowCapableNodeConnectorStatisticsDataBuilder().build())
                         .build());
             } catch (final Exception e) {
-                LOG.debug("Failed to write node {} to DS ", deviceInfo.getLOGValue(), e);
+                LOG.debug("Failed to write node {} to DS ", deviceInfo, e);
             }
         });
     }
@@ -142,7 +144,7 @@ public class OF10DeviceInitializer extends AbstractDeviceInitializer {
                     .augmentation(FlowCapableNode.class),
                 new FlowCapableNodeBuilder().build());
         } catch (final Exception e) {
-            LOG.debug("Failed to write empty node {} to DS ", deviceInfo.getLOGValue(), e);
+            LOG.debug("Failed to write empty node {} to DS ", deviceInfo, e);
         }
     }
 
@@ -153,7 +155,7 @@ public class OF10DeviceInitializer extends AbstractDeviceInitializer {
                 new SingleLayerMultipartCollectorService(deviceContext, deviceContext);
 
             return Futures.transform(service.handleServiceCall(multipartType), new Function<RpcResult<List<MultipartReply>>, Boolean>() {
-                @Nullable
+                @Nonnull
                 @Override
                 public Boolean apply(final RpcResult<List<MultipartReply>> input) {
                     return input.isSuccessful();
@@ -165,7 +167,7 @@ public class OF10DeviceInitializer extends AbstractDeviceInitializer {
             new MultiLayerMultipartCollectorService(deviceContext, deviceContext);
 
         return Futures.transform(service.handleServiceCall(multipartType), new Function<RpcResult<List<org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.MultipartReply>>, Boolean>() {
-            @Nullable
+            @Nonnull
             @Override
             public Boolean apply(final RpcResult<List<org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.MultipartReply>> input) {
                 return input.isSuccessful();