Skip to content

Update jinja templates #59

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update jinja templates #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 5 additions & 4 deletions roles/scaffold_rm_facts/templates/module_directory/network_os/network_os_facts.py.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,16 @@ from __future__ import absolute_import, division, print_function
__metaclass__ = type


ANSIBLE_METADATA = {'metadata_version': '{{rm_ansible_metadata['metadata_version']}}',
'status': {{rm_ansible_metadata['status']}},
'supported_by': '{{rm_ansible_metadata['supported_by']}}'}
ANSIBLE_METADATA = {
'metadata_version': '{{rm_ansible_metadata['metadata_version']}}',
'status': {{rm_ansible_metadata['status']}},
'supported_by': '{{rm_ansible_metadata['supported_by']}}'}


DOCUMENTATION = """
---
module: {{ network_os }}_facts
version_added: {{ rm_docmentation['version_added'] }}
version_added: '{{ rm_docmentation['version_added'] }}'
short_description: Get facts about {{ network_os }} devices.
description:
- Collects facts from network devices running the {{ network_os }} operating
Expand Down
2 changes: 2 additions & 0 deletions roles/scaffold_rm_facts/templates/module_utils/network_os/argspec/resource/resource.py.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
"""
The arg spec for the {{ network_os }}_{{ resource }} module
"""
from __future__ import (absolute_import, division, print_function)
__metaclass__ = type


class {{ resource|capitalize }}Args(object): # pylint: disable=R0903
Expand Down
14 changes: 9 additions & 5 deletions roles/scaffold_rm_facts/templates/module_utils/network_os/config/resource/resource.py.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,11 @@ from ansible.module_utils.network.common.cfg.base import ConfigBase
from ansible.module_utils.network.common.utils import to_list
from {{ import_path }}.{{ network_os }}.facts.facts import Facts
{% if transport == 'netconf' %}
from ansible.module_utils.network.netconf.netconf import locked_config
from ansible.module_utils.network.junos.junos import (locked_config,
load_config,
commit_configuration,
discard_changes,
tostring)
from ansible.module_utils.network.common.netconf import (build_root_xml_node,
build_child_xml_node)
{% endif %}
Expand Down Expand Up @@ -62,14 +66,14 @@ class {{ resource|capitalize }}(ConfigBase):

with locked_config(self._module):
for config_xml in to_list(config_xmls):
diff = self._module._connectionload_config(self._module, config_xml, [])
diff = load_config(self._module, config_xml, [])

commit = not self._module.check_mode
if diff:
if commit:
self._module._connection.commit_configuration(self._module)
commit_configuration(self._module)
else:
self._module._connection.discard_changes(self._module)
discard_changes(self._module)
result['changed'] = True

if self._module._diff:
Expand Down Expand Up @@ -135,7 +139,7 @@ class {{ resource|capitalize }}(ConfigBase):
for xml in config_xmls:
root.append(xml)

return self._module._connection.tostring(root)
return tostring(root)
{% else %}
state = self._module.params['state']
if state == 'overridden':
Expand Down