mirror of
https://github.com/valitydev/salt.git
synced 2024-11-06 16:45:27 +00:00
002aa88a97
Without allow_unicode=True, unicode characters are processed through the str representer and on Python 2 are dumped as a Unicode code point (i.e. a literal \u0414). This commit makes allow_unicode=True the default in our salt.utils.yamlloader.safe_dump() helper. It also adds a new salt.utils.yamlloader.dump() helper which wraps yaml.dump() and also makes allow_unicode=True the default. To make importing and using our custom yaml loader/dumper easier, a convenience module called salt.utils.yaml has been added, which does a wildcard import from both salt.utils.yamldumper and salt.utils.yamlloader. Refs to yaml.load/dump and yaml.safe_load/safe_dump have been updated to salt.utils.yaml, to ensure that unicode is handled properly.
73 lines
1.8 KiB
Python
73 lines
1.8 KiB
Python
# -*- coding: utf-8 -*-
|
|
# pylint: disable=resource-leakage
|
|
|
|
# Import Python libs
|
|
from __future__ import absolute_import, print_function
|
|
import subprocess
|
|
import hashlib
|
|
import pprint
|
|
import optparse
|
|
|
|
# Import Salt libs
|
|
import salt.utils.color
|
|
import salt.utils.files
|
|
import salt.utils.yaml
|
|
|
|
# Import 3rd-party libs
|
|
from salt.ext import six
|
|
|
|
colors = salt.utils.color.get_colors()
|
|
|
|
|
|
def parse():
|
|
'''
|
|
Parse command line options
|
|
'''
|
|
parser = optparse.OptionParser()
|
|
parser.add_option('-r',
|
|
'--runs',
|
|
dest='runs',
|
|
default=10,
|
|
type=int,
|
|
help='Specify the number of times to run the consistency check')
|
|
parser.add_option('-c',
|
|
'--command',
|
|
dest='command',
|
|
default='state.show_highstate',
|
|
help='The command to execute')
|
|
|
|
options, args = parser.parse_args()
|
|
return options.__dict__
|
|
|
|
|
|
def run(command):
|
|
'''
|
|
Execute a single command and check the returns
|
|
'''
|
|
cmd = r'salt \* {0} --yaml-out -t 500 > high'.format(command)
|
|
subprocess.call(cmd, shell=True)
|
|
with salt.utils.files.fopen('high') as fp_:
|
|
data = salt.utils.yaml.safe_load(fp_)
|
|
hashes = set()
|
|
for key, val in six.iteritems(data):
|
|
has = hashlib.md5(str(val)).hexdigest()
|
|
if has not in hashes:
|
|
print('{0}:'.format(has))
|
|
pprint.pprint(val)
|
|
hashes.add(has)
|
|
if len(hashes) > 1:
|
|
print('{0}Command: {1} gave inconsistent returns{2}'.format(
|
|
colors['LIGHT_RED'],
|
|
command,
|
|
colors['ENDC']
|
|
))
|
|
|
|
|
|
if __name__ == '__main__':
|
|
opts = parse()
|
|
for _ in opts['runs']:
|
|
for command in opts['command'].split(','):
|
|
print('-' * 30)
|
|
print('Running command {0}'.format(command))
|
|
run(command)
|