mirror of
https://github.com/valitydev/salt.git
synced 2024-11-07 00:55:19 +00:00
Merge branch '2014.7' into develop
This commit is contained in:
Colton Myers
commit
932aa97e1f
@ -3,4 +3,5 @@ salt.states.event
|
||||
=================
|
||||
|
||||
.. automodule:: salt.states.event
|
||||
:members:
|
||||
:members:
|
||||
:exclude-members: fire_master, mod_watch
|
||||
|
||||
@ -311,3 +311,32 @@ strings to force YAML to serialize them as strings:
|
||||
datetime.datetime(2014, 1, 20, 14, 23, 23)
|
||||
>>> yaml.safe_load('"2014-01-20 14:23:23"')
|
||||
'2014-01-20 14:23:23'
|
||||
|
||||
Additionally, numbers formatted like ``XXXX-XX-XX`` will also be converted (or
|
||||
YAML will attempt to convert them, and error out if it doesn't think the date
|
||||
is a real one). Thus, for example, if a minion were to have an ID of
|
||||
``4017-16-20`` the minion would not start because YAML would complain that the
|
||||
date was out of range. The workaround is the same, surround the offending
|
||||
string with quotes:
|
||||
|
||||
.. code-block:: python
|
||||
|
||||
>>> import yaml
|
||||
>>> yaml.safe_load('4017-16-20')
|
||||
Traceback (most recent call last):
|
||||
File "<stdin>", line 1, in <module>
|
||||
File "/usr/local/lib/python2.7/site-packages/yaml/__init__.py", line 93, in safe_load
|
||||
return load(stream, SafeLoader)
|
||||
File "/usr/local/lib/python2.7/site-packages/yaml/__init__.py", line 71, in load
|
||||
return loader.get_single_data()
|
||||
File "/usr/local/lib/python2.7/site-packages/yaml/constructor.py", line 39, in get_single_data
|
||||
return self.construct_document(node)
|
||||
File "/usr/local/lib/python2.7/site-packages/yaml/constructor.py", line 43, in construct_document
|
||||
data = self.construct_object(node)
|
||||
File "/usr/local/lib/python2.7/site-packages/yaml/constructor.py", line 88, in construct_object
|
||||
data = constructor(self, node)
|
||||
File "/usr/local/lib/python2.7/site-packages/yaml/constructor.py", line 312, in construct_yaml_timestamp
|
||||
return datetime.date(year, month, day)
|
||||
ValueError: month must be in 1..12
|
||||
>>> yaml.safe_load('"4017-16-20"')
|
||||
'4017-16-20'
|
||||
|
||||
@ -223,7 +223,7 @@ class APIClient(object):
|
||||
client = parts[0]
|
||||
module = '.'.join(parts[1:]) # strip prefix
|
||||
if client == 'wheel':
|
||||
functions = self.wheelClient.w_funcs
|
||||
functions = self.wheelClient.functions
|
||||
elif client == 'runner':
|
||||
functions = self.runnerClient.functions
|
||||
result = {'master': salt.utils.argspec_report(functions, module)}
|
||||
|
||||
@ -151,7 +151,11 @@ EOF'''.format(
|
||||
)
|
||||
|
||||
if not is_windows():
|
||||
with open(os.path.join(os.path.dirname(__file__), 'ssh_py_shim.py')) as ssh_py_shim:
|
||||
shim_file = os.path.join(os.path.dirname(__file__), 'ssh_py_shim.py')
|
||||
if not os.path.exists(shim_file):
|
||||
# On esky builds we only have the .pyc file
|
||||
shim_file += "c"
|
||||
with open(shim_file) as ssh_py_shim:
|
||||
SSH_PY_SHIM = ''.join(ssh_py_shim.readlines()).encode('base64')
|
||||
|
||||
log = logging.getLogger(__name__)
|
||||
|
||||
@ -1324,10 +1324,9 @@ class ClearFuncs(object):
|
||||
'load': {'ret': False}}
|
||||
log.info('Authentication request from {id}'.format(**load))
|
||||
|
||||
minions = salt.utils.minions.CkMinions(self.opts).connected_ids()
|
||||
|
||||
# 0 is default which should be 'unlimited'
|
||||
if self.opts['max_minions'] > 0:
|
||||
minions = salt.utils.minions.CkMinions(self.opts).connected_ids()
|
||||
if not len(minions) < self.opts['max_minions']:
|
||||
# we reject new minions, minions that are already
|
||||
# connected must be allowed for the mine, highstate, etc.
|
||||
|
||||
@ -12,7 +12,7 @@ import time
|
||||
import datetime
|
||||
|
||||
# Import salt libs
|
||||
from salt.exceptions import SaltInvocationError
|
||||
from salt.exceptions import SaltInvocationError, CommandExecutionError
|
||||
|
||||
# Import third party libs
|
||||
try:
|
||||
@ -347,12 +347,19 @@ def virtual_memory():
|
||||
|
||||
Return a dict that describes statistics about system memory usage.
|
||||
|
||||
.. note::
|
||||
|
||||
This function is only available in psutil version 0.6.0 and above.
|
||||
|
||||
CLI Example:
|
||||
|
||||
.. code-block:: bash
|
||||
|
||||
salt '*' ps.virtual_memory
|
||||
'''
|
||||
if psutil.version_info < (0, 6, 0):
|
||||
msg = 'virtual_memory is only available in psutil 0.6.0 or greater'
|
||||
raise CommandExecutionError(msg)
|
||||
return dict(psutil.virtual_memory()._asdict())
|
||||
|
||||
|
||||
@ -362,12 +369,19 @@ def swap_memory():
|
||||
|
||||
Return a dict that describes swap memory statistics.
|
||||
|
||||
.. note::
|
||||
|
||||
This function is only available in psutil version 0.6.0 and above.
|
||||
|
||||
CLI Example:
|
||||
|
||||
.. code-block:: bash
|
||||
|
||||
salt '*' ps.swap_memory
|
||||
'''
|
||||
if psutil.version_info < (0, 6, 0):
|
||||
msg = 'swap_memory is only available in psutil 0.6.0 or greater'
|
||||
raise CommandExecutionError(msg)
|
||||
return dict(psutil.swap_memory()._asdict())
|
||||
|
||||
|
||||
|
||||
@ -378,7 +378,7 @@ class _RepoInfo(object):
|
||||
|
||||
@property
|
||||
def url(self):
|
||||
return [url.asCompleteString() for url in self.zypp.baseUrls()]
|
||||
return self.zypp.url().asCompleteString()
|
||||
|
||||
@url.setter
|
||||
def url(self, value):
|
||||
|
||||
@ -32,34 +32,34 @@ def output(data):
|
||||
rej: color['BLUE'],
|
||||
'local': color['PURPLE']}
|
||||
|
||||
trans = {pend: '{0}Unaccepted Keys:{1}'.format(
|
||||
trans = {pend: u'{0}Unaccepted Keys:{1}'.format(
|
||||
color['LIGHT_RED'],
|
||||
color['ENDC']),
|
||||
acc: '{0}Accepted Keys:{1}'.format(
|
||||
acc: u'{0}Accepted Keys:{1}'.format(
|
||||
color['LIGHT_GREEN'],
|
||||
color['ENDC']),
|
||||
rej: '{0}Rejected Keys:{1}'.format(
|
||||
rej: u'{0}Rejected Keys:{1}'.format(
|
||||
color['LIGHT_BLUE'],
|
||||
color['ENDC']),
|
||||
'local': '{0}Local Keys:{1}'.format(
|
||||
'local': u'{0}Local Keys:{1}'.format(
|
||||
color['LIGHT_PURPLE'],
|
||||
color['ENDC'])}
|
||||
|
||||
ret = ''
|
||||
|
||||
for status in sorted(data):
|
||||
ret += '{0}\n'.format(trans[status])
|
||||
ret += u'{0}\n'.format(trans[status])
|
||||
for key in data[status]:
|
||||
skey = key
|
||||
if strip_colors:
|
||||
skey = salt.output.strip_esc_sequence(key)
|
||||
if isinstance(data[status], list):
|
||||
ret += '{0}{1}{2}\n'.format(
|
||||
ret += u'{0}{1}{2}\n'.format(
|
||||
cmap[status],
|
||||
skey,
|
||||
color['ENDC'])
|
||||
if isinstance(data[status], dict):
|
||||
ret += '{0}{1}: {2}{3}\n'.format(
|
||||
ret += u'{0}{1}: {2}{3}\n'.format(
|
||||
cmap[status],
|
||||
skey,
|
||||
data[status][key],
|
||||
|
||||
@ -171,7 +171,7 @@ class SREQ(object):
|
||||
zmq.RECONNECT_IVL_MAX, 5000
|
||||
)
|
||||
|
||||
if self.master.startswith('tcp://[') and hasattr(zmq, 'IPV4ONLY'):
|
||||
if self.master.startswith('tcp://') and hasattr(zmq, 'IPV4ONLY'):
|
||||
# IPv6 sockets work for both IPv6 and IPv4 addresses
|
||||
self._socket.setsockopt(zmq.IPV4ONLY, 0)
|
||||
self._socket.linger = self.linger
|
||||
|
||||
@ -26,8 +26,7 @@ def send(name,
|
||||
# ...snip bunch of states above
|
||||
|
||||
mycompany/mystaterun/status/update:
|
||||
event:
|
||||
- fire_master
|
||||
event.send:
|
||||
- data:
|
||||
status: "Half-way through the state run!"
|
||||
|
||||
|
||||
@ -290,7 +290,8 @@ class SaltEvent(object):
|
||||
continue
|
||||
|
||||
try:
|
||||
ret = self.get_event_noblock()
|
||||
ret = self.get_event_block() # Please do not use non-blocking mode here.
|
||||
# Reliability is more important than pure speed on the event bus.
|
||||
except zmq.ZMQError as ex:
|
||||
if ex.errno == errno.EAGAIN or ex.errno == errno.EINTR:
|
||||
continue
|
||||
@ -353,6 +354,14 @@ class SaltEvent(object):
|
||||
mtag, data = self.unpack(raw, self.serial)
|
||||
return {'data': data, 'tag': mtag}
|
||||
|
||||
def get_event_block(self):
|
||||
'''Get the raw event in a blocking fashion
|
||||
Slower, but decreases the possibility of dropped events
|
||||
'''
|
||||
raw = self.sub.recv()
|
||||
mtag, data = self.unpack(raw, self.serial)
|
||||
return {'data': data, 'tag': mtag}
|
||||
|
||||
def iter_events(self, tag='', full=False):
|
||||
'''
|
||||
Creates a generator that continuously listens for events
|
||||
|
||||
@ -14,7 +14,7 @@ import integration
|
||||
import salt.utils
|
||||
|
||||
|
||||
@skipIf(salt.utils.which('lxc') is None, 'Skipping - lxc must be installed.')
|
||||
@skipIf(salt.utils.which('lxc-start') is None, 'LXC is not installed or minimal version not met')
|
||||
class LXCModuleTest(integration.ModuleCase):
|
||||
'''
|
||||
Test the lxc module
|
||||
|
||||
@ -13,6 +13,7 @@ ensure_in_syspath('../../')
|
||||
from salt.modules import ps
|
||||
|
||||
HAS_PSUTIL = ps.__virtual__()
|
||||
HAS_PSUTIL_VERSION = False
|
||||
|
||||
if HAS_PSUTIL:
|
||||
import psutil
|
||||
@ -35,6 +36,9 @@ if HAS_PSUTIL:
|
||||
1000, 2000, 500, 600, 2000, 3000)
|
||||
STUB_USER = psutil._compat.namedtuple('user', 'name, terminal, host, started')('bdobbs', 'ttys000', 'localhost',
|
||||
0.0)
|
||||
if psutil.version_info >= (0, 6, 0):
|
||||
HAS_PSUTIL_VERSION = True
|
||||
|
||||
else:
|
||||
(STUB_CPU_TIMES,
|
||||
STUB_VIRT_MEM,
|
||||
@ -104,11 +108,13 @@ class PsTestCase(TestCase):
|
||||
def test_cpu_times(self):
|
||||
self.assertDictEqual({'idle': 4, 'nice': 2, 'system': 3, 'user': 1}, ps.cpu_times())
|
||||
|
||||
@skipIf(HAS_PSUTIL_VERSION is False, 'psutil 0.6.0 or greater is required for this test')
|
||||
@patch('psutil.virtual_memory', new=MagicMock(return_value=STUB_VIRT_MEM))
|
||||
def test_virtual_memory(self):
|
||||
self.assertDictEqual({'used': 500, 'total': 1000, 'available': 500, 'percent': 50, 'free': 500},
|
||||
ps.virtual_memory())
|
||||
|
||||
@skipIf(HAS_PSUTIL_VERSION is False, 'psutil 0.6.0 or greater is required for this test')
|
||||
@patch('psutil.swap_memory', new=MagicMock(return_value=STUB_SWAP_MEM))
|
||||
def test_swap_memory(self):
|
||||
self.assertDictEqual({'used': 500, 'total': 1000, 'percent': 50, 'free': 500, 'sin': 0, 'sout': 0},
|
||||
|
||||
Loading…
Reference in New Issue
Block a user