Code Review / openflowplugin.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Bump upstreams for 2022.09 Chlorine
[openflowplugin.git] / test-provider / src / main / java / org / opendaylight / openflowplugin / test / OpenflowpluginStatsTestCommandProvider.java
diff --git a/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginStatsTestCommandProvider.java b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginStatsTestCommandProvider.java
index 264736000bd438404d88313f922ce43be0d3227b..8ef877f03b2a445be9a3f96242a111c2e8ce5da2 100644 (file)
--- a/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginStatsTestCommandProvider.java
+++ b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginStatsTestCommandProvider.java
@@ -5,15 +5,14 @@
  * 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.test;
 
-import java.util.List;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import java.util.Collection;
 import org.eclipse.osgi.framework.console.CommandInterpreter;
 import org.eclipse.osgi.framework.console.CommandProvider;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.binding.api.ReadTransaction;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNode;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNodeConnector;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.meters.Meter;
@@ -46,15 +45,15 @@ import org.slf4j.LoggerFactory;
 public class OpenflowpluginStatsTestCommandProvider implements CommandProvider {
 
     private static final Logger LOG = LoggerFactory.getLogger(OpenflowpluginStatsTestCommandProvider.class);
-    private DataBroker dataProviderService;
+    private final DataBroker dataProviderService;
     private final BundleContext ctx;
 
-    public OpenflowpluginStatsTestCommandProvider(BundleContext ctx) {
+    public OpenflowpluginStatsTestCommandProvider(DataBroker dataProviderService, BundleContext ctx) {
+        this.dataProviderService = dataProviderService;
         this.ctx = ctx;
     }
 
-    public void onSessionInitiated(ProviderContext session) {
-        dataProviderService = session.getSALService(DataBroker.class);
+    public void init() {
         ctx.registerService(CommandProvider.class.getName(), this, null);
 
     }
@@ -62,15 +61,15 @@ public class OpenflowpluginStatsTestCommandProvider implements CommandProvider {
     public void _portStats(CommandInterpreter ci) {
         int nodeConnectorCount = 0;
         int nodeConnectorStatsCount = 0;
-        List<Node> nodes = getNodes();
+        Collection<Node> nodes = getNodes();
         for (Node node2 : nodes) {
             NodeKey nodeKey = node2.key();
             InstanceIdentifier<Node> nodeRef = InstanceIdentifier.create(Nodes.class).child(Node.class, nodeKey);
-            ReadOnlyTransaction readOnlyTransaction = dataProviderService.newReadOnlyTransaction();
+            ReadTransaction readOnlyTransaction = dataProviderService.newReadOnlyTransaction();
             Node node = TestProviderTransactionUtil.getDataObject(readOnlyTransaction, nodeRef);
             if (node != null) {
                 if (node.getNodeConnector() != null) {
-                    List<NodeConnector> ports = node.getNodeConnector();
+                    Collection<NodeConnector> ports = node.nonnullNodeConnector().values();
 
                     for (NodeConnector nodeConnector2 : ports) {
                         nodeConnectorCount++;
@@ -103,16 +102,16 @@ public class OpenflowpluginStatsTestCommandProvider implements CommandProvider {
     public void _portDescStats(CommandInterpreter ci) {
         int nodeConnectorCount = 0;
         int nodeConnectorDescStatsCount = 0;
-        List<Node> nodes = getNodes();
+        Collection<Node> nodes = getNodes();
         for (Node node2 : nodes) {
             NodeKey nodeKey = node2.key();
             InstanceIdentifier<Node> nodeRef = InstanceIdentifier.create(Nodes.class).child(Node.class, nodeKey);
 
-            ReadOnlyTransaction readOnlyTransaction = dataProviderService.newReadOnlyTransaction();
+            ReadTransaction readOnlyTransaction = dataProviderService.newReadOnlyTransaction();
             Node node = TestProviderTransactionUtil.getDataObject(readOnlyTransaction, nodeRef);
             if (node != null) {
                 if (node.getNodeConnector() != null) {
-                    List<NodeConnector> ports = node.getNodeConnector();
+                    Collection<NodeConnector> ports = node.nonnullNodeConnector().values();
                     for (NodeConnector nodeConnector2 : ports) {
                         nodeConnectorCount++;
                         NodeConnectorKey nodeConnectorKey = nodeConnector2.key();
@@ -144,20 +143,21 @@ public class OpenflowpluginStatsTestCommandProvider implements CommandProvider {
 
     }
 
+    @SuppressFBWarnings("SLF4J_SIGN_ONLY_FORMAT")
     public void _flowStats(CommandInterpreter ci) {
         int flowCount = 0;
         int flowStatsCount = 0;
-        List<Node> nodes = getNodes();
+        Collection<Node> nodes = getNodes();
         for (Node node2 : nodes) {
             NodeKey nodeKey = node2.key();
             InstanceIdentifier<FlowCapableNode> nodeRef = InstanceIdentifier.create(Nodes.class)
                     .child(Node.class, nodeKey).augmentation(FlowCapableNode.class);
 
-            ReadOnlyTransaction readOnlyTransaction = dataProviderService.newReadOnlyTransaction();
+            ReadTransaction readOnlyTransaction = dataProviderService.newReadOnlyTransaction();
             FlowCapableNode node = TestProviderTransactionUtil.getDataObject(readOnlyTransaction, nodeRef);
 
             if (node != null) {
-                List<Table> tables = node.getTable();
+                Collection<Table> tables = node.nonnullTable().values();
                 for (Table table2 : tables) {
                     TableKey tableKey = table2.key();
                     InstanceIdentifier<Table> tableRef = InstanceIdentifier.create(Nodes.class)
@@ -166,7 +166,7 @@ public class OpenflowpluginStatsTestCommandProvider implements CommandProvider {
                     Table table = TestProviderTransactionUtil.getDataObject(readOnlyTransaction, tableRef);
                     if (table != null) {
                         if (table.getFlow() != null) {
-                            List<Flow> flows = table.getFlow();
+                            Collection<Flow> flows = table.nonnullFlow().values();
                             for (Flow flow2 : flows) {
                                 flowCount++;
                                 FlowKey flowKey = flow2.key();
@@ -202,16 +202,16 @@ public class OpenflowpluginStatsTestCommandProvider implements CommandProvider {
     public void _tableStats(CommandInterpreter ci) {
         int tableCount = 0;
         int tableStatsCount = 0;
-        List<Node> nodes = getNodes();
+        Collection<Node> nodes = getNodes();
         for (Node node2 : nodes) {
             NodeKey nodeKey = node2.key();
             InstanceIdentifier<FlowCapableNode> nodeRef = InstanceIdentifier.create(Nodes.class)
                     .child(Node.class, nodeKey).augmentation(FlowCapableNode.class);
 
-            ReadOnlyTransaction readOnlyTransaction = dataProviderService.newReadOnlyTransaction();
+            ReadTransaction readOnlyTransaction = dataProviderService.newReadOnlyTransaction();
             FlowCapableNode node = TestProviderTransactionUtil.getDataObject(readOnlyTransaction, nodeRef);
             if (node != null) {
-                List<Table> tables = node.getTable();
+                Collection<Table> tables = node.nonnullTable().values();
                 for (Table table2 : tables) {
                     tableCount++;
                     TableKey tableKey = table2.key();
@@ -242,16 +242,16 @@ public class OpenflowpluginStatsTestCommandProvider implements CommandProvider {
         int groupCount = 0;
         int groupStatsCount = 0;
         NodeGroupStatistics data = null;
-        List<Node> nodes = getNodes();
+        Collection<Node> nodes = getNodes();
         for (Node node2 : nodes) {
             NodeKey nodeKey = node2.key();
             InstanceIdentifier<FlowCapableNode> nodeRef = InstanceIdentifier.create(Nodes.class)
                     .child(Node.class, nodeKey).augmentation(FlowCapableNode.class);
-            ReadOnlyTransaction readOnlyTransaction = dataProviderService.newReadOnlyTransaction();
+            ReadTransaction readOnlyTransaction = dataProviderService.newReadOnlyTransaction();
             FlowCapableNode node = TestProviderTransactionUtil.getDataObject(readOnlyTransaction, nodeRef);
             if (node != null) {
                 if (node.getGroup() != null) {
-                    List<Group> groups = node.getGroup();
+                    Collection<Group> groups = node.nonnullGroup().values();
                     for (Group group2 : groups) {
                         groupCount++;
                         GroupKey groupKey = group2.key();
@@ -283,17 +283,17 @@ public class OpenflowpluginStatsTestCommandProvider implements CommandProvider {
         int groupCount = 0;
         int groupDescStatsCount = 0;
         NodeGroupDescStats data = null;
-        List<Node> nodes = getNodes();
+        Collection<Node> nodes = getNodes();
         for (Node node2 : nodes) {
             NodeKey nodeKey = node2.key();
             InstanceIdentifier<FlowCapableNode> nodeRef = InstanceIdentifier.create(Nodes.class)
                     .child(Node.class, nodeKey).augmentation(FlowCapableNode.class);
-            ReadOnlyTransaction readOnlyTransaction = dataProviderService.newReadOnlyTransaction();
+            ReadTransaction readOnlyTransaction = dataProviderService.newReadOnlyTransaction();
             FlowCapableNode node = TestProviderTransactionUtil.getDataObject(readOnlyTransaction, nodeRef);
 
             if (node != null) {
                 if (node.getGroup() != null) {
-                    List<Group> groups = node.getGroup();
+                    Collection<Group> groups = node.nonnullGroup().values();
                     for (Group group2 : groups) {
                         groupCount++;
                         GroupKey groupKey = group2.key();
@@ -325,16 +325,16 @@ public class OpenflowpluginStatsTestCommandProvider implements CommandProvider {
         int meterCount = 0;
         int meterStatsCount = 0;
         NodeMeterStatistics data = null;
-        List<Node> nodes = getNodes();
+        Collection<Node> nodes = getNodes();
         for (Node node2 : nodes) {
             NodeKey nodeKey = node2.key();
             InstanceIdentifier<FlowCapableNode> nodeRef = InstanceIdentifier.create(Nodes.class)
                     .child(Node.class, nodeKey).augmentation(FlowCapableNode.class);
-            ReadOnlyTransaction readOnlyTransaction = dataProviderService.newReadOnlyTransaction();
+            ReadTransaction readOnlyTransaction = dataProviderService.newReadOnlyTransaction();
             FlowCapableNode node = TestProviderTransactionUtil.getDataObject(readOnlyTransaction, nodeRef);
             if (node != null) {
                 if (node.getMeter() != null) {
-                    List<Meter> meters = node.getMeter();
+                    Collection<Meter> meters = node.nonnullMeter().values();
                     for (Meter meter2 : meters) {
                         meterCount++;
                         MeterKey meterKey = meter2.key();
@@ -366,16 +366,16 @@ public class OpenflowpluginStatsTestCommandProvider implements CommandProvider {
         int meterCount = 0;
         int meterConfigStatsCount = 0;
         NodeMeterConfigStats data = null;
-        List<Node> nodes = getNodes();
+        Collection<Node> nodes = getNodes();
         for (Node node2 : nodes) {
             NodeKey nodeKey = node2.key();
             InstanceIdentifier<FlowCapableNode> nodeRef = InstanceIdentifier.create(Nodes.class)
                     .child(Node.class, nodeKey).augmentation(FlowCapableNode.class);
-            ReadOnlyTransaction readOnlyTransaction = dataProviderService.newReadOnlyTransaction();
+            ReadTransaction readOnlyTransaction = dataProviderService.newReadOnlyTransaction();
             FlowCapableNode node = TestProviderTransactionUtil.getDataObject(readOnlyTransaction, nodeRef);
             if (node != null) {
                 if (node.getMeter() != null) {
-                    List<Meter> meters = node.getMeter();
+                    Collection<Meter> meters = node.nonnullMeter().values();
                     for (Meter meter2 : meters) {
                         meterCount++;
                         MeterKey meterKey = meter2.key();
@@ -407,15 +407,15 @@ public class OpenflowpluginStatsTestCommandProvider implements CommandProvider {
     public void _aggregateStats(CommandInterpreter ci) {
         int aggregateFlowCount = 0;
         int aggerateFlowStatsCount = 0;
-        List<Node> nodes = getNodes();
+        Collection<Node> nodes = getNodes();
         for (Node node2 : nodes) {
             NodeKey nodeKey = node2.key();
             InstanceIdentifier<FlowCapableNode> nodeRef = InstanceIdentifier.create(Nodes.class)
                     .child(Node.class, nodeKey).augmentation(FlowCapableNode.class);
-            ReadOnlyTransaction readOnlyTransaction = dataProviderService.newReadOnlyTransaction();
+            ReadTransaction readOnlyTransaction = dataProviderService.newReadOnlyTransaction();
             FlowCapableNode node = TestProviderTransactionUtil.getDataObject(readOnlyTransaction, nodeRef);
             if (node != null) {
-                List<Table> tables = node.getTable();
+                Collection<Table> tables = node.nonnullTable().values();
                 for (Table table2 : tables) {
                     aggregateFlowCount++;
                     TableKey tableKey = table2.key();
@@ -445,13 +445,13 @@ public class OpenflowpluginStatsTestCommandProvider implements CommandProvider {
     public void _descStats(CommandInterpreter ci) {
         int descCount = 0;
         int descStatsCount = 0;
-        List<Node> nodes = getNodes();
+        Collection<Node> nodes = getNodes();
         for (Node node2 : nodes) {
             descCount++;
             NodeKey nodeKey = node2.key();
             InstanceIdentifier<FlowCapableNode> nodeRef = InstanceIdentifier.create(Nodes.class)
                     .child(Node.class, nodeKey).augmentation(FlowCapableNode.class);
-            ReadOnlyTransaction readOnlyTransaction = dataProviderService.newReadOnlyTransaction();
+            ReadTransaction readOnlyTransaction = dataProviderService.newReadOnlyTransaction();
             FlowCapableNode node = TestProviderTransactionUtil.getDataObject(readOnlyTransaction, nodeRef);
             if (node != null) {
                 if (null != node.getHardware() && null != node.getManufacturer() && null != node.getSoftware()) {
@@ -469,14 +469,14 @@ public class OpenflowpluginStatsTestCommandProvider implements CommandProvider {
 
     }
 
-    private List<Node> getNodes() {
-        ReadOnlyTransaction readOnlyTransaction = dataProviderService.newReadOnlyTransaction();
+    private Collection<Node> getNodes() {
+        ReadTransaction readOnlyTransaction = dataProviderService.newReadOnlyTransaction();
         InstanceIdentifier<Nodes> nodesID = InstanceIdentifier.create(Nodes.class);
         Nodes nodes = TestProviderTransactionUtil.getDataObject(readOnlyTransaction, nodesID);
         if (nodes == null) {
-            throw new RuntimeException("nodes are not found, pls add the node.");
+            throw new IllegalStateException("nodes are not found, pls add the node.");
         }
-        return nodes.getNode();
+        return nodes.nonnullNode().values();
     }
 
     @Override
OpenFlow Plugin