mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
Replace util path references with new ones
This commit is contained in:
rallytime
parent
052b13c98e
commit
1dea504f2d
7 changed files with 25 additions and 16 deletions
|
|
@ -42,6 +42,7 @@ import salt.utils.platform
|
|||
import salt.utils.stringutils
|
||||
import salt.utils.user
|
||||
import salt.utils.verify
|
||||
import salt.utils.versions
|
||||
from salt.defaults import DEFAULT_TARGET_DELIM
|
||||
from salt.pillar import git_pillar
|
||||
from salt.exceptions import FileserverConfigError, SaltMasterError
|
||||
|
|
@ -534,7 +535,7 @@ class RemoteFuncs(object):
|
|||
return ret
|
||||
expr_form = load.get('expr_form')
|
||||
if expr_form is not None and 'tgt_type' not in load:
|
||||
salt.utils.warn_until(
|
||||
salt.utils.versions.warn_until(
|
||||
u'Neon',
|
||||
u'_mine_get: minion {0} uses pre-Nitrogen API key '
|
||||
u'"expr_form". Accepting for backwards compatibility '
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@ import re
|
|||
# Import Salt Libs
|
||||
from salt.exceptions import CommandExecutionError
|
||||
import salt.utils.path
|
||||
import salt.utils.versions
|
||||
|
||||
log = logging.getLogger(__name__)
|
||||
|
||||
|
|
@ -635,8 +636,10 @@ def add_port(zone, port, permanent=True, force_masquerade=None):
|
|||
# This will be deprecated in a future release
|
||||
if force_masquerade is None:
|
||||
force_masquerade = True
|
||||
salt.utils.warn_until('Neon',
|
||||
'add_port function will no longer force enable masquerading in future releases. Use add_masquerade to enable masquerading.')
|
||||
salt.utils.versions.warn_until(
|
||||
'Neon',
|
||||
'add_port function will no longer force enable masquerading '
|
||||
'in future releases. Use add_masquerade to enable masquerading.')
|
||||
|
||||
# (DEPRECATED) Force enable masquerading
|
||||
# TODO: remove in future release
|
||||
|
|
@ -709,8 +712,10 @@ def add_port_fwd(zone, src, dest, proto='tcp', dstaddr='', permanent=True, force
|
|||
# This will be deprecated in a future release
|
||||
if force_masquerade is None:
|
||||
force_masquerade = True
|
||||
salt.utils.warn_until('Neon',
|
||||
'add_port_fwd function will no longer force enable masquerading in future releases. Use add_masquerade to enable masquerading.')
|
||||
salt.utils.versions.warn_until(
|
||||
'Neon',
|
||||
'add_port_fwd function will no longer force enable masquerading '
|
||||
'in future releases. Use add_masquerade to enable masquerading.')
|
||||
|
||||
# (DEPRECATED) Force enable masquerading
|
||||
# TODO: remove in future release
|
||||
|
|
|
|||
|
|
@ -82,8 +82,9 @@ import logging
|
|||
|
||||
# Import Salt Libs
|
||||
from salt.exceptions import CommandExecutionError
|
||||
import salt.utils.path
|
||||
from salt.output import nested
|
||||
import salt.utils.path
|
||||
import salt.utils.versions
|
||||
|
||||
log = logging.getLogger(__name__)
|
||||
|
||||
|
|
@ -231,8 +232,10 @@ def present(name,
|
|||
# if prune_services == None, set to True and log a deprecation warning
|
||||
if prune_services is None:
|
||||
prune_services = True
|
||||
salt.utils.warn_until('Neon',
|
||||
'The \'prune_services\' argument default is currently True, but will be changed to True in future releases.')
|
||||
salt.utils.versions.warn_until(
|
||||
'Neon',
|
||||
'The \'prune_services\' argument default is currently True, '
|
||||
'but will be changed to True in future releases.')
|
||||
|
||||
ret = _present(name, block_icmp, prune_block_icmp, default, masquerade, ports, prune_ports,
|
||||
port_fwd, prune_port_fwd, services, prune_services, interfaces, prune_interfaces,
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ import salt.utils.versions
|
|||
|
||||
log = logging.getLogger(__name__)
|
||||
|
||||
ROOT_DIR = 'c:\\salt' if salt.utils.is_windows() else '/'
|
||||
ROOT_DIR = 'c:\\salt' if salt.utils.platform.is_windows() else '/'
|
||||
|
||||
|
||||
def zmq_version():
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@ class KeyTest(ShellCase, ShellCaseCommonTestsMixin):
|
|||
pki_dir = self.master_opts['pki_dir']
|
||||
key = os.path.join(pki_dir, 'minions', min_name)
|
||||
|
||||
with salt.utils.fopen(key, 'w') as fp:
|
||||
with salt.utils.files.fopen(key, 'w') as fp:
|
||||
fp.write(textwrap.dedent('''\
|
||||
-----BEGIN PUBLIC KEY-----
|
||||
MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoqIZDtcQtqUNs0wC7qQz
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ class ServiceTest(ModuleCase, SaltReturnAssertsMixin):
|
|||
self.service_name = 'systemd-journald'
|
||||
cmd_name = 'systemctl'
|
||||
|
||||
if salt.utils.which(cmd_name) is None:
|
||||
if salt.utils.path.which(cmd_name) is None:
|
||||
self.skipTest('{0} is not installed'.format(cmd_name))
|
||||
|
||||
def check_service_status(self, exp_return):
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ from tests.support.mock import (
|
|||
# Import Salt Libs
|
||||
import salt.states.archive as archive
|
||||
from salt.ext.six.moves import zip # pylint: disable=import-error,redefined-builtin
|
||||
import salt.utils
|
||||
import salt.utils.platform
|
||||
|
||||
|
||||
def _isfile_side_effect(path):
|
||||
|
|
@ -63,7 +63,7 @@ class ArchiveTestCase(TestCase, LoaderModuleMockMixin):
|
|||
archive.extracted tar options
|
||||
'''
|
||||
|
||||
if salt.utils.is_windows():
|
||||
if salt.utils.platform.is_windows():
|
||||
source = 'c:\\tmp\\foo.tar.gz'
|
||||
tmp_dir = 'c:\\tmp\\test_extracted_tar'
|
||||
else:
|
||||
|
|
@ -112,7 +112,7 @@ class ArchiveTestCase(TestCase, LoaderModuleMockMixin):
|
|||
'file.source_list': mock_source_list}),\
|
||||
patch.dict(archive.__states__, {'file.directory': mock_true}),\
|
||||
patch.object(os.path, 'isfile', isfile_mock),\
|
||||
patch('salt.utils.which', MagicMock(return_value=True)):
|
||||
patch('salt.utils.path.which', MagicMock(return_value=True)):
|
||||
|
||||
for test_opts, ret_opts in zip(test_tar_opts, ret_tar_opts):
|
||||
archive.extracted(tmp_dir, source, options=test_opts,
|
||||
|
|
@ -152,7 +152,7 @@ class ArchiveTestCase(TestCase, LoaderModuleMockMixin):
|
|||
'file.source_list': mock_source_list}),\
|
||||
patch.dict(archive.__states__, {'file.directory': mock_true}),\
|
||||
patch.object(os.path, 'isfile', isfile_mock),\
|
||||
patch('salt.utils.which', MagicMock(return_value=True)):
|
||||
patch('salt.utils.path.which', MagicMock(return_value=True)):
|
||||
ret = archive.extracted(os.path.join(os.sep + 'tmp', 'out'),
|
||||
source,
|
||||
options='xvzf',
|
||||
|
|
@ -191,7 +191,7 @@ class ArchiveTestCase(TestCase, LoaderModuleMockMixin):
|
|||
'file.source_list': mock_source_list}),\
|
||||
patch.dict(archive.__states__, {'file.directory': mock_true}),\
|
||||
patch.object(os.path, 'isfile', isfile_mock),\
|
||||
patch('salt.utils.which', MagicMock(return_value=True)):
|
||||
patch('salt.utils.path.which', MagicMock(return_value=True)):
|
||||
ret = archive.extracted(os.path.join(os.sep + 'tmp', 'out'),
|
||||
source,
|
||||
options='xvzf',
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue