valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
87,468 Commits 24 Branches 182 Tags 341 MiB
df937bf2fa
Commit Graph

6788 Commits

Author SHA1 Message Date
Vernon Cole
4c8cd9c507
lint and comment fixes 2017-10-19 10:16:28 -06:00
Vernon Cole
2b4f69e1f8
remove unused parameter 2017-10-18 20:20:36 -06:00
Vernon Cole
cce7bc9719
add more unit tests 2017-10-18 20:06:14 -06:00
Benedikt Werner
4bfeb7f1d1
Fixed missing import 2017-10-19 03:17:16 +02:00
Gareth J. Greenaway
8bbb1088e8
Fixing lint. 2017-10-18 14:57:33 -07:00
Gareth J. Greenaway
1e312d1b59
Adding tests for _memdata, Linux & *BSD 2017-10-18 14:57:33 -07:00
twangboy
bb1d2eb85b
Skip tests that are failing on PAM eauth 2017-10-18 14:03:10 -06:00
rallytime
832aa3010c
Reorder and group imports in jina template unit tests 
The imports were scattered around quite a bit, which made it hard
to see where multiple uses of salt/utils/* imports were being pulled
in.

This PR just adjusts the ordering so it's easier to see what is included
already for the future. (This is particularly useful for catching misuses
of salt.utils.__init__.py functions.)
 2017-10-18 14:15:50 -04:00
kstreee
e210f12cb7
Fixes inconsistent exception handling in rest_tornado. 2017-10-19 02:22:23 +09:00
Benedikt Werner
77b948b00a
Skip shadow module unit test if not root or no shadow 2017-10-18 19:10:55 +02:00
Mike Place
990a454f99 Merge pull request #44153 from rallytime/merge-develop 
[develop] Merge forward from 2017.7 to develop
 2017-10-18 10:51:14 -06:00
Nicole Thomas
255a20f0e7 Merge pull request #44123 from terminalmage/gitfs-singleton 
Use one salt.utils.gitfs.GitFS instance per thread
 2017-10-18 12:12:25 -04:00
rallytime
d712031a43
Update to_unicode util references to new stringutils path 2017-10-18 09:44:55 -04:00
rallytime
b8dc018178
Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/modules/opkg.py
  - salt/utils/templates.py
  - tests/unit/templates/test_jinja.py
 2017-10-18 09:37:47 -04:00
Mike Place
71f2bc4776 Merge branch 'develop' into panos-2017-9-26 2017-10-17 15:19:48 -06:00
Daniel Wallace
319b811f2f
exclude module name checker for kitchen helpers 2017-10-17 15:18:19 -06:00
Mike Place
afcaa0c591 Merge pull request #43913 from twangboy/win_fix_test_jinja 
Fix `unit.templates.test_jinja` for Windows
 2017-10-17 15:09:04 -06:00
Mike Place
fc5754c6a1 Merge pull request #43917 from twangboy/win_unit_test_pillar 
Fix `unit.test_pillar` for Windows
 2017-10-17 15:06:45 -06:00
Mike Place
4809dd41c0 Merge branch 'develop' into gitfs-singleton 2017-10-17 14:16:28 -06:00
rallytime
74acaad46e
Refactor publish func in master/masterapi to use check_authentication 
In a previous PR, the runner and wheel functions in master.py and masterapi.py
were refactored to reduce common code via the salt.auth.check_authentication
method.

The publish function also can utilize the check_authentication function in
master.py and masterapi.py.

Consolidation of this code will help us be able to differentiate between
authorization and authentication errors in the future.
 2017-10-17 12:27:13 -04:00
Marc Koderer
c4d9684a90 Use correct mac prefix for kvm/qemu 
Using the private mac range for vms makes it impossible to
distinguish between hypervisors.

Issues #44056

Signed-off-by: Marc Koderer <marc.koderer@sap.com>
 2017-10-17 10:46:06 +02:00
Gareth J. Greenaway
a89c26c88e
Various fixes to beacons to handle situations when beacons are stored in pillar. Updating execution module to report that beacons stored in pillar can not be managed via module. Updating add function to ensure beacon is available before attempting to add it. Updaitng unit tests to include new beacon is available check. 2017-10-16 14:32:12 -07:00
Erik Johnson
3e96225210
Use one salt.utils.gitfs.GitFS instance per thread 
This reduces some of the overhead caused by many concurrent fileclient
requests from minions.

Additionally, initializing remotes has been folded into the GitBase
class' dunder init. Instantiating an instance and initializing its
remotes were initially split so that an object could simply be created
with the master opts so that the configuration was loaded and nothing
else, allowing for certain cases (like clearing the cache files) where
we didn't need to actually initialize the remotes. But this both A)
presents a problem when the instance being used is a singleton, as you
don't want to be re-initializing the remotes all the time, and B)
suppressing initialization can be (and is now being) done via a new
argument to the dunder init.
 2017-10-16 15:25:29 -05:00
Nicole Thomas
68974aa74d Merge pull request #44029 from msummers42/2017.7 
addresses issue #43307, disk.format_ to disk.format
 2017-10-16 15:59:19 -04:00
rallytime
54c4be35ae
Update any moved utils references from the merge-forward 2017-10-16 15:47:32 -04:00
rallytime
c0f16dae74
Merge branch '2017.7' into 'develop' 
Conflicts:
  - doc/topics/tutorials/index.rst
  - salt/crypt.py
  - salt/modules/cmdmod.py
  - salt/modules/grains.py
  - salt/pillar/git_pillar.py
  - salt/roster/clustershell.py
  - tests/unit/states/test_augeas.py
  - tests/unit/utils/test_utils.py
 2017-10-16 15:26:19 -04:00
Nicole Thomas
9fe94d7843 Merge pull request #44098 from twangboy/win_mock_test_parsers 
Return multiprocessing queue in LogSetupMock class
 2017-10-16 14:14:29 -04:00
twangboy
a4e2d8059d
Fix unit.templates.test_jinja for Windows 
Fix problem with files that end with new line on Windows
Fix some problems with regex
Fix some unicode conversion issues
 2017-10-16 10:41:36 -06:00
Matthew Summers
16e1c1dfc8
fixed test addressing issue #43307, disk.format_ to disk.format 2017-10-16 09:47:40 -05:00
Erik Johnson
877abb89d0
Complete the salt.utils refactor 
This moves the remaining 30 functions from salt.utils to new locations.
 2017-10-15 09:43:31 -05:00
garethgreenaway
abf596bbd9 Merge branch 'develop' into 43647_fix_InitiatorName_in_comments 2017-10-15 07:35:31 -07:00
twangboy
caf086c05a
Skip Master, Minion, and Syndic parser tests 2017-10-13 16:02:01 -06:00
twangboy
cc43ca27af
Return multiprocessing queue in LogSetupMock class 2017-10-13 15:47:19 -06:00
Gareth J. Greenaway
f06bb04348
Adding the right mocked data to the Windows test. Updating the grains/core.py to check if the entire line is alpha_numeric characters to determine if it should be skipped. 2017-10-13 10:01:58 -07:00
Gareth J. Greenaway
4b1d5f3005
Adding additional tests for grains/isci_iqn 2017-10-13 10:01:58 -07:00
Erik Johnson
c6b655b6e9
Move 14 more functions from salt.utils 
These functions are:

salt.utils.test_mode -> salt.utils.args.test_mode
salt.utils.split_input -> salt.utils.args.split_input
alt.utils.pem_finger -> salt.utils.crypt.pem_finger
salt.utils.is_bin_file -> salt.utils.files.is_binary
salt.utils.list_files -> salt.utils.files.list_files
salt.utils.safe_walk -> salt.utils.files.safe_walk
salt.utils.st_mode_to_octal -> salt.utils.files.st_mode_to_octal
salt.utils.normalize_mode -> salt.utils.files.normalize_mode
salt.utils.human_size_to_bytes -> salt.utils.files.human_size_to_bytes
salt.utils.get_hash -> salt.utils.hashutils.get_hash
salt.utils.is_list -> salt.utils.data.is_list
salt.utils.is_iter -> salt.utils.data.is_iter
salt.utils.isorted -> salt.utils.data.sorted_ignorecase
salt.utils.is_true -> salt.utils.data.is_true
 2017-10-13 09:29:03 -05:00
Erik Johnson
1e2e2b6ac5
Move 5 functions from salt.utils 
These functions are:

- salt.utils.ip_bracket -> salt.utils.zeromq.ip_bracket
- salt.utils.gen_mac -> salt.utils.network.gen_mac
- salt.utils.mac_str_to_bytes -> salt.utils.network.mac_str_to_bytes
- salt.utils.refresh_dns -> salt.utils.network.refresh_dns
- salt.utils.dns_check -> salt.utils.network.dns_check
 2017-10-12 09:07:00 -05:00
Erik Johnson
554c685ce5
Move 4 functions from salt.utils 
- salt.utils.reinit_crypto -> salt.utils.crypt.reinit_crypto
- salt.utils.appendproctitle -> salt.utils.process.appendproctitle
- salt.utils.daemonize -> salt.utils.process.daemonize
- salt.utils.daemonize_if -> salt.utils.process.daemonize_if
 2017-10-11 14:49:50 -05:00
Nicole Thomas
3a078304d8 Merge pull request #43982 from terminalmage/salt.utils.data 
Move 13 functions from salt.utils to salt.utils.data
 2017-10-11 11:42:08 -04:00
Erik Johnson
d947ddf176
Move 13 functions from salt.utils to salt.utils.data 
These functions are:

- salt.utils.compare_dicts
- salt.utils.compare_lists
- salt.utils.decode_dict
- salt.utils.decode_list
- salt.utils.exactly_n
- salt.utils.exactly_one
- salt.utils.traverse_dict
- salt.utils.filter_by
- salt.utils.traverse_dict_and_list
- salt.utils.subdict_match
- salt.utils.substr_in_list
- salt.utils.is_dictlist
- salt.utils.repack_dictlist
 2017-10-10 17:42:42 -05:00
twangboy
00dbba5712
Fix unit.test_pillar for Windows 
Use delete=True in NamedTemporaryFile command otherwise the handle to
the file isn't released and the file can't be opened by the actual test.
 2017-10-10 13:44:58 -06:00
Erik Johnson
92e05cf1c0
Don't allow path separators in minion ID 2017-10-10 11:03:29 -04:00
garethgreenaway
76ff44bc84 Merge branch 'develop' into vagrant-module 2017-10-09 09:06:42 -07:00
Daniel Wallace
1f8ec5d335 Merge branch 'develop' into vagrant-module 2017-10-06 11:32:31 -06:00
garethgreenaway
11c7d3ab39 Merge branch 'develop' into unit-test-sdb 2017-10-06 07:28:42 -07:00
Nicole Thomas
d136650b31 Merge pull request #43938 from terminalmage/salt.utils.user 
Move several functions from salt.utils to salt.utils.user
 2017-10-06 09:42:42 -04:00
Erik Johnson
aa3309ef59
Move several functions from salt.utils to salt.utils.user 
These functions are as follows:

- salt.utils.get_user
- salt.utils.get_uid
- salt.utils.get_specific_user
- salt.utils.chugid
- salt.utils.chugid_and_umask
- salt.utils.get_default_group
- salt.utils.get_group_list
- salt.utils.get_group_dict
- salt.utils.get_gid_list
- salt.utils.get_gid
 2017-10-05 19:50:14 -05:00
twangboy
254dac7723
Fix unit.utils.test_utils for Windows 
Use os agnostic path seps
Mock sys.platform to not return win
 2017-10-05 16:47:32 -06:00
garethgreenaway
53509e8d46 Merge branch 'develop' into unit-test-sdb 2017-10-05 15:35:13 -07:00
Nicole Thomas
31a641ce74 Merge branch 'develop' into panos-2017-9-26 2017-10-05 16:19:37 -04:00
Nicole Thomas
7785919437 Merge pull request #43829 from rallytime/merge-develop 
[develop] Merge forward from 2017.7 to develop
 2017-10-05 16:09:23 -04:00
garethgreenaway
4c5af8cc96 Merge branch 'develop' into unit-test-sdb 2017-10-05 13:01:01 -07:00
garethgreenaway
37d7f13926 Merge branch 'develop' into vagrant-module 2017-10-05 10:25:24 -07:00
rallytime
eaca3291e2
Merge branch '2016.11' into '2017.7' 
Conflicts:
  - tests/unit/modules/test_state.py
 2017-10-05 12:09:40 -04:00
Nicole Thomas
a9dc04fb7f Lint: disable the unused-import check 2017-10-05 08:51:16 -04:00
Eric Radman
0dc3c4ef1c
Skip some vsphere tests if pyvmomi library is not installed 
Also fix up 'E127: continuation line over-indented' lint errors
 2017-10-04 13:09:29 -04:00
Vernon Cole
73947e3103
lint (again!) blank lines can have no spaces 2017-10-04 09:10:47 -06:00
Vernon Cole
67a701de7c lint PEP-8 2017-10-03 23:23:17 -06:00
Vernon Cole
83a3678cef
provide mocked unit tests 2017-10-03 17:24:05 -06:00
Vernon Cole
7d5a121265
Skip unit tests under Python3 until loader is fixed 2017-10-03 10:22:18 -06:00
rallytime
b7dae5addd
Bump with statements in one level 
This is needed because the previous commit changed the context
management style from nested with statements to stacked with
statements.
 2017-10-03 12:18:27 -04:00
garethgreenaway
6034b36bf6 Merge branch 'develop' into unit-test-sdb 2017-10-03 09:07:35 -07:00
Vernon Cole
c6b2e1e35b
update tests to match improved module 
(cherry picked from commit 7fcdc51)
 2017-10-02 22:10:37 -06:00
Vernon Cole
f96740d278
use recommended source for TMP directory 2017-10-02 21:07:27 -06:00
Vernon Cole
2bccf228ba
fix code-lint complaint 2017-10-02 12:18:11 -06:00
garethgreenaway
6c20e146c3 Lint Fixes 
Lint Fixes
 2017-10-02 10:10:53 -07:00
Erik Johnson
5d56a03a67
Improve failures for module.run states 
Bare asserts are zero help in troubleshooting. This commit changes the
tests that uses bare asserts such that they fail with a useful error
mesage as well as the return data from the module.run call.
 2017-10-02 10:48:45 -05:00
Vernon Cole
22792e56cc
lint, style, and Windows fixes 2017-10-02 09:48:27 -06:00
Alexandru Bleotu
3c6418b98f pylint 2017-09-29 19:45:56 -04:00
Vernon Cole
18357ac59d
provide a unit test for the sdb utility 2017-09-29 13:58:13 -06:00
spenceation
0f3503ee22 Added unit test for utils/xmlutil. 2017-09-29 15:30:15 -04:00
twangboy
fd1d6c31de
Fix unit.states.test_augeas for Windows 
Mock `os.path.isfile` so the test will continue
 2017-09-29 12:52:32 -06:00
rallytime
c976df7c09
Fix mocking in test_status since the "which" util has moved 2017-09-29 13:56:01 -04:00
Alexandru Bleotu
0c6a49ba38 Added tests for salt.utils.vsan.remove_diskgroup 2017-09-29 13:39:59 -04:00
Alexandru Bleotu
9de868fdfb Added tests for salt.utils.vsan.remove_capacity_from_diskgroup 2017-09-29 13:39:57 -04:00
Alexandru Bleotu
32d44142f2 Added tests for salt.utils.vsan.add_capacity_to_diskgroup 2017-09-29 13:39:54 -04:00
Alexandru Bleotu
d813164d18 Added tests for salt.utils.vsan.create_diskgroup 2017-09-29 13:39:52 -04:00
Alexandru Bleotu
523a2ac21d Added tests for salt.utils.vsan.get_host_vsan_system 2017-09-29 13:39:49 -04:00
Alexandru Bleotu
dac9522814 Added tests for salt.utils.vsan.get_vsan_disk_management_system 2017-09-29 13:39:47 -04:00
Alexandru Bleotu
b4a05dc7c0 Added tests for salt.modules.vsphere.remove_capacity_from_diskgroup 2017-09-29 13:39:44 -04:00
Alexandru Bleotu
ec2637db44 Added tests for salt.modules.vsphere.remove_diskgroup 2017-09-29 13:39:41 -04:00
Alexandru Bleotu
4e0755de20 Added tests for salt.modules.vsphere.remove_datastore 2017-09-29 13:39:39 -04:00
Alexandru Bleotu
51703a8a34 Added tests for salt.modules.vsphere.erase_disk_partitions 2017-09-29 13:39:36 -04:00
rallytime
a38ceab7cf
Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/cli/batch.py
  - salt/master.py
  - salt/utils/path.py
  - tests/unit/modules/test_state.py
 2017-09-29 11:48:33 -04:00
Mike Place
952b5d8e87 Merge branch 'develop' into vagrant-module 2017-09-29 12:34:41 +02:00
Mike Place
2f3f4705bd Merge pull request #43791 from alexbleotu/extra_minion_data_in_pillar-gh 
External pillar that includes extra minion data in the minion pillar
 2017-09-29 12:02:06 +02:00
Vernon Cole
e9661aea07
lint: must not use bare except: even in teardown 2017-09-28 18:27:54 -06:00
vernoncole
8d27e20b63 replace salt.utils.sdb calls with __utils__ 2017-09-28 16:43:47 -06:00
Alexandru Bleotu
503cb9c93a pylint 2017-09-28 11:32:03 -04:00
Alexandru Bleotu
8c5b021519 Added * as an include all wildcard in extra_minion_data_in_pillar external pillar (+ test) 2017-09-28 11:32:01 -04:00
Mike Place
77ef439ee0 Merge pull request #41956 from yagnik/encrypted-salt 
Add support for encrypted tag in yaml serializer
 2017-09-28 16:41:01 +02:00
Mike Place
6f687fdcff Merge pull request #43779 from twangboy/win_fix_test_state 
Fix `unit.modules.test_state` for Windows
 2017-09-28 16:27:02 +02:00
Mike Place
db0f569f7a Merge pull request #43782 from twangboy/win_fix_test_virt 
Fix `unit.modules.test_virt` for Windows
 2017-09-28 16:25:15 +02:00
Mike Place
8ddf2e9442 Merge pull request #43751 from alexbleotu/esxi_vsan_states-gh 
ESXi diskgroup and host cache creation/configuration + dependencies
 2017-09-28 15:21:36 +02:00
Alexandru Bleotu
998c4a95fa Added tests for salt.pillar.extra_minion_data_in_pillar 2017-09-28 09:14:30 -04:00
Mike Place
6a25bf4475 Merge pull request #42349 from coredumb/saltclass 
New pillar/master_tops saltclass module
 2017-09-28 14:26:45 +02:00
Mike Place
5e29507c21 Merge pull request #43781 from twangboy/win_fix_test_status 
Fix `unit.modules.test_status` for Windows
 2017-09-28 11:06:18 +02:00
Mike Place
05c78ae649 Merge pull request #43785 from twangboy/win_fix_test_znc 
Fix `unit.modules.test_znc` for Windows
 2017-09-28 10:56:10 +02:00
Alexandru Bleotu
90a174c915 more pylint 2017-09-28 04:42:44 -04:00
Alexandru Bleotu
adfa462c05 Fixed tests for salt.utils.vmware.get_hosts 2017-09-28 04:42:42 -04:00