mirror of
https://github.com/valitydev/salt.git
synced 2024-11-09 01:36:48 +00:00
000de95974
Conflicts:
.pylintrc
doc/ref/runners/all/salt.runners.nacl.rst
doc/topics/cloud/config.rst
salt/cli/salt.py
salt/client/mixins.py
salt/client/ssh/__init__.py
salt/loader.py
salt/minion.py
salt/modules/cassandra_cql.py
salt/modules/gpg.py
salt/modules/grains.py
salt/modules/iptables.py
salt/modules/yumpkg.py
salt/netapi/rest_cherrypy/app.py
salt/renderers/pyobjects.py
salt/returners/mysql.py
salt/runners/jobs.py
salt/state.py
salt/states/file.py
salt/states/service.py
salt/utils/minions.py
tests/integration/__init__.py
tests/integration/netapi/rest_tornado/test_app.py
tests/integration/states/cmd.py
115 lines
3.4 KiB
Python
115 lines
3.4 KiB
Python
# encoding: utf-8
|
|
|
|
# Import Python libs
|
|
from __future__ import absolute_import
|
|
import os
|
|
|
|
# Import Salt Testing libs
|
|
from integration import TMP_CONF_DIR
|
|
from salttesting import TestCase
|
|
|
|
# Import Salt libs
|
|
import salt.config
|
|
import salt.netapi
|
|
|
|
|
|
class NetapiClientTest(TestCase):
|
|
eauth_creds = {
|
|
'username': 'saltdev_auto',
|
|
'password': 'saltdev',
|
|
'eauth': 'auto',
|
|
}
|
|
|
|
def setUp(self):
|
|
'''
|
|
Set up a NetapiClient instance
|
|
'''
|
|
opts = salt.config.client_config(os.path.join(TMP_CONF_DIR, 'master'))
|
|
self.netapi = salt.netapi.NetapiClient(opts)
|
|
|
|
def test_local(self):
|
|
low = {'client': 'local', 'tgt': '*', 'fun': 'test.ping'}
|
|
low.update(self.eauth_creds)
|
|
|
|
ret = self.netapi.run(low)
|
|
self.assertEqual(ret, {'minion': True, 'sub_minion': True})
|
|
|
|
def test_local_async(self):
|
|
low = {'client': 'local_async', 'tgt': '*', 'fun': 'test.ping'}
|
|
low.update(self.eauth_creds)
|
|
|
|
ret = self.netapi.run(low)
|
|
|
|
# Remove all the volatile values before doing the compare.
|
|
self.assertIn('jid', ret)
|
|
ret.pop('jid', None)
|
|
ret['minions'] = sorted(ret['minions'])
|
|
self.assertEqual(ret, {'minions': sorted(['minion', 'sub_minion'])})
|
|
|
|
def test_wheel(self):
|
|
low = {'client': 'wheel', 'fun': 'key.list_all'}
|
|
low.update(self.eauth_creds)
|
|
|
|
ret = self.netapi.run(low)
|
|
|
|
# Remove all the volatile values before doing the compare.
|
|
self.assertIn('tag', ret)
|
|
ret.pop('tag')
|
|
|
|
data = ret.get('data', {})
|
|
self.assertIn('jid', data)
|
|
data.pop('jid', None)
|
|
|
|
self.assertIn('tag', data)
|
|
data.pop('tag', None)
|
|
|
|
ret.pop('_stamp', None)
|
|
data.pop('_stamp', None)
|
|
|
|
self.maxDiff = None
|
|
self.assertEqual({
|
|
'data': {
|
|
'return': {
|
|
'minions_pre': [],
|
|
'minions_rejected': [],
|
|
'minions_denied': [],
|
|
'local': [
|
|
'master.pem', 'master.pub', 'minion.pem', 'minion.pub',
|
|
'minion_master.pub', 'syndic_master.pub'
|
|
],
|
|
'minions': ['minion', 'sub_minion']},
|
|
'success': True,
|
|
'user': 'saltdev_auto',
|
|
'fun': 'wheel.key.list_all'
|
|
}}, ret)
|
|
|
|
def test_wheel_async(self):
|
|
low = {'client': 'wheel_async', 'fun': 'key.list_all'}
|
|
low.update(self.eauth_creds)
|
|
|
|
ret = self.netapi.run(low)
|
|
self.assertIn('jid', ret)
|
|
self.assertIn('tag', ret)
|
|
|
|
def test_runner(self):
|
|
# TODO: fix race condition in init of event-- right now the event class
|
|
# will finish init even if the underlying zmq socket hasn't connected yet
|
|
# this is problematic for the runnerclient's master_call method if the
|
|
# runner is quick
|
|
#low = {'client': 'runner', 'fun': 'cache.grains'}
|
|
low = {'client': 'runner', 'fun': 'test.sleep', 'arg': [2]}
|
|
low.update(self.eauth_creds)
|
|
|
|
ret = self.netapi.run(low)
|
|
|
|
def test_runner_async(self):
|
|
low = {'client': 'runner', 'fun': 'cache.grains'}
|
|
low.update(self.eauth_creds)
|
|
|
|
ret = self.netapi.run(low)
|
|
|
|
|
|
if __name__ == '__main__':
|
|
from integration import run_tests
|
|
run_tests(NetapiClientTest, needs_daemon=True)
|