Commit Graph

10932 Commits

Author SHA1 Message Date
Nicole Thomas
16b8ec8471 Merge pull request #43604 from alexbleotu/dvs_states-gh
DVS states + dependencies
2017-09-25 15:34:45 -04:00
Alexandru Bleotu
3c26d4e3be Updated all list_differ tests to compare dicts so the key order is not assumed 2017-09-25 13:11:08 -04:00
Alexandru Bleotu
cdb028b794 Added key sorting to have deterministing string repr of RecursiveDictDiffer objects 2017-09-25 13:09:47 -04:00
Alexandru Bleotu
2d2f094810 Merge branch 'develop' into dvs_states-gh 2017-09-25 11:22:45 +01:00
Heghedus Razvan
19da1000b4 test_nilrt_ip: Fix set_static_all test
The nameservers needs to be specified only by ip address.

Signed-off-by: Heghedus Razvan <razvan.heghedus@ni.com>
2017-09-25 12:49:46 +03:00
Mike Place
68fa74e88f Merge pull request #43571 from nadvornik/raid_add
Add missing devices to RAID array
2017-09-24 19:54:10 -06:00
Mike Place
cae79d2020 Merge pull request #43699 from rallytime/merge-develop
[develop] Merge forward from 2017.7 to develop
2017-09-24 19:27:17 -06:00
Alexandru Bleotu
847debab7a Fix failing storage and listdiffer tests 2017-09-22 17:50:09 -04:00
Gareth J. Greenaway
ca3f77f81e Adding test_btmp_beacon. 2017-09-22 14:24:31 -07:00
Gareth J. Greenaway
6fe02e3c6c Updating btmp & wtmp beacons to work with python3. Adding ability to fire alerts for specific users & specific times. Adding some unit tests for both. 2017-09-22 14:24:31 -07:00
Mike Place
3ad43a5a67 Merge pull request #43470 from alexbleotu/esxdatacenter-gh
Fix to esxdatacenter proxy
2017-09-22 13:18:54 -06:00
rallytime
03ce4d81b7
Reactor Test: Fix incorrect merge conflict resolution 2017-09-22 15:01:11 -04:00
Alexandru Bleotu
3c7c202216 Fixed assert_has_calls in vmware.utils.dvs tests 2017-09-22 14:35:21 -04:00
Alexandru Bleotu
f811523e80 pylint 2017-09-22 14:35:14 -04:00
Alexandru Bleotu
d4d6ad99c2 Added tests for salt.utils.vmware.remove_dvportgroup 2017-09-22 14:31:48 -04:00
Alexandru Bleotu
d7474f8d30 Added tests for salt.utils.vmware.update_dvportgroup 2017-09-22 14:31:46 -04:00
Alexandru Bleotu
8a84f27adf Added tests for salt.utils.vmware.create_dvportgroup 2017-09-22 14:31:41 -04:00
Alexandru Bleotu
b8bc8fd581 Added tests for salt.utils.vmware.get_uplink_dvportgroup 2017-09-22 14:31:34 -04:00
Alexandru Bleotu
82f6ae3688 Added tests for salt.utils.vmware.get_dvportgroups 2017-09-22 14:31:29 -04:00
Alexandru Bleotu
aa247b43b8 Added tests for salt.utils.vmware.set_dvs_network_resource_management_enabled 2017-09-22 14:31:24 -04:00
Alexandru Bleotu
f211874462 Added tests for salt.utils.vmware.update_dvs 2017-09-22 14:31:19 -04:00
Alexandru Bleotu
d31d98c2d3 Added tests for salt.utils.vmware.create_dvs 2017-09-22 14:31:14 -04:00
Alexandru Bleotu
4f09bf5e88 Added tests for salt.utils.vmware.get_network_folder 2017-09-22 14:31:08 -04:00
Alexandru Bleotu
3584a91692 Added tests for salt.utils.vmware.get_dvss 2017-09-22 14:31:03 -04:00
Alexandru Bleotu
173a697be2 Added comments and imports for dvs functions in salt.utils.vmware 2017-09-22 14:31:01 -04:00
Mike Place
75dd97ee50 Merge pull request #43645 from alexbleotu/cluster_states-gh
VMware cluster states + dependencies
2017-09-22 11:46:25 -06:00
rallytime
e0ae50e489
Merge branch '2017.7' into 'develop'
Conflicts:
  - pkg/salt.bash
  - salt/client/mixins.py
  - salt/minion.py
  - salt/modules/aptpkg.py
  - salt/modules/boto_vpc.py
  - salt/modules/win_pkg.py
  - salt/utils/reactor.py
  - tests/unit/utils/test_reactor.py
2017-09-22 10:24:04 -04:00
Mike Place
e6dc4d64df Merge pull request #43314 from twangboy/win_fix_unit.utils.test_verify
Fix `unit.utils.test_verify` for Windows
2017-09-21 16:26:12 -06:00
Mike Place
426eb92474 Merge branch 'develop' into raid_add 2017-09-21 15:37:31 -06:00
Mike Place
ed22e0f2fd Merge pull request #43507 from rallytime/replace-utils-calls
Update which and is_windows calls to use new paths
2017-09-21 14:11:21 -06:00
Vladimir Nadvornik
1c006db2a6 Fix and extend mdadm unit tests 2017-09-21 17:46:15 +02:00
Nicole Thomas
f66eb1c5ad Merge pull request #43588 from gtmanfred/do
digitalocean should be one word.
2017-09-21 09:25:38 -04:00
Daniel Wallace
2f3be5785b
there were more 2017-09-20 15:55:37 -06:00
Nicole Thomas
d02953ce6a Merge pull request #43235 from brejoc/improve-async-operation-handling-in-kubernetes-module
Improve delete_deployment handling
2017-09-20 17:33:32 -04:00
Alexandru Bleotu
23f58c0ff3 Even more pylint 2017-09-20 17:07:17 -04:00
Alexandru Bleotu
a41b5072da more pylint 2017-09-20 13:40:36 -04:00
Daniel Wallace
f54ddae6bb
fix do test where space was seperated by a newline 2017-09-20 09:57:57 -06:00
Alexandru Bleotu
8cdaf01642 pylint 2017-09-20 09:40:22 -04:00
Alexandru Bleotu
4f4db431fa Fixed tests for the ignore_unset_values change 2017-09-20 09:40:20 -04:00
Alexandru Bleotu
14deb25379 Added tests for salt.utils.vmware.assign_license 2017-09-20 06:28:51 -04:00
Alexandru Bleotu
e0ae5ecd83 Added tests for salt.utils.vmware.get_assigned_licenses 2017-09-20 06:28:47 -04:00
Alexandru Bleotu
ca33adcee7 Added tests for salt.utils.vmware.add_license 2017-09-20 06:28:44 -04:00
Alexandru Bleotu
e660af495b Added tests for salt.utils.vmware.get_licenses 2017-09-20 06:28:40 -04:00
Alexandru Bleotu
e844dbceeb Added tests for salt.utils.vmware.get_license_assignment_manager 2017-09-20 06:28:37 -04:00
Alexandru Bleotu
9f566fbe9c Added tests for salt.utils.vmware.get_license_manager 2017-09-20 06:28:33 -04:00
Alexandru Bleotu
71b10b81f9 Added tests for salt.modules.vspere.rename_datastore 2017-09-20 06:28:26 -04:00
Alexandru Bleotu
643f38c98c Added tests for salt.utils.vmware.rename_datastore 2017-09-20 06:28:21 -04:00
Alexandru Bleotu
51e881e5cf Added tests for salt.utils.vmware.get_datastores 2017-09-20 06:28:18 -04:00
Alexandru Bleotu
457246a871 Added tests for salt.utils.vmware.get_storage_system 2017-09-20 06:28:14 -04:00
Alexandru Bleotu
f042334584 Added tests for list_diff 2017-09-20 06:28:03 -04:00