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

230 missing protocol email server #231

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
0bfb61c
Adding rule audit comment - #228
ntwrkguru Jun 2, 2021
5a1ebe2
bumped version for testing
ntwrkguru Jun 2, 2021
ee513f6
Adding rule audit comment - #228
ntwrkguru Jun 2, 2021
5c25a28
Adding rule audit comment - #228
ntwrkguru Jun 2, 2021
24f86ef
Adding rule audit comment - #228
ntwrkguru Jun 2, 2021
fd19cff
Adding rule audit comment - #228
ntwrkguru Jun 2, 2021
bb7db29
Adding rule audit comment - #228
ntwrkguru Jun 2, 2021
e6d20e4
removing .vscode
ntwrkguru Jun 3, 2021
f4897da
bumped to pan-os-python 1.1.0 and added tests
ntwrkguru Jun 3, 2021
27f13bd
Adding rule audit comment support - fixes #228
ntwrkguru Jun 2, 2021
7e2e06b
Merge branch 'develop' of github.com:ntwrkguru/pan-os-ansible into de…
ntwrkguru Jun 3, 2021
2888656
228 formatted per lint test results
ntwrkguru Jun 7, 2021
2036bc5
230: Added protocol to panos_email_server.py
ntwrkguru Jun 7, 2021
b6e1a78
230: Added default parameter
ntwrkguru Jun 7, 2021
0c64e5c
bumped version in galaxy.yml
ntwrkguru Jun 7, 2021
055aed4
230 reverted galaxy.yml collection semver
ntwrkguru Jun 7, 2021
292b1e0
Rebasing with develop
ntwrkguru Jun 2, 2021
85159a3
Rebasing and removing conflicts
ntwrkguru Jun 2, 2021
d8cd108
Adding rule audit comment - #228
ntwrkguru Jun 2, 2021
01087bb
Adding rule audit comment - #228
ntwrkguru Jun 2, 2021
8562368
Adding rule audit comment - #228
ntwrkguru Jun 2, 2021
cf13a8b
Adding rule audit comment - #228
ntwrkguru Jun 2, 2021
bc08aee
Adding rule audit comment - #228
ntwrkguru Jun 2, 2021
d782ff7
228 formatted per lint test results
ntwrkguru Jun 7, 2021
7743a89
230: Added protocol to panos_email_server.py
ntwrkguru Jun 7, 2021
0e51bbe
230: Added default parameter
ntwrkguru Jun 7, 2021
5c0fb79
bumped version in galaxy.yml
ntwrkguru Jun 7, 2021
e42bc18
230 reverted galaxy.yml collection semver
ntwrkguru Jun 7, 2021
ddc080f
more merge conflicts
ntwrkguru Jun 14, 2021
6c2c047
chore(deps): bump JamesIves/github-pages-deploy-action (#227)
dependabot[bot] Jun 8, 2021
6bc7813
chore: Clean up pipenv (#233)
Jun 14, 2021
7849afd
Rebasing and removing conflicts
ntwrkguru Jun 2, 2021
cb78ab1
Adding rule audit comment - #228
ntwrkguru Jun 2, 2021
2acdc2d
Adding rule audit comment - #228
ntwrkguru Jun 2, 2021
f0f4441
Adding rule audit comment - #228
ntwrkguru Jun 2, 2021
3848143
Adding rule audit comment - #228
ntwrkguru Jun 2, 2021
6f9ce6c
Adding rule audit comment - #228
ntwrkguru Jun 2, 2021
25ba6e8
228 formatted per lint test results
ntwrkguru Jun 7, 2021
c4fb814
230: Added protocol to panos_email_server.py
ntwrkguru Jun 7, 2021
e9a308c
230: Added default parameter
ntwrkguru Jun 7, 2021
c2b1d3b
bumped version in galaxy.yml
ntwrkguru Jun 7, 2021
487db3c
230 reverted galaxy.yml collection semver
ntwrkguru Jun 7, 2021
2da6aac
228 formatted per lint test results
ntwrkguru Jun 7, 2021
4bbc4ef
230: Added protocol to panos_email_server.py
ntwrkguru Jun 7, 2021
f52b8a5
230: Added default parameter
ntwrkguru Jun 7, 2021
f170862
bumped version in galaxy.yml
ntwrkguru Jun 7, 2021
4a4eba3
230 reverted galaxy.yml collection semver
ntwrkguru Jun 7, 2021
651bd23
merge conflict resolution
ntwrkguru Jun 14, 2021
5876cb6
updated arg spec
ntwrkguru Jun 14, 2021
0fe213e
230: final cleanup
ntwrkguru Jun 14, 2021
fbdbf6d
style: black fixes
Jun 14, 2021
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
8 changes: 0 additions & 8 deletions .vscode/settings.json

This file was deleted.

2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ else ifneq (ansible_collections,$(toplevel))
endif

python_version := $(shell \
python -c 'import sys; print(".".join(map(str, sys.version_info[:2])))' \
python3 -c 'import sys; print(".".join(map(str, sys.version_info[:2])))' \
)


Expand Down
2 changes: 1 addition & 1 deletion galaxy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ namespace: 'paloaltonetworks'
name: 'panos'

# The version of the collection. Must be compatible with semantic versioning
version: 2.6.0
version: '2.6.0'

# The path to the Markdown (.md) readme file. This path is relative to the root of the collection
readme: 'README.md'
Expand Down
10 changes: 10 additions & 0 deletions plugins/modules/panos_email_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,14 @@
description:
- IP address or FQDN of email gateway to use.
type: str
protocol:
description:
- Specify whether to use clear-text or encrypted SMTP.
type: str
choices:
- SMTP
- TLS
default: SMTP
"""

EXAMPLES = """
Expand Down Expand Up @@ -119,6 +127,7 @@ def main():
to_email=dict(),
also_to_email=dict(),
email_gateway=dict(),
protocol=dict(choices=["SMTP", "TLS"], default="SMTP"),
),
)
module = AnsibleModule(
Expand Down Expand Up @@ -146,6 +155,7 @@ def main():
"to": module.params["to_email"],
"also_to": module.params["also_to_email"],
"email_gateway": module.params["email_gateway"],
"protocol": module.params["protocol"],
}
obj = EmailServer(**spec)
sp.add(obj)
Expand Down
2 changes: 2 additions & 0 deletions tests/integration/firewall/test_panos_security_rule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
application: ['ssh']
action: 'allow'
device_group: '{{ device_group | default(omit) }}'
audit_comment: 'Test audit comment'
register: result

- name: test_panos_security_rule - Assert create was successful
Expand All @@ -33,6 +34,7 @@
application: ['ssh']
action: 'allow'
device_group: '{{ device_group | default(omit) }}'
audit_comment: 'Testing audit_comment'
register: result

- name: test_panos_security_rule - Assert create (idempotence) was successful
Expand Down