* 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.netconf.test.tool;
-import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import com.google.common.util.concurrent.MoreExecutors;
import java.util.Collections;
import java.util.EnumMap;
+import java.util.HashMap;
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.common.api.LogicalDatastoreType;
+import org.opendaylight.mdsal.dom.api.DOMDataBroker;
+import org.opendaylight.mdsal.dom.api.DOMDataTreeWriteTransaction;
+import org.opendaylight.mdsal.dom.api.DOMSchemaService;
+import org.opendaylight.mdsal.dom.broker.SerializedDOMDataBroker;
+import org.opendaylight.mdsal.dom.spi.store.DOMStore;
+import org.opendaylight.mdsal.dom.store.inmemory.InMemoryDOMDataStoreFactory;
+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;
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;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeWithValue;
import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild;
import org.opendaylight.yangtools.yang.data.api.schema.LeafSetEntryNode;
import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode;
-import org.opendaylight.yangtools.yang.data.api.schema.MapNode;
+import org.opendaylight.yangtools.yang.data.api.schema.SystemMapNode;
+import org.opendaylight.yangtools.yang.data.api.schema.builder.CollectionNodeBuilder;
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.api.EffectiveModelContext;
+import org.opendaylight.yangtools.yang.model.api.EffectiveModelContextListener;
import org.opendaylight.yangtools.yang.model.repo.api.YangTextSchemaSource;
import org.opendaylight.yangtools.yang.model.repo.spi.SchemaSourceProvider;
import org.slf4j.Logger;
.getLogger(MdsalOperationProvider.class);
private final Set<Capability> caps;
- private final SchemaContext schemaContext;
+ private final EffectiveModelContext schemaContext;
private final SchemaSourceProvider<YangTextSchemaSource> sourceProvider;
MdsalOperationProvider(final SessionIdProvider idProvider,
final Set<Capability> caps,
- final SchemaContext schemaContext,
+ final EffectiveModelContext schemaContext,
final SchemaSourceProvider<YangTextSchemaSource> sourceProvider) {
this.caps = caps;
this.schemaContext = schemaContext;
@Override
public AutoCloseable registerCapabilityListener(
final CapabilityListener listener) {
- listener.onCapabilitiesChanged(caps, Collections.<Capability>emptySet());
+ listener.onCapabilitiesChanged(caps, Collections.emptySet());
return () -> {
};
}
static class MdsalOperationService implements NetconfOperationService {
private final long currentSessionId;
- private final SchemaContext schemaContext;
+ private final EffectiveModelContext schemaContext;
private final Set<Capability> caps;
- private final SchemaService schemaService;
+ private final DOMSchemaService schemaService;
private final DOMDataBroker dataBroker;
private final SchemaSourceProvider<YangTextSchemaSource> sourceProvider;
MdsalOperationService(final long currentSessionId,
- final SchemaContext schemaContext,
+ final EffectiveModelContext schemaContext,
final Set<Capability> caps,
final SchemaSourceProvider<YangTextSchemaSource> sourceProvider) {
this.currentSessionId = currentSessionId;
YangInstanceIdentifier yangInstanceIdentifier = YangInstanceIdentifier.builder().node(NetconfState.QNAME)
.build();
- final DOMDataWriteTransaction tx = dataBroker.newWriteOnlyTransaction();
+ final DOMDataTreeWriteTransaction tx = dataBroker.newWriteOnlyTransaction();
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);
}
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);
}
final QName location = QName.create(Schema.QNAME, "location");
final QName namespace = QName.create(Schema.QNAME, "namespace");
- CollectionNodeBuilder<MapEntryNode, MapNode> schemaMapEntryNodeMapNodeCollectionNodeBuilder = Builders
- .mapBuilder().withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(Schema.QNAME));
+ CollectionNodeBuilder<MapEntryNode, SystemMapNode> schemaMapEntryNodeMapNodeCollectionNodeBuilder =
+ Builders.mapBuilder().withNodeIdentifier(new NodeIdentifier(Schema.QNAME));
LeafSetEntryNode locationLeafSetEntryNode = Builders.leafSetEntryBuilder().withNodeIdentifier(
- new YangInstanceIdentifier.NodeWithValue(location, "NETCONF")).withValue("NETCONF").build();
+ new NodeWithValue<>(location, "NETCONF")).withValue("NETCONF").build();
- Map<QName, Object> keyValues = Maps.newHashMap();
- for (final Schema schema : monitor.getSchemas().getSchema()) {
+ Map<QName, Object> keyValues = new HashMap<>();
+ for (final Schema schema : monitor.getSchemas().nonnullSchema().values()) {
keyValues.put(identifier, schema.getIdentifier());
keyValues.put(version, schema.getVersion());
keyValues.put(format, Yang.QNAME);
- MapEntryNode schemaMapEntryNode = Builders.mapEntryBuilder().withNodeIdentifier(
- new YangInstanceIdentifier.NodeIdentifierWithPredicates(Schema.QNAME, keyValues))
- .withChild(Builders.leafBuilder().withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(
- identifier)).withValue(schema.getIdentifier()).build())
- .withChild(Builders.leafBuilder().withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(
- version)).withValue(schema.getVersion()).build())
- .withChild(Builders.leafBuilder().withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(
- format)).withValue(Yang.QNAME).build())
- .withChild(Builders.leafBuilder().withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(
- namespace)).withValue(schema.getNamespace().getValue()).build())
- .withChild((DataContainerChild<?, ?>) Builders.leafSetBuilder().withNodeIdentifier(
- new YangInstanceIdentifier.NodeIdentifier(location))
+ MapEntryNode schemaMapEntryNode = Builders.mapEntryBuilder()
+ .withNodeIdentifier(NodeIdentifierWithPredicates.of(Schema.QNAME, keyValues))
+ .withChild(Builders.leafBuilder().withNodeIdentifier(new NodeIdentifier(identifier))
+ .withValue(schema.getIdentifier()).build())
+ .withChild(Builders.leafBuilder().withNodeIdentifier(new NodeIdentifier(version))
+ .withValue(schema.getVersion()).build())
+ .withChild(Builders.leafBuilder().withNodeIdentifier(new NodeIdentifier(format))
+ .withValue(Yang.QNAME).build())
+ .withChild(Builders.leafBuilder().withNodeIdentifier(new NodeIdentifier(namespace))
+ .withValue(schema.getNamespace().getValue()).build())
+ .withChild((DataContainerChild) Builders.leafSetBuilder().withNodeIdentifier(
+ new NodeIdentifier(location))
.withChild(locationLeafSetEntryNode).build())
.build();
schemaMapEntryNodeMapNodeCollectionNodeBuilder.withChild(schemaMapEntryNode);
}
- DataContainerChild<?, ?> schemaList = schemaMapEntryNodeMapNodeCollectionNodeBuilder.build();
+ DataContainerChild schemaList = schemaMapEntryNodeMapNodeCollectionNodeBuilder.build();
ContainerNode schemasContainer = Builders.containerBuilder().withNodeIdentifier(
- new YangInstanceIdentifier.NodeIdentifier(Schemas.QNAME)).withChild(schemaList).build();
+ new NodeIdentifier(Schemas.QNAME)).withChild(schemaList).build();
return Builders.containerBuilder().withNodeIdentifier(
- new YangInstanceIdentifier.NodeIdentifier(NetconfState.QNAME)).withChild(schemasContainer).build();
+ new NodeIdentifier(NetconfState.QNAME)).withChild(schemasContainer).build();
}
- private static DOMDataBroker createDataStore(final SchemaService schemaService, final 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);
- final DOMStore configStore = InMemoryDOMDataStoreFactory
- .create("DOM-CFG", schemaService);
+ final DOMStore operStore = InMemoryDOMDataStoreFactory.create("DOM-OPER", schemaService);
+ final DOMStore configStore = InMemoryDOMDataStoreFactory.create("DOM-CFG", schemaService);
ExecutorService listenableFutureExecutor = SpecialExecutors.newBlockingBoundedCachedThreadPool(
16, 16, "CommitFutures", MdsalOperationProvider.class);
return new SerializedDOMDataBroker(datastores, MoreExecutors.listeningDecorator(listenableFutureExecutor));
}
- private SchemaService createSchemaService() {
- return new SchemaService() {
-
- @Override
- public void addModule(final Module module) {
- }
-
- @Override
- public void removeModule(final Module module) {
-
- }
-
+ private DOMSchemaService createSchemaService() {
+ return new DOMSchemaService() {
@Override
- public SchemaContext getSessionContext() {
+ public EffectiveModelContext getGlobalContext() {
return schemaContext;
}
@Override
- public SchemaContext getGlobalContext() {
- return schemaContext;
- }
-
- @Override
- public ListenerRegistration<SchemaContextListener> registerSchemaContextListener(
- final SchemaContextListener listener) {
- listener.onGlobalContextUpdated(getGlobalContext());
- return new ListenerRegistration<SchemaContextListener>() {
- @Override
- public void close() {
-
- }
-
+ public ListenerRegistration<EffectiveModelContextListener> registerSchemaContextListener(
+ final EffectiveModelContextListener listener) {
+ listener.onModelContextUpdated(getGlobalContext());
+ return new AbstractListenerRegistration<>(listener) {
@Override
- public SchemaContextListener getInstance() {
- return listener;
+ protected void removeRegistration() {
+ // No-op
}
};
}
Code Review / netconf.git / blobdiff