X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-netconf-connector%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Fconnect%2Fnetconf%2Futil%2FNetconfBaseOps.java;h=7b231f989ece10b3f58c7e9308270965039e6bf8;hp=40e890e80cc4c5636ccfc0bec8855537d001bb9d;hb=8ce853c0627e829d40fe18e550bc807efbcbafee;hpb=35d50d7b5b69ebb08c753a699bf0aa1e645027fe diff --git a/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/util/NetconfBaseOps.java b/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/util/NetconfBaseOps.java index 40e890e80c..7b231f989e 100644 --- a/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/util/NetconfBaseOps.java +++ b/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/util/NetconfBaseOps.java @@ -10,6 +10,7 @@ package org.opendaylight.controller.sal.connect.netconf.util; import static org.opendaylight.controller.sal.connect.netconf.util.NetconfMessageTransformUtil.DISCARD_CHANGES_RPC_CONTENT; import static org.opendaylight.controller.sal.connect.netconf.util.NetconfMessageTransformUtil.NETCONF_CANDIDATE_QNAME; +import static org.opendaylight.controller.sal.connect.netconf.util.NetconfMessageTransformUtil.NETCONF_COPY_CONFIG_QNAME; import static org.opendaylight.controller.sal.connect.netconf.util.NetconfMessageTransformUtil.NETCONF_DEFAULT_OPERATION_QNAME; import static org.opendaylight.controller.sal.connect.netconf.util.NetconfMessageTransformUtil.NETCONF_DISCARD_CHANGES_QNAME; import static org.opendaylight.controller.sal.connect.netconf.util.NetconfMessageTransformUtil.NETCONF_EDIT_CONFIG_QNAME; @@ -24,26 +25,28 @@ import static org.opendaylight.controller.sal.connect.netconf.util.NetconfMessag import static org.opendaylight.controller.sal.connect.netconf.util.NetconfMessageTransformUtil.NETCONF_VALIDATE_QNAME; import static org.opendaylight.controller.sal.connect.netconf.util.NetconfMessageTransformUtil.ROLLBACK_ON_ERROR_OPTION; import static org.opendaylight.controller.sal.connect.netconf.util.NetconfMessageTransformUtil.toFilterStructure; +import static org.opendaylight.controller.sal.connect.netconf.util.NetconfMessageTransformUtil.toId; +import static org.opendaylight.controller.sal.connect.netconf.util.NetconfMessageTransformUtil.toPath; import com.google.common.base.Optional; import com.google.common.base.Preconditions; -import com.google.common.collect.Lists; +import com.google.common.collect.Iterables; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; -import java.util.Collections; -import org.opendaylight.controller.sal.core.api.RpcImplementation; +import org.opendaylight.controller.md.sal.dom.api.DOMRpcResult; +import org.opendaylight.controller.md.sal.dom.api.DOMRpcService; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.base._1._0.rev110601.copy.config.input.target.ConfigTarget; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.base._1._0.rev110601.get.config.input.source.ConfigSource; import org.opendaylight.yangtools.yang.common.QName; -import org.opendaylight.yangtools.yang.common.RpcResult; -import org.opendaylight.yangtools.yang.data.api.CompositeNode; import org.opendaylight.yangtools.yang.data.api.ModifyAction; -import org.opendaylight.yangtools.yang.data.api.Node; -import org.opendaylight.yangtools.yang.data.api.SimpleNode; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; -import org.opendaylight.yangtools.yang.data.impl.ImmutableCompositeNode; -import org.opendaylight.yangtools.yang.data.impl.NodeFactory; -import org.opendaylight.yangtools.yang.data.impl.SimpleNodeTOImpl; -import org.opendaylight.yangtools.yang.data.impl.util.CompositeNodeBuilder; +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.NormalizedNode; +import org.opendaylight.yangtools.yang.data.impl.schema.Builders; +import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeAttrBuilder; +import org.opendaylight.yangtools.yang.model.api.SchemaContext; /** * Provides base operations for netconf e.g. get, get-config, edit-config, (un)lock, commit etc. @@ -51,114 +54,117 @@ import org.opendaylight.yangtools.yang.data.impl.util.CompositeNodeBuilder; */ public final class NetconfBaseOps { - private final RpcImplementation rpc; + private final DOMRpcService rpc; + private final SchemaContext schemaContext; - public NetconfBaseOps(final RpcImplementation rpc) { + public NetconfBaseOps(final DOMRpcService rpc, final SchemaContext schemaContext) { this.rpc = rpc; + this.schemaContext = schemaContext; } - public ListenableFuture> lock(final FutureCallback> callback, final QName datastore) { + public ListenableFuture lock(final FutureCallback callback, final QName datastore) { Preconditions.checkNotNull(callback); Preconditions.checkNotNull(datastore); - final ListenableFuture> future = rpc.invokeRpc(NETCONF_LOCK_QNAME, getLockContent(datastore)); + final ListenableFuture future = rpc.invokeRpc(toPath(NETCONF_LOCK_QNAME), getLockContent(datastore)); Futures.addCallback(future, callback); return future; } - public ListenableFuture> lockCandidate(final FutureCallback> callback) { - final ListenableFuture> future = rpc.invokeRpc(NETCONF_LOCK_QNAME, getLockContent(NETCONF_CANDIDATE_QNAME)); + public ListenableFuture lockCandidate(final FutureCallback callback) { + final ListenableFuture future = rpc.invokeRpc(toPath(NETCONF_LOCK_QNAME), getLockContent(NETCONF_CANDIDATE_QNAME)); Futures.addCallback(future, callback); return future; } - public ListenableFuture> lockRunning(final FutureCallback> callback) { - final ListenableFuture> future = rpc.invokeRpc(NETCONF_LOCK_QNAME, getLockContent(NETCONF_RUNNING_QNAME)); + public ListenableFuture lockRunning(final FutureCallback callback) { + final ListenableFuture future = rpc.invokeRpc(toPath(NETCONF_LOCK_QNAME), getLockContent(NETCONF_RUNNING_QNAME)); Futures.addCallback(future, callback); return future; } - public ListenableFuture> unlock(final FutureCallback> callback, final QName datastore) { + public ListenableFuture unlock(final FutureCallback callback, final QName datastore) { Preconditions.checkNotNull(callback); Preconditions.checkNotNull(datastore); - final ListenableFuture> future = rpc.invokeRpc(NETCONF_UNLOCK_QNAME, getUnLockContent(datastore)); + final ListenableFuture future = rpc.invokeRpc(toPath(NETCONF_UNLOCK_QNAME), getUnLockContent(datastore)); Futures.addCallback(future, callback); return future; } - public ListenableFuture> unlockRunning(final FutureCallback> callback) { - final ListenableFuture> future = rpc.invokeRpc(NETCONF_UNLOCK_QNAME, getUnLockContent(NETCONF_RUNNING_QNAME)); + public ListenableFuture unlockRunning(final FutureCallback callback) { + final ListenableFuture future = rpc.invokeRpc(toPath(NETCONF_UNLOCK_QNAME), getUnLockContent(NETCONF_RUNNING_QNAME)); Futures.addCallback(future, callback); return future; } - public ListenableFuture> unlockCandidate(final FutureCallback> callback) { - final ListenableFuture> future = rpc.invokeRpc(NETCONF_UNLOCK_QNAME, getUnLockContent(NETCONF_CANDIDATE_QNAME)); + public ListenableFuture unlockCandidate(final FutureCallback callback) { + final ListenableFuture future = rpc.invokeRpc(toPath(NETCONF_UNLOCK_QNAME), getUnLockContent(NETCONF_CANDIDATE_QNAME)); Futures.addCallback(future, callback); return future; } - public ListenableFuture> discardChanges(final FutureCallback> callback) { + public ListenableFuture discardChanges(final FutureCallback callback) { Preconditions.checkNotNull(callback); - final ListenableFuture> future = rpc.invokeRpc(NETCONF_DISCARD_CHANGES_QNAME, DISCARD_CHANGES_RPC_CONTENT); + final ListenableFuture future = rpc.invokeRpc(toPath(NETCONF_DISCARD_CHANGES_QNAME), DISCARD_CHANGES_RPC_CONTENT); Futures.addCallback(future, callback); return future; } - public ListenableFuture> commit(final FutureCallback> callback) { + public ListenableFuture commit(final FutureCallback callback) { Preconditions.checkNotNull(callback); - final ListenableFuture> future = rpc.invokeRpc(NetconfMessageTransformUtil.NETCONF_COMMIT_QNAME, NetconfMessageTransformUtil.COMMIT_RPC_CONTENT); + final ListenableFuture future = rpc.invokeRpc(toPath(NetconfMessageTransformUtil.NETCONF_COMMIT_QNAME), NetconfMessageTransformUtil.COMMIT_RPC_CONTENT); Futures.addCallback(future, callback); return future; } - public ListenableFuture> validate(final FutureCallback> callback, final QName datastore) { + public ListenableFuture validate(final FutureCallback callback, final QName datastore) { Preconditions.checkNotNull(callback); Preconditions.checkNotNull(datastore); - final ListenableFuture> future = rpc.invokeRpc(NetconfMessageTransformUtil.NETCONF_VALIDATE_QNAME, getValidateContent(datastore)); + final ListenableFuture future = rpc.invokeRpc(toPath(NetconfMessageTransformUtil.NETCONF_VALIDATE_QNAME), getValidateContent(datastore)); Futures.addCallback(future, callback); return future; } - public ListenableFuture> validateCandidate(final FutureCallback> callback) { + public ListenableFuture validateCandidate(final FutureCallback callback) { return validate(callback, NETCONF_CANDIDATE_QNAME); } - public ListenableFuture> validateRunning(final FutureCallback> callback) { + public ListenableFuture validateRunning(final FutureCallback callback) { return validate(callback, NETCONF_RUNNING_QNAME); } - public ListenableFuture> copyConfig(final FutureCallback> callback, final QName source, final QName target) { + public ListenableFuture copyConfig(final FutureCallback callback, final QName source, final QName target) { Preconditions.checkNotNull(callback); Preconditions.checkNotNull(source); Preconditions.checkNotNull(target); - final ListenableFuture> future = rpc.invokeRpc(NetconfMessageTransformUtil.NETCONF_COPY_CONFIG_QNAME, getCopyConfigContent(source, target)); + final ListenableFuture future = rpc.invokeRpc(toPath(NetconfMessageTransformUtil.NETCONF_COPY_CONFIG_QNAME), getCopyConfigContent(source, target)); Futures.addCallback(future, callback); return future; } - public ListenableFuture> copyRunningToCandidate(final FutureCallback> callback) { + public ListenableFuture copyRunningToCandidate(final FutureCallback callback) { return copyConfig(callback, NETCONF_RUNNING_QNAME, NETCONF_CANDIDATE_QNAME); } - public ListenableFuture> getConfig(final FutureCallback> callback, final QName datastore, final Optional filterPath) { + public ListenableFuture getConfig(final FutureCallback callback, final QName datastore, final Optional filterPath) { Preconditions.checkNotNull(callback); Preconditions.checkNotNull(datastore); - final ListenableFuture> future; - if (filterPath.isPresent()) { - final Node node = toFilterStructure(filterPath.get()); - future = rpc.invokeRpc(NETCONF_GET_CONFIG_QNAME, + final ListenableFuture future; + if (isFilterPresent(filterPath)) { + // FIXME the source node has to be wrapped in a choice + final DataContainerChild node = toFilterStructure(filterPath.get(), schemaContext); + future = rpc.invokeRpc(toPath(NETCONF_GET_CONFIG_QNAME), NetconfMessageTransformUtil.wrap(NETCONF_GET_CONFIG_QNAME, getSourceNode(datastore), node)); } else { - future = rpc.invokeRpc(NETCONF_GET_CONFIG_QNAME, + future = rpc.invokeRpc(toPath(NETCONF_GET_CONFIG_QNAME), NetconfMessageTransformUtil.wrap(NETCONF_GET_CONFIG_QNAME, getSourceNode(datastore))); } @@ -166,104 +172,117 @@ public final class NetconfBaseOps { return future; } - public ListenableFuture> getConfigRunning(final FutureCallback> callback, final Optional filterPath) { + public ListenableFuture getConfigRunning(final FutureCallback callback, final Optional filterPath) { return getConfig(callback, NETCONF_RUNNING_QNAME, filterPath); } - public ListenableFuture> getConfigCandidate(final FutureCallback> callback, final Optional filterPath) { + public ListenableFuture getConfigCandidate(final FutureCallback callback, final Optional filterPath) { return getConfig(callback, NETCONF_CANDIDATE_QNAME, filterPath); } - public ListenableFuture> get(final FutureCallback> callback, final Optional filterPath) { + public ListenableFuture get(final FutureCallback callback, final Optional filterPath) { Preconditions.checkNotNull(callback); - final ListenableFuture> future; - final Node node = filterPath.isPresent() ? toFilterStructure(filterPath.get()) : NetconfMessageTransformUtil.GET_RPC_CONTENT; - future = rpc.invokeRpc(NETCONF_GET_QNAME, NetconfMessageTransformUtil.wrap(NETCONF_GET_QNAME, node)); + final ListenableFuture future; + + future = isFilterPresent(filterPath) ? + rpc.invokeRpc(toPath(NETCONF_GET_QNAME), NetconfMessageTransformUtil.wrap(NETCONF_GET_QNAME, toFilterStructure(filterPath.get(), schemaContext))) : + rpc.invokeRpc(toPath(NETCONF_GET_QNAME), NetconfMessageTransformUtil.GET_RPC_CONTENT); Futures.addCallback(future, callback); return future; } - public ListenableFuture> editConfigCandidate(final FutureCallback> callback, final CompositeNode editStructure, final ModifyAction modifyAction, final boolean rollback) { + private boolean isFilterPresent(final Optional filterPath) { + return filterPath.isPresent() && Iterables.isEmpty(filterPath.get().getPathArguments()) == false; + } + + public ListenableFuture editConfigCandidate(final FutureCallback callback, final DataContainerChild editStructure, final ModifyAction modifyAction, final boolean rollback) { return editConfig(callback, NETCONF_CANDIDATE_QNAME, editStructure, Optional.of(modifyAction), rollback); } - public ListenableFuture> editConfigCandidate(final FutureCallback> callback, final CompositeNode editStructure, final boolean rollback) { + public ListenableFuture editConfigCandidate(final FutureCallback callback, final DataContainerChild editStructure, final boolean rollback) { return editConfig(callback, NETCONF_CANDIDATE_QNAME, editStructure, Optional.absent(), rollback); } - public ListenableFuture> editConfigRunning(final FutureCallback> callback, final CompositeNode editStructure, final ModifyAction modifyAction, final boolean rollback) { + public ListenableFuture editConfigRunning(final FutureCallback callback, final DataContainerChild editStructure, final ModifyAction modifyAction, final boolean rollback) { return editConfig(callback, NETCONF_RUNNING_QNAME, editStructure, Optional.of(modifyAction), rollback); } - public ListenableFuture> editConfigRunning(final FutureCallback> callback, final CompositeNode editStructure, final boolean rollback) { + public ListenableFuture editConfigRunning(final FutureCallback callback, final DataContainerChild editStructure, final boolean rollback) { return editConfig(callback, NETCONF_RUNNING_QNAME, editStructure, Optional.absent(), rollback); } - public ListenableFuture> editConfig(final FutureCallback> callback, final QName datastore, final CompositeNode editStructure, final Optional modifyAction, final boolean rollback) { + public ListenableFuture editConfig(final FutureCallback callback, final QName datastore, final DataContainerChild editStructure, final Optional modifyAction, final boolean rollback) { Preconditions.checkNotNull(editStructure); Preconditions.checkNotNull(callback); Preconditions.checkNotNull(datastore); - final ListenableFuture> future = rpc.invokeRpc(NETCONF_EDIT_CONFIG_QNAME, getEditConfigContent(datastore, editStructure, modifyAction, rollback)); + final ListenableFuture future = rpc.invokeRpc(toPath(NETCONF_EDIT_CONFIG_QNAME), getEditConfigContent(datastore, editStructure, modifyAction, rollback)); Futures.addCallback(future, callback); return future; } - private CompositeNode getEditConfigContent(final QName datastore, final CompositeNode editStructure, final Optional defaultOperation, final boolean rollback) { - final CompositeNodeBuilder ret = ImmutableCompositeNode.builder(); + public DataContainerChild createEditConfigStrcture(final Optional> lastChild, final Optional operation, final YangInstanceIdentifier dataPath) { + return NetconfMessageTransformUtil.createEditConfigStructure(schemaContext, dataPath, operation, lastChild); + } + + private ContainerNode getEditConfigContent(final QName datastore, final DataContainerChild editStructure, final Optional defaultOperation, final boolean rollback) { + final DataContainerNodeAttrBuilder editBuilder = Builders.containerBuilder().withNodeIdentifier(toId(NETCONF_EDIT_CONFIG_QNAME)); // Target - ret.add(getTargetNode(datastore)); + editBuilder.withChild(getTargetNode(datastore)); // Default operation if(defaultOperation.isPresent()) { - final SimpleNode defOp = NodeFactory.createImmutableSimpleNode(NETCONF_DEFAULT_OPERATION_QNAME, null, NetconfMessageTransformUtil.modifyOperationToXmlString(defaultOperation.get())); - ret.add(defOp); + editBuilder.withChild(Builders.leafBuilder().withNodeIdentifier(toId(NETCONF_DEFAULT_OPERATION_QNAME)).withValue(NetconfMessageTransformUtil.modifyOperationToXmlString(defaultOperation.get())).build()); } // Error option if(rollback) { - ret.addLeaf(NETCONF_ERROR_OPTION_QNAME, ROLLBACK_ON_ERROR_OPTION); + editBuilder.withChild(Builders.leafBuilder().withNodeIdentifier(toId(NETCONF_ERROR_OPTION_QNAME)).withValue(ROLLBACK_ON_ERROR_OPTION).build()); } - ret.setQName(NETCONF_EDIT_CONFIG_QNAME); // Edit content - ret.add(editStructure); - return ret.toInstance(); + editBuilder.withChild(editStructure); + return editBuilder.build(); } - private static CompositeNode getSourceNode(final QName datastore) { - return NodeFactory.createImmutableCompositeNode(NETCONF_SOURCE_QNAME, null, - Collections.> singletonList(new SimpleNodeTOImpl<>(datastore, null, null))); + public static DataContainerChild getSourceNode(final QName datastore) { + return Builders.containerBuilder().withNodeIdentifier(toId(NETCONF_SOURCE_QNAME)) + .withChild( + Builders.choiceBuilder().withNodeIdentifier(toId(ConfigSource.QNAME)).withChild( + Builders.leafBuilder().withNodeIdentifier(toId(datastore)).build()).build() + ).build(); } - - public static CompositeNode getLockContent(final QName datastore) { - return NodeFactory.createImmutableCompositeNode(NETCONF_LOCK_QNAME, null, Collections.>singletonList( - getTargetNode(datastore))); + public static NormalizedNode getLockContent(final QName datastore) { + return Builders.containerBuilder().withNodeIdentifier(toId(NETCONF_LOCK_QNAME)) + .withChild(getTargetNode(datastore)).build(); } - private static CompositeNode getTargetNode(final QName datastore) { - return NodeFactory.createImmutableCompositeNode(NETCONF_TARGET_QNAME, null, Collections.>singletonList( - NodeFactory.createImmutableSimpleNode(datastore, null, null) - )); + public static DataContainerChild getTargetNode(final QName datastore) { + return Builders.containerBuilder().withNodeIdentifier(toId(NETCONF_TARGET_QNAME)) + .withChild( + Builders.choiceBuilder().withNodeIdentifier(toId(ConfigTarget.QNAME)).withChild( + Builders.leafBuilder().withNodeIdentifier(toId(datastore)).build()).build() + ).build(); } - public static CompositeNode getCopyConfigContent(final QName source, final QName target) { - return NodeFactory.createImmutableCompositeNode(NETCONF_LOCK_QNAME, null, - Lists.> newArrayList(getTargetNode(target), getSourceNode(source))); + public static NormalizedNode getCopyConfigContent(final QName source, final QName target) { + return Builders.containerBuilder().withNodeIdentifier(toId(NETCONF_COPY_CONFIG_QNAME)) + .withChild(getTargetNode(target)).withChild(getSourceNode(source)).build(); } - public static CompositeNode getValidateContent(final QName source) { - return NodeFactory.createImmutableCompositeNode(NETCONF_VALIDATE_QNAME, null, Lists.> newArrayList(getSourceNode(source))); + public static NormalizedNode getValidateContent(final QName source) { + return Builders.containerBuilder().withNodeIdentifier(toId(NETCONF_VALIDATE_QNAME)) + .withChild(getSourceNode(source)).build(); } - public static CompositeNode getUnLockContent(final QName preferedDatastore) { - return NodeFactory.createImmutableCompositeNode(NETCONF_UNLOCK_QNAME, null, Collections.>singletonList( - getTargetNode(preferedDatastore))); + public static NormalizedNode getUnLockContent(final QName datastore) { + return Builders.containerBuilder().withNodeIdentifier(toId(NETCONF_UNLOCK_QNAME)) + .withChild(getTargetNode(datastore)).build(); } }