mirror of
https://github.com/valitydev/salt.git
synced 2024-11-08 17:33:54 +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.
92 lines
2.8 KiB
Python
92 lines
2.8 KiB
Python
# -*- coding: utf-8 -*-
|
|
'''
|
|
:codeauthor: :email:`Daniel Mizyrycki (mzdaniel@glidelink.net)`
|
|
|
|
|
|
tests.integration.cli.grains
|
|
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
|
|
Test salt-ssh grains id work for localhost. (gh #16129)
|
|
|
|
$ salt-ssh localhost grains.get id
|
|
localhost:
|
|
localhost
|
|
'''
|
|
# Import Python libs
|
|
from __future__ import absolute_import
|
|
import os
|
|
|
|
# Import Salt Libs
|
|
import salt.utils.files
|
|
|
|
# Import Salt Testing Libs
|
|
from tests.support.case import ShellCase, SSHCase
|
|
|
|
|
|
class GrainsTargetingTest(ShellCase):
|
|
'''
|
|
Integration tests for targeting with grains.
|
|
'''
|
|
|
|
def test_grains_targeting_os_running(self):
|
|
'''
|
|
Tests running "salt -G 'os:<system-os>' test.ping and minions both return True
|
|
'''
|
|
test_ret = ['sub_minion:', ' True', 'minion:', ' True']
|
|
|
|
os_grain = ''
|
|
for item in self.run_salt('minion grains.get os'):
|
|
if item != 'minion:':
|
|
os_grain = item.strip()
|
|
|
|
ret = self.run_salt('-G \'os:{0}\' test.ping'.format(os_grain))
|
|
self.assertEqual(sorted(ret), sorted(test_ret))
|
|
|
|
def test_grains_targeting_minion_id_running(self):
|
|
'''
|
|
Tests return of each running test minion targeting with minion id grain
|
|
'''
|
|
minion = self.run_salt('-G \'id:minion\' test.ping')
|
|
self.assertEqual(sorted(minion), sorted(['minion:', ' True']))
|
|
|
|
sub_minion = self.run_salt('-G \'id:sub_minion\' test.ping')
|
|
self.assertEqual(sorted(sub_minion), sorted(['sub_minion:', ' True']))
|
|
|
|
def test_grains_targeting_disconnected(self):
|
|
'''
|
|
Tests return of minion using grains targeting on a disconnected minion.
|
|
'''
|
|
test_ret = 'Minion did not return. [No response]'
|
|
|
|
# Create a minion key, but do not start the "fake" minion. This mimics a
|
|
# disconnected minion.
|
|
key_file = os.path.join(self.master_opts['pki_dir'], 'minions', 'disconnected')
|
|
with salt.utils.files.fopen(key_file, 'a'):
|
|
pass
|
|
|
|
import logging
|
|
log = logging.getLogger(__name__)
|
|
# ping disconnected minion and ensure it times out and returns with correct message
|
|
try:
|
|
ret = ''
|
|
for item in self.run_salt('-t 1 -G \'id:disconnected\' test.ping', timeout=40):
|
|
if item != 'disconnected:':
|
|
ret = item.strip()
|
|
self.assertEqual(ret, test_ret)
|
|
finally:
|
|
os.unlink(key_file)
|
|
|
|
|
|
class SSHGrainsTest(SSHCase):
|
|
'''
|
|
Test salt-ssh grains functionality
|
|
Depend on proper environment set by SSHCase class
|
|
'''
|
|
|
|
def test_grains_id(self):
|
|
'''
|
|
Test salt-ssh grains id work for localhost.
|
|
'''
|
|
cmd = self.run_function('grains.get', ['id'])
|
|
self.assertEqual(cmd, 'localhost')
|