[PATCH 0 of 2] [CU] Couple of usability tweaks to indication_tester
Trying to use indication_tester.py to test my new indication, I realized it wasn't terribly user friendly, so I made a few changes to make it more usable and to help us figure out what went wrong when it doesn't work.
# HG changeset patch # User Jay Gagnon <grendel@linux.vnet.ibm.com> # Date 1197065349 18000 # Node ID d9cc64a39524abaa5b88d6ac2b94199cdcf0b23e # Parent d09a2f8d14bf7fb9e78480353cb18c54545b9d1d [CU] Make help output a little more clear, add example. Signed-off-by: Jay Gagnon <grendel@linux.vnet.ibm.com> diff -r d09a2f8d14bf -r d9cc64a39524 tools/indication_tester.py --- a/tools/indication_tester.py Thu Dec 06 11:36:42 2007 -0500 +++ b/tools/indication_tester.py Fri Dec 07 17:09:09 2007 -0500 @@ -325,13 +325,16 @@ class CIMIndicationSubscription: self.__do_cimpost(self.conn, delete_inst_xml(self.name, "Filter")) def main(): - parser = OptionParser(usage="usage: %prog [options] type") + usage = "usage: %prog [options] provider\nex: %prog CIM_InstModification" + parser = OptionParser(usage) + parser.add_option("-u", "--url", dest="url", default="localhost:5988", help="URL of CIMOM to connect to (host:port)") parser.add_option("-N", "--ns", dest="ns", default="root/virt", help="Namespace (default is root/virt)") parser.add_option("-n", "--name", dest="name", default="Test", - help="Base name for filter, handler, subscription") + help="Name for filter, handler, subscription \ + (default: Test)") (options, args) = parser.parse_args()
# HG changeset patch # User Jay Gagnon <grendel@linux.vnet.ibm.com> # Date 1197065707 18000 # Node ID 899c73bed1397d077e18b638fe5bc69013fb381f # Parent d9cc64a39524abaa5b88d6ac2b94199cdcf0b23e [CU] Add --dump-xml option to indication_helper so we can see what xml it's using. Signed-off-by: Jay Gagnon <grendel@linux.vnet.ibm.com> diff -r d9cc64a39524 -r 899c73bed139 tools/indication_tester.py --- a/tools/indication_tester.py Fri Dec 07 17:09:09 2007 -0500 +++ b/tools/indication_tester.py Fri Dec 07 17:15:07 2007 -0500 @@ -324,6 +324,21 @@ class CIMIndicationSubscription: self.__do_cimpost(self.conn, delete_inst_xml(self.name, "Handler")) self.__do_cimpost(self.conn, delete_inst_xml(self.name, "Filter")) +def dump_xml(name, typ, ns): + filter_str = filter_xml(name, typ, ns) + handler_str = handler_xml(name, 8000) + subscript_str = subscription_xml(name) + del_filter_str = delete_inst_xml(name, "Filter") + del_handler_str = delete_inst_xml(name, "Handler") + del_subscript_str = delete_sub_xml(name) + + print "CreateFilter:\n%s\n" % filter_str + print "DeleteFilter:\n%s\n" % del_filter_str + print "CreateHandler:\n%s\n" % handler_str + print "DeleteHandler:\n%s\n" % del_handler_str + print "CreateSubscription:\n%s\n" % subscript_str + print "DeleteSubscription:\n%s\n" % del_subscript_str + def main(): usage = "usage: %prog [options] provider\nex: %prog CIM_InstModification" parser = OptionParser(usage) @@ -335,12 +350,19 @@ def main(): parser.add_option("-n", "--name", dest="name", default="Test", help="Name for filter, handler, subscription \ (default: Test)") + parser.add_option("-d", "--dump-xml", dest="dump", default=False, + action="store_true", + help="Dump the xml that would be used and quit.") (options, args) = parser.parse_args() if len(args) == 0: print "Fatal: no indication type provided." sys.exit(1) + + if options.dump: + dump_xml(options.name, args[0], options.ns) + sys.exit(0) sub = CIMIndicationSubscription(options.name, args[0], options.ns) sub.subscribe(options.url)
participants (1)
-
Jay Gagnon