Skip to content

Commit a9bacf4

Browse files
committed
Correct some error messages.
1 parent 1dedf1b commit a9bacf4

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

src/plugins_exts/yang_revisions.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ recommended_min_date_parse(struct lysp_ctx *pctx, struct lysp_ext_instance *ext)
119119

120120
if (revision_date_validate(ext->argument) != LY_SUCCESS) {
121121
lyplg_ext_parse_log(pctx, ext, LY_LLERR, LY_EVALID,
122-
"Extension %s has invalid revision-date format: %s (expected YYYY-MM-DD)",
122+
"Extension %s has invalid revision-date format: %s (expected YYYY-MM-DD and a valid date)",
123123
ext->name, ext->argument);
124124
return LY_EVALID;
125125
}

src/plugins_exts/yang_semver.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,13 +133,13 @@ version_parse(struct lysp_ctx *pctx, struct lysp_ext_instance *ext)
133133
/* Validate the argument format */
134134
if (!ext->argument) {
135135
lyplg_ext_parse_log(pctx, ext, LY_LLERR, LY_EVALID,
136-
"Extension %s requires a yang-semantic-version argument.", ext->name);
136+
"Extension %s requires a YANG Semver argument.", ext->name);
137137
return LY_EVALID;
138138
}
139139

140140
if (semver_validate_format(ext->argument, 1) != LY_SUCCESS) {
141141
lyplg_ext_parse_log(pctx, ext, LY_LLERR, LY_EVALID,
142-
"Extension %s has invalid semantic version format: %s", ext->name, ext->argument);
142+
"Extension %s has invalid YANG Semver version format: %s", ext->name, ext->argument);
143143
return LY_EVALID;
144144
}
145145

tests/utests/extensions/test_yang_revisions.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ test_recommended_min_date_invalid(void **state)
103103
"import ietf-yang-types { prefix yt; rev:recommended-min-date \"2013/07/15\"; }}";
104104
assert_int_equal(LY_EVALID, lys_parse_mem(UTEST_LYCTX, data, LYS_IN_YANG, NULL));
105105
CHECK_LOG_CTX("Ext plugin \"ly2 ietf-yang-revisions v1\": "
106-
"Extension rev:recommended-min-date has invalid revision-date format: 2013/07/15 (expected YYYY-MM-DD)",
106+
"Extension rev:recommended-min-date has invalid revision-date format: 2013/07/15 (expected YYYY-MM-DD and a valid date)",
107107
"/b:{extension='rev:recommended-min-date'}/2013/07/15", 0);
108108

109109
/* Invalid: bad date format - too short */
@@ -112,7 +112,7 @@ test_recommended_min_date_invalid(void **state)
112112
"import ietf-yang-types { prefix yt; rev:recommended-min-date \"2013-07\"; }}";
113113
assert_int_equal(LY_EVALID, lys_parse_mem(UTEST_LYCTX, data, LYS_IN_YANG, NULL));
114114
CHECK_LOG_CTX("Ext plugin \"ly2 ietf-yang-revisions v1\": "
115-
"Extension rev:recommended-min-date has invalid revision-date format: 2013-07 (expected YYYY-MM-DD)",
115+
"Extension rev:recommended-min-date has invalid revision-date format: 2013-07 (expected YYYY-MM-DD and a valid date)",
116116
"/c:{extension='rev:recommended-min-date'}/2013-07", 0);
117117

118118
/* Invalid: bad date - invalid month */
@@ -121,7 +121,7 @@ test_recommended_min_date_invalid(void **state)
121121
"import ietf-yang-types { prefix yt; rev:recommended-min-date \"2013-13-15\"; }}";
122122
assert_int_equal(LY_EVALID, lys_parse_mem(UTEST_LYCTX, data, LYS_IN_YANG, NULL));
123123
CHECK_LOG_CTX("Ext plugin \"ly2 ietf-yang-revisions v1\": "
124-
"Extension rev:recommended-min-date has invalid revision-date format: 2013-13-15 (expected YYYY-MM-DD)",
124+
"Extension rev:recommended-min-date has invalid revision-date format: 2013-13-15 (expected YYYY-MM-DD and a valid date)",
125125
"/d:{extension='rev:recommended-min-date'}/2013-13-15", 0);
126126

127127
/* Invalid: duplicate in same import */

tests/utests/extensions/test_yang_semver.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ test_version_invalid(void **state)
9090
"revision 2025-01-01 { ysv:version \"1.0\"; }}";
9191
assert_int_equal(LY_EVALID, lys_parse_mem(UTEST_LYCTX, data, LYS_IN_YANG, NULL));
9292
CHECK_LOG_CTX("Ext plugin \"ly2 ietf-yang-semver v1\": "
93-
"Extension ysv:version has invalid semantic version format: 1.0",
93+
"Extension ysv:version has invalid YANG Semver version format: 1.0",
9494
"/c:{extension='ysv:version'}/1.0", 0);
9595

9696
/* Invalid: bad format - too many dots */
@@ -99,7 +99,7 @@ test_version_invalid(void **state)
9999
"revision 2025-01-01 { ysv:version \"1.0.0.1\"; }}";
100100
assert_int_equal(LY_EVALID, lys_parse_mem(UTEST_LYCTX, data, LYS_IN_YANG, NULL));
101101
CHECK_LOG_CTX("Ext plugin \"ly2 ietf-yang-semver v1\": "
102-
"Extension ysv:version has invalid semantic version format: 1.0.0.1",
102+
"Extension ysv:version has invalid YANG Semver version format: 1.0.0.1",
103103
"/d:{extension='ysv:version'}/1.0.0.1", 0);
104104

105105
/* Invalid: duplicate in same revision */

0 commit comments

Comments
 (0)