Integrate CLI on a proper management interface

[ovsdb.git] / hwvtepsouthbound / hwvtepsouthbound-impl / src / main / java / org / opendaylight / ovsdb / hwvtepsouthbound / HwvtepConnectionManager.java

diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepConnectionManager.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepConnectionManager.java
index e664a46f0063ccbf6b5e18ae179711464da12622..10412e837aeae07241a27c338fc0629d8e8c4735 100644 (file)
--- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepConnectionManager.java
+++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepConnectionManager.java
@@ -10,6 +10,7 @@ package org.opendaylight.ovsdb.hwvtepsouthbound;
 import static java.util.Objects.requireNonNull;
 import static org.opendaylight.ovsdb.lib.operations.Operations.op;
 
+import com.google.common.collect.Maps;
 import com.google.common.util.concurrent.FluentFuture;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.MoreExecutors;
@@ -672,14 +673,6 @@ public class HwvtepConnectionManager implements OvsdbConnectionListener, AutoClo
         return entityConnectionMap.get(entity);
     }
 
-    public Map<InstanceIdentifier<Node>, TransactionHistory> getControllerTxHistory() {
-        return controllerTxHistory;
-    }
-
-    public Map<InstanceIdentifier<Node>, TransactionHistory> getDeviceUpdateHistory() {
-        return deviceUpdateHistory;
-    }
-
     private static class HwvtepDeviceEntityOwnershipListener implements EntityOwnershipListener {
         private final HwvtepConnectionManager hcm;
         private final EntityOwnershipListenerRegistration listenerRegistration;
@@ -700,6 +693,23 @@ public class HwvtepConnectionManager implements OvsdbConnectionListener, AutoClo
         }
     }
 
+    final Map<InstanceIdentifier<Node>, HwvtepDeviceInfo> allConnectedInstances() {
+        return Maps.transformValues(Collections.unmodifiableMap(nodeIidVsConnectionInstance),
+            HwvtepConnectionInstance::getDeviceInfo);
+    }
+
+    final Map<InstanceIdentifier<Node>, TransactionHistory> controllerTxHistory() {
+        return Collections.unmodifiableMap(controllerTxHistory);
+    }
+
+    final Map<InstanceIdentifier<Node>, TransactionHistory> deviceUpdateHistory() {
+        return Collections.unmodifiableMap(deviceUpdateHistory);
+    }
+
+    public void cleanupOperationalNode(final InstanceIdentifier<Node> nodeIid) {
+        txInvoker.invoke(new HwvtepGlobalRemoveCommand(nodeIid));
+    }
+
     private enum ConnectionReconciliationTriggers {
         /*
         Reconciliation trigger for scenario where controller's attempt
@@ -713,12 +723,4 @@ public class HwvtepConnectionManager implements OvsdbConnectionListener, AutoClo
         */
         ON_DISCONNECT
     }
-
-    public Map<InstanceIdentifier<Node>, HwvtepConnectionInstance> getAllConnectedInstances() {
-        return Collections.unmodifiableMap(nodeIidVsConnectionInstance);
-    }
-
-    public void cleanupOperationalNode(final InstanceIdentifier<Node> nodeIid) {
-        txInvoker.invoke(new HwvtepGlobalRemoveCommand(nodeIid));
-    }
 }