Merge "SONAR TD - FlatBatchUtil, DeviceInitializationUtils"
authorShuva Jyoti Kar <shuva.jyoti.kar@ericsson.com>
Mon, 15 Aug 2016 14:00:10 +0000 (14:00 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Mon, 15 Aug 2016 14:00:10 +0000 (14:00 +0000)
1  2 
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/DeviceInitializationUtils.java

index bd40f4c9f6e9a436549be66c89cbec0be738f3a4,ad5599f1cebf2bffdfa96d0112df8f5e09370bbb..264f0d4d52e5766c3faf1356dc6bdf7ba5786554
@@@ -19,7 -19,6 +19,6 @@@ import java.net.InetSocketAddress
  import java.util.Arrays;
  import java.util.Collection;
  import java.util.Collections;
- import java.util.Iterator;
  import java.util.List;
  import java.util.concurrent.ExecutionException;
  import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
@@@ -89,6 -88,10 +88,10 @@@ public class DeviceInitializationUtils 
  
      private static final Logger LOG = LoggerFactory.getLogger(DeviceInitializationUtils.class);
  
+     private DeviceInitializationUtils() {
+         // Hiding implicit constructor
+     }
      /**
       * InitializationNodeInformation is good to call only for MASTER otherwise we will have not empty transaction
       * for every Cluster Node (SLAVE too) and we will get race-condition by closing Connection.
@@@ -96,8 -99,9 +99,8 @@@
       * @param deviceContext
       * @param switchFeaturesMandatory
       * @param convertorExecutor
 -     * @return future - recommended to have blocking call for this future
       */
 -    public static ListenableFuture<Void> initializeNodeInformation(final DeviceContext deviceContext, final boolean switchFeaturesMandatory, final ConvertorExecutor convertorExecutor) {
 +    public static void initializeNodeInformation(final DeviceContext deviceContext, final boolean switchFeaturesMandatory, final ConvertorExecutor convertorExecutor) throws ExecutionException, InterruptedException {
          Preconditions.checkArgument(deviceContext != null);
          final DeviceState deviceState = Preconditions.checkNotNull(deviceContext.getDeviceState());
          final DeviceInfo deviceInfo = deviceContext.getDeviceInfo();
              final Capabilities capabilities = connectionContext.getFeatures().getCapabilities();
              LOG.debug("Setting capabilities for device {}", deviceInfo.getNodeId());
              DeviceStateUtil.setDeviceStateBasedOnV13Capabilities(deviceState, capabilities);
 -            deviceFeaturesFuture = createDeviceFeaturesForOF13(deviceContext, switchFeaturesMandatory, convertorExecutor);
 +            createDeviceFeaturesForOF13(deviceContext, switchFeaturesMandatory, convertorExecutor).get();
          } else {
 -            deviceFeaturesFuture = Futures.immediateFailedFuture(new ConnectionException("Unsupported version "
 -                    + version));
 +            throw new ExecutionException(new ConnectionException("Unsupported version " + version));
          }
  
 -        Futures.addCallback(deviceFeaturesFuture, new FutureCallback<List<RpcResult<List<MultipartReply>>>>() {
 -            @Override
 -            public void onSuccess(final List<RpcResult<List<MultipartReply>>> result) {
 -                LOG.debug("All init data for node {} is in submitted.", deviceInfo.getNodeId());
 -                returnFuture.set(null);
 -            }
 -
 -            @Override
 -            public void onFailure(final Throwable t) {
 -                // FIXME : remove session
 -                LOG.trace("Device capabilities gathering future failed.");
 -                LOG.trace("more info in exploration failure..", t);
 -                LOG.debug("All init data for node {} was not submited correctly - connection has to go down.", deviceInfo.getNodeId());
 -                returnFuture.setException(t);
 -            }
 -        });
 -        return returnFuture;
      }
  
      private static void addNodeToOperDS(final DeviceContext deviceContext, final SettableFuture<Void> future) {
                                         final InstanceIdentifier<Node> nodeII, final Collection<MultipartReply> result,
                                         final ConvertorExecutor convertorExecutor) {
          try {
-             for (final MultipartReply reply : result) {
-                 final MultipartReplyBody body = reply.getMultipartReplyBody();
-                 switch (type) {
-                     case OFPMPDESC:
-                         Preconditions.checkArgument(body instanceof MultipartReplyDescCase);
-                         final MultipartReplyDesc replyDesc = ((MultipartReplyDescCase) body).getMultipartReplyDesc();
-                         final FlowCapableNode fcNode = NodeStaticReplyTranslatorUtil.nodeDescTranslator(replyDesc,
-                                 getIpAddressOf(dContext));
-                         final InstanceIdentifier<FlowCapableNode> fNodeII = nodeII.augmentation(FlowCapableNode.class);
-                         dContext.writeToTransaction(LogicalDatastoreType.OPERATIONAL, fNodeII, fcNode);
-                         break;
-                     case OFPMPTABLEFEATURES:
-                         Preconditions.checkArgument(body instanceof MultipartReplyTableFeaturesCase);
-                         final MultipartReplyTableFeatures tableFeaturesMP = ((MultipartReplyTableFeaturesCase) body)
-                                 .getMultipartReplyTableFeatures();
-                         final List<TableFeatures> tableFeatures = NodeStaticReplyTranslatorUtil
-                                 .nodeTableFeatureTranslator(tableFeaturesMP, dContext.getDeviceInfo().getVersion(), convertorExecutor);
-                         for (final TableFeatures tableFeature : tableFeatures) {
-                             final Short tableId = tableFeature.getTableId();
-                             final KeyedInstanceIdentifier<TableFeatures, TableFeaturesKey> tableFeaturesII =
-                                     nodeII.augmentation(FlowCapableNode.class)
-                                             .child(TableFeatures.class, new TableFeaturesKey(tableId));
-                             dContext.writeToTransaction(LogicalDatastoreType.OPERATIONAL, tableFeaturesII, tableFeature);
-                             // write parent for table statistics
-                             final KeyedInstanceIdentifier<Table, TableKey> tableII =
-                                     nodeII.augmentation(FlowCapableNode.class)
-                                             .child(Table.class, new TableKey(tableId));
-                             final TableBuilder tableBld = new TableBuilder().setId(tableId)
-                                     .addAugmentation(FlowTableStatisticsData.class,
-                                             new FlowTableStatisticsDataBuilder().build());
-                             dContext.writeToTransaction(LogicalDatastoreType.OPERATIONAL, tableII, tableBld.build());
-                         }
-                         break;
-                     case OFPMPMETERFEATURES:
-                         Preconditions.checkArgument(body instanceof MultipartReplyMeterFeaturesCase);
-                         final MultipartReplyMeterFeatures meterFeatures = ((MultipartReplyMeterFeaturesCase) body)
-                                 .getMultipartReplyMeterFeatures();
-                         final NodeMeterFeatures mFeature = NodeStaticReplyTranslatorUtil
-                                 .nodeMeterFeatureTranslator(meterFeatures);
-                         final InstanceIdentifier<NodeMeterFeatures> mFeatureII = nodeII
-                                 .augmentation(NodeMeterFeatures.class);
-                         dContext.writeToTransaction(LogicalDatastoreType.OPERATIONAL, mFeatureII, mFeature);
-                         if (0L < mFeature.getMeterFeatures().getMaxMeter().getValue()) {
-                             dContext.getDeviceState().setMeterAvailable(true);
+             result.stream()
+                     .map(MultipartReply::getMultipartReplyBody)
+                     .forEach(multipartReplyBody -> {
+                         if (!(writeDesc(type, multipartReplyBody, dContext, nodeII)
+                                 || writeTableFeatures(type, multipartReplyBody, dContext, nodeII, convertorExecutor)
+                                 || writeMeterFeatures(type, multipartReplyBody, dContext, nodeII)
+                                 || writeGroupFeatures(type, multipartReplyBody, dContext, nodeII)
+                                 || writePortDesc(type, multipartReplyBody, dContext, nodeII))) {
+                             throw new IllegalArgumentException("Unexpected MultipartType " + type);
                          }
-                         break;
-                     case OFPMPGROUPFEATURES:
-                         Preconditions.checkArgument(body instanceof MultipartReplyGroupFeaturesCase);
-                         final MultipartReplyGroupFeatures groupFeatures = ((MultipartReplyGroupFeaturesCase) body)
-                                 .getMultipartReplyGroupFeatures();
-                         final NodeGroupFeatures gFeature = NodeStaticReplyTranslatorUtil
-                                 .nodeGroupFeatureTranslator(groupFeatures);
-                         final InstanceIdentifier<NodeGroupFeatures> gFeatureII = nodeII
-                                 .augmentation(NodeGroupFeatures.class);
-                         dContext.writeToTransaction(LogicalDatastoreType.OPERATIONAL, gFeatureII, gFeature);
-                         break;
-                     case OFPMPPORTDESC:
-                         Preconditions.checkArgument(body instanceof MultipartReplyPortDescCase);
-                         final MultipartReplyPortDesc portDesc = ((MultipartReplyPortDescCase) body)
-                                 .getMultipartReplyPortDesc();
-                         for (final PortGrouping port : portDesc.getPorts()) {
-                             final short ofVersion = dContext.getDeviceInfo().getVersion();
-                             final TranslatorKey translatorKey = new TranslatorKey(ofVersion, PortGrouping.class.getName());
-                             final MessageTranslator<PortGrouping, FlowCapableNodeConnector> translator = dContext.oook()
-                                     .lookupTranslator(translatorKey);
-                             final FlowCapableNodeConnector fcNodeConnector = translator.translate(port, dContext.getDeviceInfo(), null);
-                             final BigInteger dataPathId = dContext.getPrimaryConnectionContext().getFeatures()
-                                     .getDatapathId();
-                             final NodeConnectorId nodeConnectorId = NodeStaticReplyTranslatorUtil.nodeConnectorId(
-                                     dataPathId.toString(), port.getPortNo(), ofVersion);
-                             final NodeConnectorBuilder ncBuilder = new NodeConnectorBuilder().setId(nodeConnectorId);
-                             ncBuilder.addAugmentation(FlowCapableNodeConnector.class, fcNodeConnector);
-                             ncBuilder.addAugmentation(FlowCapableNodeConnectorStatisticsData.class,
-                                     new FlowCapableNodeConnectorStatisticsDataBuilder().build());
-                             final NodeConnector connector = ncBuilder.build();
-                             final InstanceIdentifier<NodeConnector> connectorII = nodeII.child(NodeConnector.class,
-                                     connector.getKey());
-                             dContext.writeToTransaction(LogicalDatastoreType.OPERATIONAL, connectorII, connector);
-                         }
-                         break;
-                     default:
-                         throw new IllegalArgumentException("Unnexpected MultipartType " + type);
-                 }
-             }
+                     });
          } catch (final Exception e) {
              LOG.debug("translateAndWriteReply: Failed to write node {} to DS ", dContext.getDeviceInfo().getNodeId().toString(), e);
          }
      }
  
+     private static boolean writeDesc(final MultipartType type,
+                                      final MultipartReplyBody body,
+                                      final DeviceContext dContext,
+                                      final InstanceIdentifier<Node> nodeII) {
+         if (!MultipartType.OFPMPDESC.equals(type)) {
+             return false;
+         }
+         Preconditions.checkArgument(body instanceof MultipartReplyDescCase);
+         final MultipartReplyDesc replyDesc = ((MultipartReplyDescCase) body).getMultipartReplyDesc();
+         final FlowCapableNode fcNode = NodeStaticReplyTranslatorUtil.nodeDescTranslator(replyDesc,
+                 getIpAddressOf(dContext));
+         final InstanceIdentifier<FlowCapableNode> fNodeII = nodeII.augmentation(FlowCapableNode.class);
+         dContext.writeToTransaction(LogicalDatastoreType.OPERATIONAL, fNodeII, fcNode);
+         return true;
+     }
+     private static boolean writeTableFeatures(final MultipartType type,
+                                               final MultipartReplyBody body,
+                                               final DeviceContext dContext,
+                                               final InstanceIdentifier<Node> nodeII,
+                                               final ConvertorExecutor convertorExecutor) {
+         if (!MultipartType.OFPMPTABLEFEATURES.equals(type)) {
+             return false;
+         }
+         Preconditions.checkArgument(body instanceof MultipartReplyTableFeaturesCase);
+         final MultipartReplyTableFeatures tableFeaturesMP = ((MultipartReplyTableFeaturesCase) body)
+                 .getMultipartReplyTableFeatures();
+         final List<TableFeatures> tableFeatures = NodeStaticReplyTranslatorUtil
+                 .nodeTableFeatureTranslator(tableFeaturesMP, dContext.getDeviceInfo().getVersion(), convertorExecutor);
+         for (final TableFeatures tableFeature : tableFeatures) {
+             final Short tableId = tableFeature.getTableId();
+             final KeyedInstanceIdentifier<TableFeatures, TableFeaturesKey> tableFeaturesII =
+                     nodeII.augmentation(FlowCapableNode.class)
+                             .child(TableFeatures.class, new TableFeaturesKey(tableId));
+             dContext.writeToTransaction(LogicalDatastoreType.OPERATIONAL, tableFeaturesII, tableFeature);
+             // write parent for table statistics
+             final KeyedInstanceIdentifier<Table, TableKey> tableII =
+                     nodeII.augmentation(FlowCapableNode.class)
+                             .child(Table.class, new TableKey(tableId));
+             final TableBuilder tableBld = new TableBuilder().setId(tableId)
+                     .addAugmentation(FlowTableStatisticsData.class,
+                             new FlowTableStatisticsDataBuilder().build());
+             dContext.writeToTransaction(LogicalDatastoreType.OPERATIONAL, tableII, tableBld.build());
+         }
+         return true;
+     }
+     private static boolean writeMeterFeatures(final MultipartType type,
+                                               final MultipartReplyBody body,
+                                               final DeviceContext dContext,
+                                               final InstanceIdentifier<Node> nodeII) {
+         if (!MultipartType.OFPMPMETERFEATURES.equals(type)) {
+             return false;
+         }
+         Preconditions.checkArgument(body instanceof MultipartReplyMeterFeaturesCase);
+         final MultipartReplyMeterFeatures meterFeatures = ((MultipartReplyMeterFeaturesCase) body)
+                 .getMultipartReplyMeterFeatures();
+         final NodeMeterFeatures mFeature = NodeStaticReplyTranslatorUtil
+                 .nodeMeterFeatureTranslator(meterFeatures);
+         final InstanceIdentifier<NodeMeterFeatures> mFeatureII = nodeII
+                 .augmentation(NodeMeterFeatures.class);
+         dContext.writeToTransaction(LogicalDatastoreType.OPERATIONAL, mFeatureII, mFeature);
+         if (0L < mFeature.getMeterFeatures().getMaxMeter().getValue()) {
+             dContext.getDeviceState().setMeterAvailable(true);
+         }
+         return true;
+     }
+     private static boolean writeGroupFeatures(final MultipartType type,
+                                               final MultipartReplyBody body,
+                                               final DeviceContext dContext,
+                                               final InstanceIdentifier<Node> nodeII) {
+         if (!MultipartType.OFPMPGROUPFEATURES.equals(type)) {
+             return false;
+         }
+         Preconditions.checkArgument(body instanceof MultipartReplyGroupFeaturesCase);
+         final MultipartReplyGroupFeatures groupFeatures = ((MultipartReplyGroupFeaturesCase) body)
+                 .getMultipartReplyGroupFeatures();
+         final NodeGroupFeatures gFeature = NodeStaticReplyTranslatorUtil
+                 .nodeGroupFeatureTranslator(groupFeatures);
+         final InstanceIdentifier<NodeGroupFeatures> gFeatureII = nodeII
+                 .augmentation(NodeGroupFeatures.class);
+         dContext.writeToTransaction(LogicalDatastoreType.OPERATIONAL, gFeatureII, gFeature);
+         return true;
+     }
+     private static boolean writePortDesc(final MultipartType type,
+                                          final MultipartReplyBody body,
+                                          final DeviceContext dContext,
+                                          final InstanceIdentifier<Node> nodeII) {
+         if (!MultipartType.OFPMPPORTDESC.equals(type)) {
+             return false;
+         }
+         Preconditions.checkArgument(body instanceof MultipartReplyPortDescCase);
+         final MultipartReplyPortDesc portDesc = ((MultipartReplyPortDescCase) body)
+                 .getMultipartReplyPortDesc();
+         for (final PortGrouping port : portDesc.getPorts()) {
+             final short ofVersion = dContext.getDeviceInfo().getVersion();
+             final TranslatorKey translatorKey = new TranslatorKey(ofVersion, PortGrouping.class.getName());
+             final MessageTranslator<PortGrouping, FlowCapableNodeConnector> translator = dContext.oook()
+                     .lookupTranslator(translatorKey);
+             final FlowCapableNodeConnector fcNodeConnector = translator.translate(port, dContext.getDeviceInfo(), null);
+             final BigInteger dataPathId = dContext.getPrimaryConnectionContext().getFeatures()
+                     .getDatapathId();
+             final NodeConnectorId nodeConnectorId = NodeStaticReplyTranslatorUtil.nodeConnectorId(
+                     dataPathId.toString(), port.getPortNo(), ofVersion);
+             final NodeConnectorBuilder ncBuilder = new NodeConnectorBuilder().setId(nodeConnectorId);
+             ncBuilder.addAugmentation(FlowCapableNodeConnector.class, fcNodeConnector);
+             ncBuilder.addAugmentation(FlowCapableNodeConnectorStatisticsData.class,
+                     new FlowCapableNodeConnectorStatisticsDataBuilder().build());
+             final NodeConnector connector = ncBuilder.build();
+             final InstanceIdentifier<NodeConnector> connectorII = nodeII.child(NodeConnector.class,
+                     connector.getKey());
+             dContext.writeToTransaction(LogicalDatastoreType.OPERATIONAL, connectorII, connector);
+         }
+         return true;
+     }
      private static void createEmptyFlowCapableNodeInDs(final DeviceContext deviceContext) {
          final FlowCapableNodeBuilder flowCapableNodeBuilder = new FlowCapableNodeBuilder();
          final InstanceIdentifier<FlowCapableNode> fNodeII = deviceContext.getDeviceInfo().getNodeInstanceIdentifier()
                      LOG.info("Static node {} info: {} collected", deviceContext.getDeviceInfo().getNodeId(), type);
                      translateAndWriteReply(type, deviceContext, nodeII, result, convertorExecutor);
                  } else {
-                     final Iterator<RpcError> rpcErrorIterator = rpcResult.getErrors().iterator();
-                     while (rpcErrorIterator.hasNext()) {
-                         final RpcError rpcError = rpcErrorIterator.next();
+                     for (RpcError rpcError : rpcResult.getErrors()) {
                          LOG.info("Failed to retrieve static node {} info: {}", type, rpcError.getMessage());
                          if (null != rpcError.getCause()) {
                              LOG.trace("Detailed error:", rpcError.getCause());
  
          final OutboundQueue queue = deviceContext.getPrimaryConnectionContext().getOutboundQueueProvider();
  
 -        final Long reserved = deviceContext.reserveXidForDeviceMessage();
 +        final Long reserved = deviceContext.getDeviceInfo().reserveXidForDeviceMessage();
          final RequestContext<List<MultipartReply>> requestContext = new AbstractRequestContext<List<MultipartReply>>(
                  reserved) {
              @Override