import com.google.common.collect.Multimaps;
import java.io.IOException;
import java.net.URISyntaxException;
+import java.time.Instant;
import java.util.Collection;
import java.util.Collections;
-import java.util.Date;
import java.util.Map;
import java.util.Set;
-import javax.annotation.Nonnull;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.stream.XMLStreamException;
import javax.xml.transform.dom.DOMResult;
import javax.xml.transform.dom.DOMSource;
-import org.opendaylight.controller.md.sal.dom.api.DOMEvent;
-import org.opendaylight.controller.md.sal.dom.api.DOMNotification;
-import org.opendaylight.controller.md.sal.dom.api.DOMRpcResult;
-import org.opendaylight.controller.md.sal.dom.spi.DefaultDOMRpcResult;
import org.opendaylight.mdsal.dom.api.DOMActionResult;
import org.opendaylight.mdsal.dom.api.DOMDataTreeIdentifier;
+import org.opendaylight.mdsal.dom.api.DOMEvent;
+import org.opendaylight.mdsal.dom.api.DOMNotification;
+import org.opendaylight.mdsal.dom.api.DOMRpcResult;
+import org.opendaylight.mdsal.dom.spi.DefaultDOMRpcResult;
import org.opendaylight.mdsal.dom.spi.SimpleDOMActionResult;
import org.opendaylight.netconf.api.NetconfMessage;
import org.opendaylight.netconf.api.xml.MissingNameSpaceException;
import org.opendaylight.yangtools.yang.common.QName;
import org.opendaylight.yangtools.yang.common.Revision;
import org.opendaylight.yangtools.yang.common.RpcError;
+import org.opendaylight.yangtools.yang.common.YangConstants;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
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.ImmutableNormalizedNodeStreamWriter;
import org.opendaylight.yangtools.yang.data.impl.schema.NormalizedNodeResult;
+import org.opendaylight.yangtools.yang.data.util.DataSchemaContextTree;
import org.opendaylight.yangtools.yang.model.api.ActionDefinition;
import org.opendaylight.yangtools.yang.model.api.ActionNodeContainer;
import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode;
return builder.build();
}
- private void findAction(
DataSchemaNode dataSchemaNode, Builder<ActionDefinition> builder) {
+ private void findAction(
final DataSchemaNode dataSchemaNode, final Builder<ActionDefinition> builder) {
if (dataSchemaNode instanceof ActionNodeContainer) {
final ActionNodeContainer containerSchemaNode = (ActionNodeContainer) dataSchemaNode;
for (ActionDefinition actionDefinition : containerSchemaNode.getActions()) {
@Override
public synchronized DOMNotification toNotification(final NetconfMessage message) {
- final Map.Entry<Date, XmlElement> stripped = NetconfMessageTransformUtil.stripNotification(message);
+ final Map.Entry<Instant, XmlElement> stripped = NetconfMessageTransformUtil.stripNotification(message);
final QName notificationNoRev;
try {
notificationNoRev = QName.create(
}
@Override
- public NetconfMessage toRpcRequest(SchemaPath rpc, final NormalizedNode<?, ?> payload) {
+ public NetconfMessage toRpcRequest(final SchemaPath rpc, final NormalizedNode<?, ?> payload) {
// In case no input for rpc is defined, we can simply construct the payload here
final QName rpcQName = rpc.getLastComponent();
- Map<QName, RpcDefinition> currentMappedRpcs = mappedRpcs;
// Determine whether a base netconf operation is being invoked
// and also check if the device exposed model for base netconf.
// If no, use pre built base netconf operations model
final boolean needToUseBaseCtx = mappedRpcs.get(rpcQName) == null && isBaseOrNotificationRpc(rpcQName);
+ final Map<QName, RpcDefinition> currentMappedRpcs;
if (needToUseBaseCtx) {
currentMappedRpcs = baseSchema.getMappedRpcs();
+ } else {
+ currentMappedRpcs = mappedRpcs;
}
- Preconditions.checkNotNull(currentMappedRpcs.get(rpcQName),
+ final RpcDefinition mappedRpc = Preconditions.checkNotNull(currentMappedRpcs.get(rpcQName),
"Unknown rpc %s, available rpcs: %s", rpcQName, currentMappedRpcs.keySet());
- if (currentMappedRpcs.get(rpcQName).getInput().getChildNodes().isEmpty()) {
+ if (mappedRpc.getInput().getChildNodes().isEmpty()) {
return new NetconfMessage(NetconfMessageTransformUtil
.prepareDomResultForRpcRequest(rpcQName, counter).getNode().getOwnerDocument());
}
Preconditions.checkArgument(payload instanceof ContainerNode,
"Transforming an rpc with input: %s, payload has to be a container, but was: %s", rpcQName, payload);
// Set the path to the input of rpc for the node stream writer
- rpc = rpc.createChild(QName.create(rpcQName, "input").intern());
+ final SchemaPath rpcInput = rpc.createChild(YangConstants.operationInputQName(rpcQName.getModule()));
final DOMResult result = NetconfMessageTransformUtil.prepareDomResultForRpcRequest(rpcQName, counter);
try {
// use default pre build context with just the base model
// This way operations like lock/unlock are supported even if the source for base model was not provided
SchemaContext ctx = needToUseBaseCtx ? baseSchema.getSchemaContext() : schemaContext;
- NetconfMessageTransformUtil.writeNormalizedRpc((ContainerNode) payload, result, rpc, ctx);
+ NetconfMessageTransformUtil.writeNormalizedRpc((ContainerNode) payload, result, rpcInput, ctx);
} catch (final XMLStreamException | IOException | IllegalStateException e) {
- throw new IllegalStateException("Unable to serialize " + rpc, e);
+ throw new IllegalStateException("Unable to serialize " + rpcInput, e);
}
final Document node = result.getNode().getOwnerDocument();
}
@Override
- public NetconfMessage toActionRequest(SchemaPath action, DOMDataTreeIdentifier domDataTreeIdentifier,
+ public NetconfMessage toActionRequest(final SchemaPath action, final DOMDataTreeIdentifier domDataTreeIdentifier,
final NormalizedNode<?, ?> payload) {
ActionDefinition actionDefinition = null;
- SchemaPath schemaPath = action;
for (ActionDefinition actionDef : actions) {
if (actionDef.getPath().getLastComponent().equals(action.getLastComponent())) {
actionDefinition = actionDef;
- schemaPath = actionDef.getPath();
}
}
Preconditions.checkNotNull(actionDefinition, "Action does not exist: %s", action.getLastComponent());
- if (actionDefinition.getInput().getChildNodes().isEmpty()) {
+ final ContainerSchemaNode inputDef = actionDefinition.getInput();
+ if (inputDef.getChildNodes().isEmpty()) {
return new NetconfMessage(NetconfMessageTransformUtil.prepareDomResultForActionRequest(
- domDataTreeIdentifier, action, counter, actionDefinition.getQName().getLocalName())
- .getNode().getOwnerDocument());
+ DataSchemaContextTree.from(schemaContext), domDataTreeIdentifier, action, counter,
+ actionDefinition.getQName().getLocalName()).getNode().getOwnerDocument());
}
Preconditions.checkNotNull(payload, "Transforming an action with input: %s, payload cannot be null",
Preconditions.checkArgument(payload instanceof ContainerNode,
"Transforming an rpc with input: %s, payload has to be a container, but was: %s",
action.getLastComponent(), payload);
- // Set the path to the input of rpc for the node stream writer
- action = action.createChild(QName.create(action.getLastComponent(), "input").intern());
+
+ // Set the path to the input of action for the node stream writer
final DOMResult result = NetconfMessageTransformUtil.prepareDomResultForActionRequest(
- domDataTreeIdentifier, action, counter, actionDefinition.getQName().getLocalName());
+ DataSchemaContextTree.from(schemaContext), domDataTreeIdentifier, inputDef.getPath(), counter,
+ actionDefinition.getQName().getLocalName());
try {
- NetconfMessageTransformUtil.writeNormalizedRpc((ContainerNode) payload, result,
- schemaPath.createChild(QName.create(action.getLastComponent(), "input").intern()), schemaContext);
+ NetconfMessageTransformUtil.writeNormalizedRpc((ContainerNode) payload, result, inputDef.getPath(),
+ schemaContext);
} catch (final XMLStreamException | IOException | IllegalStateException e) {
throw new IllegalStateException("Unable to serialize " + action, e);
}
}
@Override
- public DOMActionResult toActionResult(SchemaPath action, NetconfMessage message) {
+ public DOMActionResult toActionResult(final SchemaPath action, final NetconfMessage message) {
ActionDefinition actionDefinition = null;
for (ActionDefinition actionDef : actions) {
if (actionDef.getPath().getLastComponent().equals(action.getLastComponent())) {
Preconditions.checkNotNull(actionDefinition, "Action does not exist: %s", action);
ContainerNode normalizedNode = (ContainerNode) parseResult(message, actionDefinition);
- return new SimpleDOMActionResult(normalizedNode, Collections.<RpcError>emptyList());
+ if (normalizedNode == null) {
+ return new SimpleDOMActionResult(Collections.<RpcError>emptyList());
+ } else {
+ return new SimpleDOMActionResult(normalizedNode, Collections.<RpcError>emptyList());
+ }
}
private NormalizedNode<?, ?> parseResult(final NetconfMessage message,
static class NetconfDeviceNotification implements DOMNotification, DOMEvent {
private final ContainerNode content;
private final SchemaPath schemaPath;
- private final Date eventTime;
+ private final Instant eventTime;
- NetconfDeviceNotification(final ContainerNode content, final Date eventTime) {
+ NetconfDeviceNotification(final ContainerNode content, final Instant eventTime) {
this.content = content;
this.eventTime = eventTime;
this.schemaPath = toPath(content.getNodeType());
}
- @Nonnull
@Override
public SchemaPath getType() {
return schemaPath;
-
}
- @Nonnull
@Override
public ContainerNode getBody() {
return content;
}
@Override
- public Date getEventTime() {
+ public Instant getEventInstant() {
return eventTime;
}
}
Code Review / netconf.git / blobdiff