commit a6723f276f0f693147e41ebd217b398844807083
author Michael Walsh <micwalsh@us.ibm.com> Tue Nov 22 11:12:01 2016 -0600
committer Andrew Geissler <geissonator@yahoo.com> Tue Nov 29 22:06:09 2016 +0000
tree 422ad7b36a92bca332bd69ebc23677df89f67618
parent fe5724db1ade65330b344324fa02bef7ec312d70

Multiple changes to support functions.

lib/dvt/obmc_call_points.robot
  - Deleting this file.  I don't really see a need for it.

lib/gen_print.py
  - I added code to convert local copy of GEN_PRINT_DEBUG to int.

lib/gen_robot_print.py
  - I added code to convert local copy of GEN_ROBOT_PRINT_DEBUG to int.
  - I added import of DotDict and collections.  I added code to define shortcuts
    for debug and quiet versions (e.g. rdpvars, rqpvars).

bin/process_plug_in_packages.py
  - Change from using dissuing to dpissuing to coincide with changes in
    gen_robot_print.py
  - Shift 'Starting plug-in' output 1 char to the right to align better with
    time stamp output.

lib/rest_client.robot
  - I added support for a quiet parm to the following keywords:
    - OpenBMC Get Request
    - OpenBMC Post Request
    - Read Attribute
    - Call Method
  - I cleaned up excessive spaces (e.g. 4 where 2 will do).
  - I changed " =" to "=" for consistency (e.g. "${data} =" to "${data}=").

lib/utils.robot
  - I cleaned up some lines exceeding 79 chars.
  - I cleaned up excessive spaces (e.g. 4 where 2 will do).
  - I changed " =" to "=" for consistency (e.g. "${data} =" to "${data}=").
  - I added support for a quiet parm to the following keywords:
    - Get Boot Progress
    - Check OS
    - Wait for OS
    - Get BMC State
    - Get Power State
    - This quiet parm may contribute to resolving the following issue:
      https://github.com/openbmc/openbmc-test-automation/issues/162

  - I added support for a wait parm to "Initiate Power On".  It defaults to ${1}
    to preserve traditional behavior.  I have calls to this keyword that only
    want it to "Initiate Power On" and that's it.  No waiting for anything.
  - I added support for print_string parm to Check OS.
  - I improved the error output for "Check OS".
  - I improved the output for "Wait for OS"

lib/dvt/obmc_driver_vars.txt
  - Changed all "IPL" to "BOOT".  "IPL" is an IBM term.  This file only used by
    obmc_boot_test.robot so change is safe.

Change-Id: I9a410b17b5ec4ffb0c8998cb6b8763c41cfd2655
Signed-off-by: Michael Walsh <micwalsh@us.ibm.com>

lib/gen_print.py

diff --git a/lib/gen_print.py b/lib/gen_print.py
index 996a289..6b405d7 100755
--- a/lib/gen_print.py
+++ b/lib/gen_print.py
@@ -17,11 +17,10 @@
 import logging
 import collections
 
-running_from_robot = 1
 try:
     from robot.utils import DotDict
 except ImportError:
-    running_from_robot = 0
+    pass
 
 import gen_arg as ga
 
@@ -70,7 +69,7 @@
 try:
     # The user can set environment variable "GEN_PRINT_DEBUG" to get debug
     # output from this module.
-    gen_print_debug = os.environ['GEN_PRINT_DEBUG']
+    gen_print_debug = int(os.environ['GEN_PRINT_DEBUG'])
 except KeyError:
     gen_print_debug = 0
 
@@ -527,10 +526,11 @@
             if type(var_value) in (dict, collections.OrderedDict):
                 type_is_dict = 1
         except AttributeError:
-                type_is_dict = 0
-        if running_from_robot:
-            if type(var_value) is DotDict:
-                type_is_dict = 1
+            try:
+                if type(var_value) is DotDict:
+                    type_is_dict = 1
+            except NameError:
+                pass
         if type_is_dict:
             for key, value in var_value.iteritems():
                 ix += 1