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.
103 lines
3.1 KiB
Python
103 lines
3.1 KiB
Python
# -*- coding: utf-8 -*-
|
|
|
|
'''
|
|
Test the lxc module
|
|
'''
|
|
|
|
# Import Python libs
|
|
from __future__ import absolute_import
|
|
|
|
# Import Salt Testing libs
|
|
from tests.support.case import ModuleCase
|
|
from tests.support.helpers import (
|
|
skip_if_not_root,
|
|
skip_if_binaries_missing
|
|
)
|
|
from tests.support.unit import skipIf
|
|
|
|
# Import 3rd-party libs
|
|
from salt.ext import six
|
|
|
|
|
|
@skipIf(True,
|
|
'Needs rewrite to be more distro agnostic. Also, the tearDown '
|
|
'function destroys ALL containers on the box, which is BAD.')
|
|
@skip_if_not_root
|
|
@skip_if_binaries_missing('lxc-start', message='LXC is not installed or minimal version not met')
|
|
class LXCModuleTest(ModuleCase):
|
|
'''
|
|
Test the lxc module
|
|
'''
|
|
prefix = '_salttesting'
|
|
|
|
def setUp(self):
|
|
os = self.run_function('grains.item',
|
|
['os', 'oscodename', 'osarch'])
|
|
|
|
p = {'download':
|
|
{'dist': os['os'].lower(),
|
|
'arch': os['osarch'].lower(),
|
|
'template': 'download',
|
|
'release': os['oscodename'].lower()},
|
|
'sshd': {'template': 'sshd'}}
|
|
self.run_function('grains.setval', ['lxc.profile', p])
|
|
|
|
def tearDown(self):
|
|
'''
|
|
Clean up any LXCs created.
|
|
'''
|
|
r = self.run_function('lxc.list')
|
|
for k, v in six.iteritems(r):
|
|
for x in v:
|
|
if x.startswith(self.prefix):
|
|
self.run_function('lxc.destroy', [x])
|
|
|
|
def test_create_destroy(self):
|
|
'''
|
|
Test basic create/destroy of an LXC.
|
|
'''
|
|
|
|
r = self.run_function('lxc.create', [self.prefix],
|
|
template='sshd')
|
|
self.assertEqual(r, {'state': {'new': 'stopped', 'old': None},
|
|
'result': True})
|
|
self.assertTrue(self.run_function('lxc.exists', [self.prefix]))
|
|
r = self.run_function('lxc.destroy', [self.prefix])
|
|
self.assertEqual(r, {'state': None, 'change': True})
|
|
self.assertFalse(self.run_function('lxc.exists', [self.prefix]))
|
|
|
|
def test_init(self):
|
|
'''
|
|
Test basic init functionality.
|
|
'''
|
|
|
|
r = self.run_function('lxc.init', [self.prefix],
|
|
profile='sshd', seed=False)
|
|
self.assertTrue(r.get('created', False))
|
|
self.assertTrue(self.run_function('lxc.exists', [self.prefix]))
|
|
|
|
def test_macvlan(self):
|
|
'''
|
|
Regression test for macvlan nic profile.
|
|
'''
|
|
|
|
p = {"macvlan": {"eth0": {
|
|
"macvlan.mode": "bridge",
|
|
"link": "eth0",
|
|
"type": "macvlan"}}}
|
|
|
|
self.run_function('grains.setval', ['lxc.nic', p])
|
|
|
|
self.run_function('lxc.init', [self.prefix],
|
|
profile='sshd', nic='macvlan',
|
|
seed=False, start=False)
|
|
|
|
f = '/var/lib/lxc/{0}/config'.format(self.prefix)
|
|
conf = self.run_function('lxc.read_conf', [f])
|
|
|
|
# Due to a segfault in lxc-destroy caused by invalid configs,
|
|
# truncate the config.
|
|
self.run_function('cmd.run', ['truncate -s 0 {0}'.format(f)])
|
|
|
|
self.assertEqual(conf.get('lxc.network.type'), 'macvlan')
|