Remove use of deprecated terse() on print_var
terse is now the default.
Change-Id: If25901eea7fdfa502b012cb995242790e7f6176d
Signed-off-by: Michael Walsh <micwalsh@us.ibm.com>
diff --git a/lib/bmc_redfish.py b/lib/bmc_redfish.py
index 46e39fb..4a54630 100644
--- a/lib/bmc_redfish.py
+++ b/lib/bmc_redfish.py
@@ -85,7 +85,7 @@
Example robot code:
${properties}= Get Properties /redfish/v1/Systems/system/
- Rprint Vars properties fmt=terse
+ Rprint Vars properties
Output:
diff --git a/lib/dump_utils.py b/lib/dump_utils.py
index c149d77..75534bf 100755
--- a/lib/dump_utils.py
+++ b/lib/dump_utils.py
@@ -28,7 +28,7 @@
Example robot program call:
${dump_dict}= Get Dump Dict
- Rprint Vars dump_dict fmt=terse
+ Rprint Vars dump_dict
Example output:
diff --git a/lib/logging_utils.py b/lib/logging_utils.py
index c0ba4ab..fa441a1 100644
--- a/lib/logging_utils.py
+++ b/lib/logging_utils.py
@@ -74,7 +74,7 @@
pass
key_list.insert(0, var.BMC_LOGGING_ENTRY + ".*")
- gp.print_var(error_logs, gp.terse(), key_list=key_list)
+ gp.print_var(error_logs, key_list=key_list)
def get_esels(error_logs=None):
diff --git a/lib/var_stack.py b/lib/var_stack.py
index f09845c..2b2aa97 100644
--- a/lib/var_stack.py
+++ b/lib/var_stack.py
@@ -92,8 +92,7 @@
buffer += self.__obj_name + ":\n"
indent = 2
- buffer += gp.sprint_varx('stack_dict', self.__stack_dict, gp.terse(),
- indent)
+ buffer += gp.sprint_varx('stack_dict', self.__stack_dict, indent)
return buffer
diff --git a/redfish/account_service/test_ldap_configuration.robot b/redfish/account_service/test_ldap_configuration.robot
index c80b12c..8acc5d9 100644
--- a/redfish/account_service/test_ldap_configuration.robot
+++ b/redfish/account_service/test_ldap_configuration.robot
@@ -102,7 +102,7 @@
${old_account_service}= Redfish.Get Properties
... ${REDFISH_BASE_URI}AccountService
- Rprint Vars old_account_service fmt=terse
+ Rprint Vars old_account_service
Redfish.Patch ${REDFISH_BASE_URI}AccountService
... body=[('AccountLockoutDuration', 0)]
Redfish.Patch ${REDFISH_BASE_URI}AccountService
diff --git a/redfish/managers/test_bmc_network_conf.robot b/redfish/managers/test_bmc_network_conf.robot
index ffb3d16..826c3a2 100644
--- a/redfish/managers/test_bmc_network_conf.robot
+++ b/redfish/managers/test_bmc_network_conf.robot
@@ -630,7 +630,7 @@
${redfish_nameservers}= Redfish.Get Attribute ${REDFISH_NW_ETH0_URI} StaticNameServers
${resolve_conf_nameservers}= CLI Get Nameservers
- Rqprint Vars redfish_nameservers resolve_conf_nameservers fmt=terse
+ Rqprint Vars redfish_nameservers resolve_conf_nameservers
# Check that the 2 lists are equivalent.
${match}= Evaluate set($redfish_nameservers) == set($resolve_conf_nameservers)
diff --git a/redfish/managers/test_managers_bmc_time.robot b/redfish/managers/test_managers_bmc_time.robot
index bab3ec3..5515473 100644
--- a/redfish/managers/test_managers_bmc_time.robot
+++ b/redfish/managers/test_managers_bmc_time.robot
@@ -126,11 +126,11 @@
${original_ntp}= Redfish.Get Attribute ${REDFISH_NW_PROTOCOL_URI} NTP
Set Suite Variable ${original_ntp}
- Rprint Vars original_ntp fmt=terse
+ Rprint Vars original_ntp
# The following patch command should set the ["NTP"]["ProtocolEnabled"] property to "True".
Redfish.Patch ${REDFISH_NW_PROTOCOL_URI} body={u'NTPEnabled': ${True}}
${ntp}= Redfish.Get Attribute ${REDFISH_NW_PROTOCOL_URI} NTP
- Rprint Vars ntp fmt=terse
+ Rprint Vars ntp
Rvalid Value ntp["ProtocolEnabled"] valid_values=[True]
diff --git a/redfish/systems/eventlog/test_event_logging.robot b/redfish/systems/eventlog/test_event_logging.robot
index 91706e9..5b19876 100644
--- a/redfish/systems/eventlog/test_event_logging.robot
+++ b/redfish/systems/eventlog/test_event_logging.robot
@@ -366,11 +366,11 @@
${event_log}= Get Event Logs
${log_entries}= Filter Struct ${event_log} [('Id', '1')]
- Rprint Vars log_entries fmt=terse
+ Rprint Vars log_entries
Should Be Equal As Strings ${log_entries[0]["Id"]} 1
${log_entries}= Filter Struct ${event_log} [('Id', '${max_num_event_logs}')]
- Rprint Vars log_entries fmt=terse
+ Rprint Vars log_entries
Should Be Equal As Strings ${log_entries[0]["Id"]} ${max_num_event_logs}
# Create event log and verify the entry ID, ${max_num_event_logs + 1}.
@@ -381,12 +381,12 @@
${event_log}= Get Event Logs
${log_entries}= Filter Struct ${event_log} [('Id', '${next_event_log_id}')]
- Rprint Vars log_entries fmt=terse
+ Rprint Vars log_entries
Should Be Equal As Strings ${log_entries[0]["Id"]} ${next_event_log_id}
# Event log 1 should be wrapped.
${log_entries}= Filter Struct ${event_log} [('Id', '1')]
- Rprint Vars log_entries fmt=terse
+ Rprint Vars log_entries
${length_log_entries} Get Length ${log_entries}
Should Be Equal As Integers ${length_log_entries} 0
diff --git a/redfish/systems/test_thermal_ambient_temperatures.robot b/redfish/systems/test_thermal_ambient_temperatures.robot
index 549c63d..3b655a5 100755
--- a/redfish/systems/test_thermal_ambient_temperatures.robot
+++ b/redfish/systems/test_thermal_ambient_temperatures.robot
@@ -38,14 +38,14 @@
... ${REDFISH_CHASSIS_THERMAL_URI} ${record_type}
${num_records}= Get Length ${records}
- Rprint Vars num_records records fmt=terse
+ Rprint Vars num_records records
${invalid_records}= Filter Struct ${records}
... [('Health', '^OK$'), ('State', '^Enabled$'), ('${reading_type}', '')] regex=1 invert=1
${num_invalid_records}= Get Length ${invalid_records}
Run Keyword If ${num_invalid_records} > ${0}
- ... Rprint Vars num_invalid_records invalid_records fmt=terse
+ ... Rprint Vars num_invalid_records invalid_records
Rvalid Value num_invalid_records valid_values=[0]
${invalid_records}= Evaluate
@@ -53,7 +53,7 @@
${num_invalid_records}= Get Length ${invalid_records}
Run Keyword If ${num_invalid_records} > ${0}
- ... Rprint Vars num_invalid_records invalid_records fmt=terse
+ ... Rprint Vars num_invalid_records invalid_records
Rvalid Value num_invalid_records valid_values=[0]
Suite Teardown Execution
diff --git a/redfish/update_service/test_firmware_property.robot b/redfish/update_service/test_firmware_property.robot
index 79861c4..753465e 100644
--- a/redfish/update_service/test_firmware_property.robot
+++ b/redfish/update_service/test_firmware_property.robot
@@ -30,7 +30,7 @@
# TODO: Move to redfish when avialable.
${apply_time}= Read Attribute ${SOFTWARE_VERSION_URI}apply_time RequestedApplyTime
- Rprint Vars apply_time fmt=terse
+ Rprint Vars apply_time
Should Be Equal ${apply_time} xyz.openbmc_project.Software.ApplyTime.RequestedApplyTimes.Immediate
@@ -52,7 +52,7 @@
# TODO: Move to redfish when avialable.
${apply_time}= Read Attribute ${SOFTWARE_VERSION_URI}apply_time RequestedApplyTime
- Rprint Vars apply_time fmt=terse
+ Rprint Vars apply_time
Should Be Equal ${apply_time} xyz.openbmc_project.Software.ApplyTime.RequestedApplyTimes.OnReset