Switch to MD-SAL APIs

[openflowplugin.git] / openflowplugin-impl / src / main / java / org / opendaylight / openflowplugin / impl / util / DeviceInitializationUtil.java

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/DeviceInitializationUtil.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/DeviceInitializationUtil.java
index f8248d3500f6d8eba9bc8b2258c46561fd7c4f13..cc1de1297788775d3853412cb7572b3aecebaae6 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/DeviceInitializationUtil.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/DeviceInitializationUtil.java
@@ -5,16 +5,19 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.openflowplugin.impl.util;
 
 import java.net.InetSocketAddress;
+import java.util.Collections;
 import java.util.Optional;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
+import java.util.concurrent.ExecutionException;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.binding.api.WriteTransaction;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.openflowplugin.api.openflow.connection.ConnectionContext;
 import org.opendaylight.openflowplugin.api.openflow.device.DeviceInfo;
 import org.opendaylight.openflowplugin.api.openflow.device.TxFacade;
-import org.opendaylight.openflowplugin.openflow.md.core.sal.SwitchFeaturesUtil;
+import org.opendaylight.openflowplugin.impl.device.SwitchFeaturesUtil;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IetfInetUtil;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber;
@@ -25,14 +28,15 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.ta
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.TableKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.table.statistics.rev131215.FlowTableStatisticsData;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.table.statistics.rev131215.FlowTableStatisticsDataBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.Nodes;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodesBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.GetFeaturesOutputBuilder;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class DeviceInitializationUtil {
-
+public final class DeviceInitializationUtil {
     private static final Logger LOG = LoggerFactory.getLogger(DeviceInitializationUtil.class);
 
     private DeviceInitializationUtil() {
@@ -40,39 +44,56 @@ public class DeviceInitializationUtil {
     }
 
     /**
-     * Create specified number of empty tables on device
+     * Merge empty nodes to operational DS to predict any problems with missing parent for node.
+     *
+     * @param dataBroker the data broker
+     */
+    public static void makeEmptyNodes(final DataBroker dataBroker) {
+        final WriteTransaction tx = dataBroker.newWriteOnlyTransaction();
+
+        try {
+            tx.merge(LogicalDatastoreType.OPERATIONAL, InstanceIdentifier.create(Nodes.class), new NodesBuilder()
+                    .setNode(Collections.emptyList())
+                    .build());
+            tx.commit().get();
+        } catch (ExecutionException | InterruptedException e) {
+            LOG.error("Creation of node failed.", e);
+            throw new IllegalStateException(e);
+        }
+    }
+
+    /**
+     * Create specified number of empty tables on device.
      * FIXME: remove after ovs table features fix
-     * @param txFacade transaction facade
+     *
+     * @param txFacade   transaction facade
      * @param deviceInfo device info
      * @param nrOfTables number of tables
      */
-    public static void makeEmptyTables(final TxFacade txFacade, final DeviceInfo deviceInfo, final Short nrOfTables) {
+    public static void makeEmptyTables(final TxFacade txFacade, final DeviceInfo deviceInfo, final short nrOfTables) {
         if (LOG.isDebugEnabled()) {
-            LOG.debug("About to create {} empty tables for node {}.", nrOfTables, deviceInfo.getLOGValue());
+            LOG.debug("About to create {} empty tables for node {}.", nrOfTables, deviceInfo);
         }
 
         for (int i = 0; i < nrOfTables; i++) {
-            try {
-                txFacade.writeToTransaction(LogicalDatastoreType.OPERATIONAL,
-                        deviceInfo
-                                .getNodeInstanceIdentifier()
-                                .augmentation(FlowCapableNode.class)
-                                .child(Table.class, new TableKey((short) i)),
-                        new TableBuilder()
-                                .setId((short) i)
-                                .addAugmentation(
-                                        FlowTableStatisticsData.class,
-                                        new FlowTableStatisticsDataBuilder().build())
-                                .build());
-            } catch (final Exception e) {
-                LOG.debug("makeEmptyTables: Failed to write node {} to DS ", deviceInfo.getLOGValue(), e);
-            }
+            txFacade.writeToTransaction(LogicalDatastoreType.OPERATIONAL,
+                    deviceInfo
+                            .getNodeInstanceIdentifier()
+                            .augmentation(FlowCapableNode.class)
+                            .child(Table.class, new TableKey((short) i)),
+                    new TableBuilder()
+                            .setId((short) i)
+                            .addAugmentation(
+                                    FlowTableStatisticsData.class,
+                                    new FlowTableStatisticsDataBuilder().build())
+                            .build());
         }
     }
 
     /**
-     * Retrieve ip address from connection
-     * @param connectionContext connection context
+     * Retrieve ip address from connection.
+     *
+     * @param connectionContext  connection context
      * @param instanceIdentifier instance identifier
      * @return ip address
      */
@@ -90,8 +111,9 @@ public class DeviceInitializationUtil {
     }
 
     /**
-     * Retrieve port number from connection
-     * @param connectionContext connection context
+     * Retrieve port number from connection.
+     *
+     * @param connectionContext  connection context
      * @param instanceIdentifier instance identifier
      * @return port number
      */
@@ -110,7 +132,8 @@ public class DeviceInitializationUtil {
     }
 
     /**
-     * Retrieve switch features from connection
+     * Retrieve switch features from connection.
+     *
      * @param connectionContext connection context
      * @return switch features
      */