Commit Graph

3555 Commits

Author SHA1 Message Date
Jorge Schrauwen
40f3a6f053
Merge branch 'develop' into issue44404 2017-12-06 20:25:14 +01:00
Erik Johnson
4908cf74e0
More conversion to __utils__
Also, actually using __utils__ here revealed several import errors in
utils modules, so these needed to be dealt with.
2017-12-06 13:14:02 -06:00
Erik Johnson
64aa4fbbec
Many improvements to docker network and container states
Much Improved Support for Docker Networking
===========================================

The `docker_network.present` state has undergone a full rewrite, which
includes the following improvements:

Full API Support for Network Management
---------------------------------------

The improvements made to input handling in the
`docker_container.running` state for 2017.7.0 have now been expanded to
docker_network.present`.  This brings with it full support for all
tunable configuration arguments.

Custom Subnets
--------------

Custom subnets can now be configured. Both IPv4 and mixed IPv4/IPv6
networks are supported.

Network Configuration in :py:func:`docker_container.running` States
-------------------------------------------------------------------

It is now possible to configure static IPv4/IPv6 addresses, as well as
links and labels.

Improved Handling of Images from Custom Registries
==================================================

Rather than attempting to parse the tag from the passed image name, Salt
will now resolve that tag down to an image ID and use that ID instead.

Due to this change, there are some backward-incompatible changes to
image management. See below for a full list of these changes.

Backward-incompatible Changes to Docker Image Management
--------------------------------------------------------

Passing image names to the following functions must now be done using separate
`repository` and `tag` arguments:

- `docker.build`
- `docker.commit`
- `docker.import`
- `docker.load`
- `docker.tag`
- `docker.sls_build`

Additionally, the `tag` argument must now be explicitly passed to the
`docker_image.present` state, unless the image is being pulled from a
docker registry.
2017-12-06 12:12:25 -06:00
Ahmed AbouZaid
aa9e505588 write unit test for defaults.merge not in place 2017-12-06 18:30:50 +01:00
Jorge Schrauwen
6324339fc6
Merge branch 'develop' into issue44404 2017-12-06 17:23:21 +01:00
Ahmed AbouZaid
2c51005810 write unit test for defaults.deepcopy 2017-12-06 16:57:55 +01:00
Ahmed AbouZaid
6af5cd844f write unit test for defaults.merge 2017-12-06 15:43:30 +01:00
Nicole Thomas
d20b3e458a
Merge branch 'develop' into issue30842 2017-12-06 09:28:06 -05:00
Anthony Shaw
6231d69f85
Merge remote-tracking branch 'origin/develop' into more_napalm_tests 2017-12-06 15:12:35 +11:00
Nicole Thomas
45573a1fdf
Merge pull request #44627 from mstagi/add-vmware-vm-management
Add vmware vm management
2017-12-05 18:07:03 -05:00
Erik Johnson
01a76919cb
Add hide_output option to cmd state/exec module
We have `output_loglevel` for controlling logging, but no corresponding
option to suppress the output from the command from being returned. This
adds a `hide_output` option to do that.

Additionally, this removes the rest of the references to the
long-since-deprecated `quiet` argument from the cmd execution module,
and adds a warning to states which use this argument. `quiet` appears to
have been incompletely removed following its deprecation. It was not
being passed to _check_loglevel(), so it was essentially ignored, but it
was still being accepted as an argument by several functions. Those
references to what has for some time now been a no-op argument are now
removed.
2017-12-05 16:10:02 -06:00
Nicole Thomas
49464dc755
Merge branch 'develop' into fixpip 2017-12-05 16:04:36 -05:00
Jorge Schrauwen
18272955ee
Merge branch 'develop' into issue44404 2017-12-05 21:11:09 +01:00
Ch3LL
cdbacfaf5c
Remove minions_state_test arg and use default test arg 2017-12-05 14:12:24 -05:00
Ch3LL
499541a8e8
Add new option minions_state_test to enable test on master side 2017-12-05 14:12:20 -05:00
Nicole Thomas
8e2e1f957e
Merge pull request #44772 from terminalmage/issue36275
Rename environment config option to saltenv, introduce lock_saltenv option
2017-12-04 16:49:23 -05:00
Nicole Thomas
2ad2d4e27d
Merge branch 'develop' into add-vmware-vm-management 2017-12-04 16:41:37 -05:00
twangboy
d5dd42aebe
Fix integration tests for Windows 2017-12-04 14:05:53 -07:00
twangboy
a24b964ea5
Fix unit test to handle new Exception 2017-12-04 14:05:52 -07:00
twangboy
4602f499a2
Remove loader module mixin, add linux paths 2017-12-04 14:05:52 -07:00
twangboy
99b27c037f
Add tests to avoid future regression 2017-12-04 14:05:51 -07:00
Bo Maryniuk
0d2675c4fe Use variable, instead of direct value 2017-12-04 15:51:56 +01:00
Bo Maryniuk
1ddc47da0a Add unit test for _get_pillar_errors when external pillar is clean and internal contains errors 2017-12-04 15:51:56 +01:00
Bo Maryniuk
68480d5dc9 Add unit test for _get_pillar_errors when both external and internal pillars contains errors 2017-12-04 15:51:56 +01:00
Bo Maryniuk
218a59e93b Add unit test for _get_pillar_errors when external pillar has errors and internal is clean 2017-12-04 15:51:56 +01:00
Bo Maryniuk
3ce19356c2 Add unit test for _get_pillar_errors when external and internal pillars are clean 2017-12-04 15:51:56 +01:00
Bo Maryniuk
67034139d9 Fix unit test: wrong error types in side effect 2017-12-04 15:51:56 +01:00
Bo Maryniuk
d9359bca13 Bugfix: unit test mistakenly expects pillar errors as a string, while it is a list 2017-12-04 15:51:56 +01:00
Michael Calmer
b6365aee3c fix order of parameters in unit tests 2017-12-04 15:38:22 +01:00
Jorge Schrauwen
9e163c847e Only update props when changed in zpool.present
We make sure the values conform to what zfs expects, this should
fix the unneeded updates as mentioned in #44404

Additional test for zpool.get with whitespaces in the result.
2017-12-02 16:00:06 +01:00
Jorge Schrauwen
0e9fe895e3 Add new unit tests for zfs.list and zfs.get
Parsable output needs new unit tests. I update the old tests with fresh
data from one of my test systems and create new tests for the same data
but with the parsable output flag set. These tests also test the new
code that converts numbers to actually numeric values.
2017-12-02 13:42:19 +01:00
Jorge Schrauwen
0813183fe8 Add new unit tests for zpool.list and zpool.get
Parsable output needs new unit tests. I update the old tests with fresh
data from one of my test systems and create new tests for the same data
but with the parsable output flag set. These tests also test the new
code that converts numbers to actually numeric values.
2017-12-02 13:09:38 +01:00
twangboy
5615862f23
Fix some lint 2017-12-01 10:25:48 -07:00
twangboy
627d5ab0c9
Mock salt.utils.which
cmd.run return values are mocked
2017-12-01 10:25:48 -07:00
twangboy
e5a96fe00f
Skip test_fstype on Windows
no lsblk on Windows
2017-12-01 10:25:48 -07:00
Agnes Tevesz
a517550bc3 Added to tests.modules.test_vsphere the esxvm compatibility for tests 2017-12-01 11:23:27 +01:00
Bo Maryniuk
e1eec2c69d Add unit test for __virtual__ in case Ansible is installed on the Minion 2017-12-01 11:21:27 +01:00
Bo Maryniuk
fa21af69dd Add unit test for __virtual__ in case Ansible is not installed on the Minion 2017-12-01 11:21:27 +01:00
Erik Johnson
c1e4bea83e
Change lock message 2017-11-30 14:30:44 -06:00
Erik Johnson
3770cd7dd3
Add unit test for lock_saltenv
Also move up the _get_opts in state.pkg to make it easier to unit test
2017-11-30 14:28:09 -06:00
Anthony Shaw
a029f70cff
merge inbound, resolve conflict and remove unfinished state test module 2017-11-29 08:21:53 +11:00
Zach Moody
1faa685d9e fixup pylint import error. 2017-11-27 19:05:51 -06:00
Zach Moody
871a90cbc5 add netbox execution module 2017-11-27 18:59:06 -06:00
Christian McHugh
249987f750 merge with develop 2017-11-27 22:04:59 +00:00
Nicole Thomas
cae5309752
Merge pull request #44646 from mchugh19/pip-is_installed
add is_installed function
2017-11-27 14:40:55 -05:00
Erik Johnson
8ee5e57fee
Merge pull request #44649 from rallytime/merge-develop
[develop] Merge forward from 2017.7 to develop
2017-11-27 11:23:29 -06:00
Nicole Thomas
9e45e4eff9
Lint: Remove extra blank lines 2017-11-27 11:25:05 -05:00
Anthony Shaw
b95750e31c
fix minor linting errors 2017-11-25 19:04:57 +11:00
Anthony Shaw
8fd459af74
complete tests for napalm_yang_mod 2017-11-25 04:06:36 +11:00
Anthony Shaw
92ef7c555b
test for napalm_yang_mod 2017-11-25 03:48:22 +11:00
Anthony Shaw
7376d631f5
add napalm_users tests 2017-11-24 17:13:59 +01:00
Anthony Shaw
8da1aafb00
add napalm_snmp tests 2017-11-24 17:13:44 +01:00
Anthony Shaw
a8c3f1bd35
add napalm_route tests 2017-11-24 17:13:30 +01:00
Anthony Shaw
c7106d646c
complete tests for napalm_probes 2017-11-24 16:48:06 +01:00
Anthony Shaw
136816c109
fix missing commas in docstrings 2017-11-24 16:36:38 +01:00
Anthony Shaw
dd682106cd
add module for testing napalm_probes 2017-11-24 16:34:40 +01:00
Anthony Shaw
452a8965a3
complete coverage for NTP module 2017-11-24 16:34:16 +01:00
Christian McHugh
590834a136 Use json format with newer pip versions (> 9)
Add unit tests for both pip > 9 and legacy
2017-11-23 22:27:23 +00:00
Jorge Schrauwen
a94edecc93
Merge branch 'develop' into zpoolupdate 2017-11-23 16:53:41 +01:00
Christian McHugh
ab5520fdf7 add true and false test for is_installed 2017-11-23 14:08:46 +00:00
rallytime
052b13c98e
Merge branch '2017.7' into 'develop'
Conflicts:
  - salt/cli/daemons.py
  - salt/client/ssh/__init__.py
  - salt/modules/win_pkg.py
  - salt/netapi/rest_cherrypy/app.py
  - salt/proxy/fx2.py
  - salt/utils/__init__.py
  - salt/utils/jinja.py
  - salt/utils/napalm.py
  - salt/utils/path.py
  - salt/utils/verify.py
  - tests/integration/modules/test_saltutil.py
  - tests/integration/states/test_service.py
  - tests/unit/utils/test_verify.py
2017-11-22 12:36:03 -05:00
Nicole Thomas
6d861f9a74
Disable pylint warning 2017-11-22 10:36:21 -05:00
Mircea Ulinic
3a0945ce3d
Merge pull request #11 from tonybaloney/gh_44332_clone
Thanks @tonybaloney
2017-11-22 10:41:01 +00:00
Anthony Shaw
dfdb43780d
coverage for ntp testing 2017-11-22 11:36:22 +01:00
Anthony Shaw
5ce67c8a7b
setup all tests for napalm_acl module 2017-11-22 09:01:26 +00:00
Anthony Shaw
40431228c8
Add test module for napalm_acl 2017-11-22 08:41:39 +00:00
Anthony Shaw
cd8d87c61f
create a common module for napalm tests, setup napalm_bgp tests 2017-11-22 08:37:56 +00:00
Anthony Shaw
88ef9f18fc
ignore lint error on import 2017-11-22 08:11:07 +00:00
Anthony Shaw
25427d845e
convert key iterator to list as python 3 wont index an iterator 2017-11-22 08:10:36 +00:00
Nicole Thomas
bce50154e5
Merge branch '2017.7' into improve-net-load 2017-11-20 10:59:54 -05:00
Roald Nefs
47147e2769
Added new Telegram module
Added a new Telegram module, which allows to send a message via Telegram
using the Telegram Bot API. The commit also includes:
- Update for the Telegram returner (merged in #44148); the Telegram
returner now fully utilizes the Telegram module.
- Update to the documentation in order to add the Telegram module to the
list list of all modules.
- Updated Telegram returner test.
- New Telegram module test.
2017-11-20 08:47:57 +01:00
Jorge Schrauwen
409acc1b1b Also add tests for zpool.scrub 2017-11-19 12:16:29 +01:00
Jorge Schrauwen
64e0b45e51 Add tests for zpool.labelclear and zpool.split 2017-11-19 12:09:36 +01:00
Anita Krueger
d3c4f6026b
Adding nexus state and module including unit tests 2017-11-18 15:31:37 +00:00
Nicole Thomas
4315c20195
Merge branch 'develop' into add-mandrill-mod 2017-11-14 17:29:52 -05:00
Nicole Thomas
2c6f8f5f9e
Merge pull request #44510 from rallytime/merge-develop
[develop] Merge forward from 2017.7 to develop
2017-11-14 17:21:13 -05:00
Mircea Ulinic
777d01e82a
Add tests for the mandrill execution module 2017-11-14 11:26:56 +00:00
Mircea Ulinic
ba4a62769c
Fix trailing spaces 2017-11-14 09:21:55 +00:00
Mike Place
3af0031e02
Merge pull request #43504 from isbm/isbm-ansible-module-dev
Got Ansible own modules? Run them from within the Salt just like that!
2017-11-13 12:28:25 -07:00
rallytime
4e2280157a
Merge branch '2017.7' into 'develop'
Conflicts:
  - .kitchen.yml
  - tests/unit/test_doc.py
  - tests/unit/utils/test_cloud.py
2017-11-13 12:27:59 -05:00
Anthony Shaw
ba0280e727
linting updates 2017-11-11 15:25:36 +02:00
Anthony Shaw
78b90f3d0c
add remaining tests 2017-11-11 15:21:24 +02:00
Anthony Shaw
386c4e5791
add tests for all the getters 2017-11-11 14:55:25 +02:00
Bo Maryniuk
f8c016cd48 Remove extra assertions 2017-11-10 20:02:04 +01:00
Bo Maryniuk
755bc35585 Fix value is not iterable error 2017-11-10 20:02:04 +01:00
Bo Maryniuk
56c52e6ab3 Fix TypeError for argument of type 'LoaderError' is not iterable 2017-11-10 20:02:04 +01:00
Bo Maryniuk
8f7ef4f45f Lintfix: E9502 2017-11-10 20:02:04 +01:00
Bo Maryniuk
0594517a2e Lintfix: E0102 2017-11-10 20:02:04 +01:00
Bo Maryniuk
7742037bcd Don't bother with non-pytest unit tests 2017-11-10 20:02:04 +01:00
Bo Maryniuk
67cede713f Add unit test for module loader failure 2017-11-10 20:02:04 +01:00
Bo Maryniuk
4004e2f53d Add unit test for module loader 2017-11-10 20:02:04 +01:00
Bo Maryniuk
fd2fca0482 Improve module loader failure 2017-11-10 20:02:04 +01:00
Bo Maryniuk
25990f66bc Add unit test resolver module loader failure 2017-11-10 20:02:04 +01:00
Bo Maryniuk
9d0762a8ee Refactor to setup/teardown methods 2017-11-10 20:02:04 +01:00
Bo Maryniuk
630b654544 Add unit test for modules filtering 2017-11-10 20:02:04 +01:00
Bo Maryniuk
fc24371704 Do not use mock but real resolver class 2017-11-10 20:02:04 +01:00
Bo Maryniuk
082d47f2c1 Add unit test for documentation extractor 2017-11-10 20:02:04 +01:00
Bo Maryniuk
c7a1b733ab Add scaffold for the unit test 2017-11-10 20:02:04 +01:00
Bo Maryniuk
b2ed7d0ecd Mute pylint on misdetected regex-like strings that are actually just test data. 2017-11-10 19:50:47 +01:00
Bo Maryniuk
40f1e1d954 Rewrite unit tests for file.line on delete/replace an empty line 2017-11-10 19:50:47 +01:00