commit aeeb527017573ff7e1d92ab40349b8e591650723
author Michael Walsh <micwalsh@us.ibm.com> Wed Nov 20 13:58:47 2019 -0600
committer George Keishing <gkeishin@in.ibm.com> Tue Nov 26 05:46:21 2019 +0000
tree d0fbcdcb9bb51274a7c691024e91ef8d0af8cab3
parent f953d74a4dec5e12c94ab472c287a2d633f08f48

return_plug_vars() new plug_in_package_name arg

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

lib/gen_plug_in_utils.py

diff --git a/lib/gen_plug_in_utils.py b/lib/gen_plug_in_utils.py
index c00263e..0f7c986 100755
--- a/lib/gen_plug_in_utils.py
+++ b/lib/gen_plug_in_utils.py
@@ -35,7 +35,8 @@
 
 
 def return_plug_vars(general=True,
-                     custom=True):
+                     custom=True,
+                     plug_in_package_name=None):
     r"""
     Return an OrderedDict which is sorted by key and which contains all of the plug-in environment variables.
 
@@ -72,16 +73,18 @@
                                     "AUTOGUI").
     custom                          Return custom plug-in parms (i.e. those beginning with the upper case
                                     name of the plug-in package, for example "OBMC_SAMPLE_PARM1").
+    plug_in_package_name            The name of the plug-in package for which custom parms are to be
+                                    returned.  The default is the current plug in package name.
     """
 
     regex_list = []
     if not (general or custom):
         return collections.OrderedDict()
-    plug_in_package_name = get_plug_in_package_name(case="upper")
+    plug_in_package_name = gm.dft(plug_in_package_name, get_plug_in_package_name())
     if general:
         regex_list = [PLUG_VAR_PREFIX, "AUTOGUI"]
     if custom:
-        regex_list.append(plug_in_package_name)
+        regex_list.append(plug_in_package_name.upper())
 
     regex = "^(" + "|".join(regex_list) + ")_"
 
@@ -96,7 +99,8 @@
 
     # For all variables specified in the parm_def file, we want them to default to "" rather than being unset.
     # Process the parm_def file if it exists.
-    parm_def_file_path = gp.pgm_dir_path + "parm_def"
+    parm_def_file_path = os.path.dirname(gp.pgm_dir_path.rstrip("/")) + "/" + plug_in_package_name \
+        + "/parm_def"
     if os.path.exists(parm_def_file_path):
         parm_defs = gm.my_parm_file(parm_def_file_path)
     else:
@@ -109,7 +113,7 @@
 
     # Create a list of plug-in environment variables by pre-pending <all caps plug-in package name>_<all
     # caps var name>
-    plug_in_parm_names = [plug_in_package_name + "_" + x for x in
+    plug_in_parm_names = [plug_in_package_name.upper() + "_" + x for x in
                           map(str.upper, parm_defs.keys())]
     # Example plug_in_parm_names:
     # plug_in_parm_names: