Bug 5679 - fix generating of schema by ietf-yang-library

and path of RestconfSchemaService

Change-Id: I5e4449599408d9634d9b88db1ef498c63f5de60f
Signed-off-by: Jakub Toth <jatoth@cisco.com>

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/Draft18.java b/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/Draft18.java
index 3c6b11e87ece20c8985f7ebb29cdb6ae4eb43c9c..dbf9f2d0b6b0673b0537959b5c27312a5b2b284c 100644 (file)
--- a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/Draft18.java
+++ b/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/Draft18.java
@@ -158,7 +158,7 @@ public final class Draft18 {
         public static final QName SPECIFIC_MODULE_REVISION_LEAF_QNAME =
                 QName.create(MODULE_QNAME, SPECIFIC_MODULE_REVISION_LEAF);
 
-        public static final String BASE_URI_OF_SCHEMA = "/data/ietf-yang-library:modules-state/module/";
+        public static final String BASE_URI_OF_SCHEMA = "/modules/";
         public static final String SPECIFIC_MODULE_SCHEMA_LEAF = "schema";
         public static final QName SPECIFIC_MODULE_SCHEMA_LEAF_QNAME =
                 QName.create(MODULE_QNAME, SPECIFIC_MODULE_SCHEMA_LEAF);

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/base/services/api/RestconfSchemaService.java b/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/base/services/api/RestconfSchemaService.java
index a636963a42ba0b7971772438cacdfb7dab7cb7af..b6a04223fc8519aff50435a742e2d1505ebce43e 100644 (file)
--- a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/base/services/api/RestconfSchemaService.java
+++ b/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/base/services/api/RestconfSchemaService.java
@@ -30,7 +30,7 @@ public interface RestconfSchemaService {
      * @return {@link SchemaExportContext}
      */
     @GET
-    @Produces({ Draft18.MediaTypes.YANG, Draft18.MediaTypes.YIN + RestconfConstants.XML })
-    @Path("data/ietf-yang-library:modules/module/{identifier:.+}/schema")
+    @Produces({ Draft18.MediaTypes.YIN + RestconfConstants.XML, Draft18.MediaTypes.YANG })
+    @Path("modules/{identifier:.+}")
     SchemaExportContext getSchema(@PathParam("identifier") String identifier);
 }