summaryrefslogtreecommitdiffstats
path: root/robotframework-onap/ONAPLibrary/VariableKeywords.py
diff options
context:
space:
mode:
authorDR695H <dr695h@att.com>2019-08-06 17:17:42 -0400
committerDR695H <dr695h@att.com>2019-08-06 17:17:42 -0400
commit9fef31d201bead81d118ad9d9db54d4a9292d0c0 (patch)
treec271fbaba6e55f8223d49e1648bc1857a46a592e /robotframework-onap/ONAPLibrary/VariableKeywords.py
parent1f4b615239b75e2dfe0482555f01771aa8d4dc5a (diff)
fix few errors
fix aai lib not loading in no robot env, fix warnigs for https calls in requests, fix, add support for client certs Issue-ID: TEST-188 Change-Id: Ife00cca98efb412e8b24bba675526ae52413af74 Signed-off-by: DR695H <dr695h@att.com>
Diffstat (limited to 'robotframework-onap/ONAPLibrary/VariableKeywords.py')
-rw-r--r--robotframework-onap/ONAPLibrary/VariableKeywords.py22
1 files changed, 17 insertions, 5 deletions
diff --git a/robotframework-onap/ONAPLibrary/VariableKeywords.py b/robotframework-onap/ONAPLibrary/VariableKeywords.py
index 6338aa2..81dcb9f 100644
--- a/robotframework-onap/ONAPLibrary/VariableKeywords.py
+++ b/robotframework-onap/ONAPLibrary/VariableKeywords.py
@@ -12,8 +12,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-from robot.libraries.BuiltIn import BuiltIn
+from robot.libraries.BuiltIn import BuiltIn, RobotNotRunningError
from robot.api.deco import keyword
+import os
class VariableKeywords(object):
@@ -25,18 +26,29 @@ class VariableKeywords(object):
@keyword
def get_globally_injected_parameters(self):
- dictionary = self.builtin.get_variables(no_decoration=True)
- return self._filter_variables_by_key_prefix(dictionary, "GLOBAL_INJECTED_")
+ return self._filter_variables_by_key_prefix(self._retrieve_robot_variables(), "GLOBAL_INJECTED_")
@keyword
def get_global_parameters(self):
- dictionary = self.builtin.get_variables(no_decoration=True)
- global_variables = self._filter_variables_by_key_prefix(dictionary, "GLOBAL_")
+ global_variables = self._filter_variables_by_key_prefix(self._retrieve_robot_variables(), "GLOBAL_")
# strip out global injected (get those above)
for key in self.get_globally_injected_parameters():
del global_variables[key]
return global_variables
+ def _retrieve_robot_variables(self):
+ """ try to get the parameters from the robot keyword, but if it is ran out of robot context,
+ allow an env to be used instead """
+ dictionary = dict()
+ try:
+ dictionary = self.builtin.get_variables(no_decoration=True)
+ except RobotNotRunningError:
+ try:
+ dictionary = os.environ['GLOBAL_ROBOT_VARIABLES']
+ except KeyError:
+ pass
+ return dictionary
+
@staticmethod
def _filter_variables_by_key_prefix(dictionary, partial):
matches = dict()