OCPBUGS-18985: FRR templates: provide a seqnum for the prefix lists

[fedepaol]

Instead of letting frr pick the sequence number, we provide it from outside. This should make the configuration more deterministic and offload some of the logic from FRR.

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: fedepaol

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

• OWNERS [fedepaol]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[fedepaol]

/jira cherry-pick OCPBUGS-18960

[fedepaol]

/jira cherrypick OCPBUGS-18960

[openshift-ci-robot]

@fedepaol: Jira Issue OCPBUGS-18960 has been cloned as Jira Issue OCPBUGS-18985. Will retitle bug to link to clone.
/retitle OCPBUGS-18985: FRR templates: provide a seqnum for the prefix lists

In response to this:

/jira cherrypick OCPBUGS-18960

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[openshift-ci-robot]

@fedepaol: This pull request references Jira Issue OCPBUGS-18985, which is invalid:

• expected dependent Jira Issue OCPBUGS-18960 to target a version in 4.14.0, but it targets "4.14" instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

Instead of letting frr pick the sequence number, we provide it from outside. This should make the configuration more deterministic and offload some of the logic from FRR.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[fedepaol]

/label backport-risk-assessed

[fedepaol]

/retest

[fedepaol]

/jira refresh

[openshift-ci-robot]

@fedepaol: This pull request references Jira Issue OCPBUGS-18985, which is valid. The bug has been moved to the POST state.

6 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target version (4.13.z) matches configured target version for branch (4.13.z)
• bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
• dependent bug Jira Issue OCPBUGS-18960 is in the state Closed (Done), which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE))
• dependent Jira Issue OCPBUGS-18960 targets the "4.14.0" version, which is one of the valid target versions: 4.14.0
• bug has dependents

Requesting review from QA contact:
/cc @asood-rh

In response to this:

/jira refresh

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[cgoncalves]

/lgtm

[gkopels]

/label cherry-pick-approved

[openshift-ci]

@fedepaol: all tests passed!

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

[openshift-ci-robot]

@fedepaol: Jira Issue OCPBUGS-18985: All pull requests linked via external trackers have merged:

• openshift/metallb#142

Jira Issue OCPBUGS-18985 has been moved to the MODIFIED state.

In response to this:

Instead of letting frr pick the sequence number, we provide it from outside. This should make the configuration more deterministic and offload some of the logic from FRR.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[fedepaol]

/cherry-pick release-4.12

[openshift-cherrypick-robot]

@fedepaol: #142 failed to apply on top of branch "release-4.12":

Applying: FRR templates: provide a seqnum for the prefix lists
Using index info to reconstruct a base tree...
M	internal/bgp/frr/config.go
M	internal/bgp/frr/templates/filters.tmpl
A	internal/bgp/frr/testdata/TestSingleAdvertisementChangeVRF.golden
A	internal/bgp/frr/testdata/TestSingleAdvertisementVRF.golden
A	internal/bgp/frr/testdata/TestSingleAdvertisementWithPeerSelectorVRF.golden
A	internal/bgp/frr/testdata/TestSingleVRFIBGPSession.golden
A	internal/bgp/frr/testdata/TestTwoAdvertisementsTwoSessionsOneVRF.golden
A	internal/bgp/frr/testdata/TestTwoAdvertisementsTwoSessionsOneWithPeerSelectorAndVRF.golden
A	internal/bgp/frr/testdata/TestTwoAdvertisementsTwoSessionsVRFWithPeerSelector.golden
A	internal/bgp/frr/testdata/TestTwoAdvertisementsVRF.golden
A	internal/bgp/frr/testdata/TestTwoSessionsOneVRF.golden
A	internal/bgp/frr/testdata/TestTwoSessionsSameIPRouterIDASNVRF.golden
A	internal/bgp/frr/testdata/TestTwoSessionsSameIPVRF.golden
A	internal/bgp/frr/testdata/TestVRFSingleEBGPSessionMultiHop.golden
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): internal/bgp/frr/testdata/TestTwoSessionsSameIPVRF.golden deleted in HEAD and modified in FRR templates: provide a seqnum for the prefix lists. Version FRR templates: provide a seqnum for the prefix lists of internal/bgp/frr/testdata/TestTwoSessionsSameIPVRF.golden left in tree.
CONFLICT (modify/delete): internal/bgp/frr/testdata/TestTwoSessionsSameIPRouterIDASNVRF.golden deleted in HEAD and modified in FRR templates: provide a seqnum for the prefix lists. Version FRR templates: provide a seqnum for the prefix lists of internal/bgp/frr/testdata/TestTwoSessionsSameIPRouterIDASNVRF.golden left in tree.
CONFLICT (modify/delete): internal/bgp/frr/testdata/TestTwoSessionsOneVRF.golden deleted in HEAD and modified in FRR templates: provide a seqnum for the prefix lists. Version FRR templates: provide a seqnum for the prefix lists of internal/bgp/frr/testdata/TestTwoSessionsOneVRF.golden left in tree.
CONFLICT (modify/delete): internal/bgp/frr/testdata/TestTwoAdvertisementsVRF.golden deleted in HEAD and modified in FRR templates: provide a seqnum for the prefix lists. Version FRR templates: provide a seqnum for the prefix lists of internal/bgp/frr/testdata/TestTwoAdvertisementsVRF.golden left in tree.
CONFLICT (modify/delete): internal/bgp/frr/testdata/TestTwoAdvertisementsTwoSessionsVRFWithPeerSelector.golden deleted in HEAD and modified in FRR templates: provide a seqnum for the prefix lists. Version FRR templates: provide a seqnum for the prefix lists of internal/bgp/frr/testdata/TestTwoAdvertisementsTwoSessionsVRFWithPeerSelector.golden left in tree.
CONFLICT (modify/delete): internal/bgp/frr/testdata/TestTwoAdvertisementsTwoSessionsOneWithPeerSelectorAndVRF.golden deleted in HEAD and modified in FRR templates: provide a seqnum for the prefix lists. Version FRR templates: provide a seqnum for the prefix lists of internal/bgp/frr/testdata/TestTwoAdvertisementsTwoSessionsOneWithPeerSelectorAndVRF.golden left in tree.
CONFLICT (modify/delete): internal/bgp/frr/testdata/TestTwoAdvertisementsTwoSessionsOneVRF.golden deleted in HEAD and modified in FRR templates: provide a seqnum for the prefix lists. Version FRR templates: provide a seqnum for the prefix lists of internal/bgp/frr/testdata/TestTwoAdvertisementsTwoSessionsOneVRF.golden left in tree.
CONFLICT (modify/delete): internal/bgp/frr/testdata/TestSingleVRFIBGPSession.golden deleted in HEAD and modified in FRR templates: provide a seqnum for the prefix lists. Version FRR templates: provide a seqnum for the prefix lists of internal/bgp/frr/testdata/TestSingleVRFIBGPSession.golden left in tree.
CONFLICT (modify/delete): internal/bgp/frr/testdata/TestSingleAdvertisementWithPeerSelectorVRF.golden deleted in HEAD and modified in FRR templates: provide a seqnum for the prefix lists. Version FRR templates: provide a seqnum for the prefix lists of internal/bgp/frr/testdata/TestSingleAdvertisementWithPeerSelectorVRF.golden left in tree.
CONFLICT (modify/delete): internal/bgp/frr/testdata/TestSingleAdvertisementVRF.golden deleted in HEAD and modified in FRR templates: provide a seqnum for the prefix lists. Version FRR templates: provide a seqnum for the prefix lists of internal/bgp/frr/testdata/TestSingleAdvertisementVRF.golden left in tree.
Auto-merging internal/bgp/frr/testdata/TestSingleAdvertisementInvalidPrefix.golden
CONFLICT (content): Merge conflict in internal/bgp/frr/testdata/TestSingleAdvertisementInvalidPrefix.golden
CONFLICT (modify/delete): internal/bgp/frr/testdata/TestSingleAdvertisementChangeVRF.golden deleted in HEAD and modified in FRR templates: provide a seqnum for the prefix lists. Version FRR templates: provide a seqnum for the prefix lists of internal/bgp/frr/testdata/TestSingleAdvertisementChangeVRF.golden left in tree.
Auto-merging internal/bgp/frr/templates/filters.tmpl
CONFLICT (content): Merge conflict in internal/bgp/frr/templates/filters.tmpl
Auto-merging internal/bgp/frr/config.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 FRR templates: provide a seqnum for the prefix lists
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-4.12

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.