Changeset 3253

Timestamp:

08/06/13 12:53:41 (11 years ago)

Author:

sanmai

Message:

• Work on LDAP monitoring plugin.
• Adapt check_lat_cql_endpoint.py to new command line argument processing code.

Location:

monitoring/plugins/mpi

Files:

• check_clarin_ldap.py (modified) (1 diff)
• check_lat_cql_endpoint.py (modified) (2 diffs)
• generic_tla_monitoring.py (modified) (3 diffs)

monitoring/plugins/mpi/check_clarin_ldap.py

@@ -14 +14 @@
 special_plugin_description = "LDAP directory"
 special_plugin_file_name = os.path.basename(__file__)
-
 command_line_parameters = [("-h", "host",),
                                                    ("-b", "bind DN",)]

monitoring/plugins/mpi/check_lat_cql_endpoint.py

@@ -9 +9 @@
 CQL_NAMESPACE = "http://www.loc.gov/zing/srw/"
 
+command_line_parameters = [("-h", "host",),
+                           ("-u", "URL",)]
+
 # Warning: check of validity of returned data relies on the XML namespace CQL_NAMESPACE of the returned XML markup.
 
-def special_main_subroutine(host, url=None) :
-
-    if url:
-        UP_URLs = (url,) # X- use frozenset
-        
-    else:
-        UP_URLs = ('/',) # X- use frozenset
+def special_main_subroutine(host,
+                            URL = '/') :
+  
+    psb.set_trace()
+    UP_URLs = (URL,) # X- use frozenset
 
     valid_root_element_tag = "{%s}explainResponse" % (CQL_NAMESPACE)
@@ -34 +35 @@
 
 if __name__ == "__main__" :
-    generic_tla_monitoring.main(special_main_subroutine)
+    generic_tla_monitoring.main(special_main_subroutine,
+                                command_line_parameters = command_line_parameters)

monitoring/plugins/mpi/generic_tla_monitoring.py

@@ -169 +169 @@
               '--bindDN', bindDN,
               "--bindPasswordFile", '/root/LDAP_passwdfile',
-              '(objectClass=CLARINPerson),
+              '(objectClass=CLARINPerson)',
               'isMemberOf']
 
     # Run OpenDJ's "ldapsearch" command line utility
-    pdb.set_trace()
+    #pdb.set_trace()
     
     process = subprocess.Popen(command, 
@@ -181 +181 @@
     stdout, stderr = process.communicate()
 
-    print stdout
-    print stderr
-
-    pdb.set_trace()
-
-    if response :
+    #print stdout
+    #print stderr
+
+    #pdb.set_trace()
+
+    if process.returncode == 0 :
         return {
                 "code"      : "OK", 
@@ -301 +301 @@
 
     try :
-        opts = filter(None, getopt.getopt(sys.argv[1:], command_line_parameters_getopt_string))[0] # X- fix other plugins with -u option
+        opts = filter(None, getopt.getopt(sys.argv[1:], command_line_parameters_getopt_string))[0]
     except getopt.GetoptError, err :
         usage(command_line_parameters_usage_string)
     else : 
         if len(command_line_parameters) == len(opts) :
+            ## main_subroutine_argument_values is based on the argument order of special_main_subroutine(). They are not mapped to the argument names! 
+            ## Therefore, command_line_parameters must be in the same order as special_main_subroutine()'s arguments.
             main_subroutine_argument_values = [parameter_value for parameter_name, parameter_value in opts]
             # pdb.set_trace()