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.

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

Verbose config extra fact #23

Merged
merged 16 commits into from
Mar 29, 2021
Merged

Verbose config extra fact #23

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
bd7ee68
allow nonverbose idempotent config
Mar 24, 2021
1e12b7e
nonverbose config output
Mar 24, 2021
365d711
typpo
Mar 24, 2021
3865105
typpo
Mar 25, 2021
28ef7c1
release fragment
Mar 25, 2021
234aba8
config extra fact
Mar 25, 2021
2e2f049
add fact ansible_net_config_nonverbose
Mar 25, 2021
9a90b3d
unit tests
Mar 25, 2021
091439e
changelog fragments
Mar 25, 2021
2304f05
remove version fragment
Mar 26, 2021
a6e616d
remove extra debug printf()
Mar 26, 2021
b321159
update chlog fragment
Mar 26, 2021
5546168
corrections for upstream pull request
Mar 26, 2021
21b07a4
corrections for upstream pull request
Mar 26, 2021
07b6064
typo in changelog fragment
qaxi Mar 29, 2021
167553d
typo in filename
qaxi Mar 29, 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
2 changes: 2 additions & 0 deletions changelogs/fragments/23-indempotent_config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
minor_changes:
- fact - add fact ``ansible_net_config_nonverbose`` to get indempotent config (no date, no verbose) (https://github.com/ansible-collections/community.routeros/pull/23).
qaxi marked this conversation as resolved.
Show resolved Hide resolved
19 changes: 18 additions & 1 deletion plugins/modules/facts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,11 @@
returned: when config is configured
type: str

ansible_net_config_nonverbose:
description: The current active config from the device in minimal form
felixfontein marked this conversation as resolved.
Show resolved Hide resolved
returned: when config is configured
type: str
felixfontein marked this conversation as resolved.
Show resolved Hide resolved

# interfaces
ansible_net_all_ipv4_addresses:
description: All IPv4 addresses configured on the device
Expand Down Expand Up @@ -280,14 +285,26 @@ def to_megabytes(self, data):

class Config(FactsBase):

COMMANDS = ['/export verbose']
COMMANDS = [
'/export verbose',
'/export',
]

RM_DATE_RE = re.compile(r'^# [a-z0-9/][a-z0-9/]* [0-9:]* by RouterOS')

def populate(self):
super(Config, self).populate()

data = self.responses[0]
if data:
self.facts['config'] = data

data = self.responses[1]
if data:
# remove datetime
data = re.sub(self.RM_DATE_RE, r'# RouterOS', data)
self.facts['config_nonverbose'] = data
felixfontein marked this conversation as resolved.
Show resolved Hide resolved


class Interfaces(FactsBase):

Expand Down
24 changes: 24 additions & 0 deletions tests/unit/plugins/modules/fixtures/facts/export
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# sep/25/2018 10:10:52 by RouterOS 6.42.5
# software id = 9EER-511K
#
#
#
/interface wireless security-profiles
set [ find default=yes ] supplicant-identity=MikroTik
/tool user-manager customer
set admin access=own-routers,own-users,own-profiles,own-limits,config-payment-gw
/ip address
add address=192.168.88.1/24 comment=defconf interface=ether1 network=192.168.88.0
/ip dhcp-client
add dhcp-options=hostname,clientid disabled=no interface=ether1
/system lcd page
set time disabled=yes display-time=5s
set resources disabled=yes display-time=5s
set uptime disabled=yes display-time=5s
set packets disabled=yes display-time=5s
set bits disabled=yes display-time=5s
set version disabled=yes display-time=5s
set identity disabled=yes display-time=5s
set ether1 disabled=yes display-time=5s
/tool user-manager database
set db-path=user-manager
4 changes: 4 additions & 0 deletions tests/unit/plugins/modules/test_facts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,10 @@ def test_facts_config(self):
result['ansible_facts']['ansible_net_config'], str
)

self.assertIsInstance(
result['ansible_facts']['ansible_net_config_nonverbose'], str
)

def test_facts_interfaces(self):
set_module_args(dict(gather_subset='interfaces'))
result = self.execute_module()
Expand Down