Refactor forwarder to use updated Options pattern from sdk-ovs

[bszirtes]

Description

Refactoring forwarder-ovs to use the updated Options patterns from sdk-ovs, just as it has been implemented in the forwarder-vpp.

Depends on: networkservicemesh/sdk-ovs#320

Issue link

networkservicemesh/sdk-ovs#319

How Has This Been Tested?

• Added unit testing to cover
• Tested manually
• Tested by integration testing
• Have not tested

Types of changes

• Bug fix
• New functionality
• Documentation
• Refactoring
• CI

[ljkiraly]

Seems good to me

[denis-tingaikin]

@bszirtes It seems like CI is stuck. Could you rebase the branch to the latest main and re-push changes?

[bszirtes]

@denis-tingaikin I just tried rebasing, and it indicated that everything is up to date. Even though, I did a force-push after the rebasing, but it appears that nothing has changed. Do you have any other suggestions?

[denis-tingaikin]

@bszirtes Looks weird. There might be something on the GitHub actions side. I just pushed a test branch #368, and CI has started. Could you try creating a new branch based on this and trying to open it?

[bszirtes]

@denis-tingaikin Could you please elaborate a bit more on what I should try to open? Should I create a new branch and open a new PR with the same code?

[denis-tingaikin]

@bszirtes Yes, you may simply use git switch -c to create a new branch based on these changes and open a new PR that I expect should fix the CI. 

[denis-tingaikin]

@bszirtes One second. It seems like your branch just has conflicts that must be resolved.

[denis-tingaikin]

Could you try this?

git switch refactor-chains-options-pattern
git fetch origin
git rebase -X theirs origin/main
git push $forkName refactor-chains-options-pattern -f

[bszirtes]

@denis-tingaikin I just tried.

[denis-tingaikin]

OK, something changed, and it seems like we're headed in the right direction 😀

This should repair the branch.

git branch -m  refactor-chains-options-pattern-tmp
git checkout origin/main
git switch -c refactor-chains-options-pattern
git cherry-pick 885de7831142d881296967b75a74361d1299fb41
git push $forkName refactor-chains-options-pattern -f

[bszirtes]

@denis-tingaikin I got the following after I executed git cherry-pick 885de7831142d881296967b75a74361d1299fb41 :

Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging main.go
CONFLICT (content): Merge conflict in main.go
error: could not apply 885de78... Refactor forwarder to use updated Options pattern from sdk-ovs
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".

Should I try to resolve these manually?

[denis-tingaikin]

Yes, it can be fixed manually; as an alternative, you may do this.

git cherry-pick --abort
git cherry-pick -X theirs 885de7831142d881296967b75a74361d1299fb41

[bszirtes]

@denis-tingaikin I just pushed again, but it seems to me that I have even more conflicts somehow. Should I create a new PR with the same changes?

[denis-tingaikin]

It looks better, but the branch is still has conflicts

OK, I see. You're using a fork that has a 3-year diff; that's why we face problems.

This should fix the problem with the diff

git remote add nsm-origin https://github.com/networkservicemesh/cmd-forwarder-ovs.git
git fetch nsm-origin
git branch -m  refactor-chains-options-pattern-tmp
git checkout nsm-origin/main
git switch -c refactor-chains-options-pattern
git cherry-pick -X theirs 885de7831142d881296967b75a74361d1299fb41
git push $forkName refactor-chains-options-pattern -f

[bszirtes]

@denis-tingaikin Well, it looks like it passed the checks. Thank you for the assistance!

[denis-tingaikin]

Woot! Problems are fixed 💪

LGTM.