add --ls/-l to invirt-getconf

[invirt/packages/invirt-base.git] / files / usr / sbin / invirt-getconf

diff --git a/files/usr/sbin/invirt-getconf b/files/usr/sbin/invirt-getconf
index d503dea..bac6596 100755 (executable)
--- a/files/usr/sbin/invirt-getconf
+++ b/files/usr/sbin/invirt-getconf
@@ -1,13 +1,14 @@
 #!/usr/bin/env python
 
 """
 #!/usr/bin/env python
 
 """

-invirt-getconf [-f FILE] KEY prints the configuration the option named KEY from
-the invirt configuration file FILE.  Keys are dot-separated paths into the YAML
+invirt-getconf loads an invirt configuration file (either the original YAML
+source or the faster-to-load JSON cache) and prints the configuration option
+with the given name (key).  Keys are dot-separated paths into the YAML

 configuration tree.  List indexes (0-based) are also treated as path
 components.
 
 (Due to this path language, certain restrictions are placed on the keys used in
 configuration tree.  List indexes (0-based) are also treated as path
 components.
 
 (Due to this path language, certain restrictions are placed on the keys used in

-the YAML configuration, e.g. they cannot contain dots.)
+the YAML configuration; e.g., they cannot contain dots.)

 
 Examples:
 
 
 Examples:
 

@@ -34,6 +35,9 @@ def main(argv):
         parser.add_option('-r', '--refresh',
                 action = 'store_true',
                 help = 'force the cache to be regenerated')
         parser.add_option('-r', '--refresh',
                 action = 'store_true',
                 help = 'force the cache to be regenerated')

+        parser.add_option('-l', '--ls',
+                action = 'store_true',
+                help = 'list node\'s children')

         opts, args = parser.parse_args()
 
         try: [key] = args
         opts, args = parser.parse_args()
 
         try: [key] = args

@@ -56,8 +60,19 @@ def main(argv):
                     '%s: key "%s" not found' % (progress, component))
             except IndexError: raise invirt_exception(
                     '%s: index %s out of range' % (progress, component))
                     '%s: key "%s" not found' % (progress, component))
             except IndexError: raise invirt_exception(
                     '%s: index %s out of range' % (progress, component))

-        print conf
-    except (invirt_exception, OSError), ex:
+        if opts.ls:
+            if type(conf) not in [dict, list]:
+                raise invirt_exception(
+                        '%s: node has no children (atomic datum)' % progress)
+            if type(conf) == list:
+                for i in xrange(len(conf)):
+                    print i
+            else:
+                for k in conf.iterkeys():
+                    print k
+        else:
+            print conf
+    except invirt_exception, ex:

         print >> stderr, ex
         return 1
 
         print >> stderr, ex
         return 1