remove rfio check on bdii, added xrootd

dist/nagios-plugins-lcgdm.spec

@@ -9,8 +9,8 @@
 %define pylib %{python_sitelib}/%{lpylib}
 
 Name:		nagios-plugins-lcgdm
-Version:	0.9.5
-Release:	3%{?dist}.sam
+Version:	0.9.6
+Release:	1%{?dist}.sam
 Summary:	Nagios probes to be run remotely against DPM / LFC nodes
 Group:		Applications/Internet
 License:	ASL 2.0
@@ -189,6 +189,9 @@ rm -rf %{buildroot}
 %{pylib}/*.py*
  
 %changelog
+* Fri Jul 24 2015 Andrea Manzi <amanzi@cern.ch> - 0.9.6-1
+- Remove rfio check as Access protocol
+
 * Wed Dec 03 2014 Ivan Calvet <icalvet@cern.ch> - 0.9.5-3
 - Merged the LFC-probe with the other probes
 

plugins/check_dpm_infosys

@@ -50,12 +50,12 @@ class check_dpm_infosys:
 \t-H, --host\tThe host to query. If not specified, DPM_HOST will be used. 'localhost' in last instance.
 \t-p, --port\tThe ldap port. Default: %d
 
-This probe expects a running local BDII and checks the correctness of information published in it. The rfio, gridftp and srm are checked as well the srm manager service (httpg://$DPM_HOST:8446/srm/managerv2)
+This probe expects a running local BDII and checks the correctness of information published in it. Xrootd, gridftp and srm are checked as well the srm manager service (httpg://$DPM_HOST:8446/srm/managerv2)
 
 Description of work executed by the probe:
 
 \t1. Initialize a ldap connection to the headnode
-\t2. Check if informations about gridftp and rfio protocols are correctly published
+\t2. Check if informations about xrootd, gridftp protocol are correctly published
 \t3. Check if informations about srmv2 protocol is correctly published  
 \t4. check if informations about "httpg://hostname:8446/srm/managerv2" service is correctly published
 \t5. Return values to nagios
@@ -112,7 +112,7 @@ Description of work executed by the probe:
 
     self.time_start()
     # Check published protocols
-    for protocol in ["rfio", "gsiftp"]:
+    for protocol in ["xrootd", "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)