Switch over to more Options usage and complete tests (everything appears to work now)

git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@4142 ce84e21b-d406-0410-9b95-82705330c041

1 files changed, 16 insertions, 17 deletions

diff --git a/src/sbin/bcfg2-repo-validate b/src/sbin/bcfg2-repo-validate
index ebfd87f25..09abcba98 100755
--- a/src/sbin/bcfg2-repo-validate
+++ b/src/sbin/bcfg2-repo-validate
@@ -3,24 +3,23 @@
 '''bcfg2-repo-validate checks all xml files in Bcfg2 repos against their respective XML schemas'''
 __revision__ = '$Revision$'
 
-import glob, lxml.etree, os, sys, ConfigParser
-from Bcfg2.Settings import settings
+import glob, lxml.etree, os, sys
 
-if __name__ == '__main__':
-    verbose = False
-    if '-v' in sys.argv:
-        verbose = True
-        sys.argv.remove('-v')
-    # override default settings
-    if '-C' in sys.argv:
-        settings.read_config_file(sys.argv[sys.argv.index('-C') + 1])
+import Bcfg2.Options
 
-    schemadir = "%s/share/bcfg2/schemas" % (settings.SERVER_PREFIX)
-    try:
-        os.chdir(schemadir)
-    except:
-        print "Failed to change to schema dir '%s'" % schemadir
-        raise SystemExit(1)
+if __name__ == '__main__':
+    opts = {'repo': Bcfg2.Options.SERVER_REPOSITORY,
+            'prefix': Bcfg2.Options.INSTALL_PREFIX,
+            'verbose': Bcfg2.Options.VERBOSE,
+            'configfile': Bcfg2.Options.CFILE}
+    setup = Bcfg2.Options.OptionParser(opts)
+    setup.parse(sys.argv[1:])
+    verbose = opts['verbose']
+    cpath = opts['configfile']
+    prefix = opts['prefix']
+    schemadir = "%s/share/bcfg2/schemas" % (prefix)
+    os.chdir(schemadir)
+    repo = opts['repo']
 
     filesets = {'metadata':("%s/Metadata/groups.xml", "%s/metadata.xsd"),
                 'clients':("%s/Metadata/clients.xml", "%s/clients.xsd"),
@@ -40,7 +39,7 @@ if __name__ == '__main__':
             print "Failed to process schema %s" % (schemaname%(schemadir))
             failures = 1
             continue
-        for filename in glob.glob(spec%(settings.SERVER_REPOSITORY)):
+        for filename in glob.glob(spec%(repo)):
             try:
                 datafile = lxml.etree.parse(open(filename))
             except SyntaxError: