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.

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

modified hp_comware_display_interface.textfsm to account for lowercase "maximum frame length" #1982

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

Conversation

marcus-cain
Copy link

modified textfsm template to account for lowercase variation of the mtu line. Additionally, added appropriate test files to prove changes are working

fixes #1960

…ally, added appopriate test files to prove changes are working for both backwards compatability as well as new test scenario

This commit is a squash commit.
Squashed commit of the following:

commit 388041cb0941bc27caadbaa931854d3f7b354f60
Author: Cain,Marcus <[email protected]>
Date:   Wed Jan 8 12:30:36 2025 -0500

    Including additional test to show that backward compatibility has been maintained

    Signed-off-by: Cain,Marcus <[email protected]>

commit fc6cc6540ff77e9294927e8f3cdf9341cd37a560
Author: Cain,Marcus <[email protected]>
Date:   Mon Jan 6 15:08:01 2025 -0500

    modified textfsm template to account for lowercase mtu line. Additionally, added appopriate test files to prove changes are working

    Signed-off-by: Cain,Marcus <[email protected]>

Signed-off-by: Cain,Marcus <[email protected]>
@@ -28,7 +28,7 @@ Start
^\s*The\sMaximum\s+Transmit\s+Unit\sis\s+${MTU}

This comment was marked as off-topic.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree, your suggested changes would make this more future proof, since it would account for a sinlge white-space (which is the currently logic) and/or multiple instances of a white-space. HP can be very inconsistent in the way they output the data, so i think its a good idea to incorporate \s+

Now, my internal process works a little bit different:

[internal fork ] -------------------- [ public fork Fidelity-Contributions] --------------- upstream repo (ntc-templates)

the github repo that is actually making the PR is "Fidelity-Contributions" as you can see above... This is the public facing repo that i do not have write access to.... so i would have to make changes in my internal fork first, get it reviewed and approved internally (shouldn't be too bad, since its not any major changes), and then once reapproved, it will be synced to the public facing repo Fidelity-Contributions... Then i can resubmit the PR.

So - i could do this.. or i can fix this on the next PR.. I am getting ready to open another issue on this same template that i recently uncovered for 100G interfaces. Thus, i could make the next PR to directly solve the new issue AND future-proof the white space..

Fine w/ either way. Just let me know.

Copy link
Contributor

@mjbear mjbear Jan 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now, my internal process works a little bit different:

[internal fork ] -------------------- [ public fork Fidelity-Contributions] --------------- upstream repo (ntc-templates)

the github repo that is actually making the PR is "Fidelity-Contributions" as you can see above... This is the public facing repo that i do not have write access to.... so i would have to make changes in my internal fork first, get it reviewed and approved internally (shouldn't be too bad, since its not any major changes), and then once reapproved, it will be synced to the public facing repo Fidelity-Contributions... Then i can resubmit the PR.

I appreciate the insight and explanation into your corporate process.
Ah, the internal fork bit limits the collaborative process.

Ok - what I'll do here is remove my suggestions from this PR and create a separate PR. instead add to PR #1963 once this PR is merged and I'm able to rebase.

If there's ever something I submit forth that you want to make tweaks to I'll consider them!

Comment on lines +31 to 33
^\s*The\s[Mm]aximum\s+[Ff]rame\s+[Ll]ength\sis\s+${L2MTU}
^\s*Internet\s+[Aa]ddress:\s+${IP_ADDRESS}\s+\([Pp]rimary\)
^\s*Internet\s+[Aa]ddress\sis\s+${IP_ADDRESS}\s+[Pp]rimary

This comment was marked as off-topic.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

see post above

@mjbear
Copy link
Contributor

mjbear commented Jan 18, 2025

Heads up that #1963 is yet to be merged, but also makes changes to this template.

And there's a direct conflict with the test data file names with 1963.
Depending on your internal process, we may ask the other contributor to change their test data file names.

@marcus-cain
Copy link
Author

Heads up that #1963 is yet to be merged, but also makes changes to this template.

And there's a direct conflict with the test data file names with 1963. Depending on your internal process, we may ask the other contributor to change their test data file names.

That would be helpful.. based on the comments in #1963, seems like it may take a little bit for him to incorporate the change. So this PR might be merged first??.. Thus in that case, the contributor in 1963 can follow the standard process of pulling in the latest changes and rebasing his branch off of the latest, and resolve any conflicts if needed.

In the future, i can make the names of the test file be more indicative of what is being tested/fixed, (which i saw you did earlier), instead of following the generic 1,2,3....10 naming convention.

@mjbear
Copy link
Contributor

mjbear commented Jan 18, 2025

That would be helpful.. based on the comments in #1963, seems like it may take a little bit for him to incorporate the change. So this PR might be merged first??..

I'm not indicating merge order, but I will drop a note to indicate we likely want to merge your PR here first since you have corporate re-approvals to go through whereas the other PR does not (or doesn't appear to).

Thus in that case, the contributor in 1963 can follow the standard process of pulling in the latest changes and rebasing his branch off of the latest, and resolve any conflicts if needed.

Whether that contributor solves the possible merge conflicts or whether I choose to step up to resolve them isn't determined yet. 😀

In the future, i can make the names of the test file be more indicative of what is being tested/fixed, (which i saw you did earlier), instead of following the generic 1,2,3....10 naming convention.

Makes sense. Less chance for a file name conflict, hehe.

@mjbear
Copy link
Contributor

mjbear commented Jan 18, 2025

@itdependsnetworks @jmcgill298 @jvanderaa
Based on the comments,
Could we assess and merge this PR for what it is?

What I'm thinking is I'll rebase/resolve any conflicts and add extra polish to 1963.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

hp_comware_display_interface.textfsm fails on lowercase variation of "maximum frame length"
2 participants