a-c-m
/
ansible.utils
mirror of https://github.com/ansible-collections/ansible.utils.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into consolidate

pull/156/head
Bradley A. Thornton 2022-04-07 13:20:12 -07:00 committed by GitHub
parent 89efc29ab4 c5d2df6256
commit 1c4d7faf83
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
22 changed files with 40 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.pre-commit-config.yaml
View File

@ -1,4 +1,10 @@
--- ---
ci:
skip:
# pre-commit.ci has trouble with this one
- update-docs
- end-of-file-fixer
- trailing-whitespace
repos: repos:
- repo: https://github.com/pre-commit/pre-commit-hooks - repo: https://github.com/pre-commit/pre-commit-hooks
rev: v3.1.0 rev: v3.1.0

4
changelogs/fragments/enable_upgrade_black.yml Normal file
View File

@ -0,0 +1,4 @@
---
trivial:
- Enable black via pre-commit.ci
- Update black version to latest

6
changelogs/fragments/pre-commit-skip.yml Normal file
View File

@ -0,0 +1,6 @@
---
trivial:
- Exempt update-docs from pre-commit.ci
- Disable black temporarily until it can be upgraded
- Disable end-of-file-fixer
- Disable trailing-whitespace

2
tests/integration/targets/utils_cli_parse/files/nxos_show_version.txt
View File

@ -34,4 +34,4 @@ Kernel uptime is 110 day(s), 12 hour(s), 32 minute(s), 10 second(s)
plugin plugin
Core Plugin, Ethernet Plugin Core Plugin, Ethernet Plugin
Active Package(s) Active Package(s)

2
tests/integration/targets/utils_cli_parse/output/nxos_show_interface_json_text.txt
View File

@ -15,4 +15,4 @@
} }
] ]
] ]
] ]

2
tests/integration/targets/utils_cli_parse/output/nxos_show_interface_ttp_parsed.json
View File

@ -15,4 +15,4 @@
} }
] ]
] ]
] ]

2
tests/integration/targets/utils_cli_parse/templates/centos_df_-h.ttp
View File

@ -1 +1 @@
Filesystem Size Used Avail Use Mounted_on {{ _headers_ }} Filesystem Size Used Avail Use Mounted_on {{ _headers_ }}

2
tests/integration/targets/utils_cli_parse/templates/centos_ifconfig.textfsm
View File

@ -16,4 +16,4 @@ Start
^${Interface}:.* mtu ${MTU} ^${Interface}:.* mtu ${MTU}
^\s+ether ${MAC} ^\s+ether ${MAC}
^\s+inet6 ${Inet6} prefixlen ${Prefix} ^\s+inet6 ${Inet6} prefixlen ${Prefix}
^\s+inet ${Inet} netmask ${Netmask} ^\s+inet ${Inet} netmask ${Netmask}

2
tests/integration/targets/utils_cli_parse/templates/fedora_df_-h.ttp
View File

@ -1 +1 @@
Filesystem Size Used Avail Use Mounted_on {{ _headers_ }} Filesystem Size Used Avail Use Mounted_on {{ _headers_ }}

2
tests/integration/targets/utils_cli_parse/templates/fedora_ifconfig.textfsm
View File

@ -16,4 +16,4 @@ Start
^${Interface}:.* mtu ${MTU} ^${Interface}:.* mtu ${MTU}
^\s+ether ${MAC} ^\s+ether ${MAC}
^\s+inet6 ${Inet6} prefixlen ${Prefix} ^\s+inet6 ${Inet6} prefixlen ${Prefix}
^\s+inet ${Inet} netmask ${Netmask} ^\s+inet ${Inet} netmask ${Netmask}

2
tests/integration/targets/utils_cli_parse/templates/ubuntu_df_-h.ttp
View File

@ -1 +1 @@
Filesystem Size Used Avail Use Mounted_on {{ _headers_ }} Filesystem Size Used Avail Use Mounted_on {{ _headers_ }}

2
tests/integration/targets/utils_cli_parse/templates/ubuntu_ifconfig.textfsm
View File

@ -16,4 +16,4 @@ Start
^${Interface}:.* mtu ${MTU} ^${Interface}:.* mtu ${MTU}
^\s+ether ${MAC} ^\s+ether ${MAC}
^\s+inet6 ${Inet6} prefixlen ${Prefix} ^\s+inet6 ${Inet6} prefixlen ${Prefix}
^\s+inet ${Inet} netmask ${Netmask} ^\s+inet ${Inet} netmask ${Netmask}

2
tests/integration/targets/utils_ipaddr_filter/vars/main.yaml
View File

@ -40,7 +40,7 @@ ipwrap_result1:
- "[fe80::100]/10" - "[fe80::100]/10"
- "[2001:db8:32c:faad::]/64" - "[2001:db8:32c:faad::]/64"
- True - True
ipv6_result1: ipv6_result1:
- "::ffff:192.168.32.0/120" - "::ffff:192.168.32.0/120"
- "::ffff:192.24.2.1/128" - "::ffff:192.24.2.1/128"

2
tests/integration/targets/utils_validate/files/criteria/check_list_data.json
View File

@ -14,4 +14,4 @@
], ],
"default": 0 "default": 0
} }
} }

2
tests/integration/targets/utils_validate/files/criteria/crc_error_check.json
View File

@ -15,4 +15,4 @@
} }
} }
} }
} }

2
tests/integration/targets/utils_validate/files/criteria/enabled_check.json
View File

@ -10,4 +10,4 @@
} }
} }
} }
} }

2
tests/integration/targets/utils_validate/files/criteria/in_rate_check.json
View File

@ -19,4 +19,4 @@
} }
} }
} }
} }

2
tests/integration/targets/utils_validate/files/criteria/oper_status_up.json
View File

@ -11,4 +11,4 @@
} }
} }
} }
} }

2
tests/unit/module_utils/fixtures/large.json
View File

@ -55315,4 +55315,4 @@
}, },
"xmlns": "http://cisco.com/ns/yang/cisco-nx-os-device" "xmlns": "http://cisco.com/ns/yang/cisco-nx-os-device"
} }
} }

2
tests/unit/plugins/action/fixtures/nxos_show_version.txt
View File

@ -35,4 +35,4 @@ Last reset
plugin plugin
Core Plugin, Ethernet Plugin Core Plugin, Ethernet Plugin
Active Package(s): Active Package(s):

12
tests/unit/plugins/sub_plugins/cli_parsers/fixtures/nxos_show_version.cfg
View File

@ -12,15 +12,15 @@ http://www.gnu.org/licenses/gpl.html.
Nexus 9000v is a demo version of the Nexus Operating System Nexus 9000v is a demo version of the Nexus Operating System
Software Software
BIOS: version BIOS: version
NXOS: version 7.0(3)I7(1) NXOS: version 7.0(3)I7(1)
BIOS compile time: BIOS compile time:
NXOS image file is: bootflash:///nxos.7.0.3.I7.1.bin NXOS image file is: bootflash:///nxos.7.0.3.I7.1.bin
NXOS compile time: 8/31/2017 14:00:00 [08/31/2017 22:29:32] NXOS compile time: 8/31/2017 14:00:00 [08/31/2017 22:29:32]
Hardware Hardware
cisco Nexus9000 9000v Chassis cisco Nexus9000 9000v Chassis
with 4041236 kB of memory. with 4041236 kB of memory.
Processor Board ID 96NK4OUJH32 Processor Board ID 96NK4OUJH32
@ -28,10 +28,10 @@ Hardware
bootflash: 3509454 kB bootflash: 3509454 kB
Kernel uptime is 12 day(s), 23 hour(s), 48 minute(s), 10 second(s) Kernel uptime is 12 day(s), 23 hour(s), 48 minute(s), 10 second(s)
Last reset Last reset
Reason: Unknown Reason: Unknown
System version: System version:
Service: Service:
plugin plugin
Core Plugin, Ethernet Plugin Core Plugin, Ethernet Plugin

2
tests/unit/plugins/sub_plugins/cli_parsers/fixtures/nxos_show_version.ttp
View File

@ -4,4 +4,4 @@
Kernel uptime is {{ uptime | ORPHRASE }} Kernel uptime is {{ uptime | ORPHRASE }}
cisco Nexus9000 {{ platform }} Chassis cisco Nexus9000 {{ platform }} Chassis
</group> </group>
""" """