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.
112 lines
4.1 KiB
Python
112 lines
4.1 KiB
Python
# -*- coding: utf-8 -*-
|
|
'''
|
|
integration tests for nilirt_ip
|
|
'''
|
|
|
|
# Import Python libs
|
|
from __future__ import absolute_import
|
|
import time
|
|
|
|
# Import Salt Testing libs
|
|
from tests.support.case import ModuleCase
|
|
from tests.support.unit import skipIf
|
|
from tests.support.helpers import destructiveTest, skip_if_not_root
|
|
|
|
# Import Salt libs
|
|
import salt.utils.platform
|
|
|
|
|
|
@skip_if_not_root
|
|
@skipIf(not salt.utils.platform.is_linux(), 'These tests can only be run on linux')
|
|
class Nilrt_ipModuleTest(ModuleCase):
|
|
'''
|
|
Validate the nilrt_ip module
|
|
'''
|
|
|
|
def __init__(self, arg):
|
|
super(self.__class__, self).__init__(arg)
|
|
self.initialState = {}
|
|
|
|
def setUp(self):
|
|
'''
|
|
Get current settings
|
|
'''
|
|
# save files from var/lib/connman*
|
|
os_grain = self.run_function('grains.item', ['os_family'])
|
|
if os_grain['os_family'] != 'NILinuxRT':
|
|
self.skipTest('Tests applicable only to NILinuxRT')
|
|
super(Nilrt_ipModuleTest, self).setUp()
|
|
self.run_function('file.copy', ['/var/lib/connman', '/tmp/connman', 'recurse=True', 'remove_existing=True'])
|
|
|
|
def tearDown(self):
|
|
'''
|
|
Reset to original settings
|
|
'''
|
|
# restore files
|
|
self.run_function('file.copy', ['/tmp/connman', '/var/lib/connman', 'recurse=True', 'remove_existing=True'])
|
|
# restart connman
|
|
self.run_function('service.restart', ['connman'])
|
|
time.sleep(10) # wait 10 seconds for connman to be fully loaded
|
|
interfaces = self.__interfaces()
|
|
for interface in interfaces:
|
|
self.run_function('ip.up', [interface])
|
|
|
|
def __connected(self, interface):
|
|
return interface['up']
|
|
|
|
def __interfaces(self):
|
|
interfaceList = []
|
|
for iface in self.run_function('ip.get_interfaces_details')['interfaces']:
|
|
interfaceList.append(iface['connectionid'])
|
|
return interfaceList
|
|
|
|
@destructiveTest
|
|
def test_down(self):
|
|
interfaces = self.__interfaces()
|
|
for interface in interfaces:
|
|
result = self.run_function('ip.down', [interface])
|
|
self.assertTrue(result)
|
|
info = self.run_function('ip.get_interfaces_details')
|
|
for interface in info['interfaces']:
|
|
self.assertFalse(self.__connected(interface))
|
|
|
|
@destructiveTest
|
|
def test_up(self):
|
|
interfaces = self.__interfaces()
|
|
#first down all interfaces
|
|
for interface in interfaces:
|
|
self.run_function('ip.down', [interface])
|
|
# up interfaces
|
|
for interface in interfaces:
|
|
result = self.run_function('ip.up', [interface])
|
|
self.assertTrue(result)
|
|
info = self.run_function('ip.get_interfaces_details')
|
|
for interface in info['interfaces']:
|
|
self.assertTrue(self.__connected(interface))
|
|
|
|
@destructiveTest
|
|
def test_set_dhcp_linklocal_all(self):
|
|
interfaces = self.__interfaces()
|
|
for interface in interfaces:
|
|
result = self.run_function('ip.set_dhcp_linklocal_all', [interface])
|
|
self.assertTrue(result)
|
|
info = self.run_function('ip.get_interfaces_details')
|
|
for interface in info['interfaces']:
|
|
self.assertEqual(interface['ipv4']['requestmode'], 'dhcp_linklocal')
|
|
|
|
@destructiveTest
|
|
def test_static_all(self):
|
|
interfaces = self.__interfaces()
|
|
for interface in interfaces:
|
|
result = self.run_function('ip.set_static_all', [interface, '192.168.10.4', '255.255.255.0', '192.168.10.1', '8.8.4.4 my.dns.com'])
|
|
self.assertTrue(result)
|
|
|
|
info = self.run_function('ip.get_interfaces_details')
|
|
for interface in info['interfaces']:
|
|
self.assertIn('8.8.4.4', interface['ipv4']['dns'])
|
|
self.assertIn('my.dns.com', interface['ipv4']['dns'])
|
|
self.assertEqual(interface['ipv4']['requestmode'], 'static')
|
|
self.assertEqual(interface['ipv4']['address'], '192.168.10.4')
|
|
self.assertEqual(interface['ipv4']['netmask'], '255.255.255.0')
|
|
self.assertEqual(interface['ipv4']['gateway'], '192.168.10.1')
|