besapi 3.2.1__tar.gz → 3.2.4__tar.gz

{besapi-3.2.1/src/besapi.egg-info → besapi-3.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: besapi
-Version: 3.2.1
+Version: 3.2.4
 Summary: Library for working with the BigFix REST API
 Home-page: https://github.com/jgstew/besapi
 Author: Matt Hansen, James Stewart

{besapi-3.2.1 → besapi-3.2.4}/setup.cfg

@@ -1,5 +1,5 @@
 [metadata]
-version = attr: besapi.__version__
+version = attr: besapi.besapi.__version__
 long_description = file: README.md
 long_description_content_type = text/markdown
 classifiers = 

{besapi-3.2.1 → besapi-3.2.4}/src/besapi/__init__.py

@@ -5,5 +5,3 @@ besapi is a python module for interacting with the BigFix REST API
 # https://stackoverflow.com/questions/279237/import-a-module-from-a-relative-path/4397291
 
 from . import besapi
-
-__version__ = "3.2.1"

{besapi-3.2.1 → besapi-3.2.4}/src/besapi/__main__.py

@@ -1,6 +1,10 @@
 """
 To run this module directly
 """
+
+import logging
+
 from bescli import bescli
 
+logging.basicConfig()
 bescli.main()

{besapi-3.2.1 → besapi-3.2.4}/src/besapi/besapi.py

@@ -29,6 +29,8 @@ import requests
 from lxml import etree, objectify
 from pkg_resources import resource_filename
 
+__version__ = "3.2.4"
+
 besapi_logger = logging.getLogger("besapi")
 
 
@@ -350,7 +352,9 @@ class BESConnection:
 
     def session_relevance_string(self, relevance, **kwargs):
         """Get Session Relevance Results string"""
-        rel_result_array = self.session_relevance_array(relevance, **kwargs)
+        rel_result_array = self.session_relevance_array(
+            "(it as string) of " + relevance, **kwargs
+        )
         return "\n".join(rel_result_array)
 
     def login(self):
@@ -389,6 +393,34 @@ class BESConnection:
         self.session.cookies.clear()
         self.session.close()
 
+    def set_dashboard_variable_value(
+        self, dashboard_name, var_name, var_value, private=False
+    ):
+        """set the variable value from a dashboard datastore"""
+
+        dash_var_xml = f"""<BESAPI xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BESAPI.xsd">
+            <DashboardData>
+                    <Dashboard>{dashboard_name}</Dashboard>
+                    <Name>{var_name}</Name>
+                    <IsPrivate>{str(private).lower()}</IsPrivate>
+                    <Value>{var_value}</Value>
+            </DashboardData>
+    </BESAPI>
+    """
+
+        return self.post(
+            f"dashboardvariable/{dashboard_name}/{var_name}", data=dash_var_xml
+        )
+
+    def get_dashboard_variable_value(self, dashboard_name, var_name):
+        """get the variable value from a dashboard datastore"""
+
+        return str(
+            self.get(
+                f"dashboardvariable/{dashboard_name}/{var_name}"
+            ).besobj.DashboardData.Value
+        )
+
     def validate_site_path(self, site_path, check_site_exists=True, raise_error=False):
         """make sure site_path is valid"""
 
@@ -999,4 +1031,5 @@ def main():
 
 
 if __name__ == "__main__":
+    logging.basicConfig()
     main()

{besapi-3.2.1 → besapi-3.2.4/src/besapi.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: besapi
-Version: 3.2.1
+Version: 3.2.4
 Summary: Library for working with the BigFix REST API
 Home-page: https://github.com/jgstew/besapi
 Author: Matt Hansen, James Stewart

{besapi-3.2.1 → besapi-3.2.4}/src/bescli/__init__.py

@@ -1,6 +1,7 @@
 """
 bescli provides a command line interface to interact with besapi
 """
+
 # https://stackoverflow.com/questions/279237/import-a-module-from-a-relative-path/4397291
 
 from . import bescli

{besapi-3.2.1 → besapi-3.2.4}/src/bescli/__main__.py

@@ -1,6 +1,10 @@
 """
 To run this module directly
 """
+
+import logging
+
 from . import bescli
 
+logging.basicConfig()
 bescli.main()

{besapi-3.2.1 → besapi-3.2.4}/src/bescli/bescli.py

@@ -28,7 +28,10 @@ except ImportError:
     # this is for the case in which we are calling bescli from besapi
     import besapi
 
-from besapi import __version__
+try:
+    from besapi.besapi import __version__
+except ImportError:
+    from besapi import __version__
 
 
 class BESCLInterface(Cmd):
@@ -421,4 +424,5 @@ def main():
 
 
 if __name__ == "__main__":
+    logging.basicConfig()
     main()

{besapi-3.2.1 → besapi-3.2.4}/tests/tests.py

@@ -5,6 +5,7 @@ Test besapi
 
 import argparse
 import os
+import random
 import subprocess
 import sys
 
@@ -25,7 +26,7 @@ if not args.test_pip:
 
 import besapi
 
-print("besapi version: " + str(besapi.__version__))
+print("besapi version: " + str(besapi.besapi.__version__))
 
 assert 15 == len(besapi.besapi.rand_password(15))
 
@@ -124,9 +125,24 @@ if bigfix_cli.bes_conn:
     upload_result = bigfix_cli.bes_conn.upload(
         "./besapi/__init__.py", "test_besapi_upload.txt"
     )
-    print(upload_result)
+    # print(upload_result)
+    assert "test_besapi_upload.txt</URL>" in str(upload_result)
     print(bigfix_cli.bes_conn.parse_upload_result_to_prefetch(upload_result))
 
+    dashboard_name = "_PyBESAPI_tests.py"
+    var_name = "TestVarName"
+    var_value = "TestVarValue " + str(random.randint(0, 9999))
+
+    print(
+        bigfix_cli.bes_conn.set_dashboard_variable_value(
+            dashboard_name, var_name, var_value
+        )
+    )
+
+    assert var_value in str(
+        bigfix_cli.bes_conn.get_dashboard_variable_value(dashboard_name, var_name)
+    )
+
     if os.name == "nt":
         subprocess.run(
             'CMD /C python -m besapi ls clear ls conf "query number of bes computers" version error_count exit',
@@ -134,3 +150,5 @@ if bigfix_cli.bes_conn:
         )
         bes_conn = besapi.besapi.get_bes_conn_using_config_file()
         print("login succeeded:", bes_conn.login())
+
+sys.exit(0)