From fa16f0ff31647202076443a5a6155393387d5d5f Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 14 Sep 2017 18:52:22 +0200 Subject: [PATCH] Adjust for yangtools normalizing module names Yangtools plugin normalizing names, so we need to adjust for that. Change-Id: I4095666a57e1fde0a109eeecb487744b58505fe2 Signed-off-by: Robert Varga --- .../controller/config/yangjmxgenerator/AbstractYangTest.java | 2 +- .../md/sal/dom/broker/impl/MountPointServiceTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/opendaylight/config/yang-jmx-generator/src/test/java/org/opendaylight/controller/config/yangjmxgenerator/AbstractYangTest.java b/opendaylight/config/yang-jmx-generator/src/test/java/org/opendaylight/controller/config/yangjmxgenerator/AbstractYangTest.java index fc11e932c3..9a23221433 100644 --- a/opendaylight/config/yang-jmx-generator/src/test/java/org/opendaylight/controller/config/yangjmxgenerator/AbstractYangTest.java +++ b/opendaylight/config/yang-jmx-generator/src/test/java/org/opendaylight/controller/config/yangjmxgenerator/AbstractYangTest.java @@ -78,7 +78,7 @@ public abstract class AbstractYangTest { } public static List getConfigApiYangInputStreams() { - return getStreams("/META-INF/yang/config.yang", "/META-INF/yang/rpc-context.yang"); + return getStreams("/META-INF/yang/config@2013-04-05.yang", "/META-INF/yang/rpc-context@2013-06-17.yang"); } public Map mapIdentitiesByQNames(final Module module) { diff --git a/opendaylight/md-sal/sal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/MountPointServiceTest.java b/opendaylight/md-sal/sal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/MountPointServiceTest.java index ef34e03c13..92b137c947 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/MountPointServiceTest.java +++ b/opendaylight/md-sal/sal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/MountPointServiceTest.java @@ -24,7 +24,7 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; public class MountPointServiceTest { private DOMMountPointService mountService; - private static final YangInstanceIdentifier PATH = YangInstanceIdentifier.of(QName.create("namespace", "12-12-2012", "top")); + private static final YangInstanceIdentifier PATH = YangInstanceIdentifier.of(QName.create("namespace", "2012-12-12", "top")); @Before public void setup() { -- 2.36.6