Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bugfix/1.3.4 gh issue329 ddname #334

Merged
merged 26 commits into from
Jun 11, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
1135265
zos_ssh - rename retries setting
samdoran Jul 1, 2021
f286ba6
Update connection module with retries support for 2.9 and later
ddimatos Jun 1, 2022
ae59db2
Update release notes for 1.3.4
ddimatos Jun 2, 2022
71dc2e9
Update version meta for this updated collection release
ddimatos Jun 2, 2022
c8e0636
update galaxy yml to reflect lastet release
ddimatos Jun 2, 2022
5d7634e
Update collection to support execution environment requirements
ddimatos Jun 2, 2022
d193a79
Remove version_added when they are the same as the project version
ddimatos Jun 2, 2022
1e4ac8d
update release notes for 1.3.4
ddimatos Jun 5, 2022
423b26d
Update galaxy yml for 1.3.4 release
ddimatos Jun 5, 2022
2299cbd
Add missing module versions for use by changlog
ddimatos Jun 5, 2022
f9cd34d
Add changelog, fragments and config
ddimatos Jun 5, 2022
290cc75
Add verson compatibility statement for Ansible 2.9 and 2.11
ddimatos Jun 5, 2022
d732ae1
Fix zos_apf modules RST generation issue zos_apf.rst:124: WARNING: In…
ddimatos Jun 6, 2022
223d913
Update RST docs based on module doc changes
ddimatos Jun 6, 2022
b7b1673
Update changelog to correct useage of minor to bugfixes
ddimatos Jun 6, 2022
2d99210
Restore module marker as it helped generate the RST and HTML but its …
ddimatos Jun 7, 2022
5c5af9f
Updated changelog fragments to ensure ansible sanity and pep8 rules a…
ddimatos Jun 7, 2022
e59bd4a
restore module default so that sanity test does not fail
ddimatos Jun 7, 2022
9dcf4f5
update moduels with the corrected release version
ddimatos Jun 7, 2022
cf7f2a2
Update linefile module to reflect 1.2.1 release version
ddimatos Jun 7, 2022
bd1ae0a
Update release fragments to correct module version release dates
ddimatos Jun 7, 2022
dd7b3f5
Fixed dd_name typo bug to enable ddname job output filtering
fernandofloresg Jun 8, 2022
31f8eb3
Added functional test case for ddname job output filtering
fernandofloresg Jun 8, 2022
28acc22
Modified for sanity testing
fernandofloresg Jun 8, 2022
05bd59e
Modified for sanity testing
fernandofloresg Jun 8, 2022
8e894d7
Merge branch 'support/1.3.x' of https://github.com/ansible-collection…
fernandofloresg Jun 10, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion plugins/module_utils/job.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ def job_output(job_id=None, owner=None, job_name=None, dd_name=None):
job_id = parsed_args.get("job_id") or "*"
job_name = parsed_args.get("job_name") or "*"
owner = parsed_args.get("owner") or "*"
dd_name = parsed_args.get("ddname") or ""
dd_name = parsed_args.get("dd_name") or ""

job_detail = _get_job_output(job_id, owner, job_name, dd_name)
if len(job_detail) == 0:
Expand Down
20 changes: 20 additions & 0 deletions tests/functional/modules/test_zos_job_output_func.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,3 +84,23 @@ def test_zos_job_output_job_exists(ansible_zos_module):
for result in results.contacted.values():
assert result.get("changed") is False
assert result.get("jobs") is not None


def test_zos_job_output_job_exists_with_filtered_ddname(ansible_zos_module):
hosts = ansible_zos_module
hosts.all.file(path=TEMP_PATH, state="directory")
hosts.all.shell(
cmd="echo {0} > {1}/SAMPLE".format(quote(JCL_FILE_CONTENTS), TEMP_PATH)
)
hosts.all.zos_job_submit(
src="{0}/SAMPLE".format(TEMP_PATH), location="USS", wait=True, volume=None
)
hosts.all.file(path=TEMP_PATH, state="absent")
dd_name = "JESMSGLG"
results = hosts.all.zos_job_output(job_name="SAMPLE", ddname=dd_name)
for result in results.contacted.values():
assert result.get("changed") is False
assert result.get("jobs") is not None
for job in result.get("jobs"):
assert len(job.get("ddnames")) == 1
assert job.get("ddnames")[0].get("ddname") == dd_name