commit ec01a6f6a0e6f9a946b4d88e08f080efdf7ed742
author Michael Walsh <micwalsh@us.ibm.com> Thu Aug 01 12:43:20 2019 -0500
committer George Keishing <gkeishin@in.ibm.com> Mon Aug 05 15:49:43 2019 +0000
tree faddc0fc25ee6a6c6c3812d403a20eef08241853
parent 44cef2586a819d4d0e070ce7dfc3212b404a04ad

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>

lib/state.py

diff --git a/lib/state.py b/lib/state.py
index 6c1c6d6..e4879f2 100755
--- a/lib/state.py
+++ b/lib/state.py
@@ -249,8 +249,8 @@
     match_type      This may be 'and' or 'or'.
     """
 
-    error_message = gv.svalid_value(match_type, var_name="match_type",
-                                    valid_values=['and', 'or'])
+    error_message = gv.valid_value(match_type, var_name="match_type",
+                                   valid_values=['and', 'or'])
     if error_message != "":
         BuiltIn().fail(gp.sprint_error(error_message))
 
@@ -310,22 +310,22 @@
     # Set parm defaults where necessary and validate all parms.
     if os_host == "":
         os_host = BuiltIn().get_variable_value("${OS_HOST}")
-    error_message = gv.svalid_value(os_host, var_name="os_host",
-                                    invalid_values=[None, ""])
+    error_message = gv.valid_value(os_host, var_name="os_host",
+                                   invalid_values=[None, ""])
     if error_message != "":
         BuiltIn().fail(gp.sprint_error(error_message))
 
     if os_username == "":
         os_username = BuiltIn().get_variable_value("${OS_USERNAME}")
-    error_message = gv.svalid_value(os_username, var_name="os_username",
-                                    invalid_values=[None, ""])
+    error_message = gv.valid_value(os_username, var_name="os_username",
+                                   invalid_values=[None, ""])
     if error_message != "":
         BuiltIn().fail(gp.sprint_error(error_message))
 
     if os_password == "":
         os_password = BuiltIn().get_variable_value("${OS_PASSWORD}")
-    error_message = gv.svalid_value(os_password, var_name="os_password",
-                                    invalid_values=[None, ""])
+    error_message = gv.valid_value(os_password, var_name="os_password",
+                                   invalid_values=[None, ""])
     if error_message != "":
         BuiltIn().fail(gp.sprint_error(error_message))
 
@@ -415,25 +415,25 @@
     # Set parm defaults where necessary and validate all parms.
     if openbmc_host == "":
         openbmc_host = BuiltIn().get_variable_value("${OPENBMC_HOST}")
-    error_message = gv.svalid_value(openbmc_host,
-                                    var_name="openbmc_host",
-                                    invalid_values=[None, ""])
+    error_message = gv.valid_value(openbmc_host,
+                                   var_name="openbmc_host",
+                                   invalid_values=[None, ""])
     if error_message != "":
         BuiltIn().fail(gp.sprint_error(error_message))
 
     if openbmc_username == "":
         openbmc_username = BuiltIn().get_variable_value("${OPENBMC_USERNAME}")
-    error_message = gv.svalid_value(openbmc_username,
-                                    var_name="openbmc_username",
-                                    invalid_values=[None, ""])
+    error_message = gv.valid_value(openbmc_username,
+                                   var_name="openbmc_username",
+                                   invalid_values=[None, ""])
     if error_message != "":
         BuiltIn().fail(gp.sprint_error(error_message))
 
     if openbmc_password == "":
         openbmc_password = BuiltIn().get_variable_value("${OPENBMC_PASSWORD}")
-    error_message = gv.svalid_value(openbmc_password,
-                                    var_name="openbmc_password",
-                                    invalid_values=[None, ""])
+    error_message = gv.valid_value(openbmc_password,
+                                   var_name="openbmc_password",
+                                   invalid_values=[None, ""])
     if error_message != "":
         BuiltIn().fail(gp.sprint_error(error_message))
 
@@ -853,8 +853,8 @@
     quiet = int(gp.get_var_value(quiet, 0))
 
     # Validate parms.
-    error_message = gv.svalid_integer(start_boot_seconds,
-                                      var_name="start_boot_seconds")
+    error_message = gv.valid_integer(start_boot_seconds,
+                                     var_name="start_boot_seconds")
     if error_message != "":
         BuiltIn().fail(gp.sprint_error(error_message))