From ddedbd16185f756fd6171c6951877cedf78a647f Mon Sep 17 00:00:00 2001 From: Bruno Sakoto Date: Wed, 5 May 2021 08:11:19 -0400 Subject: Fix cps ran yang data model * Add a liquibase change set to update cps ran model data * Rename model "cps-ran-schema-model@2021-01-28.yang" to be compliant with yang specifications related to file layout https://tools.ietf.org/html/rfc7950#section-5.2 * Improve yang validation error handling to provide more information about the validation failure in the request response * Add csit test to verify cps ran model retrieval Issue-ID: CPS-377 Signed-off-by: Bruno Sakoto Change-Id: I4f0e337b50d79e81f895eb32f09ae9cb5d9d8a70 --- .../main/java/org/onap/cps/yang/YangTextSchemaSourceSetBuilder.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'cps-service') diff --git a/cps-service/src/main/java/org/onap/cps/yang/YangTextSchemaSourceSetBuilder.java b/cps-service/src/main/java/org/onap/cps/yang/YangTextSchemaSourceSetBuilder.java index 0e8d939ee..67d5ffb03 100644 --- a/cps-service/src/main/java/org/onap/cps/yang/YangTextSchemaSourceSetBuilder.java +++ b/cps-service/src/main/java/org/onap/cps/yang/YangTextSchemaSourceSetBuilder.java @@ -126,7 +126,8 @@ public final class YangTextSchemaSourceSetBuilder { String.format("Exception occurred on reading resource %s.", resourceName), e); } catch (final YangSyntaxErrorException e) { throw new ModelValidationException("Yang resource is invalid.", - String.format("Yang syntax validation failed for resource %s.", resourceName), e); + String.format( + "Yang syntax validation failed for resource %s:%n%s", resourceName, e.getMessage()), e); } } try { -- cgit 1.2.3-korg