2021-11-07 Fred Gleason <fredg@paravelsystems.com>

* Removed 'xmltodict' Python module dependency to the 'rivwebpyapi'
	API.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>

apis/rivwebpyapi/tests/Makefile.am

@@ -20,7 +20,8 @@
 ##
 ## Use automake to process this into a Makefile.in
 
-EXTRA_DIST = list_services.py
+EXTRA_DIST = list_logs.py\
+             list_services.py
 
 CLEANFILES = *~\
              *.idb\

apis/rivwebpyapi/tests/list_logs.py

@@ -0,0 +1,95 @@
+#!%PYTHON_BANGPATH%
+
+# list_logs.py
+#
+# RivWebPyApi test script for Rivendell
+#
+#  Test the ListLogs Web API call
+#
+#   (C) Copyright 2021 Fred Gleason <fredg@paravelsystems.com>
+#
+#   This program is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License version 2 as
+#   published by the Free Software Foundation.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public
+#   License along with this program; if not, write to the Free Software
+#   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+#
+
+import getpass
+import rivwebpyapi
+import sys
+
+url='';
+username=''
+password=''
+service_name=''
+log_name=''
+trackable=False
+filter_string=''
+recent=False
+
+#
+# Get login parameters
+#
+usage='list_logs --url=<rd-url> --username=<rd-username> [--password=<passwd>]'
+for arg in sys.argv:
+    f0=arg.split('=')
+    if(len(f0)==2):
+        if(f0[0]=='--url'):
+            url=f0[1]
+        if(f0[0]=='--username'):
+            username=f0[1]
+        if(f0[0]=='--password'):
+            password=f0[1]
+        if(f0[0]=='--service-name'):
+            service_name=f0[1]
+        if(f0[0]=='--log-name'):
+            log_name=f0[1]
+        if(f0[0]=='--trackable'):
+            trackable=True
+        if(f0[0]=='--filter-string'):
+            filter_string=f0[1]
+        if(f0[0]=='--recent'):
+            recent=True
+if(not password):
+    password=getpass.getpass()
+if((not url)or(not username)):
+    print(usage)
+    sys.exit(1)
+
+#
+# Get the log list
+#
+webapi=rivwebpyapi.RivWebPyApi(url=url,username=username,password=password)
+logs=webapi.ListLogs(service_name=service_name,log_name=log_name,
+                     trackable=trackable,filter_string=filter_string,
+                     recent=recent)
+
+#
+# Display the log list
+#
+for log in logs:
+    print('name: '+log['name'])
+    print('serviceName: '+log['serviceName'])
+    print('description: '+log['description'])
+    print('originUserName: '+log['originUserName'])
+    print('originDatetime: '+str(log['originDatetime']))
+    print('linkDatetime: '+str(log['linkDatetime']))
+    print('modifiedDatetime: '+str(log['modifiedDatetime']))
+    print('startDate: '+str(log['startDate']))
+    print('endDate: '+str(log['endDate']))
+    print('purgeDate: '+str(log['purgeDate']))
+    print('scheduledTracks: '+str(log['scheduledTracks']))
+    print('completedTracks: '+str(log['completedTracks']))
+    print('musicLinks: '+str(log['musicLinks']))
+    print('musicLinked: '+str(log['musicLinked']))
+    print('trafficLinks: '+str(log['trafficLinks']))
+    print('trafficLinked: '+str(log['trafficLinked']))
+    print('')

apis/rivwebpyapi/tests/list_services.py

@@ -26,14 +26,14 @@ import getpass
 import rivwebpyapi
 import sys
 
-url='';
-username=''
-password=''
-
 #
 # Get login parameters
 #
-usage='login_test --url=<rd-url> --username=<rd-username>'
+usage='list_services --url=<rd-url> --username=<rd-username> [--trackable]'
+url='';
+username=''
+password=''
+trackable=False
 for arg in sys.argv:
     f0=arg.split('=')
     if(len(f0)==2):
@@ -43,19 +43,24 @@ for arg in sys.argv:
             username=f0[1]
         if(f0[0]=='--password'):
             password=f0[1]
+        if(f0[0]=='--trackable'):
+            trackable=True
 if(not password):
     password=getpass.getpass()
 if((not url)or(not username)):
     print(usage)
     sys.exit(1)
 
+#
+# Get the services list
+#
+webapi=rivwebpyapi.RivWebPyApi(url=url,username=username,password=password)
+services=webapi.ListServices(trackable=trackable)
 
-webapi=rivwebpyapi.RivWebPyApi(url=url,username=username,passwd=password)
-services=webapi.ListServices(False)
-for svc in services['serviceList']['service']:
-    print('NAME: '+svc['name'])
-    if(svc['description']):
-        print('DESCRIPTION: '+svc['description'])
-    else:
-        print('DESCRIPTION: [none]')
+#
+# Display the services list
+#
+for svc in services:
+    print('name: '+svc['name'])
+    print('description: '+svc['description'])
     print('')

apis/rivwebpyapi/tests/rivwebpyapi.py

@@ -1 +0,0 @@
-../api/rivwebpyapi.py