Merge "NECONF-524 : Setting the netconf keepalive logic to be more proactive."

[netconf.git] / netconf / tools / netconf-testtool / src / main / java / org / opendaylight / netconf / test / tool / MdsalOperationProvider.java

diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/MdsalOperationProvider.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/MdsalOperationProvider.java
index 071085ddf8c78d532dce8a2656dafb8a5c12c998..eb2f93f1ac2557344183fbebd1bb66fc4c41534c 100644 (file)
--- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/MdsalOperationProvider.java
+++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/MdsalOperationProvider.java
@@ -8,6 +8,8 @@
 
 package org.opendaylight.netconf.test.tool;
 
+import com.google.common.collect.ClassToInstanceMap;
+import com.google.common.collect.ImmutableClassToInstanceMap;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 import com.google.common.util.concurrent.MoreExecutors;
@@ -15,16 +17,17 @@ import java.util.Collections;
 import java.util.EnumMap;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
-import org.opendaylight.controller.config.util.capability.Capability;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;
 import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker;
 import org.opendaylight.controller.md.sal.dom.api.DOMDataWriteTransaction;
 import org.opendaylight.controller.md.sal.dom.broker.impl.SerializedDOMDataBroker;
 import org.opendaylight.controller.md.sal.dom.store.impl.InMemoryDOMDataStoreFactory;
-import org.opendaylight.controller.sal.core.api.model.SchemaService;
 import org.opendaylight.controller.sal.core.spi.data.DOMStore;
+import org.opendaylight.mdsal.dom.api.DOMSchemaService;
+import org.opendaylight.mdsal.dom.api.DOMSchemaServiceExtension;
+import org.opendaylight.netconf.api.capability.Capability;
 import org.opendaylight.netconf.api.monitoring.CapabilityListener;
 import org.opendaylight.netconf.impl.SessionIdProvider;
 import org.opendaylight.netconf.mapping.api.NetconfOperation;
@@ -43,6 +46,7 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.mon
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.Yang;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.netconf.state.Schemas;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.netconf.state.schemas.Schema;
+import org.opendaylight.yangtools.concepts.AbstractListenerRegistration;
 import org.opendaylight.yangtools.concepts.ListenerRegistration;
 import org.opendaylight.yangtools.util.concurrent.SpecialExecutors;
 import org.opendaylight.yangtools.yang.common.QName;
@@ -54,7 +58,6 @@ import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode;
 import org.opendaylight.yangtools.yang.data.api.schema.MapNode;
 import org.opendaylight.yangtools.yang.data.impl.schema.Builders;
 import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.CollectionNodeBuilder;
-import org.opendaylight.yangtools.yang.model.api.Module;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 import org.opendaylight.yangtools.yang.model.api.SchemaContextListener;
 import org.opendaylight.yangtools.yang.model.repo.api.YangTextSchemaSource;
@@ -69,7 +72,7 @@ class MdsalOperationProvider implements NetconfOperationServiceFactory {
 
     private final Set<Capability> caps;
     private final SchemaContext schemaContext;
-    private SchemaSourceProvider<YangTextSchemaSource> sourceProvider;
+    private final SchemaSourceProvider<YangTextSchemaSource> sourceProvider;
 
     MdsalOperationProvider(final SessionIdProvider idProvider,
                            final Set<Capability> caps,
@@ -87,17 +90,14 @@ class MdsalOperationProvider implements NetconfOperationServiceFactory {
 
     @Override
     public AutoCloseable registerCapabilityListener(
-            CapabilityListener listener) {
-        listener.onCapabilitiesChanged(caps, Collections.<Capability>emptySet());
-        return new AutoCloseable() {
-            @Override
-            public void close() throws Exception {
-            }
+            final CapabilityListener listener) {
+        listener.onCapabilitiesChanged(caps, Collections.emptySet());
+        return () -> {
         };
     }
 
     @Override
-    public NetconfOperationService createService(String netconfSessionIdForReporting) {
+    public NetconfOperationService createService(final String netconfSessionIdForReporting) {
         return new MdsalOperationService(Long.parseLong(netconfSessionIdForReporting), schemaContext,
             caps, sourceProvider);
     }
@@ -106,9 +106,9 @@ class MdsalOperationProvider implements NetconfOperationServiceFactory {
         private final long currentSessionId;
         private final SchemaContext schemaContext;
         private final Set<Capability> caps;
-        private final SchemaService schemaService;
+        private final DOMSchemaService schemaService;
         private final DOMDataBroker dataBroker;
-        private SchemaSourceProvider<YangTextSchemaSource> sourceProvider;
+        private final SchemaSourceProvider<YangTextSchemaSource> sourceProvider;
 
         MdsalOperationService(final long currentSessionId,
                               final SchemaContext schemaContext,
@@ -139,9 +139,9 @@ class MdsalOperationProvider implements NetconfOperationServiceFactory {
             tx.put(LogicalDatastoreType.OPERATIONAL, yangInstanceIdentifier, netconf);
 
             try {
-                tx.submit().checkedGet();
+                tx.commit().get();
                 LOG.debug("Netconf state updated successfully");
-            } catch (TransactionCommitFailedException e) {
+            } catch (InterruptedException | ExecutionException e) {
                 LOG.warn("Unable to update netconf state", e);
             }
 
@@ -156,7 +156,7 @@ class MdsalOperationProvider implements NetconfOperationServiceFactory {
             final DiscardChanges discardChanges = new DiscardChanges(
                 String.valueOf(currentSessionId), transactionProvider);
 
-            return Sets.<NetconfOperation>newHashSet(get, getConfig,
+            return Sets.newHashSet(get, getConfig,
                     editConfig, commit, lock, unLock, discardChanges);
         }
 
@@ -207,11 +207,11 @@ class MdsalOperationProvider implements NetconfOperationServiceFactory {
 
             ContainerNode schemasContainer = Builders.containerBuilder().withNodeIdentifier(
                     new YangInstanceIdentifier.NodeIdentifier(Schemas.QNAME)).withChild(schemaList).build();
-            return (ContainerNode) Builders.containerBuilder().withNodeIdentifier(
+            return Builders.containerBuilder().withNodeIdentifier(
                     new YangInstanceIdentifier.NodeIdentifier(NetconfState.QNAME)).withChild(schemasContainer).build();
         }
 
-        private DOMDataBroker createDataStore(SchemaService schemaService, long sessionId) {
+        private static DOMDataBroker createDataStore(final DOMSchemaService schemaService, final long sessionId) {
             LOG.debug("Session {}: Creating data stores for simulated device", sessionId);
             final DOMStore operStore = InMemoryDOMDataStoreFactory
                     .create("DOM-OPER", schemaService);
@@ -219,7 +219,7 @@ class MdsalOperationProvider implements NetconfOperationServiceFactory {
                     .create("DOM-CFG", schemaService);
 
             ExecutorService listenableFutureExecutor = SpecialExecutors.newBlockingBoundedCachedThreadPool(
-                    16, 16, "CommitFutures");
+                    16, 16, "CommitFutures", MdsalOperationProvider.class);
 
             final EnumMap<LogicalDatastoreType, DOMStore> datastores = new EnumMap<>(LogicalDatastoreType.class);
             datastores.put(LogicalDatastoreType.CONFIGURATION, configStore);
@@ -228,17 +228,8 @@ class MdsalOperationProvider implements NetconfOperationServiceFactory {
             return new SerializedDOMDataBroker(datastores, MoreExecutors.listeningDecorator(listenableFutureExecutor));
         }
 
-        private SchemaService createSchemaService() {
-            return new SchemaService() {
-
-                @Override
-                public void addModule(Module module) {
-                }
-
-                @Override
-                public void removeModule(Module module) {
-
-                }
+        private DOMSchemaService createSchemaService() {
+            return new DOMSchemaService() {
 
                 @Override
                 public SchemaContext getSessionContext() {
@@ -254,18 +245,19 @@ class MdsalOperationProvider implements NetconfOperationServiceFactory {
                 public ListenerRegistration<SchemaContextListener> registerSchemaContextListener(
                         final SchemaContextListener listener) {
                     listener.onGlobalContextUpdated(getGlobalContext());
-                    return new ListenerRegistration<SchemaContextListener>() {
-                        @Override
-                        public void close() {
-
-                        }
+                    return new AbstractListenerRegistration<SchemaContextListener>(listener) {
 
                         @Override
-                        public SchemaContextListener getInstance() {
-                            return listener;
+                        protected void removeRegistration() {
+                            // No-op
                         }
                     };
                 }
+
+                @Override
+                public ClassToInstanceMap<DOMSchemaServiceExtension> getExtensions() {
+                    return ImmutableClassToInstanceMap.of();
+                }
             };
         }
     }