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

pathd: fix space before pcep port in running-config #14762

Merged
merged 2 commits into from
Nov 29, 2023

Conversation

pguibert6WIND
Copy link
Member

The below running-configuration has extra spaces before the pce port configuration:

segment-routing
traffic-engineering
pce test
address ip 192.0.2.2 port 1234

Fix this by keeping only one space.

address ip 192.0.2.2 port 1234

Fixes: efba098 ("pathd: Add optional support for PCEP to pathd")

@ton31337
Copy link
Member

ton31337 commented Nov 9, 2023

@Mergifyio backport dev/9.1

Copy link

mergify bot commented Nov 9, 2023

backport dev/9.1

❌ No backport have been created

  • Backport to branch dev/9.1 failed

GitHub error: Branch not found

@ton31337
Copy link
Member

ton31337 commented Nov 9, 2023

This is even not compiling yet.

pathd/path_pcep_cli.c Outdated Show resolved Hide resolved
@@ -471,7 +471,7 @@ Configuration Commands
Disable or start the definition of a PCC.


.. clicmd:: msd (1-32)
.. clicmd:: msd [(1-32)]
Copy link
Member

Choose a reason for hiding this comment

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

For me it's unclear when reading here. Seems I'm able to enter just "msd", and what is the effect of that? Can it be clarified?

Copy link
Member Author

Choose a reason for hiding this comment

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

which behaviour do you expect?

Copy link
Member

Choose a reason for hiding this comment

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

No idea what would be the behavior here, is this something that is picked by default if I do not specify the depth?

Copy link
Member

Choose a reason for hiding this comment

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

In general, there is a default value for MSD which depend of the hardware. For Linux Kernel, the default value is 32. This CLI is used to specify a different value as the default one. Thus, the CLI should keep the (1-32) syntax to force specifying the new value of MSD. The no MSD CLI acts as go back to the default value.
So, it is preferable to not change this.

Copy link
Member Author

Choose a reason for hiding this comment

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

@odd22 ,@ton31337, please review

Copy link
Member

@odd22 odd22 left a comment

Choose a reason for hiding this comment

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

Do not modify the MSD CLI command and keep the (1-32) mandatory parameter.

@@ -471,7 +471,7 @@ Configuration Commands
Disable or start the definition of a PCC.


.. clicmd:: msd (1-32)
.. clicmd:: msd [(1-32)]
Copy link
Member

Choose a reason for hiding this comment

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

In general, there is a default value for MSD which depend of the hardware. For Linux Kernel, the default value is 32. This CLI is used to specify a different value as the default one. Thus, the CLI should keep the (1-32) syntax to force specifying the new value of MSD. The no MSD CLI acts as go back to the default value.
So, it is preferable to not change this.

The below running-configuration has extra spaces before the pce
port configuration:

> segment-routing
>  traffic-engineering
>   pce test
>    address ip 192.0.2.2   port 1234
>

Fix this by keeping only one space.

>    address ip 192.0.2.2 port 1234

Fixes: efba098 ("pathd: Add optional support for PCEP to pathd")
Signed-off-by: Philippe Guibert <[email protected]>
It should be possible to reset the configured msd value,
and not mentioning the previous msd value.

> ubuntu2204(config-sr-te-pcep-pcc)# no msd
> % Command incomplete: no msd
> ubuntu2204(config-sr-te-pcep-pcc)#

Fix this by defining the msd parameter optional, and
separating the 'no msd' command from the 'msd' command.

Fixe: efba098 ("pathd: Add optional support for PCEP to pathd")

Signed-off-by: Philippe Guibert <[email protected]>
Copy link
Member

@odd22 odd22 left a comment

Choose a reason for hiding this comment

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

LGTM

@odd22 odd22 merged commit 81ccc5a into FRRouting:master Nov 29, 2023
78 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants