Skip to content
Snippets Groups Projects
Commit 8b920842 authored by Ricardo Rocha's avatar Ricardo Rocha
Browse files

change check_dpm_infosys to use lists instead of tuples for loops.

parent 2cf0a57b
No related branches found
No related tags found
No related merge requests found
......@@ -6,7 +6,7 @@
%define pnp4nagios_templates_dir %{_datadir}/nagios/html/pnp4nagios/templates.lcgdm
Name: nagios-plugins-lcgdm
Version: 0.9.3
Version: 0.9.4
Release: 1%{?dist}
Summary: Nagios probes to be run remotely against DPM / LFC nodes
Group: Applications/Internet
......@@ -14,8 +14,8 @@ License: ASL 2.0
URL: https://svnweb.cern.ch/trac/lcgdm/wiki/Dpm/Admin/Monitoring
# The source of this package was pulled from upstream's vcs. Use the
# following commands to generate the tarball:
# svn export http://svn.cern.ch/guest/lcgdm/nagios-plugins/tags/nagios-plugins_0_9_3 nagios-plugins-lcgdm-0.9.3
# tar -czvf nagios-plugins-lcgdm-0.9.3.tar.gz nagios-plugins-lcgdm-0.9.3
# svn export http://svn.cern.ch/guest/lcgdm/nagios-plugins/tags/nagios-plugins_0_9_4 nagios-plugins-lcgdm-0.9.4
# tar -czvf nagios-plugins-lcgdm-0.9.4.tar.gz nagios-plugins-lcgdm-0.9.4
Source0: %{name}-%{version}.tar.gz
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
......@@ -174,6 +174,9 @@ rm -rf %{buildroot}
%{nagios_plugins_dir}/lcgdm/check_oracle_expiration
%changelog
* Tue Oct 22 2012 Ricardo Rocha <ricardo.rocha@cern.ch> - 0.9.4-1
- Update for new upstream release
* Tue Oct 16 2012 Ricardo Rocha <ricardo.rocha@cern.ch> - 0.9.3-1
- Update for new upstream release
......
......@@ -112,14 +112,14 @@ Description of work executed by the probe:
self.time_start()
# Check published protocols
for protocol in ("rfio", "gsiftp"):
for protocol in ["rfio", "gsiftp"]:
result = conn.search_s(self.base_dn, ldap.SCOPE_SUBTREE, "GlueSEAccessProtocolLocalID=%s" % protocol)
if not len(result):
return (EX_CRITICAL, "Access protocol %s not published" % protocol, None)
elif verbosity(V_EXTENDED):
print "Access protocol %s published" % protocol
for protocol in ("srmv2"):
for protocol in ["srmv2"]:
result = conn.search_s(self.base_dn, ldap.SCOPE_SUBTREE, "GlueSEControlProtocolLocalID=%s" % protocol)
if not len(result):
return (EX_CRITICAL, "Control protocol %s not published" % protocol, None)
......@@ -127,7 +127,7 @@ Description of work executed by the probe:
print "Control protocol %s published" % protocol
# Services
for s in ("httpg://%s:8446/srm/managerv2"):
for s in ["httpg://%s:8446/srm/managerv2"]:
service = s % self.host
result = conn.search_s(self.base_dn, ldap.SCOPE_SUBTREE, "GlueServiceUniqueID=%s" % service)
if not len(result):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment