X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=netconf%2Fsal-netconf-connector%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fnetconf%2Fsal%2Fconnect%2Fnetconf%2FNetconfStateSchemas.java;h=f5ae6935b5023f8d7661c5f857b86fe4dfe51643;hb=f597da23057c39e38a38fda0038f2388506c0a14;hp=d9ca7df3e923572d8acb8aed014450fba92f0163;hpb=82138f659ae26fc2af5dc2130ab9f640b388aac7;p=netconf.git diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/NetconfStateSchemas.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/NetconfStateSchemas.java index d9ca7df3e9..f5ae6935b5 100644 --- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/NetconfStateSchemas.java +++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/NetconfStateSchemas.java @@ -14,7 +14,6 @@ import static org.opendaylight.netconf.sal.connect.netconf.util.NetconfMessageTr import static org.opendaylight.netconf.sal.connect.netconf.util.NetconfMessageTransformUtil.toPath; import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Function; import com.google.common.base.Optional; import com.google.common.base.Preconditions; import com.google.common.base.Strings; @@ -50,7 +49,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * Holds QNames for all yang modules reported by ietf-netconf-monitoring/state/schemas + * Holds QNames for all yang modules reported by ietf-netconf-monitoring/state/schemas. */ public final class NetconfStateSchemas implements NetconfDeviceSchemas { @@ -62,6 +61,7 @@ public final class NetconfStateSchemas implements NetconfDeviceSchemas { YangInstanceIdentifier.builder().node(NetconfState.QNAME).node(Schemas.QNAME).build(); private static final ContainerNode GET_SCHEMAS_RPC; + static { final DataContainerChild filter = NetconfMessageTransformUtil.toFilterStructure(STATE_SCHEMAS_IDENTIFIER, BaseSchema.BASE_NETCONF_CTX_WITH_NOTIFICATIONS.getSchemaContext()); @@ -81,19 +81,15 @@ public final class NetconfStateSchemas implements NetconfDeviceSchemas { @Override public Set getAvailableYangSchemasQNames() { - return Sets.newHashSet(Collections2.transform(getAvailableYangSchemas(), new Function() { - @Override - public QName apply(final RemoteYangSchema input) { - return input.getQName(); - } - })); + return Sets.newHashSet(Collections2.transform(getAvailableYangSchemas(), RemoteYangSchema::getQName)); } /** - * Issue get request to remote device and parse response to find all schemas under netconf-state/schemas + * Issue get request to remote device and parse response to find all schemas under netconf-state/schemas. */ - static NetconfStateSchemas create(final DOMRpcService deviceRpc, final NetconfSessionPreferences remoteSessionCapabilities, final RemoteDeviceId id) { - if(remoteSessionCapabilities.isMonitoringSupported() == false) { + static NetconfStateSchemas create(final DOMRpcService deviceRpc, + final NetconfSessionPreferences remoteSessionCapabilities, final RemoteDeviceId id) { + if (!remoteSessionCapabilities.isMonitoringSupported()) { // TODO - need to search for get-schema support, not just ietf-netconf-monitoring support // issue might be a deviation to ietf-netconf-monitoring where get-schema is unsupported... LOG.warn("{}: Netconf monitoring not supported on device, cannot detect provided schemas", id); @@ -105,61 +101,50 @@ public final class NetconfStateSchemas implements NetconfDeviceSchemas { schemasNodeResult = deviceRpc.invokeRpc(toPath(NETCONF_GET_QNAME), GET_SCHEMAS_RPC).get(); } catch (final InterruptedException e) { Thread.currentThread().interrupt(); - throw new RuntimeException(id + ": Interrupted while waiting for response to " + STATE_SCHEMAS_IDENTIFIER, e); + throw new RuntimeException(id + + ": Interrupted while waiting for response to " + STATE_SCHEMAS_IDENTIFIER, e); } catch (final ExecutionException e) { LOG.warn("{}: Unable to detect available schemas, get to {} failed", id, STATE_SCHEMAS_IDENTIFIER, e); return EMPTY; } - if(schemasNodeResult.getErrors().isEmpty() == false) { - LOG.warn("{}: Unable to detect available schemas, get to {} failed, {}", id, STATE_SCHEMAS_IDENTIFIER, schemasNodeResult.getErrors()); + if (!schemasNodeResult.getErrors().isEmpty()) { + LOG.warn("{}: Unable to detect available schemas, get to {} failed, {}", + id, STATE_SCHEMAS_IDENTIFIER, schemasNodeResult.getErrors()); return EMPTY; } final Optional> schemasNode = findSchemasNode(schemasNodeResult.getResult()); - if(schemasNode.isPresent()) { + if (schemasNode.isPresent()) { Preconditions.checkState(schemasNode.get() instanceof ContainerNode, "Expecting container containing schemas, but was %s", schemasNode.get()); - return create(id, ((ContainerNode) schemasNode.get())); + return create(id, (ContainerNode) schemasNode.get()); } else { LOG.warn("{}: Unable to detect available schemas, get to {} was empty", id, STATE_SCHEMAS_IDENTIFIER); return EMPTY; } } - private static Optional> findSchemasNode(final NormalizedNode result) { - if(result == null) { - return Optional.absent(); - } - final Optional> dataNode = ((DataContainerNode) result).getChild(toId(NETCONF_DATA_QNAME)); - if(dataNode.isPresent() == false) { - return Optional.absent(); - } - - final Optional> nStateNode = - ((DataContainerNode) dataNode.get()).getChild(toId(NetconfState.QNAME)); - if(nStateNode.isPresent() == false) { - return Optional.absent(); - } - - return ((DataContainerNode) nStateNode.get()).getChild(toId(Schemas.QNAME)); - } - /** - * Parse response of get(netconf-state/schemas) to find all schemas under netconf-state/schemas + * Parse response of get(netconf-state/schemas) to find all schemas under netconf-state/schemas. */ @VisibleForTesting protected static NetconfStateSchemas create(final RemoteDeviceId id, final ContainerNode schemasNode) { final Set availableYangSchemas = Sets.newHashSet(); - final Optional> child = schemasNode.getChild(toId(Schema.QNAME)); - Preconditions.checkState(child.isPresent(), "Unable to find list: %s in response: %s", Schema.QNAME.withoutRevision(), schemasNode); - Preconditions.checkState(child.get() instanceof MapNode, "Unexpected structure for container: %s in response: %s. Expecting a list", Schema.QNAME.withoutRevision(), schemasNode); + final Optional> child = + schemasNode.getChild(toId(Schema.QNAME)); + Preconditions.checkState(child.isPresent(), + "Unable to find list: %s in response: %s", Schema.QNAME.withoutRevision(), schemasNode); + Preconditions.checkState(child.get() instanceof MapNode, + "Unexpected structure for container: %s in response: %s. Expecting a list", + Schema.QNAME.withoutRevision(), schemasNode); for (final MapEntryNode schemaNode : ((MapNode) child.get()).getValue()) { - final Optional fromCompositeNode = RemoteYangSchema.createFromNormalizedNode(id, schemaNode); - if(fromCompositeNode.isPresent()) { + final Optional fromCompositeNode = + RemoteYangSchema.createFromNormalizedNode(id, schemaNode); + if (fromCompositeNode.isPresent()) { availableYangSchemas.add(fromCompositeNode.get()); } } @@ -167,7 +152,26 @@ public final class NetconfStateSchemas implements NetconfDeviceSchemas { return new NetconfStateSchemas(availableYangSchemas); } - public final static class RemoteYangSchema { + private static Optional> findSchemasNode(final NormalizedNode result) { + if (result == null) { + return Optional.absent(); + } + final Optional> dataNode = + ((DataContainerNode) result).getChild(toId(NETCONF_DATA_QNAME)); + if (!dataNode.isPresent()) { + return Optional.absent(); + } + + final Optional> nStateNode = + ((DataContainerNode) dataNode.get()).getChild(toId(NetconfState.QNAME)); + if (!nStateNode.isPresent()) { + return Optional.absent(); + } + + return ((DataContainerNode) nStateNode.get()).getChild(toId(Schemas.QNAME)); + } + + public static final class RemoteYangSchema { private final QName qname; RemoteYangSchema(final QName qname) { @@ -178,27 +182,34 @@ public final class NetconfStateSchemas implements NetconfDeviceSchemas { return qname; } - static Optional createFromNormalizedNode(final RemoteDeviceId id, final MapEntryNode schemaNode) { - Preconditions.checkArgument(schemaNode.getNodeType().equals(Schema.QNAME), "Wrong QName %s", schemaNode.getNodeType()); + static Optional createFromNormalizedNode(final RemoteDeviceId id, + final MapEntryNode schemaNode) { + Preconditions.checkArgument( + schemaNode.getNodeType().equals(Schema.QNAME), "Wrong QName %s", schemaNode.getNodeType()); QName childNode = NetconfMessageTransformUtil.IETF_NETCONF_MONITORING_SCHEMA_FORMAT; final String formatAsString = getSingleChildNodeValue(schemaNode, childNode).get(); - if(formatAsString.equals(Yang.QNAME.toString()) == false) { + if (!formatAsString.equals(Yang.QNAME.toString())) { LOG.debug("{}: Ignoring schema due to unsupported format: {}", id, formatAsString); return Optional.absent(); } childNode = NetconfMessageTransformUtil.IETF_NETCONF_MONITORING_SCHEMA_LOCATION; final Set locationsAsString = getAllChildNodeValues(schemaNode, childNode); - if(locationsAsString.contains(Schema.Location.Enumeration.NETCONF.toString()) == false) { + if (!locationsAsString.contains(Schema.Location.Enumeration.NETCONF.toString())) { LOG.debug("{}: Ignoring schema due to unsupported location: {}", id, locationsAsString); return Optional.absent(); } childNode = NetconfMessageTransformUtil.IETF_NETCONF_MONITORING_SCHEMA_NAMESPACE; - final String namespaceAsString = getSingleChildNodeValue(schemaNode, childNode).get(); + final Optional namespaceValue = getSingleChildNodeValue(schemaNode, childNode); + if (!namespaceValue.isPresent()) { + LOG.warn("{}: Ignoring schema due to missing namespace", id); + return Optional.absent(); + } + final String namespaceAsString = namespaceValue.get(); childNode = NetconfMessageTransformUtil.IETF_NETCONF_MONITORING_SCHEMA_VERSION; // Revision does not have to be filled @@ -215,46 +226,53 @@ public final class NetconfStateSchemas implements NetconfDeviceSchemas { } /** - * Extracts all values of a leaf-list node as a set of strings + * Extracts all values of a leaf-list node as a set of strings. */ - private static Set getAllChildNodeValues(final DataContainerNode schemaNode, final QName childNodeQName) { + private static Set getAllChildNodeValues(final DataContainerNode schemaNode, + final QName childNodeQName) { final Set extractedValues = Sets.newHashSet(); - final Optional> child = schemaNode.getChild(toId(childNodeQName)); + final Optional> child = + schemaNode.getChild(toId(childNodeQName)); Preconditions.checkArgument(child.isPresent(), "Child nodes %s not present", childNodeQName); - Preconditions.checkArgument(child.get() instanceof LeafSetNode, "Child nodes %s not present", childNodeQName); + Preconditions.checkArgument(child.get() instanceof LeafSetNode, + "Child nodes %s not present", childNodeQName); for (final LeafSetEntryNode childNode : ((LeafSetNode) child.get()).getValue()) { extractedValues.add(getValueOfSimpleNode(childNode).get()); } return extractedValues; } - private static Optional getSingleChildNodeValue(final DataContainerNode schemaNode, final QName childNode) { - final Optional> node = schemaNode.getChild(toId(childNode)); - Preconditions.checkArgument(node.isPresent(), "Child node %s not present", childNode); - return getValueOfSimpleNode(node.get()); + private static Optional getSingleChildNodeValue(final DataContainerNode schemaNode, + final QName childNode) { + final Optional> node = + schemaNode.getChild(toId(childNode)); + if (node.isPresent()) { + return getValueOfSimpleNode(node.get()); + } else { + LOG.debug("Child node {} not present", childNode); + return Optional.absent(); + } } - private static Optional getValueOfSimpleNode(final NormalizedNode node) { + private static Optional getValueOfSimpleNode( + final NormalizedNode node) { final Object value = node.getValue(); - return value == null || Strings.isNullOrEmpty(value.toString()) ? Optional.absent() : Optional.of(value.toString().trim()); + return value == null || Strings.isNullOrEmpty(value.toString()) + ? Optional.absent() : Optional.of(value.toString().trim()); } @Override - public boolean equals(final Object o) { - if (this == o) { + public boolean equals(final Object obj) { + if (this == obj) { return true; } - if (o == null || getClass() != o.getClass()) { + if (obj == null || getClass() != obj.getClass()) { return false; } - final RemoteYangSchema that = (RemoteYangSchema) o; - - if (!qname.equals(that.qname)) { - return false; - } + final RemoteYangSchema that = (RemoteYangSchema) obj; - return true; + return qname.equals(that.qname); } @Override