Merge autotest upstream from @5318 ~ @5336

client/common_lib/cartesian_config.py

 #!/usr/bin/python
 """
-KVM test configuration file parser
+Cartesian configuration format file parser.
+
+ Filter syntax:
+ , means OR
+ .. means AND
+ . means IMMEDIATELY-FOLLOWED-BY
+
+ Example:
+ qcow2..Fedora.14, RHEL.6..raw..boot, smp2..qcow2..migrate..ide
+ means match all dicts whose names have:
+ (qcow2 AND (Fedora IMMEDIATELY-FOLLOWED-BY 14)) OR
+ ((RHEL IMMEDIATELY-FOLLOWED-BY 6) AND raw AND boot) OR
+ (smp2 AND qcow2 AND migrate AND ide)
+
+ Note:
+ 'qcow2..Fedora.14' is equivalent to 'Fedora.14..qcow2'.
+ 'qcow2..Fedora.14' is not equivalent to 'qcow2..14.Fedora'.
+ 'ide, scsi' is equivalent to 'scsi, ide'.
+
+ Filters can be used in 3 ways:
+ only <filter>
+ no <filter>
+ <filter>:
+ The last one starts a conditional block.
 
 @copyright: Red Hat 2008-2011
 """
 
 import re, os, sys, optparse, collections
 
-
-# Filter syntax:
-# , means OR
-# .. means AND
-# . means IMMEDIATELY-FOLLOWED-BY
-
-# Example:
-# qcow2..Fedora.14, RHEL.6..raw..boot, smp2..qcow2..migrate..ide
-# means match all dicts whose names have:
-# (qcow2 AND (Fedora IMMEDIATELY-FOLLOWED-BY 14)) OR
-# ((RHEL IMMEDIATELY-FOLLOWED-BY 6) AND raw AND boot) OR
-# (smp2 AND qcow2 AND migrate AND ide)
-
-# Note:
-# 'qcow2..Fedora.14' is equivalent to 'Fedora.14..qcow2'.
-# 'qcow2..Fedora.14' is not equivalent to 'qcow2..14.Fedora'.
-# 'ide, scsi' is equivalent to 'scsi, ide'.
-
-# Filters can be used in 3 ways:
-# only <filter>
-# no <filter>
-# <filter>:
-# The last one starts a conditional block.
-
-
 class ParserError:
     def __init__(self, msg, line=None, filename=None, linenum=None):
         self.msg = msg
         self.line = line
         self.filename = filename
         self.linenum = linenum
 
     def __str__(self):
         if self.line:
             return "%s: %r (%s:%s)" % (self.msg, self.line,
@@ skipping 138 matching lines @@
 
 class NegativeCondition(OnlyFilter):
     def __init__(self, line):
         Filter.__init__(self, line.lstrip("!").rstrip(":"))
         self.line = line
         self.content = []
 
 
 class Parser(object):
     """
-    Parse an input file or string that follows the KVM Test Config File format
+    Parse an input file or string that follows the Cartesian Config File format
     and generate a list of dicts that will be later used as configuration
-    parameters by the KVM tests.
+    parameters by autotest tests that use that format.
 
-    @see: http://www.linux-kvm.org/page/KVM-Autotest/Test_Config_File
+    @see: http://autotest.kernel.org/wiki/CartesianConfig
     """
 
     def __init__(self, filename=None, debug=False):
         """
         Initialize the parser and optionally parse a file.
 
         @param filename: Path of the file to parse.
         @param debug: Whether to turn on debugging output.
         """
         self.node = Node()
@@ skipping 481 matching lines @@
     for i, d in enumerate(c.get_dicts()):
         if options.fullname:
             print "dict %4d:  %s" % (i + 1, d["name"])
         else:
             print "dict %4d:  %s" % (i + 1, d["shortname"])
         if options.contents:
             keys = d.keys()
             keys.sort()
             for key in keys:
                 print "    %s = %s" % (key, d[key])