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.

Sign up for GitHub

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

Jump to bottom

Add support for route flow counter #2094

Merged
merged 17 commits into from
Apr 19, 2022
Merged

Add support for route flow counter #2094

merged 17 commits into from
Apr 19, 2022
+1,733 −29

Conversation

Junchao-Mellanox
Copy link
Collaborator

@Junchao-Mellanox Junchao-Mellanox commented Jan 4, 2022 •
edited
Loading

HLD: sonic-net/SONiC#908

Build dependency: sonic-net/sonic-swss-common#576

What I did

Add support for route flow counter

Why I did it

For feature route flow counter

How I verified it

  1. Added VS test cases
  2. Manual test
  3. sonic-mgmt test cases

Details if related

@Junchao-Mellanox Junchao-Mellanox marked this pull request as draft January 4, 2022 01:44
@Junchao-Mellanox Junchao-Mellanox force-pushed the route-flow-counter branch 2 times, most recently from c92fe8b to 8e299f3 Compare January 12, 2022 02:42
@Junchao-Mellanox Junchao-Mellanox marked this pull request as ready for review January 24, 2022 02:26
@Junchao-Mellanox Junchao-Mellanox mentioned this pull request Jan 24, 2022
Merged
dgsudharsan
dgsudharsan requested changes Jan 28, 2022
View reviewed changes
orchagent/flex_counter/flex_counter_manager.cpp Outdated Show resolved Hide resolved
orchagent/routeflowcounterorch.cpp Outdated Show resolved Hide resolved
orchagent/routeorch.cpp Outdated Show resolved Hide resolved
orchagent/routeorch.cpp Outdated Show resolved Hide resolved
orchagent/routeorch.h Outdated Show resolved Hide resolved
orchagent/routeorch.cpp Outdated Show resolved Hide resolved
orchagent/routeorch.cpp Outdated Show resolved Hide resolved
orchagent/routeorch.cpp Outdated Show resolved Hide resolved
orchagent/routeorch.cpp Outdated Show resolved Hide resolved
orchagent/vnetorch.cpp Show resolved Hide resolved
dgsudharsan
dgsudharsan previously approved these changes Feb 15, 2022
View reviewed changes
stephenxs
stephenxs previously approved these changes Feb 15, 2022
View reviewed changes
@Junchao-Mellanox
Copy link
Collaborator Author

/azpw run Azure.sonic-swss

@mssonicbld
Copy link
Collaborator

/AzurePipelines run Azure.sonic-swss

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@Junchao-Mellanox
Copy link
Collaborator Author

/azpw run Azure.sonic-swss

@mssonicbld
Copy link
Collaborator

/AzurePipelines run Azure.sonic-swss

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@Junchao-Mellanox
Copy link
Collaborator Author

/azpw run Azure.sonic-swss

@mssonicbld
Copy link
Collaborator

/AzurePipelines run Azure.sonic-swss

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@Junchao-Mellanox
Copy link
Collaborator Author

/azpw run Azure.sonic-swss

@mssonicbld
Copy link
Collaborator

/AzurePipelines run Azure.sonic-swss

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@Junchao-Mellanox
Copy link
Collaborator Author

/azpw run Azure.sonic-swss

@mssonicbld
Copy link
Collaborator

/AzurePipelines run Azure.sonic-swss

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@Junchao-Mellanox
Copy link
Collaborator Author

/azpw run Azure.sonic-swss

dgsudharsan
dgsudharsan requested changes Apr 6, 2022
View reviewed changes
orchagent/flex_counter/flowcounterrouteorch.cpp Show resolved Hide resolved
orchagent/flex_counter/flowcounterrouteorch.cpp Show resolved Hide resolved
orchagent/routeorch.h Outdated Show resolved Hide resolved
orchagent/swssnet.h Outdated Show resolved Hide resolved
dgsudharsan
dgsudharsan previously approved these changes Apr 6, 2022
View reviewed changes
prsunny
prsunny requested changes Apr 6, 2022
View reviewed changes
orchagent/muxorch.cpp Outdated Show resolved Hide resolved
orchagent/routeorch.cpp Outdated Show resolved Hide resolved
orchagent/routeorch.cpp Outdated Show resolved Hide resolved
orchagent/vnetorch.cpp Show resolved Hide resolved
orchagent/swssnet.h Outdated Show resolved Hide resolved
orchagent/swssnet.h Outdated Show resolved Hide resolved
orchagent/flex_counter/flowcounterrouteorch.cpp Show resolved Hide resolved
@Junchao-Mellanox
Merge remote-tracking branch 'origin/master' into route-flow-counter
fef7d62 
Conflicts:
	orchagent/orchdaemon.cpp
	tests/test_flex_counters.py
dgsudharsan
dgsudharsan previously approved these changes Apr 8, 2022
View reviewed changes
@Junchao-Mellanox
Copy link
Collaborator Author

/azpw run Azure.sonic-swss

@mssonicbld
Copy link
Collaborator

/AzurePipelines run Azure.sonic-swss

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

prsunny
prsunny reviewed Apr 11, 2022
View reviewed changes
orchagent/flex_counter/flowcounterrouteorch.cpp Show resolved Hide resolved
orchagent/flex_counter/flowcounterrouteorch.cpp Show resolved Hide resolved
orchagent/routeorch.cpp Outdated Show resolved Hide resolved
orchagent/routeorch.h Outdated Show resolved Hide resolved
orchagent/routeorch.h Show resolved Hide resolved
orchagent/swssnet.h Outdated Show resolved Hide resolved
orchagent/swssnet.h Outdated Show resolved Hide resolved
orchagent/vrforch.cpp Outdated Show resolved Hide resolved
orchagent/vrforch.cpp Outdated Show resolved Hide resolved
prsunny
prsunny previously approved these changes Apr 13, 2022
View reviewed changes
prsunny
prsunny reviewed Apr 15, 2022
View reviewed changes
tests/test_flex_counters.py
dvs.servers[1].runcmd("ip route add default via 10.0.0.2")
dvs.servers[0].runcmd("ping -c 1 10.0.0.3")

dvs.runcmd("vtysh -c \"configure terminal\" -c \"ip route 1.1.1.0/24 10.0.0.1\"")
Copy link
Collaborator

Choose a reason for hiding this comment

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

Why do we have to change to vtysh? Is the previous approach to write to APP_DB not working?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Yes, it does not work after some merge/rebase...I guess there is some new changes which introduce more strict check.

@Junchao-Mellanox
Copy link
Collaborator Author

@prsunny could you please review and sign-off?

@liat-grozovik
Copy link
Collaborator

as this was prev approved and the changes are due to recent master changes, I assumes we can move forward. @prsunny any objection to merge it?

@prsunny prsunny merged commit 1fd1dbf into sonic-net:master Apr 19, 2022
dprital pushed a commit to dprital/sonic-swss that referenced this pull request May 8, 2022
@Junchao-Mellanox @dprital
Add support for route flow counter (sonic-net#2094)
27de8a4 
* Add support for route flow counter
preetham-singh pushed a commit to preetham-singh/sonic-swss that referenced this pull request Aug 6, 2022
@Junchao-Mellanox @preetham-singh
Add support for route flow counter (sonic-net#2094)
1946a83 
* Add support for route flow counter
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@prsunny prsunny prsunny approved these changes

@stephenxs stephenxs stephenxs left review comments

@dgsudharsan dgsudharsan dgsudharsan left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@Junchao-Mellanox @mssonicbld @liushilongbuaa @liat-grozovik @stephenxs @dgsudharsan @prsunny