Adjust to deprecated validation functions
- The "svalid" functions (e.g. svalid_value) have been deprecated. The
new method is to use the corresponding "valid" function (e.g.
valid_value).
- Also, valid_range now takes lower and upper args (vs. the old
"<lower>..<upper>" string).
Change-Id: Ib554b4991c8a2ef8925380003941e355aa5cadd6
Signed-off-by: Michael Walsh <micwalsh@us.ibm.com>
diff --git a/lib/openbmctool_utils.py b/lib/openbmctool_utils.py
index 1a79b7d..2ec836b 100755
--- a/lib/openbmctool_utils.py
+++ b/lib/openbmctool_utils.py
@@ -502,7 +502,7 @@
ignore_err=False)
health_check = vf.key_value_outbuf_to_dict(output, delim=":")
if int(verify):
- err_msg = gv.svalid_dict(health_check, health_check_fields())
+ err_msg = gv.valid_dict(health_check, health_check_fields())
if err_msg != "":
BuiltIn().fail(gp.sprint_error(err_msg))
@@ -551,8 +551,8 @@
ignore_err=False)
if int(verify):
- err_msg = gv.svalid_dict(remote_logging_view,
- remote_logging_view_fields())
+ err_msg = gv.valid_dict(remote_logging_view,
+ remote_logging_view_fields())
if err_msg != "":
BuiltIn().fail(gp.sprint_error(err_msg))