Commit Graph

931 Commits

Author SHA1 Message Date
twangboy
93aec6fbd9
Fix decode issue on Py2, Use os.linesep 2018-01-18 20:45:40 +00:00
Nicole Thomas
bd891ee13a
Merge pull request #45405 from garethgreenaway/oxygen_updating_utils_for_unicode_round_one
[oxygen] Updating various utils and related tests for Unicode goodness.
2018-01-18 10:39:55 -05:00
Erik Johnson
e0890baa31
Use correct attribute in test_log_created 2018-01-17 19:54:47 -06:00
Erik Johnson
2ab1e71ef2
[PY3] Add unicode_literals to salt.utils modules (P) 2018-01-17 19:54:44 -06:00
Gareth J. Greenaway
e14b655c01
More unicode changes. Adding print_function to all files. Updating various reads & writes to files. 2018-01-17 09:02:17 -08:00
Gareth J. Greenaway
db41d9b303
Updating various utils and related tests for unicode goodness. 2018-01-17 09:02:17 -08:00
Nicole Thomas
e8e82f2f7f
Merge pull request #45429 from terminalmage/py3-salt.utils-r-s
[PY3] Add unicode_literals to salt.utils modules (R-S)
2018-01-14 08:06:51 -05:00
Nicole Thomas
80f6815c11
Merge pull request #45439 from terminalmage/py3-salt.utils-w-z
[PY3] Add unicode_literals to salt.utils modules (W-Z)
2018-01-14 08:02:22 -05:00
Nicole Thomas
78ce60e4d4
Merge pull request #44977 from terminalmage/remove-more-explicit-unicode-literals
Remove more unnecessary explicit unicode literals
2018-01-14 07:55:29 -05:00
Nicole Thomas
b90e7aedde
Merge pull request #45440 from terminalmage/py3-a
[PY3] Add unicode_literals to states/modules (A)
2018-01-14 07:52:02 -05:00
Nicole Thomas
4d03162227
Merge pull request #45396 from rallytime/merge-oxygen
[oxygen] Merge forward from 2017.7 to oxygen
2018-01-14 07:44:37 -05:00
Erik Johnson
ce6fccde9c
[PY3] Add unicode_literals to states/modules (A) 2018-01-14 01:31:52 -06:00
Erik Johnson
54f9785e6c
[PY3] Add unicode_literals to salt.utils modules (R-S) 2018-01-13 21:14:09 -06:00
Erik Johnson
b89efc16eb
Remove more unnecessary explicit unicode literals 2018-01-13 21:10:04 -06:00
Erik Johnson
a9c82c47ea
[PY3] Add unicode_literals to salt.utils modules (W-Z) 2018-01-13 20:52:16 -06:00
Nicole Thomas
dcac4d4ce9
Merge pull request #45423 from terminalmage/py3-salt.utils-a-d
[PY3] Add unicode_literals to salt.utils modules (A-D)
2018-01-13 20:33:28 -05:00
Erik Johnson
1044b627a1
[PY3] Add unicode_literals to salt.utils modules (A-D) 2018-01-13 16:08:56 -06:00
Erik Johnson
c57b5a5502
Fix breakage in salt.utils.iam
This fixes breakage introduced in
https://github.com/saltstack/salt/pull/45406 and adds a unit test.
2018-01-13 15:04:18 -06:00
Nicole Thomas
0c58cb77ac
Merge pull request #45406 from garethgreenaway/oxygen_updating_utils_for_unicode_round_two
[oxygen] Oxygen updating utils and related tests for Unicode round two
2018-01-12 14:07:47 -05:00
Nicole Thomas
1755af821d
Merge pull request #44866 from DSRCorporation/slots3
Slots: use execution function return as a state arg value
2018-01-12 13:58:16 -05:00
Gareth J. Greenaway
0e44911d77
Updating various tests for Unicode goodness 2018-01-12 08:42:39 -08:00
Nicole Thomas
04b8e1cafc
Merge pull request #45401 from gtmanfred/oxygen
fix boto import failures
2018-01-12 10:55:48 -05:00
Erik Johnson
6fbe368b71
Fall back to utf-8 on windows when to_str/to_unicode/to_bytes fail to encode/decode 2018-01-11 16:49:03 -06:00
Daniel Wallace
fdcf71a10c
fix test boto imports
Test boto imports are failing for some reason
2018-01-11 15:14:25 -07:00
rallytime
60370f5fb6
Merge branch '2017.7' into 'oxygen'
Conflicts:
  - salt/config/__init__.py
  - salt/daemons/masterapi.py
  - salt/proxy/dummy.py
  - salt/states/file.py
  - tests/integration/modules/test_state.py
  - tests/integration/runners/test_runner_returns.py
  - tests/integration/ssh/test_state.py
  - tests/support/parser/__init__.py
  - tests/unit/grains/test_core.py
  - tests/unit/states/test_file.py
2018-01-11 16:00:08 -05:00
Dmitry Kuzmenko
f40cb3f2f1
Slots: bugfixes and tests. 2018-01-11 14:05:58 +03:00
rallytime
8025b14584
Merge branch '2016.11' into '2017.7'
Conflicts:
  - tests/unit/utils/test_parsers.py
2018-01-04 17:37:48 -05:00
Erik Johnson
002aa88a97
Replace yaml usage with a helper to ensure unicode is handled properly
Without allow_unicode=True, unicode characters are processed through the
str representer and on Python 2 are dumped as a Unicode code point (i.e.
a literal \u0414). This commit makes allow_unicode=True the default in
our salt.utils.yamlloader.safe_dump() helper. It also adds a new
salt.utils.yamlloader.dump() helper which wraps yaml.dump() and also
makes allow_unicode=True the default.

To make importing and using our custom yaml loader/dumper easier, a
convenience module called salt.utils.yaml has been added, which does a
wildcard import from both salt.utils.yamldumper and
salt.utils.yamlloader.

Refs to yaml.load/dump and yaml.safe_load/safe_dump have been updated to
salt.utils.yaml, to ensure that unicode is handled properly.
2018-01-03 14:14:21 -06:00
rallytime
68f971b38f
Apply test fixes from #45034 to parsers_test.py 2018-01-03 15:10:04 -05:00
Erik Johnson
7b13a7df8b
Replace json module usage with a helper to ensure unicode content is handled properly
This adds wrappers for json.dump{,s} which disable `ensure_ascii` by
default.
2017-12-27 09:30:58 -06:00
rallytime
ec2a32a106
Update old utils paths to new paths 2017-12-20 08:03:14 -05:00
Erik Johnson
016ffbe7f8
Fix incorrectly-written VMware tests 2017-12-19 12:09:36 -06:00
Nicole Thomas
8331d51628
Merge pull request #45041 from terminalmage/add-print_function
[PY3] Add print_function import to files with unicode_literals already added
2017-12-18 11:45:26 -05:00
Erik Johnson
8cdb9ea54f
[PY3] Add print_function import to files with unicode_literals already added
This makes the 2.x usage invalid syntax and forces the use of print as a
function. This adds the import to the files which I've updated in the
last couple of days but forgot to add it.
2017-12-15 12:14:18 -06:00
rallytime
3e319d50b3
Merge branch '2017.7' into 'oxygen'
Conflicts:
  - README.rst
  - salt/modules/win_pkg.py
  - salt/utils/process.py
2017-12-14 13:01:29 -05:00
Nicole Thomas
ae8dd2e202
Merge pull request #44982 from terminalmage/docker-unicode
[PY3] Add unicode_literals to docker state/execution modules
2017-12-14 11:03:15 -05:00
Erik Johnson
2a8d7e2a0b
[PY3] Add unicode_literals to files in root salt/ dir (and associated tests) 2017-12-14 00:47:44 -06:00
Erik Johnson
5e1f75aab0
[PY3] Add unicode_literals to docker state/execution modules 2017-12-13 22:49:23 -06:00
twangboy
40665d7b08
Skip test_log_created on Windows 2017-12-13 14:12:07 -07:00
rallytime
db5866d097
Update old utils paths to new utils paths 2017-12-11 18:43:33 -05:00
rallytime
08c71f13e4
Merge branch '2017.7' into 'oxygen'
Conflicts:
  - doc/ref/configuration/minion.rst
  - doc/topics/thorium/index.rst
  - salt/beacons/__init__.py
  - salt/client/mixins.py
  - salt/client/ssh/wrapper/state.py
  - salt/daemons/masterapi.py
  - salt/grains/extra.py
  - salt/minion.py
  - salt/modules/cron.py
  - salt/modules/file.py
  - salt/modules/mac_user.py
  - salt/modules/napalm_network.py
  - salt/modules/state.py
  - salt/modules/win_file.py
  - salt/modules/win_pkg.py
  - salt/proxy/dummy.py
  - salt/state.py
  - salt/states/file.py
  - salt/states/lxc.py
  - salt/utils/__init__.py
  - salt/utils/schedule.py
  - tests/integration/modules/test_file.py
  - tests/integration/modules/test_groupadd.py
  - tests/integration/ssh/test_state.py
  - tests/integration/states/test_file.py
  - tests/unit/daemons/test_masterapi.py
  - tests/unit/grains/test_core.py
  - tests/unit/modules/test_disk.py
  - tests/unit/modules/test_napalm_network.py
  - tests/unit/modules/test_state.py
  - tests/unit/test_minion.py
  - tests/unit/utils/test_process.py
2017-12-11 18:24:41 -05:00
Ch3LL
3bb58fb577
skip salt-key log creation test 2017-12-11 10:59:10 -05:00
Erik Johnson
272044c688
Roll back use of explicit unicode literals 2017-12-10 17:41:45 -06:00
Ch3LL
6a379195bc
Add test to ensure log files are created 2017-12-07 17:31:26 -05: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
twangboy
a5737e8fc3
Fix lint errors 2017-12-01 16:45:18 -07:00
twangboy
be96de09cc
Fix pickling error by decorating 2017-12-01 16:45:18 -07:00
Agnes Tevesz
42fcaf6c05 Fixed esxvm module, schema, proxy, states and vmware utils, vsphere
module pr-pylint issues
2017-12-01 11:23:38 +01:00
Agnes Tevesz
c1b430ca65 Added tests: unit.utils.vmware.test_vm, covers:
- vm creation
 - vm registation
2017-12-01 11:22:57 +01:00
Agnes Tevesz
c3c15a2b92 Adding vmware utils changes for virtual machine management, tests are
included
2017-12-01 11:22:43 +01:00