From fe3aec278260801df58e5498b51c1064cc3a6bcd Mon Sep 17 00:00:00 2001 From: Lukas Sedlak Date: Wed, 27 Aug 2014 16:31:52 +0200 Subject: [PATCH] Hotfix for resolving of remote yang schemas. Added hotfix for proper resolving of yang schemas when they are stated as identities and prefixed. Change-Id: If5dc421095f273bb720f54c104a96a61c94dc5e5 Signed-off-by: Lukas Sedlak --- .../sal/connect/netconf/NetconfStateSchemas.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/NetconfStateSchemas.java b/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/NetconfStateSchemas.java index 23b039c254..e0b774f53c 100644 --- a/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/NetconfStateSchemas.java +++ b/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/NetconfStateSchemas.java @@ -156,7 +156,13 @@ public final class NetconfStateSchemas { QName childNode = NetconfMessageTransformUtil.IETF_NETCONF_MONITORING_SCHEMA_FORMAT.withoutRevision(); - final String formatAsString = getSingleChildNodeValue(schemaNode, childNode).get(); + String formatAsString = getSingleChildNodeValue(schemaNode, childNode).get(); + //This is HotFix for situations where format statement in netconf-monitoring might be passed with prefix. + if (formatAsString.contains(":")) { + String[] prefixedString = formatAsString.split(":"); + //FIXME: might be good idea to check prefix against model namespace + formatAsString = prefixedString[1]; + } if(formatAsString.equals(Yang.QNAME.getLocalName()) == false) { logger.debug("{}: Ignoring schema due to unsupported format: {}", id, formatAsString); return Optional.absent(); -- 2.36.6