summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/lib/Options.py6
-rwxr-xr-xsrc/lib/Server/Reports/utils.py34
-rwxr-xr-xsrc/sbin/bcfg2-repo-validate103
3 files changed, 85 insertions, 58 deletions
diff --git a/src/lib/Options.py b/src/lib/Options.py
index 4041ccf78..f64b491d5 100644
--- a/src/lib/Options.py
+++ b/src/lib/Options.py
@@ -201,6 +201,12 @@ PARANOID_MAX_COPIES = Option('Specify the number of paranoid copies you want',
OMIT_LOCK_CHECK = Option('Omit lock check', default=False, cmd='-O')
CORE_PROFILE = Option('profile',
default=False, cmd='-p', )
+FILES_ON_STDIN = Option('Operate on a list of files supplied on stdin',
+ cmd='--stdin', default=False, long_arg=True)
+SCHEMA_PATH = Option('Path to XML Schema files', cmd='--schema',
+ odesc='<schema path>',
+ default="%s/share/bcfg2/schemas" % DEFAULT_INSTALL_PREFIX,
+ long_arg=True)
# Metadata options
MDATA_OWNER = Option('Default Path owner',
diff --git a/src/lib/Server/Reports/utils.py b/src/lib/Server/Reports/utils.py
index 04fdbf985..6010f366b 100755
--- a/src/lib/Server/Reports/utils.py
+++ b/src/lib/Server/Reports/utils.py
@@ -1,25 +1,10 @@
"""Helper functions for reports"""
from django.conf.urls.defaults import *
import re
-import sys
"""List of filters provided by filteredUrls"""
filter_list = ('server', 'state')
-def increment(self):
- """Return the next object from our array and fetch from the
- database when needed"""
- if self.block_count + self.count - self.step == self.max:
- raise StopIteration
- if self.block_count == 0 or self.count == self.step:
- # Without list() this turns into LIMIT 1 OFFSET x queries
- self.data = list(self.obj.all()[self.block_count: \
- (self.block_count + self.step)])
- self.block_count += self.step
- self.count = 0
- self.count += 1
- return self.data[self.count - 1]
-
class BatchFetch(object):
"""Fetch Django objects in smaller batches to save memory"""
@@ -35,12 +20,19 @@ class BatchFetch(object):
def __iter__(self):
return self
- if sys.hexversion > 0x03000000:
- def __next__(self):
- return increment(self)
- else:
- def next(self):
- return increment(self)
+ def __next__(self):
+ """Return the next object from our array and fetch from the
+ database when needed"""
+ if self.block_count + self.count - self.step == self.max:
+ raise StopIteration
+ if self.block_count == 0 or self.count == self.step:
+ # Without list() this turns into LIMIT 1 OFFSET x queries
+ self.data = list(self.obj.all()[self.block_count: \
+ (self.block_count + self.step)])
+ self.block_count += self.step
+ self.count = 0
+ self.count += 1
+ return self.data[self.count - 1]
def generateUrls(fn):
diff --git a/src/sbin/bcfg2-repo-validate b/src/sbin/bcfg2-repo-validate
index a5ba24898..cd71aba42 100755
--- a/src/sbin/bcfg2-repo-validate
+++ b/src/sbin/bcfg2-repo-validate
@@ -10,32 +10,69 @@ import glob
import lxml.etree
import os
import sys
+import fnmatch
import Bcfg2.Options
if __name__ == '__main__':
opts = {'repo': Bcfg2.Options.SERVER_REPOSITORY,
'prefix': Bcfg2.Options.INSTALL_PREFIX,
'verbose': Bcfg2.Options.VERBOSE,
- 'configfile': Bcfg2.Options.CFILE}
+ 'configfile': Bcfg2.Options.CFILE,
+ 'schema' : Bcfg2.Options.SCHEMA_PATH,
+ 'stdin': Bcfg2.Options.FILES_ON_STDIN}
setup = Bcfg2.Options.OptionParser(opts)
setup.parse(sys.argv[1:])
verbose = setup['verbose']
cpath = setup['configfile']
- prefix = setup['prefix']
- schemadir = "%s/share/bcfg2/schemas" % (prefix)
+ schemadir = setup['schema']
os.chdir(schemadir)
repo = setup['repo']
- # Get a list of all info.xml files in the bcfg2 repository
- info_list = []
- for infodir in ['Cfg', 'TGenshi', 'TCheetah']:
- for root, dirs, files in os.walk('%s/%s' % (repo, infodir)):
- for filename in files:
- if filename == 'info.xml':
- info_list.append(os.path.join(root, filename))
+ if setup['stdin']:
+ file_list = map(lambda s: s.strip(), sys.stdin.readlines())
+ info_list = [f for f in file_list if os.path.basename(f) == 'info.xml']
+ metadata_list = fnmatch.filter(file_list, "*/Metadata/groups.xml")
+ clients_list = fnmatch.filter(file_list, "*/Metadata/clients.xml")
+ bundle_list = fnmatch.filter(file_list, "*/Bundler/*.xml")
+ genshibundle_list = fnmatch.filter(file_list, "*/Bundler/*.genshi")
+ pkg_list = fnmatch.filter(file_list, "*/Pkgmgr/*.xml")
+ base_list = fnmatch.filter(file_list, "*/Base/*.xml")
+ rules_list = fnmatch.filter(file_list, "*/Rules/*.xml")
+ imageinfo_list = fnmatch.filter(file_list,
+ "*/etc/report-configuration.xml")
+ services_list = fnmatch.filter(file_list, "*/Svcmgr/*.xml")
+ deps_list = fnmatch.filter(file_list, "*/Deps/*.xml")
+ dec_list = fnmatch.filter(file_list, "*/Decisions/*")
+ pkgcfg_list = fnmatch.filter(file_list, "*/Packages/config.xml")
+ gp_list = fnmatch.filter(file_list, "*/GroupPatterns/config.xml")
+ else:
+ # not reading files from stdin
+
+ # Get a list of all info.xml files in the bcfg2 repository
+ info_list = []
+ for infodir in ['Cfg', 'TGenshi', 'TCheetah']:
+ for root, dirs, files in os.walk('%s/%s' % (repo, infodir)):
+ info_list.extend([os.path.join(root, f) for f in files
+ if f == 'info.xml'])
- # get metadata list (with all included files)
- metadata_list = glob.glob("%s/Metadata/groups.xml" % repo)
+ # get metadata list
+ metadata_list = glob.glob("%s/Metadata/groups.xml" % repo)
+
+ # get other file lists
+ clients_list = glob.glob("%s/Metadata/clients.xml" % repo)
+ bundle_list = glob.glob("%s/Bundler/*.xml" % repo)
+ genshibundle_list = glob.glob("%s/Bundler/*.genshi" % repo)
+ pkg_list = glob.glob("%s/Pkgmgr/*.xml" % repo)
+ base_list = glob.glob("%s/Base/*.xml" % repo)
+ rules_list = glob.glob("%s/Rules/*.xml" % repo)
+ imageinfo_list = glob.glob("%s/etc/report-configuration.xml" % repo)
+ services_list = glob.glob("%s/Svcmgr/*.xml" % repo)
+ deps_list = glob.glob("%s/Deps/*.xml" % repo)
+ dec_list = glob.glob("%s/Decisions/*" % repo)
+ pkgcfg_list = glob.glob("%s/Packages/config.xml" % repo)
+ gp_list = glob.glob('%s/GroupPatterns/config.xml' % repo)
+
+ # include files in metadata_list
ref_bundles = set()
xdata = lxml.etree.parse("%s/Metadata/groups.xml" % repo)
included = set([ent.get('href') for ent in \
@@ -70,20 +107,6 @@ if __name__ == '__main__':
for bundle in xdata.findall("//Bundle"):
ref_bundles.add("%s/Bundler/%s" % (repo, bundle.get('name')))
- # get lists of all other xml files to validate
- clients_list = glob.glob("%s/Metadata/clients.xml" % repo)
- bundle_list = glob.glob("%s/Bundler/*.xml" % repo)
- genshibundle_list = glob.glob("%s/Bundler/*.genshi" % repo)
- pkg_list = glob.glob("%s/Pkgmgr/*.xml" % repo)
- base_list = glob.glob("%s/Base/*.xml" % repo)
- rules_list = glob.glob("%s/Rules/*.xml" % repo)
- imageinfo_list = glob.glob("%s/etc/report-configuration.xml" % repo)
- services_list = glob.glob("%s/Svcmgr/*.xml" % repo)
- deps_list = glob.glob("%s/Deps/*.xml" % repo)
- dec_list = glob.glob("%s/Decisions/*" % repo)
- pkgcfg_list = glob.glob("%s/Packages/config.xml" % repo)
- gp_list = glob.glob('%s/GroupPatterns/config.xml' % repo)
-
# verify attributes for configuration entries
# (as defined in doc/server/configurationentries)
# TODO: See if it is possible to do this in the schema instead
@@ -168,9 +191,10 @@ if __name__ == '__main__':
failures = 0
for schemaname, filelist in list(filesets.items()):
try:
- schema = lxml.etree.XMLSchema(lxml.etree.parse(open(schemaname % (schemadir))))
+ schema = lxml.etree.XMLSchema(lxml.etree.parse(open(schemaname %
+ schemadir)))
except:
- print("Failed to process schema %s" % (schemaname % (schemadir)))
+ print("Failed to process schema %s" % (schemaname % schemadir))
failures = 1
continue
for filename in filelist:
@@ -203,15 +227,20 @@ if __name__ == '__main__':
# print out missing bundle information
if verbose:
print("")
- for bundle in ref_bundles:
- # check for both regular and genshi bundles
- xmlbundle = "%s.xml" % bundle
- genshibundle = "%s.genshi" % bundle
- allbundles = bundle_list + genshibundle_list
- if xmlbundle not in allbundles and \
- genshibundle not in allbundles:
- print("*** Warning: Bundle %s referenced, but does not "
- "exist." % bundle)
+ if not setup['stdin']:
+ # if we've taken a list of files on stdin, there's an
+ # excellent chance that referenced bundles do not exist,
+ # so skip this check
+ for bundle in ref_bundles:
+ # check for both regular and genshi bundles
+ xmlbundle = "%s.xml" % bundle
+ genshibundle = "%s.genshi" % bundle
+ allbundles = bundle_list + genshibundle_list
+ if (xmlbundle not in allbundles and
+ genshibundle not in allbundles):
+ print("*** Warning: Bundle %s referenced, but does not "
+ "exist." % bundle)
+
# verify bundle name attribute matches filename
for bundle in (bundle_list + genshibundle_list):
fname = bundle.split('Bundler/')[1].split('.')[0]
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-07-10 01:40:37 +0000