mirror of
https://github.com/valitydev/salt.git
synced 2024-11-07 08:58:59 +00:00
3184168365
This PR is part of what will be an ongoing effort to use explicit unicode strings in Salt. Because Python 3 does not suport Python 2's raw unicode string syntax (i.e. `ur'\d+'`), we must use `salt.utils.locales.sdecode()` to ensure that the raw string is unicode. However, because of how `salt/utils/__init__.py` has evolved into the hulking monstrosity it is today, this means importing a large module in places where it is not needed, which could negatively impact performance. For this reason, this PR also breaks out some of the functions from `salt/utils/__init__.py` into new/existing modules under `salt/utils/`. The long term goal will be that the modules within this directory do not depend on importing `salt.utils`. A summary of the changes in this PR is as follows: * Moves the following functions from `salt.utils` to new locations (including a deprecation warning if invoked from `salt.utils`): `to_bytes`, `to_str`, `to_unicode`, `str_to_num`, `is_quoted`, `dequote`, `is_hex`, `is_bin_str`, `rand_string`, `contains_whitespace`, `clean_kwargs`, `invalid_kwargs`, `which`, `which_bin`, `path_join`, `shlex_split`, `rand_str`, `is_windows`, `is_proxy`, `is_linux`, `is_darwin`, `is_sunos`, `is_smartos`, `is_smartos_globalzone`, `is_smartos_zone`, `is_freebsd`, `is_netbsd`, `is_openbsd`, `is_aix` * Moves the functions already deprecated by @rallytime to the bottom of `salt/utils/__init__.py` for better organization, so we can keep the deprecated ones separate from the ones yet to be deprecated as we continue to break up `salt.utils` * Updates `salt/*.py` and all files under `salt/client/` to use explicit unicode string literals. * Gets rid of implicit imports of `salt.utils` (e.g. `from salt.utils import foo` becomes `import salt.utils.foo as foo`). * Renames the `test.rand_str` function to `test.random_hash` to more accurately reflect what it does * Modifies `salt.utils.stringutils.random()` (née `salt.utils.rand_string()`) such that it returns a string matching the passed size. Previously this function would get `size` bytes from `os.urandom()`, base64-encode it, and return the result, which would in most cases not be equal to the passed size.
71 lines
1.7 KiB
Python
71 lines
1.7 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
|
|
|
|
# Import 3rd-party libs
|
|
import yaml
|
|
from salt.ext import six
|
|
|
|
colors = salt.utils.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)
|
|
data = yaml.load(open('high'))
|
|
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)
|