Commit Graph

1175 Commits (317c7fe14472a2ac76027ff896b7cb0db1e0a043)

Author SHA1 Message Date
Matt Martz 5941e4c843
Properly JSON encode AnsibleUnsafe, using a pre-processor (#60602)
* Properly JSON encode AnsibleUnsafe, using a pre-processor. Fixes #47295

* Add AnsibleUnsafe json tests

* Require preprocess_unsafe to be enabled for that functionality

* Support older json

* sort keys in tests

* Decouple AnsibleJSONEncoder from isinstance checks in preparation to move to module_utils

* Move AnsibleJSONEncoder to module_utils, consolidate instances

* add missing boilerplate

* remove removed.py from ignore
5 years ago
Miguel Angel Muñoz González 69fcd771e0 FortiOS modules for 2.9 - 8 (#61308)
* FortiOS modules for 2.9 - 8

* Add missing files

* Fix trailing spaces
5 years ago
Trishna Guha 5a04b4feb6
Add nxos_l2_interfaces resource module (#61120)
Signed-off-by: Trishna Guha <trishnaguha17@gmail.com>
5 years ago
Miguel Angel Muñoz González a6b124cccc FortiOS modules for 2.9 - 7 (#61217) 5 years ago
Matt Clay 02c38ed4fd
Relocate ansible-test self tests outside package. (#61255)
* Relocate ansible-test self tests outside package.

We don't want to include the tests for verifying ansible-test within the ansible-test package.

* Add `test/ansible_test/` to classification.py.

* Fix test invocation.

* Relocate tests in MANIFEST.in.

* Improve package-data sanity test error checking.

* Only use includes for ansible-test in MANIFEST.in.

* Improve readability of MANIFEST.in.
5 years ago
Matt Clay 6ec0b4ec86
Sanity test updates for collections support. (#61248)
* Run no-unwanted-files sanity test only on Ansible.

Since collections should be able to use binary modules there is not really any limit on what could exist in a collection `plugins` directory.

* Add support for symlinks in sanity target lists:

- Sanity tests that need to analyze symlinks can do so using the supplied target list.
- Tests that analyze directories will now only look at symlinks if requested.
- Directory symlinks will now be seen as directories instead of files.

* Enable symlinks on filename based sanity tests.

Sanity tests that evalulate filenames instead of content should include symlinks.

* Update symlinks sanity test.

Use the sanity test target list now that it can include symlinks.
5 years ago
Ryan Conway e4c1c05363 Renaming `onepassword_facts` to `onepassword_info`. (#61237)
* Renaming `onepassword_facts` to `onepassword_info`.

* Update module examples.

* Add changelog fragment.

* Add module rename to the 2.9 porting guide.

* Document the parameter types in the module docs.

* Fix incorrect parameter name.

* Update docs/docsite/rst/porting_guides/porting_guide_2.9.rst

Co-Authored-By: Felix Fontein <felix@fontein.de>

* Remove `onepassword_facts` as it has been renamed to `onepassword_info` including fixes for the sanity tests.
5 years ago
Sumit Jaiswal c9f0b0fb42
Resource module for ios_l3_interfaces (#60405)
* ios_l3_interfaces

* fix shippable

* fix tests

Signed-off-by: Sumit Jaiswal <sjaiswal@redhat.com>

* fix ignore txt file

Signed-off-by: Sumit Jaiswal <sjaiswal@redhat.com>

* fix doc

Signed-off-by: Sumit Jaiswal <sjaiswal@redhat.com>

* fix shippable n tests

* fix replace test

Signed-off-by: Sumit Jaiswal <sjaiswal@redhat.com>

* fix zuul failures

Signed-off-by: Sumit Jaiswal <sjaiswal@redhat.com>

* fix shippable n zuul

* fix zuul

* fix zuul

* fix zuul test

* fix zuul

Signed-off-by: Sumit Jaiswal <sjaiswal@redhat.com>

* code zuul fix

* fix merge

Signed-off-by: Sumit Jaiswal <sjaiswal@redhat.com>

* fix merge

Signed-off-by: Sumit Jaiswal <sjaiswal@redhat.com>
5 years ago
Trishna Guha f0ef624cff
Add nxos_l3_interfaces resource module (#61021)
Signed-off-by: Trishna Guha <trishnaguha17@gmail.com>
5 years ago
Miguel Angel Muñoz González a6837609e2 FortiOS modules for 2.9 - 6 (#61170)
* FortiOS modules for 2.9 - 5

* Update fortios_firewall_vip.py

* Update fortios_firewall_vip6.py
5 years ago
Felix Fontein 18f7c3b850
Netapp: rename _facts -> _info (#60980)
* Rename na_ontap_gather_facts -> na_ontap_info
Rename netapp_e_facts -> netapp_e_info

* Add changelog.

* Fix sanity.

* Forgot test.

* Forgot to remove 'gather'.

* Fix sanity ignore.

* Remove netapp_e_facts from PR.

* Remove superfluous version_added.
5 years ago
Sumit Jaiswal 47243b0b2d
Resource module for iosxr_interfaces (#59853)
* iosxr interfaces resource

Signed-off-by: Sumit Jaiswal <sjaiswal@redhat.com>
5 years ago
Nathaniel Case 8c5936671e
Add new module eos_l3_interfaces (#59820)
* Update base files for resource modules

* Add modules

* Add module_utils

* Add tests

* Deprecate eos_l3_interface

* Update facts
5 years ago
Miguel Angel Muñoz González 3ea55fc254 Fortinet's new module for fortios_system_settings (#60952)
* Fortinet's new module for fortios_system_settings

* Avoid warnings on E336 a E336 for system settings
5 years ago
Miguel Angel Muñoz González 628aa3a808 FortiOS modules for 2.9 - 5 (#61062)
* FortiOS modules for 2.9 - 5

* Update fortios_firewall_vip.py

* Update fortios_firewall_vip6.py
5 years ago
Fortinet Core CSE NA df6d46fed3 Fortinet: fmgr_fwpol_ipv4 update/behavioral option fix (#58154)
* PR Update to fmgr_fwpol_ipv4 -- now allows for failure or skip behavior option upon missing dependencies

* fmgr_fwpol_ipv4 minor docs fix

* Removed "system_package_print" line from test/sanity/ignore.txt as instructed by failed shippable test.

Actual PR module isn't affected.
5 years ago
Pedro Magalhães 145a6a8756 maven_artifact.py - add support for version ranges by using spec (#54309) 5 years ago
Lukas Kämmerling 96199be96b Rename hcloud_*_facts to hcloud_*_info (#60926)
* Rename hcloud_datacenter_facts to hcloud_datacenter_info

* Rename hcloud_location_facts to hcloud_location_info

* Rename hcloud_image_facts to hcloud_image_info

* Rename hcloud_floating_ip_facts to hcloud_floating_ip_info

* Rename hcloud_server_type_facts to hcloud_server_type_info

* Rename hcloud_server_facts to hcloud_server_info

* Rename hcloud_ssh_key_facts to hcloud_ssh_key_info

* Rename hcloud_volume_facts to hcloud_volume_info

* Fix typo in hcloud_image_info

* Add to porting guide and add changelog fragment

* Reword porting guide
5 years ago
Felix Fontein c1b2aa1d11
nginx_status_facts: deprecate/rename to nginx_status_info (#60979)
* Rename nginx_status_facts -> nginx_status_info

* Add changelog.

* Remove warnings.

* Re-add ignore.txt entries.

* ...

* Raw strings for docs.

* Use U(...) for link.
5 years ago
Rohit 8b3ff933af
Vyos lldp interfaces (#60931)
* module_utils checkin

Signed-off-by: rohitthakur2590 <rohitthakur2590@outlook.com>

* vyos lldp_interfaces merging

Signed-off-by: rohitthakur2590 <rohitthakur2590@outlook.com>

* shippable fix

Signed-off-by: rohitthakur2590 <rohitthakur2590@outlook.com>

* merge changes

Signed-off-by: rohitthakur2590 <rohitthakur2590@outlook.com>

* failure added in ignore list

Signed-off-by: rohitthakur2590 <rohitthakur2590@outlook.com>

* comments incorporated

Signed-off-by: rohitthakur2590 <rohitthakur2590@outlook.com>

* comments incorporated

Signed-off-by: rohitthakur2590 <rohitthakur2590@outlook.com>

* test cases updated

Signed-off-by: rohitthakur2590 <rohitthakur2590@outlook.com>

* remove global commands

Signed-off-by: rohitthakur2590 <rohitthakur2590@outlook.com>
5 years ago
Toshio Kuratomi 5f227fe260 Install ansible-test (#60718)
* Install ansible-test

Modify the install script to install ansible-test and its supporting
code.  Alternative to #60701 that doesn't change package_dir ansible for
fear that it might regress https://github.com/ansible/ansible/issues/10437

Also:
* No longer use package_data.  Everything in the package dirs is going
  to be installed.  Anything that shouldn't be installed needs to be
  moved elsewhere.
* modify the algorithm to store symlinks which are in the same tree
  instead of same directory

* Add ansible_test files to package-data sanity test

* MANIFEST.in cleanups

* Add lib/ansible/config/*.yml
* Make most things in code directories (lib/ansible and test/lib/ansible_test/)
  use explicit file extensions instead of wildcards for maintainability
* Exclude common file extensions that we don't want included in the code
  directories

* Change package-data test to be more complete

* Now compares the repository, sdist, and install
* Compares both that everything in the sdist is in the repo and
  everything in the install is in the sdist in addition to comparing that
  everything in the repo that we want is in the install

* Leave out test artifacts

Only include the directory structure for test/results and test/cache not
any files that may have been generated by test runs

Remove test/utils files from the sdist as these are only needed for our CI

cleanup of docs in MANIFEST.in; getting rid of build files.

* Add the ability to output sdist and snapshot to specific directory

* Add a warning about modifying the heuristic to setup.py

* Address generated files

* Use make snapshot instead of sdist to generate changelog and man pages
  and make sure they're included
* Ignore both the test/utils and generated test files (results, cache)
* Deal with Python3 __pycache__ byte code caches
* Don't check documentation, that isn't built for the sdist
* Restructure for clarity

* Add cli web docs to make clean

This was causing problems when attempting to test that the sdist didn't
have extra files

* Fix bug constructing python names from __pycache__ names

* Create a clean repo to work from

* Exclude test/legacy and be more explicit on extensions

* Exclude the legacy directory from sdist
5 years ago
chkp-orso f1d568749f fix: Checkpoint check_mode, add suboptions, return the facts (#60264)
* fix: check_mode, add suboptions, return the facts

* pip8, ansible_facts, get_payload

* add space to create PR

* remove space to create PR

* test tests of cp_network

* change for the test of network

* fixes to pass the tests

* fix tests

* Update ignore.txt
5 years ago
Matt Clay 32b0a72547
Support windows-integration on collections. (#60984)
* Support windows-integration on collections.

* Update configure-remoting-ps1 sanity test.

* Add copy of ConfigureRemotingForAnsible.ps1.

* Add ignore entry for copied file.
5 years ago
Felix Fontein e58919bccd
gluster_heal_facts: rename to gluster_heal_info (#60919)
* Rename gluster_heal_facts -> gluster_heal_info

* Add changelog.
5 years ago
Felix Fontein c66163b118
hpilo_facts: rename to hpilo_info (#60917)
* Rename hpilo_facts -> hpilo_info

* Fix porting guide.

* Add changelog.
5 years ago
Miguel Angel Muñoz González 3cd70f53cc FortiOS modules for 2.9 - 4 (#60806)
* FortiOS modules for 2.9 - 4

* Update ignore.txt

* Updates from maintainers to legacy modules

* Update fortios_firewall_ssl_setting.py

* Update fortios_firewall_ssl_server.py
5 years ago
Nathaniel Case efa163a2e8
New module eos_lag_interfaces (#60610)
* Copy module files

* Deprecate eos_linkagg

* Add tests
5 years ago
Nathaniel Case d9ffc61539
Add new module eos_l2_interfaces (#59794)
* Add module files for l2_interfaces

* Add module_utils

* Add tests

* Deprecate eos_l2_interface

* Clean up tests so eos_vlan will still pass
5 years ago
Nathaniel Case 446dcb7c96
New module eos_vlans (#60652)
* Initial commit of module files

* Add tests, implement facts

* Implement config, fix issues

* Handle vlan ranges from the device

* Deprecate eos_vlan
5 years ago
Miguel Angel Muñoz González decb016a2d FortiOS modules for 2.9 - 3 (#60678)
* FortiOS modules for 2.9 - 3

* Remove default values in doc, as suggested from review

* Retriggering due to shippable failure

* Update fortios_firewall_ipv6_eh_filter.py

* Update fortios_firewall_ipmacbinding_setting.py

* Update fortios_firewall_ippool.py

* Update fortios_firewall_local_in_policy6.py

* Update fortios_firewall_local_in_policy.py
5 years ago
Rohit d8f9904f43
vyos_lldp_global (#59627)
* vyos_lldp_global

Signed-off-by: rohitthakur2590 <rohitthakur2590@outlook.com>

* sanity checks

Signed-off-by: rohitthakur2590 <rohitthakur2590@outlook.com>

* deprecated changes

Signed-off-by: rohitthakur2590 <rohitthakur2590@outlook.com>

* comments incorporated

Signed-off-by: rohitthakur2590 <rohitthakur2590@outlook.com>

* test cases updated

Signed-off-by: rohitthakur2590 <rohitthakur2590@outlook.com>

* comments incorporated

Signed-off-by: rohitthakur2590 <rohitthakur2590@outlook.com>

* branch conflict resolved

Signed-off-by: rohitthakur2590 <rohitthakur2590@outlook.com>

* sanity check passes

Signed-off-by: rohitthakur2590 <rohitthakur2590@outlook.com>
5 years ago
Sumit Jaiswal b55a54469c
Resource module for ios_vlans (#59640)
* ios_vlans resource module

* fix shippable error

* fix shippable

Signed-off-by: Sumit Jaiswal <sjaiswal@redhat.com>

* fix vlans resource

* fix facts doc

Signed-off-by: Sumit Jaiswal <sjaiswal@redhat.com>

* fix shippable n review

* fix test

Signed-off-by: Sumit Jaiswal <sjaiswal@redhat.com>

* fix indentation

Signed-off-by: Sumit Jaiswal <sjaiswal@redhat.com>

* fix review

* fix shebang

Signed-off-by: Sumit Jaiswal <sjaiswal@redhat.com>
5 years ago
Felix Fontein 26b9c81a8e
crypto modules: fix sanity errors (#60046)
* Remove sanity warnings.

* Linting.

* More linting.

* Forgot one place.

* no_bytes -> num_bytes
5 years ago
Sumit Jaiswal ab07c206aa
Resource module for ios_l2_interfaces (#60344)
* ios_l2_interface checkin

Signed-off-by: Sumit Jaiswal <sjaiswal@redhat.com>
5 years ago
Miguel Angel Muñoz González ca28ae3be5 FortiOS modules for 2.9 - 2 (#60598)
* FortiOS modules for 2.9 - 2

* Fix long lines and ignore.txt
5 years ago
Miguel Angel Muñoz González 4cae96109b FortiOS modules for 2.9 - 1 (#60469)
* FortiOS modules for 2.9 - 1

* Fix empty choices and avoid E337,E338 warnings

* Ansible comments on version_added and ignore.txt only on this PR files

* Add version_added also for state attribute

* Avoid null choices on dlp_sensor

* Change required flag according to argspec
5 years ago
Rohit 69bc24f607
lag interfaces resource module (#59175)
* lag interfaces resource module

Signed-off-by: rohitthakur2590 <rohitthakur2590@outlook.com>

* sanity check imports

Signed-off-by: rohitthakur2590 <rohitthakur2590@outlook.com>

* sanity fixes

Signed-off-by: rohitthakur2590 <rohitthakur2590@outlook.com>

* dict_diff usage issue fix

Signed-off-by: rohitthakur2590 <rohitthakur2590@outlook.com>

* new task

Signed-off-by: rohitthakur2590 <rohitthakur2590@outlook.com>

* overridden updated

Signed-off-by: rohitthakur2590 <rohitthakur2590@outlook.com>

* dict update

Signed-off-by: rohitthakur2590 <rohitthakur2590@outlook.com>

* comments incorporated

Signed-off-by: rohitthakur2590 <rohitthakur2590@outlook.com>

* facts merged

Signed-off-by: rohitthakur2590 <rohitthakur2590@outlook.com>

* rebased and merged

Signed-off-by: rohitthakur2590 <rohitthakur2590@outlook.com>

* new failures added

Signed-off-by: rohitthakur2590 <rohitthakur2590@outlook.com>

* obsolete file removed

Signed-off-by: rohitthakur2590 <rohitthakur2590@outlook.com>

* test cases updated

Signed-off-by: rohitthakur2590 <rohitthakur2590@outlook.com>

* comments incorporated

Signed-off-by: rohitthakur2590 <rohitthakur2590@outlook.com>

* dependency added

Signed-off-by: rohitthakur2590 <rohitthakur2590@outlook.com>
5 years ago
Trishna Guha d5d88f9b11
Add nxos_interfaces resource module (#60421)
Signed-off-by: Trishna Guha <trishnaguha17@gmail.com>
5 years ago
Matt Clay 60f8483603
Add missing boilerplate to collections test. (#60507)
* Add missing boilerplate to collections test.
* Remove redundant Python version check.
5 years ago
Nathaniel Case 6b5c7f7c42
Add new module eos_interfaces (#59729)
* Move module_utils

* Add eos_interfaces and deprecate eos_interface

* Add boilerplate, update ignores.txt

* Try to reconcile eos provider documentation with argspec

* Try to work around unknown interfaces

* Move param_list_to_dict to utils
5 years ago
Felix Fontein 2d98734ad5 Amazon modules: rename _facts with ansible_facts result to _info (#60178)
* aws_s3_bucket_facts -> aws_s3_bucket_info

* cloudformation_facts -> cloudformation_info

* cloudfront_facts -> cloudfront_info

* ecs_service_facts -> ecs_service_info

* efs_facts -> efs_info

* Add changelog and porting guide entry.

* lambda_facts -> lambda_info

* Improve examples.

* Add subsection on renamed modules.

* Add sentence on registering variables.

* Fix ReST.

* Instead of renaming lambda_facts, deprecate it and replace with new module.

* Rename internal variable.

* Re-add sanity ignores for lambda_facts.
5 years ago
Ganesh Nalawade 9efa00e762
Add [junos_lldp_global] model (#59712)
* Add [junos_lldp_global] model

*  Add new resource module junos_lldp_global
*  Targets model https://github.com/ansible/network/pull/30
*  Deprecate junos_lldp module

* Run lldp integration test only if protocol supported
5 years ago
Matt Clay 473bd6bb0a Relax boilerplate sanity tests.
This will avoid requiring boilerplate for documentation only python files.
5 years ago
Felix Fontein 3290b8343c
docker: fix sanity errors (#60047)
* Remove sanity check errors.

* More linting.

* Forgot to update places.

* Remove choices which aren't provided in argspec.
5 years ago
Matt Clay 5a50fb35df Add sanity test for obsolete files.
This will help prevent accidental merging of content to recently obsoleted directories when adding new files.

It may also help contributors who have modified obsolete files understand where their changes should now be made.
5 years ago
Matt Clay 6c09b5c659
Unit test cleanup. (#60315)
* Clean up option parsing unit tests.
* Remove unused unit test marker and import.
5 years ago
Felix Fontein 49e16922b2 Remove no longer necessary check (since elements is procesed for path). (#59953) 5 years ago
Ganesh Nalawade 309a58eafd
Add [junos_l2_interfaces] resource module (#59693)
* Add [junos_l2_interfaces] resource module

*  Add new resource module junos_lag_interfaces.
*  Targets model https://github.com/ansible-network/resource_module_models/pull/12
*  Deprecate junos_l2_interface module

* Fix CI failures

* Fix CI issues
5 years ago
Nathan Swartz 10543c8a4c Facts dev upstream (#57082)
* Improved netapp_e_facts module.

Added the following facts:
  - storage system segment size
  - cache block size capabilities
  - workload tags
  - storage array hosts
  - host groups
  - list of mapped volumes for each initiator

* Remove proxy specific facts from netapp_e_facts module

* Add unit tests for netapp_e_facts module.
5 years ago
Ganesh Nalawade 6f0aae256d
Add [junos_lldp_interfaces] model (#59720)
* Add [junos_lldp_interfaces] model

*  Add new resource module junos_lldp_interface
*  Targets model https://github.com/ansible-network/resource_module_models/pull/40
*  Deprecate junos_lldp_interface module

* Fix CI issues
5 years ago
silverwizard 5d8302120b Removed breaking type check from nagios module (#49568)
* Removed extraneous type check from nagios module, in order to allow python 3.x

* Removed now useless import types

* Added changelog fragment

* Update changelog.

* Rebased and removed check due to module adding earlier guardrails

* Updated changelog to mention earlier fix adding now completely removed guardrails

* Remove superfluous type checks. Fix docs type.

* Update ignore.txt.
5 years ago
Matt Clay 278044358c Split up ansible-test sanity test requirements. 5 years ago
Nathan Swartz e80f8048ee Fix netapp_e_volume wait-for-initialization to complete issue. (#58304)
* Fix netapp_e_volume wait-for-initialization to complete issue.

* Add unit tests for wait_for operations in netapp_e_volume module.
5 years ago
Matt Clay 18867847f4
Split up "code smell" sanity tests. (#60174)
* Relocate ansible-only sanity tests.

* Get "code smell" sanity tests from multiple dirs.

- `test/lib/ansible_test/_data/sanity/code-smell/` - General purpose tests used for both Ansible and Ansible Collections.
- `test/sanity/code-smell/` - Tests specific to Ansible, will not be used for Ansible Collections.
5 years ago
Matt Clay d651bda123
Relocate ansible-test code. (#60147)
* Initial move of `test/runner/` content.

`test/runner/lib/` -> `test/lib/ansible_test/_internal/`
`test/runner/`     -> `test/lib/ansible_test/_internal/data/`

* Initial move of `test/sanity/` content.

`test/sanity/` -> `test/lib/ansible_test/_internal/data/sanity/` (except `test/sanity/ignore.txt`)

* Initial move of `test/units/pytest/` content.

`test/units/pytest/` -> `test/lib/ansible_test/_internal/data/pytest/`

* Follow-up move of `test/runner/unit/` content.

`test/lib/ansible_test/_internal/data/unit/` -> `test/lib/ansible_test/tests/unit/`

* Initial move of `ansible.cfg` content.

`test/units/ansible.cfg` -> `test/lib/ansible_test/_internal/data/units/ansible.cfg`
`test/env/ansible.cfg` -> `test/lib/ansible_test/_internal/data/env/ansible.cfg`

* Follow-up move of `data` directory.

`test/lib/ansible_test/_internal/data/` -> `test/lib/ansible_test/_data/`

* Update import statements.

* Add missing __init__.py for unit tests.

* Fix path references and miscellaneous issues.
5 years ago
Wojciech Wypior 2af67f0dce fixes issue with RD encoding in names (#59990)
fixes issue with file download function on ASM file transfer endpoints
corrects doc fragments
removes not used parameters
corrects various sanity failures previously ignored across multiple modules
5 years ago
Nathan Swartz a9aeabb456 Improve netapp_e_storagepool and add units. (#57095)
Refactored module to use eseries base class
Removed E322 and E326 for netapp_e_storage module from the ignore.txt file
Updated version_added quotes in netapp_e_storagepool
5 years ago
Nilashish Chakraborty 2c432f8bc7
Add vyos_l3_interfaces resource module (#59929)
Signed-off-by: NilashishC <nilashishchakraborty8@gmail.com>
5 years ago
Daniel Mellado Area e3681c049c
Add junos vlans resource module (#59041) 5 years ago
Matt Clay fa2adf3b7b
More prep for ansible-test relocation. (#60114)
* Update pytest plugins.
* Fix update-bundled sanity test.
* Remove old validate-modules comment.
* Fix ansible-test plugin loading
* Update code coverage comments.
* Fix Makefile ansible-test reference.
* Remove incorrect path from lint output.
* Update ansible-test unit tests.
* Make ansible-test's own unit tests singular.
5 years ago
Alex Stephen ac5228390c Removing validate-module exceptions on GCP modules (#60113)
* facts modules with new types
* remove ignores on sanity tests
* removing new modules
5 years ago
Felix Fontein aecdfd397e ecs_taskdefinition_facts: rename to ecs_taskdefinition_info (#60023)
* Rename ecs_taskdefinition_facts to ecs_taskdefinition_info.
5 years ago
Matt Clay d3da8e4a5b
Replace old shippable.py with new check_matrix.py. (#60022)
This new script does not depend on ansible-test and provides much more robust job matrix testing.

It is also run on every job in the matrix now, to detect issues with jobs being re-run after matrix changes are made.
5 years ago
Nathan Swartz 41235ac05a Improve netapp_e_hostgroup and add unit tests. (#57094)
* Improve netapp_e_hostgroup and add unit and integration tests.

netapp_e_hostgroup was refactored for maintainability and improved
documentation clarity.

* Remove ignore sanity check E338 for netapp_e_hostgroup module

* Add __future__ import (absolute_import, division, print_function) to test_netapp_e_hostgroup unit test.
5 years ago
Trishna Guha 021b1810c9
Add nxos_vlans resource module (#59294)
* Add nxos_vlans resource module

Signed-off-by: Trishna Guha <trishnaguha17@gmail.com>

* address review comments

Signed-off-by: Trishna Guha <trishnaguha17@gmail.com>

* fix CI failure and udpate tests

Signed-off-by: Trishna Guha <trishnaguha17@gmail.com>

* Add commands in module doc

Signed-off-by: Trishna Guha <trishnaguha17@gmail.com>
5 years ago
Matt Davis 8d1f658ce4
move CLI entrypoints under ansible package (#60004)
* needed so ansible-test can always find the right ones to copy to a target
* renamed the underlying scripts to be properly accessible as Python modules
5 years ago
Felix Fontein f3e20346cb
Google: gcpubsub_facts -> gcpubsub_info (#57668)
* Rename gcpubsub_facts -> gcpubsub_info.

* Update porting guide and add changelog fragment.
5 years ago
Sumit Jaiswal b847327645
Resource module for ios_interfaces and Facts Update (#59716)
* ios interfaces resource
5 years ago
Felix Fontein 6d074d8a94
Move ome_* and idrac_* modules one level up (#59698)
* Move ome_* and idrac_* modules one level up.

* Fix paths.

* Fix package name.

* Oranize in different directories.

* Update BOTMETA.

* Update new ignore entries.

* Revert "Update BOTMETA."
Revert "Oranize in different directories."
Adjust ignores.txt.
5 years ago
Nilashish Chakraborty 730fa78ca4
Add vyos_interfaces resource module (#58589)
Signed-off-by: NilashishC <nilashishchakraborty8@gmail.com>
5 years ago
Daniel Mellado Area 58a53fe0eb
Add junos_l3_interfaces (#59026) 5 years ago
Matt Clay 32fa4b15d1
More sanity test updates for collections. (#59841)
* Move action-plugin-docs ignores into ignore file.

* Update package-data sanity test.

The test now uses the file list provided by ansible-test.
5 years ago
Matt Clay ef6be41bf1 Disable pylint import-error for collections.
This matches the Ansible configuration.
5 years ago
Matt Clay f61b044bf0 Support directories in sanity tests. 5 years ago
Matt Martz c06751fb26 Handle situation where DOCS.options is None (#59783) 5 years ago
Matt Clay e07c4f41d7 Standardize ansible-test sanity test filters. 5 years ago
Matt Clay 9f41a4273e Remove redundant sanity test ignores. 5 years ago
Ganesh Nalawade 127bd67f6e
Render elements in module doc and sanity test for sub-options (#59244)
* Render elements in module doc and sanity test for suboptions

*  Add support to render module elements value in ansible-doc output
   module html
*  Add validate-module sanity test of sunoptions.

* Add current validate module failures to ignore list

* Fix CI failure

* fix rebase conflict

* Fix CI issues

* Fix review comments

* Add validate-modules failure in ignore list
5 years ago
Matt Clay 5d7cc993dd
Clean up sanity test ignore handling. (#59749)
* Allow sanity tests to easily ignore themselves.

Useful for simple regex based sanity tests that error on their own script due to the regex or error message generated.

* Simplify no-smart-quotes sanity test.

Pruning of unversioned directories is handled by ansible-test.

* Remove directory pruning from boilerplate tests.

Files not passing these tests should be ignored instead.

* Add missing sanity ignore entries.
5 years ago
The Magician 4a7e11ba9a Bug fixes for GCP (as of 2019-07-09T06:06:53Z) (#59324) 5 years ago
Matt Clay ecddbdf0cb Isolate globals in import sanity test. 5 years ago
Toshio Kuratomi 0e9f002073 Fix build-ansible.py release-announcement
* When the release scripts were changed, this file to implement release
  announcements was left out

* Add announce.py to the compile skip lists as only the release engineers
  run this during package build.
5 years ago
Matt Clay f274cefa59
Consolidate sanity test ignore entries. (#59665)
* Update empty-init test.
* Update future-import-boilerplate test.
* Update line-endings test.
* Update metaclass-boilerplate test.
* Update no-assert test.
* Update no-basestring test.
* Update no-dict-iteritems test.
* Update no-dict-iterkeys test.
* Update no-dict-itervalues test.
* Update no-get-exception test.
* Update no-main-display test.
* Update no-smart-quotes test.
* Update no-unicode-literals test.
* Update no-unwanted-files test.
* Update replace-urlopen test.
* Update required-and-default-attributes test.
* Update shebang test.
* Update test-constraints test.
* Update use-argspec-type-path test.
* Update use-compat-six test.
5 years ago
Matt Clay db7e9aa051
Use consolidated ignore.txt in ansible-test. (#59618) 5 years ago
Matt Clay 9e0a3fcc2a Use EOL comment for ansible-test PEP8 skip file. 5 years ago
Matt Clay b232a9337e Switch sanity ignores to EOL comments.
This will make automated conversion to consolidated ignores easier.
5 years ago
Matt Martz 95f4282c42
Verify package data in setup.py installs all files (#59537)
* Add sanity test to ensure all non-py files are installed

* Fix mode and regex

* Fix role skel inventory package_data

* Add docs

* Update package_data for inventory files

* Address pylint concerns

* Another tweak to package_data

* Address review feedback

* Change index to 1

* add to ansible-only.txt
5 years ago
Abhijeet Kasurde d9b9e07d0b
VMware: Add datatypes in documentation (#59221)
* Remove E337 warnings
* Update docs
* Fix minor typos

Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com>
5 years ago
Matt Clay 7c728118e6
Fix import sanity test for collections. (#59484) 5 years ago
Matt Clay 44a262714c
Add common sanity ignore & skip to ansible-test. (#59416)
* Add common sanity ignore & skip to ansible-test.
* Switch ansible-doc sanity test to single version.
* Remove duplicate ignore entry.
5 years ago
Nathan Swartz 6a77533b57 Specify type-str for common NetApp E-Series documention options. (#59459) 5 years ago
Ganesh Nalawade 1092ee55d4
Add [junos_lag_interfaces] resource module (#59011)
* Add junos_lag_interfaces resource module

*  Add new resource module junos_lag_interfaces.
*  Targets model https://github.com/ansible-network/resource_module_models/pull/29
*  Deprecate junos_linkagg module

* Fix CI issues

* Fix junos integration test cases

* Fail if base lag interface is not configured
5 years ago
Trishna Guha 3bad4d6a50
Add nxos_lag_interfaces resource module (#59031)
* Add nxos_lag_interfaces resource module

Signed-off-by: Trishna Guha <trishnaguha17@gmail.com>

* ix CI failure

Signed-off-by: Trishna Guha <trishnaguha17@gmail.com>

* module_utils nxos transport-provider fix

Signed-off-by: Trishna Guha <trishnaguha17@gmail.com>

* CI failure

Signed-off-by: Trishna Guha <trishnaguha17@gmail.com>

* nxos_lag_interfaces tests

Signed-off-by: Trishna Guha <trishnaguha17@gmail.com>

* Integration test

Signed-off-by: Trishna Guha <trishnaguha17@gmail.com>
5 years ago
The Magician 04445f184b Bug fixes for GCP (as of 2019-07-09T06:06:53Z) (#59322) 5 years ago
The Magician c6c262a07e Bug fixes for GCP (as of 2019-07-09T06:06:53Z) (#59131)
* Bug fixes for GCP modules
* ignore syntax
5 years ago
The Magician b81239ce50 Bug fixes for GCP (as of 2019-07-09T06:06:53Z) (#59323)
* Bug fixes for GCP modules
* ignore syntax
5 years ago
The Magician 5d412d89b1 Bug fixes for GCP (as of 2019-07-09T06:06:53Z) (#59325)
* Bug fixes for GCP modules
* ignore syntax
5 years ago
Matt Clay 79eca9c8fb
Initial ansible-test support for collections. (#59197)
* Initial ansible-test support for collections.
* Include cloud config in delegation payload.
* Add missing types import and fix `t` shadowing.
* Fix plugin traceback when config_path not set.
* Fix encoding issues.
* Remove unused imports.
* More encoding fixes.
* Handle delegation outside exception handler.
* Inject ssh keys only if not already in place.
* More defensive approach to getting remote pwd.
* Add missing string format var.
* Correct PowerShell require regex.
* Rename `is_install` and `INSTALL_ROOT`.
5 years ago
Jordan Borean 65049620ee
Generate galaxy.yml based on single source of truth (#59170)
* Generate galaxy.yml based on single source of truth

* Fix up tests and align file names

* Minor Makefile tweak

* Remove link in galaxy.yml file and make it a template file

* Moved collections docs to dev_guide

* change Makefile clean path

* Added readme to example meta file

* review fixes

* Use newer style for doc generation script

* Fix mistake in dev_guide index

* removed uneeded file, fixed links and added preview banner

* Moved banner for sanity test
5 years ago
Jordan Borean 015119df8c
Windows - Add common util for web requests (#54759)
* Windows - Add common util for web requests

* Use different method of retrieving options from module arg spec

* Added proper version_added for module options

* Fix linting errors

* Fix proxy issues and updated cred docs

* Fix FTP usage with proxy settings

* Removed uneeded function added in bad rebase

* Fix up client certificate auth

* fix new sanity checks

* Edit http agent code and update porting guide
5 years ago
Matt Clay 4f1d0f1b39 Skip using paths for ansible-doc sanity test. 5 years ago
The Magician 5c6aa9b9e8 Bug fixes for GCP (as of 2019-07-09T06:06:53Z) (#59171)
* Bug fixes for GCP modules

* ignore syntax
5 years ago
The Magician c5e26ab4da Bug fixes for GCP (as of 2019-07-09T06:06:53Z) (#59172)
* Bug fixes for GCP modules

* ignore syntax
5 years ago
The Magician b75e8d19be Bug fixes for GCP (as of 2019-07-09T06:06:53Z) (#59132)
* Bug fixes for GCP modules

* ignore syntax
5 years ago
Abhijeet Kasurde 4b152235ff
Typo fixes (#59227)
Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com>
5 years ago
Hannes Ljungberg 0e8eb1d17f pip: Remove unused option use_mirrors and remove all ignore.txt entries
PR #58977

* Remove unused option use_mirrors

* Add changelog fragment
5 years ago
Hannes Ljungberg 6f94995b52 npm: Validate all option types (#58965)
* Add type validation for name, version and registry
* Add changelog fragment
* Remove ignore of E337 and E338
5 years ago
Toshio Kuratomi 019d078a5a
Move common build code from _build_helpers (#55986)
We have some common code used by several docs scripts.  Migrate that
into the build-only shared code repository.

* Move lib/ansible/utils/_build_helpers.py to the directory for common
  build code
* Migrate docs/bin/dump_config.py to a build-ansible subcommand
* Migrate dump_keywords to the build-ansible framework
  * Make the script more maintainable by using functions and good
    variable names
  * Port to Python3 idioms
  * Fix bug so that private attributes will be undocumented
* Move generate_man to a build-ansible subcommand
* Port plugin_formatter to a build-ansible subcommand
* Rework command_plugins so that docs scripts can target Python-3.4+ and
  releng-only subcommands can use more recent versions of Python.
  The architecture is now that command_plugins/* need to be importable
  on Python-3.4.  The init_parsers() method needs to run on Python-3.4.
  But the main() method can utilize features of more recent Python as
  long as it fits within those parameters.
* Update docs build requirements

Port the plugin_formatter to build-ansible framework
5 years ago
Wojciech Sciesinski e8a7d89180 Correct a documentation of the jenkins_plugin module (#59139) 5 years ago
Abhijeet Kasurde de66abe521
VMware: Add support for storagePod (#58627)
* User now can be specify datastore cluster for deploying OVF
* Added find_resource_pool_by_cluster API

Fixes: #57849

Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com>
5 years ago
Matt Clay f81238012b Clean up pylint issues in test infra. 5 years ago
n3pjk a135c483ce Add OAuth and Multi-Record Query for SNOW (#58410)
* Add SNOW OAuth Support and Multi-record Query

* Add OAuth documentation to snow_record_find

* Fix lint and verification issue for PR 58410

* Fix E309 and E324 errors in PR 58410

* Fix E307, need advice on E309

* Fix E309 for PR 58410

* Re-add instance, username and password documentation

* Fix data type mismatch in documentation

* Remove doc_fragment overlap

* Refactor service now module space

Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com>
5 years ago
Chris Archibald f3aac3a112 MOTD was not idempotent (#57372)
* fix issue

* fix issues

* fix issues

* fix issues
5 years ago
Matt Clay 6645054329
Code cleanup for test infrastructure. (#59046)
* Remove useless object inheritance in test code.
* Remove unnecessary pass statements from test code.
* Comment on why certain pylint rules are ignored.
* Add more pylint test contexts.
* Fix import order.
* Remove unused variables.
* Remove unnecessary pass statement.
* Fix bad continuations.
* Remove unnecessary elif.
* Allow legitimate broad except statements.
* Allow legitimate protected access.
* Clean up names to make pylint pass.
5 years ago
Toshio Kuratomi dd2755e0b4 Fix pylint warnings for update-bundled 5 years ago
Matt Clay 3f2b766d10 Add future and metaclass boilerplate to test code.
Continue to ignore:

- test/integration/
- test/legacy/
- test/units/
5 years ago
Ganesh Nalawade f09bd91ad0
Add junos_interfaces resource module (#58871)
* Add junos_interfaces resource module [junos_interfaces]

*  Add new resource module junos_interfaces.
*  Targets model https://github.com/ansible-network/resource_module_models/pull/8
*  Depcreate junos_interface module

* Fix CI failures

* Fix integration test failures

* Fix CI failures

* Fix review comments
5 years ago
Chris Archibald 59feb63d19 Add uid, and gid to volume clone (#57371)
* and new features

* fix issues

* fix issues

* fix issues

* add unit tests
5 years ago
Sam Doran 36da7e462a
Better fix for invalid data in 'options' field (#58353) 5 years ago
Toshio Kuratomi 33d2728879 Rename python files in hacking/ directory to have .py suffix
ansible-test only passes files which have the .py suffix for sanity
tests on python files.  This change will allow sanity tests to run on
the Python files in hacking/

* Rename test-module to test-module.py
* Symlink test-module for backwards compat since end users may be using
  test-module
* Fix test-module sanity errors that are now triggered
* Rename ansible_profile to ansible-profile.py
* Rename build-ansible
5 years ago
Toshio Kuratomi 146a7f8ff6 Split the metaclass == type and from future boilerplate code.
The metaclass boilerplate is safe to apply en masse.  The future import
boilerplate needs code to be inspected to be sure that there aren't any
py2isms that need to be fixed.  Split these two checks so that we can
fix them independently

Be explicit about which files are grandfathered so we can fix them up one by one
5 years ago
Chris Archibald ee24e6c5be Qtree was not idempotent (#58596)
* fixes

* fixes
5 years ago
Sam Doran c68bf5997f
Add version 2.13 to the removed_in list (#58924) 5 years ago
Andrey Klychkov 41b7b1c6e9 jboss module: actualize doc formatting (#58913)
* jboss module: actualize doc formatting, remove exceptions from ignore.txt
5 years ago
Matt Clay 1e1463401d
Prepare ansible-test for supporting collections. (#58886)
This is a small but incomplete set of the initial changes for supporting testing of collections with ansible-test.
5 years ago
Shachaf92 7ddcaafee5 many pslint fixes (#55862)
* Handles:

PSAvoidTrailingWhitespace
PSAvoidGlobalVars
PSAvoidAssignmentToAutomaticVariable
PSAvoidUsingCmdletAliases
PSAvoidUsingWriteHost
PSUseDeclaredVarsMoreThanAssignments
PSUsePSCredentialType
PSAvoidUsingPositionalParameters
PSAvoidUsingEmptyCatchBlock
PSAvoidUsingWMICmdlet

Replaced Write-Host with Write-Output
Added smart reboot check for win_domain feature installation
Modify the Creation of the pagefileto fit to CIM
Changelog fragment addition
Ignore.txt without fixes

* Changes after community reviews

* Change Out-Null to '> $null'

* Fixes after jborean93 comments

* Test

* Revert "Test"

This reverts commit 35c5c0648fa9d2868a18094d84954e53ffa28880.

* Removed all  > $null since they broke the module since the output got dumped

* run test again

* Revert "run test again"

This reverts commit 80eaf07143f9d8cb0116cbbc68a6a69c0ace840c.

* Changes after community review

* ignore PSUseDeclaredVarsMoreThanAssignments that are on a diffrent PR

* CI failed on extra line in ignore.txt

* Review changes

* PSlint errors

* Trail space

* send to null breaks the tests for  Set-Workgroup

* Lint stuff

* win_domain_user issue of indent.

* Update win_domain_user.ps1

* Update win_domain_membership.ps1

* Fix redirect to null

* lint space issue

* removed return from set-workgroup

* removed send to null
5 years ago
Matt Martz 0e9cfd3ee8
Fix sanity tests that are failing with LC_ALL set (#58604) 5 years ago
Jordan Borean c3978fed4b
Load Ansible module_utils for ps_argspec validator (#58571)
* Load Ansible module_utils for ps_argspec validator

* fix validation for modules without Requires statement

* Moved future comment to proper location
5 years ago
Jordan Borean c260721ce5
win_domain_user: do not hide error on failures (#58357)
* win_domain_user: do not hide error on failures

* Was a bit too overzealous in the removal

* Remove uneeded sanity ignore rule
5 years ago
Pilou 5f8080aaa0 consul_session: improve documentation and add integration tests (#56392)
* consul_session: Python 2.6 is always required on managed node
* consul_session: document all types
* consul_session: add doc for 'id' parameter
* consul_session: improve parameter descriptions
    - use formatting functions in descriptions
    - 'name' parameter is required when state=node
* consul_session: use required_if
* consul_session: add integration tests
* consul_session: use 'retry' with network dependent tasks
* Use ansible-ci-files bucket for consul binaries

Co-Authored-By: Matt Clay <matt@mystile.com>
5 years ago
Zim Kalinowski c9d82024c7 shared image gallery modules (#57386)
* modules to handle shared image gallery

* update test

* and firewall update

* fixed gallery problems

* fixed gallery version

* fix

* several fixes to the gallery

* several fixes

* fixes

* fix non-updatable

* fixed test & image

* fixed idempotency

* fix test

* image version test fixed

* fixes

* changed ux

* trigger

* fix syntax

* fixed sanity

* updated module + test delete

* fixed some sanity & delete

* continue fixing sanity

* sanity fix and pause after deleting image version

* extended delay

* removed sanity ignore

* try to ignore errors

* repeat until successful

* more retries

* updated test, etc.

* updated test

* updated shared image gallery docs
6 years ago
Abhijeet Kasurde bc3c90f2f1 datadog_monitor: Fix docs with datatypes of params (#58371)
* datadog_monitor: Fix docs with datatypes of params

Fixes: #58342

Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com>

* indentation and other minor fixes
6 years ago
Matt Clay 4591a300ae Update sanity test ignore for hostname module. 6 years ago
René Moser f2cc447b4d
dnsimple: fix missing defaults and doc (#58116)
* dnsimple: fix missing defaults and doc

* fix sanity
6 years ago
Matt Clay d5542afd97 Properly enforce shebang on collections. 6 years ago
René Moser 360a9f1a68
exoscale: exo_dns: fix sanity checks (#58312) 6 years ago
Sam Doran 18d713e6d5 Use Mapping rather than dict when evaluation 'options' (#58215) 6 years ago
Matt Clay f749ef5c0a Remove existing invalid ignores. 6 years ago
Felix Fontein 808cf4aa26
Remove from sanity ignores. (#57911) 6 years ago
Kevin Breit 0f12e1c7d8 Meraki - Improve type information in module documentation (#58114)
* Improve type information in module documentation
- Removed some duplicate documentation
- Ensure org_id is always string
- Add type information for items which don't have it

* Fix whitespace
6 years ago
Sam Doran dc8f7b38e6
Check that provider['options'] is a dictionary in validate-modules (#58078) 6 years ago
Felix Fontein f56cf72e2b
ufw: remove from sanity ignores (#57910)
* Remove from pylint ignore list.

* Make sure that option is called the same as in the documentation.
6 years ago
Felix Fontein da6f6cc456 Fix missing doc type. (#57884) 6 years ago
Pierre-Louis Bonicoli 3fb4c91d4c validate-modules: ignore existing E337/E338 errors 6 years ago
Pierre-Louis Bonicoli c289006e05 validate-modules: new module: fail if 'type' isn't documented
Don't require 'type' when:
- parameter name starts with an underscore
6 years ago
ShachafGoldstein 7880be240f Remove usage of global var log_path for win_domain_* modules (#57092)
* Remove usage of global var log_path

* Add changelog and edit ignore.txt

* win_pagefile: not using testPath

* Revert "win_pagefile: not using testPath"

This reverts commit c8bc10234048257414454905e1c860a8f57a3b3f.

* PSLint error

* Update win_domain_membership.ps1

* Update win_domain_controller.ps1
6 years ago
ShachafGoldstein a87495d07c win_pagefile: not using testPath (#57093)
* win_pagefile: not using testPath

* Added changelog
6 years ago
Felix Fontein 13f73adef5
AWS: _facts -> _info (part 4) (#57651)
* Rename ec2_vpc_dhcp_option_facts -> ec2_vpc_dhcp_option_info.

* Rename ec2_vpc_endpoint_facts -> ec2_vpc_endpoint_info.

* Rename ec2_vpc_igw_facts -> ec2_vpc_igw_info.

* Rename ec2_vpc_nacl_facts -> ec2_vpc_nacl_info.

* Rename ec2_vpc_nat_gateway_facts -> ec2_vpc_nat_gateway_info.

* Rename ec2_vpc_net_facts -> ec2_vpc_net_info.

* Rename ec2_vpc_peering_facts -> ec2_vpc_peering_info.

* Rename ec2_vpc_route_table_facts -> ec2_vpc_route_table_info.

* Rename ec2_vpc_subnet_facts -> ec2_vpc_subnet_info.

* Rename ec2_vpc_vgw_facts -> ec2_vpc_vgw_info.

* Rename ec2_vpc_vpn_facts -> ec2_vpc_vpn_info.

* Update module defaults, add changelog and porting guide.

* Update BOTMETA.
6 years ago
Felix Fontein 804d5eaf8e
AWS: _facts -> _info (part 3) (#57635)
* Rename ec2_ami_facts -> ec2_ami_info.

* Rename ec2_asg_facts -> ec2_asg_info.

* Rename ec2_customer_gateway_facts -> ec2_customer_gateway_info.

* Rename ec2_eip_facts -> ec2_eip_info.

* Rename ec2_elb_facts -> ec2_elb_info.

* Rename ec2_eni_facts -> ec2_eni_info.

* Rename ec2_group_facts -> ec2_group_info.

* Rename ec2_instance_facts -> ec2_instance_info.

* Rename ec2_lc_facts -> ec2_lc_info.

* Rename ec2_placement_group_facts -> ec2_placement_group_info.

* Rename ec2_snapshot_facts -> ec2_snapshot_info.

* Rename ec2_vol_facts -> ec2_vol_info.

* Update module defaults, add changelog and porting guide.

* Forgot one occurence of ec2_instance_facts.

* Update BOTMETA.

* Break too long line.
6 years ago
Felix Fontein fc4bbff6e1
AWS: _facts -> _info (part 2) (#57626)
* Rename cloudwatchlogs_log_group_facts -> cloudwatchlogs_log_group_info.

* Rename elasticache_facts -> elasticache_info.

* redshift_facts -> redshift_info.

* Rename route53_facts -> route53_info.

* Rename rds_instance_facts -> rds_instance_info.

* Rename rds_snapshot_facts -> rds_snapshot_info.

* Rename iam_mfa_device_facts -> iam_mfa_device_info.

* Rename iam_role_facts -> iam_role_info.

* Rename iam_server_certificate_facts -> iam_server_certificate_info.

* Rename elb_application_lb_facts -> elb_application_lb_info.

* Renaming elb_classic_lb_facts -> elb_classic_lb_info.

* elb_target_facts -> elb_target_info.

* Rename elb_target_group_facts -> elb_target_group_info.

* Update porting guide.

* Add changelog.

* Fix module defaults (both for this PR and #57613).

* Two fixes.
6 years ago