Merge pull request #16 from ARGOeu-Metrics/devel

Version 2.6.1
ARGOeu-Metrics · Jul 12, 2022 · bebfd5f · bebfd5f
2 parents bb97a9e + a7acacd
commit bebfd5f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/argo-probe-eudat-b2find.spec b/argo-probe-eudat-b2find.spec
@@ -1,5 +1,5 @@
 Name:		argo-probe-eudat-b2find
-Version:	2.5
+Version:	2.6
 Release:	3%{?dist}
 Summary:	B2FIND metrics to check the functionality of the service. 
 License:	GPLv3+
@@ -39,6 +39,7 @@ install -m 755 checkB2FIND.py %{buildroot}/%{_libexecdir}/argo/probes/eudat-b2fi
 %pre
 
 %changelog
+* Fri Jun 22 2022 Themis Zamani <themis@admin.grnet.gr> - 2.6-1
 * Fri Mar 04 2022 Themis Zamani <themis@admin.grnet.gr> - 2.5-3
 * Fri Mar 26 2021 Themis Zamani <themis@admin.grnet.gr> - 2.4-1
 * Wed Mar 24 2021 Themis Zamani <themis@admin.grnet.gr> - 2.2-1

diff --git a/checkB2FIND.py b/checkB2FIND.py
@@ -107,7 +107,7 @@ def check_ckan_action(actionreq, data, rows):
         retcode = 0
         assert response.status_code == 200
 
-        if actionreq.endswith('group_show'):
+        if actionreq.endswith('organization_show'):
             resplen = result['package_count']
         else:
             resplen = len(result)
@@ -166,9 +166,9 @@ def checkProbes(args):
             if probe == 'ListDatasets':
                 action = 'package_list'
             elif probe == 'ListCommunities':
-                action = 'group_list'
+                action = 'organization_list'
             elif probe == 'ShowGroupENES':
-                action = 'group_show'
+                action = 'organization_show'
                 data_dict = {'id': 'enes'}
             actionreq = ckanapi3act+action