Skip to content

Commit

Permalink
Replace uses of 192.0.3.0/24 with 198.51.100.0/24 (TEST-NET-2) (#130)
Browse files Browse the repository at this point in the history
* Replace uses of 192.0.3.0/24 with 198.51.100.0/24 (TEST-NET-2)

See https://datatracker.ietf.org/doc/html/rfc5737#section-3 for more on
why this particular block should be used instead

* Add changelog

* Swap one with TEST-NET-3 for coverage
  • Loading branch information
Qalthos authored Jun 14, 2023
1 parent 50c2fae commit bc560f2
Show file tree
Hide file tree
Showing 25 changed files with 192 additions and 189 deletions.
3 changes: 3 additions & 0 deletions changelogs/fragments/test-net-2.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
doc_changes:
- Replace all references to non-example address ranges in module documentation and tests.
38 changes: 19 additions & 19 deletions docs/cisco.asa.asa_acls_module.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2424,7 +2424,7 @@ Examples
address: 192.0.2.0
netmask: 255.255.255.0
destination:
address: 192.0.3.0
address: 198.51.100.0
netmask: 255.255.255.0
port_protocol:
eq: www
Expand Down Expand Up @@ -2503,7 +2503,7 @@ Examples
# access-list global_access line 4 extended deny tcp any any eq www log errors interval 300
# access-list R1_traffic line 1 remark test_v6_acls
# access-list R1_traffic line 2 extended deny tcp 2001:db8:0:3::/64 eq www 2001:fc8:0:4::/64 eq telnet inactive
# access-list temp_access line 1 extended deny tcp 192.0.2.0 255.255.255.0 192.0.3.0 255.255.255.0 eq www log default
# access-list temp_access line 1 extended deny tcp 192.0.2.0 255.255.255.0 198.51.100.0 255.255.255.0 eq www log default
# access-list temp_access line 2 extended deny igrp 198.51.100.0 255.255.255.0 198.51.110.0 255.255.255.0
# time-range temp inactive
# access-list temp_access line 2 extended deny tcp interface management interface management
Expand All @@ -2527,7 +2527,7 @@ Examples
# inactive (hitcnt=0) (inactive) 0xe922b432
# access-list temp_access; 2 elements; name hash: 0xaf1b712e
# access-list temp_access line 1
# extended deny tcp 192.0.2.0 255.255.255.0 192.0.3.0 255.255.255.0 eq www
# extended deny tcp 192.0.2.0 255.255.255.0 198.51.100.0 255.255.255.0 eq www
# log default (hitcnt=0) 0xb58abb0d
# access-list temp_access line 2
# extended deny igrp 198.51.100.0 255.255.255.0 198.51.110.0 255.255.255.0
Expand All @@ -2537,9 +2537,9 @@ Examples
# interval 300 (hitcnt=0) 0x78aa233d
# access-list test_access line 2 extended deny tcp object-group test_og_network object-group test_network_og
# eq www log default (hitcnt=0) 0x477aec1e
# access-list test_access line 2 extended deny tcp 192.0.2.0 255.255.255.0 host 192.0.3.1 eq www
# access-list test_access line 2 extended deny tcp 192.0.2.0 255.255.255.0 host 198.51.100.1 eq www
# log default (hitcnt=0) 0xdc7edff8
# access-list test_access line 2 extended deny tcp 192.0.2.0 255.255.255.0 host 192.0.3.2 eq www
# access-list test_access line 2 extended deny tcp 192.0.2.0 255.255.255.0 host 198.51.100.2 eq www
# log default (hitcnt=0) 0x7b0e9fde
# access-list test_access line 2 extended deny tcp 198.51.100.0 255.255.255.0 2001:db8:3::/64 eq www
# log default (hitcnt=0) 0x97c75adc
Expand Down Expand Up @@ -2604,7 +2604,7 @@ Examples
# inactive (hitcnt=0) (inactive) 0xe922b432
# access-list temp_access; 2 elements; name hash: 0xaf1b712e
# access-list temp_access line 1
# extended deny tcp 192.0.2.0 255.255.255.0 192.0.3.0 255.255.255.0 eq www
# extended deny tcp 192.0.2.0 255.255.255.0 198.51.100.0 255.255.255.0 eq www
# log default (hitcnt=0) 0xb58abb0d
# access-list temp_access line 2
# extended deny igrp 198.51.100.0 255.255.255.0 198.51.110.0 255.255.255.0
Expand Down Expand Up @@ -2656,7 +2656,7 @@ Examples
# inactive (hitcnt=0) (inactive) 0xe922b432
# access-list temp_access; 2 elements; name hash: 0xaf1b712e
# access-list temp_access line 1
# extended deny tcp 192.0.2.0 255.255.255.0 192.0.3.0 255.255.255.0 eq www
# extended deny tcp 192.0.2.0 255.255.255.0 198.51.100.0 255.255.255.0 eq www
# log default (hitcnt=0) 0xb58abb0d
# access-list temp_access line 2
# extended deny igrp 198.51.100.0 255.255.255.0 198.51.110.0 255.255.255.0
Expand All @@ -2681,7 +2681,7 @@ Examples
# inactive (hitcnt=0) (inactive) 0xe922b432
# access-list temp_access; 2 elements; name hash: 0xaf1b712e
# access-list temp_access line 1
# extended deny tcp 192.0.2.0 255.255.255.0 192.0.3.0 255.255.255.0 eq www
# extended deny tcp 192.0.2.0 255.255.255.0 198.51.100.0 255.255.255.0 eq www
# log default (hitcnt=0) 0xb58abb0d
# access-list temp_access line 2
# extended deny igrp 198.51.100.0 255.255.255.0 198.51.110.0 255.255.255.0
Expand Down Expand Up @@ -2716,7 +2716,7 @@ Examples
# access-list temp_access line 2
# extended deny igrp 198.51.100.0 255.255.255.0 198.51.110.0 255.255.255.0 time-range temp
# no access-list temp_access line 1
# extended grant deny tcp 192.0.2.0 255.255.255.0 192.0.3.0 255.255.255.0 eq www log default
# extended grant deny tcp 192.0.2.0 255.255.255.0 198.51.100.0 255.255.255.0 eq www log default
# no access-list R1_traffic line 2
# extended grant deny tcp 2001:db8:0:3::/64 eq www 2001:fc8:0:4::/64 eq telnet inactive
# no access-list R1_traffic line 1
Expand Down Expand Up @@ -2752,7 +2752,7 @@ Examples
# inactive (hitcnt=0) (inactive) 0xe922b432
# access-list temp_access; 2 elements; name hash: 0xaf1b712e
# access-list temp_access line 1
# extended deny tcp 192.0.2.0 255.255.255.0 192.0.3.0 255.255.255.0 eq www
# extended deny tcp 192.0.2.0 255.255.255.0 198.51.100.0 255.255.255.0 eq www
# log default (hitcnt=0) 0xb58abb0d
# access-list temp_access line 2
# extended deny igrp 198.51.100.0 255.255.255.0 198.51.110.0 255.255.255.0
Expand All @@ -2770,7 +2770,7 @@ Examples
# ---------------
# no access-list temp_access line 2 extended deny igrp 198.51.100.0 255.255.255.0 198.51.110.0 255.255.255.0
# time-range temp inactive
# no access-list temp_access line 1 extended deny tcp 192.0.2.0 255.255.255.0 192.0.3.0 255.255.255.0 eq www
# no access-list temp_access line 1 extended deny tcp 192.0.2.0 255.255.255.0 198.51.100.0 255.255.255.0 eq www
# log default
# no access-list global_access line 3 extended deny tcp any any eq www log errors interval 300
# no access-list global_access line 2 extended deny tcp any any eq telnet
Expand Down Expand Up @@ -2808,7 +2808,7 @@ Examples
# inactive (hitcnt=0) (inactive) 0xe922b432
# access-list temp_access; 2 elements; name hash: 0xaf1b712e
# access-list temp_access line 1
# extended deny tcp 192.0.2.0 255.255.255.0 192.0.3.0 255.255.255.0 eq www
# extended deny tcp 192.0.2.0 255.255.255.0 198.51.100.0 255.255.255.0 eq www
# log default (hitcnt=0) 0xb58abb0d
# access-list temp_access line 2
# extended deny igrp 198.51.100.0 255.255.255.0 198.51.110.0 255.255.255.0
Expand All @@ -2826,7 +2826,7 @@ Examples
# no access-list R1_traffic line 1 extended deny tcp 2001:db8:0:3::/64 eq telnet 2001:fc8:0:4::/64 eq www
# log errors interval 300
# no access-list R1_traffic line 2 extended deny tcp 2001:db8:0:3::/64 eq www 2001:fc8:0:4::/64 eq telnet inactive
# no access-list temp_access line 1 extended deny tcp 192.0.2.0 255.255.255.0 192.0.3.0 255.255.255.0 eq www log default
# no access-list temp_access line 1 extended deny tcp 192.0.2.0 255.255.255.0 198.51.100.0 255.255.255.0 eq www log default
# no access-list temp_access line 2 extended deny igrp 198.51.100.0 255.255.255.0 198.51.110.0 255.255.255.0
# time-range temp inactive
Expand All @@ -2853,7 +2853,7 @@ Examples
# inactive (hitcnt=0) (inactive) 0xe922b432
# access-list temp_access; 2 elements; name hash: 0xaf1b712e
# access-list temp_access line 1
# extended deny tcp 192.0.2.0 255.255.255.0 192.0.3.0 255.255.255.0 eq www
# extended deny tcp 192.0.2.0 255.255.255.0 198.51.100.0 255.255.255.0 eq www
# log default (hitcnt=0) 0xb58abb0d
# access-list temp_access line 2
# extended deny igrp 198.51.100.0 255.255.255.0 198.51.110.0 255.255.255.0
Expand Down Expand Up @@ -2958,7 +2958,7 @@ Examples
# "aces": [
# {
# "destination": {
# "address": "192.0.3.0",
# "address": "198.51.100.0",
# "netmask": "255.255.255.0",
# "port_protocol": {
# "eq": "www"
Expand Down Expand Up @@ -3019,7 +3019,7 @@ Examples
address: 192.0.2.0
netmask: 255.255.255.0
destination:
address: 192.0.3.0
address: 198.51.100.0
netmask: 255.255.255.0
port_protocol:
eq: www
Expand Down Expand Up @@ -3056,7 +3056,7 @@ Examples
#
# "rendered": [
# "access-list temp_access line 1
# extended deny tcp 192.0.2.0 255.255.255.0 192.0.3.0 255.255.255.0
# extended deny tcp 192.0.2.0 255.255.255.0 198.51.100.0 255.255.255.0
# eq www log default"
# "access-list temp_access line 2
# extended deny igrp 198.51.100.0 255.255.255.0 198.51.110.0 255.255.255.0
Expand All @@ -3070,7 +3070,7 @@ Examples
# parsed.cfg
#
# access-list test_access; 2 elements; name hash: 0xaf1b712e
# access-list test_access line 1 extended deny tcp 192.0.2.0 255.255.255.0 192.0.3.0 255.255.255.0 eq www log default
# access-list test_access line 1 extended deny tcp 192.0.2.0 255.255.255.0 198.51.100.0 255.255.255.0 eq www log default
# access-list test_access line 2 extended deny igrp 198.51.100.0 255.255.255.0 198.51.110.0 255.255.255.0 log errors
# access-list test_R1_traffic; 1 elements; name hash: 0xaf40d3c2
# access-list test_R1_traffic line 1 extended deny tcp 2001:db8:0:3::/64 eq www 2001:fc8:0:4::/64 eq telnet inactive
Expand All @@ -3090,7 +3090,7 @@ Examples
# "aces": [
# {
# "destination": {
# "address": "192.0.3.0",
# "address": "198.51.100.0",
# "netmask": "255.255.255.0",
# "port_protocol": {
# "eq": "www"
Expand Down
80 changes: 40 additions & 40 deletions docs/cisco.asa.asa_ogs_module.rst
Original file line number Diff line number Diff line change
Expand Up @@ -1158,7 +1158,7 @@ Examples
# ciscoasa# sh running-config object-group
# object-group network test_og_network
# description test_network_og
# network-object host 192.0.3.1
# network-object host 198.51.100.1
- name: "Merge module attributes of given object-group"
cisco.asa.asa_ogs:
Expand All @@ -1181,8 +1181,8 @@ Examples
description: test_network_og
network_object:
host:
- 192.0.3.1
- 192.0.3.2
- 198.51.100.1
- 198.51.100.2
ipv6_address:
- 2001:db8:3::/64
- object_type: security
Expand Down Expand Up @@ -1247,8 +1247,8 @@ Examples
# network-object host 192.0.2.1
# network-object host 192.0.2.2
# object-group network test_network_og
# network-object host 192.0.3.1
# network-object host 192.0.3.2
# network-object host 198.51.100.1
# network-object host 198.51.100.2
# network-object 2001:db8:3::/64
# object-group service O-Worker
# service-object tcp destination range 100 200
Expand All @@ -1273,11 +1273,11 @@ Examples
# network-object host 192.0.2.2
# network-object 192.0.2.0 255.255.255.0
# network-object 198.51.100.0 255.255.255.0
# network-object host 192.0.3.1
# network-object host 198.51.100.1
# object-group network test_network_og
# description test_network_og
# network-object host 192.0.3.1
# network-object host 192.0.3.2
# network-object host 198.51.100.1
# network-object host 198.51.100.2
# network-object 2001:db8:0:3::/64
# group-object test_og_network
# object-group security test_og_security
Expand Down Expand Up @@ -1310,8 +1310,8 @@ Examples
# network-object 198.51.100.0 255.255.255.0
# object-group network test_network_og
# description test_network_og
# network-object host 192.0.3.1
# network-object host 192.0.3.2
# network-object host 198.51.100.1
# network-object host 198.51.100.2
# network-object 2001:db8:0:3::/64
# group-object test_og_network
# object-group security test_og_security
Expand All @@ -1338,9 +1338,9 @@ Examples
description: test_og_network_replace
network_object:
host:
- 192.0.3.1
- 198.51.100.1
address:
- 192.0.3.0 255.255.255.0
- 198.51.100.0 255.255.255.0
- object_type: protocol
object_groups:
- name: test_og_protocol
Expand All @@ -1362,23 +1362,23 @@ Examples
# description test_og_network_replace
# no network-object 192.0.2.0 255.255.255.0
# no network-object 198.51.100.0 255.255.255.0
# network-object 192.0.3.0 255.255.255.0
# network-object 198.51.100.0 255.255.255.0
# no network-object host 192.0.2.1
# no network-object host 192.0.2.2
# network-object host 192.0.3.1
# network-object host 198.51.100.1
# After state:
# -------------
#
# ciscoasa# sh running-config object-group
# object-group network test_og_network
# description test_og_network_replace
# network-object host 192.0.3.1
# network-object 192.0.3.0 255.255.255.0
# network-object host 198.51.100.1
# network-object 198.51.100.0 255.255.255.0
# object-group network test_network_og
# description test_network_og
# network-object host 192.0.3.1
# network-object host 192.0.3.2
# network-object host 198.51.100.1
# network-object host 198.51.100.2
# network-object 2001:db8:0:3::/64
# group-object test_og_network
# object-group security test_og_security
Expand Down Expand Up @@ -1413,8 +1413,8 @@ Examples
# network-object 198.51.100.0 255.255.255.0
# object-group network test_network_og
# description test_network_og
# network-object host 192.0.3.1
# network-object host 192.0.3.2
# network-object host 198.51.100.1
# network-object host 198.51.100.2
# network-object 2001:db8:0:3::/64
# group-object test_og_network
# object-group security test_og_security
Expand All @@ -1441,9 +1441,9 @@ Examples
description: test_og_network_override
network_object:
host:
- 192.0.3.1
- 198.51.100.1
address:
- 192.0.3.0 255.255.255.0
- 198.51.100.0 255.255.255.0
- name: ANSIBLE_TEST
network_object:
object:
Expand Down Expand Up @@ -1474,10 +1474,10 @@ Examples
# description test_og_network_override
# no network-object 192.0.2.0 255.255.255.0
# no network-object 198.51.100.0 255.255.255.0
# network-object 192.0.3.0 255.255.255.0
# network-object 198.51.100.0 255.255.255.0
# no network-object host 192.0.2.1
# no network-object host 192.0.2.2
# network-object host 192.0.3.1
# network-object host 198.51.100.1
# no object-group network test_network_og
# object-group network ANSIBLE_TEST
# network-object object TEST1
Expand All @@ -1489,8 +1489,8 @@ Examples
# ciscoasa# sh running-config object-group
# object-group network test_og_network
# description test_og_network_override
# network-object host 192.0.3.1
# network-object 192.0.3.0 255.255.255.0
# network-object host 198.51.100.1
# network-object 198.51.100.0 255.255.255.0
# object-group network ANSIBLE_TEST
# network-object object TEST1
# network-object object TEST2
Expand All @@ -1512,8 +1512,8 @@ Examples
# network-object 198.51.100.0 255.255.255.0
# object-group network test_network_og
# description test_network_og
# network-object host 192.0.3.1
# network-object host 192.0.3.2
# network-object host 198.51.100.1
# network-object host 198.51.100.2
# network-object 2001:db8:0:3::/64
# group-object test_og_network
# object-group security test_og_security
Expand Down Expand Up @@ -1580,8 +1580,8 @@ Examples
# network-object 198.51.100.0 255.255.255.0
# object-group network test_network_og
# description test_network_og
# network-object host 192.0.3.1
# network-object host 192.0.3.2
# network-object host 198.51.100.1
# network-object host 198.51.100.2
# network-object 2001:db8:0:3::/64
# group-object test_og_network
# object-group security test_og_security
Expand Down Expand Up @@ -1625,8 +1625,8 @@ Examples
# network-object 198.51.100.0 255.255.255.0
# object-group network test_network_og
# description test_network_og
# network-object host 192.0.3.1
# network-object host 192.0.3.2
# network-object host 198.51.100.1
# network-object host 198.51.100.2
# network-object 2001:db8:0:3::/64
# group-object test_og_network
# object-group security test_og_security
Expand Down Expand Up @@ -1673,8 +1673,8 @@ Examples
# "name": "test_network_og",
# "network_object": {
# "host": [
# "192.0.3.1",
# "192.0.3.2"
# "198.51.100.1",
# "198.51.100.2"
# ],
# "ipv6_address": [
# "2001:db8:3::/64"
Expand Down Expand Up @@ -1733,8 +1733,8 @@ Examples
# network-object 198.51.100.0 255.255.255.0
# object-group network test_network_og
# description test_network_og
# network-object host 192.0.3.1
# network-object host 192.0.3.2
# network-object host 198.51.100.1
# network-object host 198.51.100.2
# network-object 2001:db8:0:3::/64
# group-object test_og_network
# object-group security test_og_security
Expand Down Expand Up @@ -1766,8 +1766,8 @@ Examples
description: test_network_og
network_object:
host:
- 192.0.3.1
- 192.0.3.2
- 198.51.100.1
- 198.51.100.2
ipv6_address:
- 2001:db8:3::/64
- object_type: security
Expand Down Expand Up @@ -1811,8 +1811,8 @@ Examples
# "network-object host 192.0.2.2",
# "object-group network test_network_og",
# "description test_network_og",
# "network-object host 192.0.3.1",
# "network-object host 192.0.3.2",
# "network-object host 198.51.100.1",
# "network-object host 198.51.100.2",
# "network-object 2001:db8:3::/64",
# "object-group user test_og_user",
# "description test_user",
Expand Down
Loading

0 comments on commit bc560f2

Please sign in to comment.