Ipv6 support #1905

brunopeter · 2024-11-20T21:55:11Z

added support for ipv6 network and service groups including ipv6 addresses and masks

…lates into ipv6-support

mjbear · 2024-11-20T22:30:42Z

@brunopeter
This PR needs test data for the template changes that have been made.
Add another file of raw test data (which contains IPv6 objects) and its parsed equivalent.

brunopeter · 2024-11-21T00:58:04Z

added raw test data and parsed

mjbear · 2024-11-21T12:00:39Z

added raw test data and parsed

Thank you.

Functionally, is there an advantage to separate ICMP and ICMPv6 types?

brunopeter · 2024-11-21T16:35:26Z

@mjbear no functional reason beyond the number of types is large and separating them made some of protocol differences more clear.

mjbear · 2024-11-22T01:14:46Z

@mjbear no functional reason beyond the number of types is large and separating them made some of protocol differences more clear.

Makes sense. Thank you for replying.
I wonder if the template even needs the specific ICMP type names or if that could be a simpler regex pattern instead.

I may have to give that a try to see if it breaks anything, haha.
Of course it's also up for input from the project maintainers too. 😁

brunopeter · 2024-11-22T02:04:39Z

@mjbear no functional reason beyond the number of types is large and separating them made some of protocol differences more clear.

Makes sense. Thank you for replying.

I wonder if the template even needs the specific ICMP type names or if that could be a simpler regex pattern instead.

I may have to give that a try to see if it breaks anything, haha.

Of course it's also up for input from the project maintainers too. 😁

If it's like the service objects, cisco will replace numbers with the name e.g. service 80 becomes service http.

tests/cisco_ios/show_object-group/cisco_ios_show_object-group-v6.raw

jmcgill298 · 2024-11-25T20:04:48Z

tests/cisco_ios/show_object-group/cisco_ios_show_object-group-v6.yml

+    PORT_RANGE_END: ''
+    PORT_RANGE_START: ''
+    PROTOCOL: ''
+    TYPE: V6-Network


Suggested change

TYPE: V6-Network

TYPE: V6-Network

Wouldn't the TYPE be a double quoted string too?

TYPE: "V6-Network"

This will be obsoleted by brunopeter/pull/1

jmcgill298

Thanks @brunopeter just a couple of minor whitespace fixes, and will need to update the YAML file to pass linting. There are some helper scripts to fix it up for you: https://ntc-templates.readthedocs.io/en/latest/dev/dev_parser/#development-helper-scripts

mjbear · 2024-11-27T00:41:39Z

tests/cisco_ios/show_object-group/cisco_ios_show_object-group-v6.yml

+    HOST: ""
+    HOST_RANGE_END: ""
+    HOST_RANGE_START: ""
+    ICMP6_TYPE: ""
+    ICMP_TYPE: echo-reply
+    NAME: TEST-v6-icmp
+    NESTED_GROUPS: ""
+    NETMASK: ""
+    NETWORK: ""
+    PORT: ""
+    PORT_MATCH: ""
+    PORT_RANGE_END: ""
+    PORT_RANGE_START: ""
+    PROTOCOL: ""
+    TYPE: V6-Service
+  - ANY: ""
+    DESCRIPTION: ""
+    HOST: ""
+    HOST_RANGE_END: ""
+    HOST_RANGE_START: ""
+    ICMP6_TYPE: ""
+    ICMP_TYPE: ""
+    NAME: TEST-v6-obj
+    NESTED_GROUPS: ""
+    NETMASK: ""
+    NETWORK: ""
+    PORT: ""
+    PORT_MATCH: ""
+    PORT_RANGE_END: ""
+    PORT_RANGE_START: ""
+    PROTOCOL: ""
+    TYPE: V6-Network
+  - ANY: ""
+    DESCRIPTION: ""
+    HOST: 2001:DB8::1:1111
+    HOST_RANGE_END: ""
+    HOST_RANGE_START: ""
+    ICMP6_TYPE: ""
+    ICMP_TYPE: ""
+    NAME: TEST-v6-obj
+    NESTED_GROUPS: ""
+    NETMASK: ""
+    NETWORK: ""
+    PORT: ""
+    PORT_MATCH: ""
+    PORT_RANGE_END: ""
+    PORT_RANGE_START: ""
+    PROTOCOL: ""
+    TYPE: V6-Network
+  - ANY: ""
+    DESCRIPTION: ""
+    HOST: 2001:DB8::2:2222
+    HOST_RANGE_END: ""
+    HOST_RANGE_START: ""
+    ICMP6_TYPE: ""
+    ICMP_TYPE: ""
+    NAME: TEST-v6-obj
+    NESTED_GROUPS: ""
+    NETMASK: ""
+    NETWORK: ""
+    PORT: ""
+    PORT_MATCH: ""
+    PORT_RANGE_END: ""
+    PORT_RANGE_START: ""
+    PROTOCOL: ""
+    TYPE: V6-Network
+  - ANY: ""
+    DESCRIPTION: ""
+    HOST: ""
+    HOST_RANGE_END: ""
+    HOST_RANGE_START: ""
+    ICMP6_TYPE: ""
+    ICMP_TYPE: ""
+    NAME: TEST-v6-obj
+    NESTED_GROUPS: ""
+    NETMASK: /48
+    NETWORK: "2001:DB8:111:1::"
+    PORT: ""
+    PORT_MATCH: ""
+    PORT_RANGE_END: ""
+    PORT_RANGE_START: ""
+    PROTOCOL: ""
+    TYPE: V6-Network
+  - ANY: ""
+    DESCRIPTION: ""
+    HOST: ""
+    HOST_RANGE_END: ""
+    HOST_RANGE_START: ""
+    ICMP6_TYPE: ""
+    ICMP_TYPE: ""
+    NAME: TEST-v6-obj
+    NESTED_GROUPS: ""
+    NETMASK: /48
+    NETWORK: "2001:DB8:222:2::"
+    PORT: ""
+    PORT_MATCH: ""
+    PORT_RANGE_END: ""
+    PORT_RANGE_START: ""
+    PROTOCOL: ""
+    TYPE: V6-Network


@brunopeter
I didn't realize this until now, but the keys in your YAML are in uppercase but they should be lowercase.

I'm going to work up a PR against your ipv6-support branch that you can easily merge in to fix this up.
Thank you!

Canceling/hiding this inline review as they're obsoleted by brunopeter/pull/1
Please review that PR and merge it in. Thank you!

@brunopeter I think the fixes in this PR should have the tests ready to go through CI

…v6.raw Co-authored-by: Jacob McGill <[email protected]>

mjbear · 2024-11-27T00:49:07Z

ntc_templates/templates/cisco_ios_show_object-group.textfsm

-Value NETWORK (\d+\.\d+\.\d+\.\d+)
-Value NETMASK (\d+\.\d+\.\d+\.\d+)
+Value NETWORK ((\d+\.\d+\.\d+\.\d+)|([A-Fa-f0-9:]+:+[A-Fa-f0-9:]+))
+Value NETMASK ((\d+\.\d+\.\d+\.\d+)|((?:\/\d{1,3})))


Obsoleted by brunopeter/pull/1

mjbear · 2024-11-27T00:49:18Z

ntc_templates/templates/cisco_ios_show_object-group.textfsm

  ^${TYPE}\s+object\s+group\s+${NAME}\s*$$ -> Record
  ^\s+Description\s+${DESCRIPTION}$$ -> Record
  ^\s+group-object\s+${NESTED_GROUPS}\s*$$ -> Record
-  ^\s+(host\s+${HOST}|range\s+${HOST_RANGE_START}\s+${HOST_RANGE_END}|${ANY}|${NETWORK}\s+${NETMASK})\s*$$ -> Record
-  ^\s+icmp\s+${ICMP_TYPE}\s*$$ -> Record
+  ^\s+(host\s+${HOST}|range\s+${HOST_RANGE_START}\s+${HOST_RANGE_END}|${ANY}|${NETWORK}\s*${NETMASK})\s*$$ -> Record


Obsoleted by brunopeter/pull/1

mjbear · 2024-11-27T00:53:53Z

@brunopeter
Lots going on here so my apologies for the flurry of things.

I've pulled together a PR against your fork of ntc-templates so you can merge some changes into your ipv6-support branch. Please review that PR and merge it into your ipv6-branch once you've read through it and follow the changes.

Any questions or comments, put them on the discussion for the PR brunopeter/pull/1 over at your forked repo.

jmcgill298 · 2024-11-27T21:57:30Z

tests/cisco_ios/show_object-group/cisco_ios_show_object-group-v6.yml

+    HOST: ""
+    HOST_RANGE_END: ""
+    HOST_RANGE_START: ""
+    ICMP6_TYPE: ""
+    ICMP_TYPE: echo-reply
+    NAME: TEST-v6-icmp
+    NESTED_GROUPS: ""
+    NETMASK: ""
+    NETWORK: ""
+    PORT: ""
+    PORT_MATCH: ""
+    PORT_RANGE_END: ""
+    PORT_RANGE_START: ""
+    PROTOCOL: ""
+    TYPE: V6-Service
+  - ANY: ""
+    DESCRIPTION: ""
+    HOST: ""
+    HOST_RANGE_END: ""
+    HOST_RANGE_START: ""
+    ICMP6_TYPE: ""
+    ICMP_TYPE: ""
+    NAME: TEST-v6-obj
+    NESTED_GROUPS: ""
+    NETMASK: ""
+    NETWORK: ""
+    PORT: ""
+    PORT_MATCH: ""
+    PORT_RANGE_END: ""
+    PORT_RANGE_START: ""
+    PROTOCOL: ""
+    TYPE: V6-Network
+  - ANY: ""
+    DESCRIPTION: ""
+    HOST: 2001:DB8::1:1111
+    HOST_RANGE_END: ""
+    HOST_RANGE_START: ""
+    ICMP6_TYPE: ""
+    ICMP_TYPE: ""
+    NAME: TEST-v6-obj
+    NESTED_GROUPS: ""
+    NETMASK: ""
+    NETWORK: ""
+    PORT: ""
+    PORT_MATCH: ""
+    PORT_RANGE_END: ""
+    PORT_RANGE_START: ""
+    PROTOCOL: ""
+    TYPE: V6-Network
+  - ANY: ""
+    DESCRIPTION: ""
+    HOST: 2001:DB8::2:2222
+    HOST_RANGE_END: ""
+    HOST_RANGE_START: ""
+    ICMP6_TYPE: ""
+    ICMP_TYPE: ""
+    NAME: TEST-v6-obj
+    NESTED_GROUPS: ""
+    NETMASK: ""
+    NETWORK: ""
+    PORT: ""
+    PORT_MATCH: ""
+    PORT_RANGE_END: ""
+    PORT_RANGE_START: ""
+    PROTOCOL: ""
+    TYPE: V6-Network
+  - ANY: ""
+    DESCRIPTION: ""
+    HOST: ""
+    HOST_RANGE_END: ""
+    HOST_RANGE_START: ""
+    ICMP6_TYPE: ""
+    ICMP_TYPE: ""
+    NAME: TEST-v6-obj
+    NESTED_GROUPS: ""
+    NETMASK: /48
+    NETWORK: "2001:DB8:111:1::"
+    PORT: ""
+    PORT_MATCH: ""
+    PORT_RANGE_END: ""
+    PORT_RANGE_START: ""
+    PROTOCOL: ""
+    TYPE: V6-Network
+  - ANY: ""
+    DESCRIPTION: ""
+    HOST: ""
+    HOST_RANGE_END: ""
+    HOST_RANGE_START: ""
+    ICMP6_TYPE: ""
+    ICMP_TYPE: ""
+    NAME: TEST-v6-obj
+    NESTED_GROUPS: ""
+    NETMASK: /48
+    NETWORK: "2001:DB8:222:2::"
+    PORT: ""
+    PORT_MATCH: ""
+    PORT_RANGE_END: ""
+    PORT_RANGE_START: ""
+    PROTOCOL: ""
+    TYPE: V6-Network


@brunopeter I think the fixes in this PR should have the tests ready to go through CI

mjbear · 2024-12-02T16:08:34Z

@brunopeter Lots going on here so my apologies for the flurry of things.

I've pulled together a PR against your fork of ntc-templates so you can merge some changes into your ipv6-support branch. Please review that PR and merge it into your ipv6-branch once you've read through it and follow the changes.

Any questions or comments, put them on the discussion for the PR brunopeter/pull/1 over at your forked repo.

@brunopeter
Have you seen this?

mjbear · 2024-12-11T18:11:19Z

@brunopeter Lots going on here so my apologies for the flurry of things.
I've pulled together a PR against your fork of ntc-templates so you can merge some changes into your ipv6-support branch. Please review that PR and merge it into your ipv6-branch once you've read through it and follow the changes.
Any questions or comments, put them on the discussion for the PR brunopeter/pull/1 over at your forked repo.

@brunopeter Have you seen this?

Hi @brunopeter
Could you take a look at this when you have time?
Thank you!

Peter Bruno and others added 2 commits November 20, 2024 16:49

add support for IPv6 object groups addresses and masks

f0da4a0

Merge branch 'networktocode:master' into ipv6-support

ef29db6

brunopeter requested review from itdependsnetworks, jmcgill298 and jvanderaa as code owners November 20, 2024 21:55

Peter Bruno added 2 commits November 20, 2024 17:12

added support for ipv6 icmp types

019483c

Merge branch 'ipv6-support' of https://github.com/brunopeter/ntc-temp…

a1ddc1a

…lates into ipv6-support

ipv6 tests

53c07f9

jmcgill298 reviewed Nov 25, 2024

View reviewed changes

tests/cisco_ios/show_object-group/cisco_ios_show_object-group-v6.raw Outdated Show resolved Hide resolved

jmcgill298 reviewed Nov 25, 2024

View reviewed changes

jmcgill298 requested changes Nov 25, 2024

View reviewed changes

fixed quote type for yamllint

0a36977

mjbear reviewed Nov 26, 2024

View reviewed changes

Update tests/cisco_ios/show_object-group/cisco_ios_show_object-group-…

704416d

…v6.raw Co-authored-by: Jacob McGill <[email protected]>

mjbear reviewed Nov 27, 2024

View reviewed changes

mjbear mentioned this pull request Nov 27, 2024

Remove IPv6 forward slash and make YAML keys lowercase brunopeter/ntc-templates#1

Open

jmcgill298 requested changes Dec 2, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Ipv6 support #1905

Ipv6 support #1905

brunopeter commented Nov 20, 2024

mjbear commented Nov 20, 2024

brunopeter commented Nov 21, 2024

mjbear commented Nov 21, 2024

brunopeter commented Nov 21, 2024

mjbear commented Nov 22, 2024

brunopeter commented Nov 22, 2024

jmcgill298 Nov 25, 2024

mjbear Nov 25, 2024

mjbear Nov 27, 2024

jmcgill298 left a comment

This comment was marked as outdated.

mjbear Nov 27, 2024 •

edited

Loading

mjbear Nov 27, 2024 •

edited

Loading

jmcgill298 Nov 27, 2024

This comment was marked as outdated.

mjbear Nov 27, 2024

This comment was marked as outdated.

mjbear Nov 27, 2024

mjbear commented Nov 27, 2024

jmcgill298 Nov 27, 2024

mjbear commented Dec 2, 2024

mjbear commented Dec 11, 2024

Ipv6 support #1905

Are you sure you want to change the base?

Ipv6 support #1905

Conversation

brunopeter commented Nov 20, 2024

mjbear commented Nov 20, 2024

brunopeter commented Nov 21, 2024

mjbear commented Nov 21, 2024

brunopeter commented Nov 21, 2024

mjbear commented Nov 22, 2024

brunopeter commented Nov 22, 2024

jmcgill298 Nov 25, 2024

Choose a reason for hiding this comment

mjbear Nov 25, 2024

Choose a reason for hiding this comment

mjbear Nov 27, 2024

Choose a reason for hiding this comment

jmcgill298 left a comment

Choose a reason for hiding this comment

This comment was marked as outdated.

mjbear Nov 27, 2024 • edited Loading

Choose a reason for hiding this comment

mjbear Nov 27, 2024 • edited Loading

Choose a reason for hiding this comment

jmcgill298 Nov 27, 2024

Choose a reason for hiding this comment

This comment was marked as outdated.

mjbear Nov 27, 2024

Choose a reason for hiding this comment

This comment was marked as outdated.

mjbear Nov 27, 2024

Choose a reason for hiding this comment

mjbear commented Nov 27, 2024

jmcgill298 Nov 27, 2024

Choose a reason for hiding this comment

mjbear commented Dec 2, 2024

mjbear commented Dec 11, 2024

mjbear Nov 27, 2024 •

edited

Loading

mjbear Nov 27, 2024 •

edited

Loading