Adjust test-tool to yangtools changes

yang-maven-plugin adds revision to packaged yang file name. Netconf
test-tool should register yang resources with valid filenames, i.e
name@revision.yang, when preparing for assembly of its schema context.

Change-Id: I1914426b96029d7d2377f77b9f7df8beb14e607a
Signed-off-by: Jakub Morvay <jmorvay@cisco.com>

diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/NetconfDeviceSimulator.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/NetconfDeviceSimulator.java
index 53ca53ab70ab4eabfdeeb8011d80e6119c31c87b..7a922f7439d0d422e00caeb77601d00da385a245 100644 (file)
--- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/NetconfDeviceSimulator.java
+++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/NetconfDeviceSimulator.java
@@ -345,10 +345,10 @@ public class NetconfDeviceSimulator implements Closeable {
 
     private void addDefaultSchemas(final SharedSchemaRepository consumer) {
         SourceIdentifier srcId = RevisionSourceIdentifier.create("ietf-netconf-monitoring", "2010-10-04");
-        registerSource(consumer, "/META-INF/yang/ietf-netconf-monitoring.yang", srcId);
+        registerSource(consumer, "/META-INF/yang/ietf-netconf-monitoring@2010-10-04.yang", srcId);
 
         srcId = RevisionSourceIdentifier.create("ietf-netconf-monitoring-extension", "2013-12-10");
-        registerSource(consumer, "/META-INF/yang/ietf-netconf-monitoring-extension.yang", srcId);
+        registerSource(consumer, "/META-INF/yang/ietf-netconf-monitoring-extension@2013-12-10.yang", srcId);
 
         srcId = RevisionSourceIdentifier.create("ietf-yang-types", "2013-07-15");
         registerSource(consumer, "/META-INF/yang/ietf-yang-types@2013-07-15.yang", srcId);