Skip to content

Fix conntrackd zone verification#7357

Merged
koolzz merged 2 commits intomagma:masterfrom
koolzz:fix_conntrackd_zone_verification
Jun 7, 2021
Merged

Fix conntrackd zone verification#7357
koolzz merged 2 commits intomagma:masterfrom
koolzz:fix_conntrackd_zone_verification

Conversation

@koolzz
Copy link
Copy Markdown
Contributor

@koolzz koolzz commented Jun 7, 2021

Summary

Instead of checking all conntrackd events only check those which match the zone set by ovs

Test Plan

Checked logs when running conntrack pipelined test, works as expected

Additional Information

  • This change is backwards-breaking

Signed-off-by: Nick Yurchenko <[email protected]>
@koolzz koolzz requested a review from a team as a code owner June 7, 2021 14:26
@koolzz koolzz requested review from a team, pshelar and themarwhal June 7, 2021 14:26
@pull-request-size pull-request-size bot added the size/M Denotes a PR that changes 30-99 lines. label Jun 7, 2021
@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Jun 7, 2021

Thanks for opening a PR! 💯 Please note that all commits must be signed off. This is enforced by the DCO check.

Howto

  • Reviews. The "Reviewers" listed for this PR are the Magma maintainers who will shepherd it.
  • Checks. All required CI checks must pass before merge.
  • Merge. Once approved and passing CI checks, use the ready2merge label to indicate the maintainers can merge your PR.

More info

Please take a moment to read through the Magma project's

If this is your first Magma PR, also consider reading

@magmabot magmabot added the component: agw Access gateway-related issue label Jun 7, 2021
@koolzz koolzz added the apply-v1.5 Apply this commit to the v1.5 release branch as well. label Jun 7, 2021
flags=0x1,
zone_src=None,
zone_ofs_nbits=ofs_nbits(14, 15),
zone_ofs_nbits=self.zone,
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I am not sure about this.
the zone_src is reg and zone_ofs_nbits bits to copy from that reg.

actions += [parser.NXActionCT(

am I missing something?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

The flows seem to be installed correctly I've ran the test_conntrack.py test

I think if zone_src is None its set by the zone_ofs_nbits as said here


zone_ofs_nbits | Start and End for the OXM/NXM field. Setting method refer to the&nbsp;nicira_ext.ofs_nbits. If you need set the Immediate value for zone, zone_src must be set to None or empty character string.

Signed-off-by: Nick Yurchenko <[email protected]>
@koolzz koolzz force-pushed the fix_conntrackd_zone_verification branch from cc3ee01 to bf6cbfd Compare June 7, 2021 16:12
@koolzz koolzz merged commit 5c4dbbf into magma:master Jun 7, 2021
themarwhal pushed a commit that referenced this pull request Jun 7, 2021
* Add zone match to conntrackd

Signed-off-by: Nick Yurchenko <[email protected]>

* Fix conntrack zone on pipelined

Signed-off-by: Nick Yurchenko <[email protected]>
rmeleromira pushed a commit to rmeleromira/magma that referenced this pull request Jul 24, 2021
* Add zone match to conntrackd

Signed-off-by: Nick Yurchenko <[email protected]>

* Fix conntrack zone on pipelined

Signed-off-by: Nick Yurchenko <[email protected]>
Signed-off-by: Ramon Melero <[email protected]>
m-trojanowski pushed a commit to openEPC/magma that referenced this pull request Oct 20, 2021
* Add zone match to conntrackd

Signed-off-by: Nick Yurchenko <[email protected]>

* Fix conntrack zone on pipelined

Signed-off-by: Nick Yurchenko <[email protected]>
m-trojanowski pushed a commit to openEPC/magma that referenced this pull request Oct 20, 2021
* Add zone match to conntrackd

Signed-off-by: Nick Yurchenko <[email protected]>

* Fix conntrack zone on pipelined

Signed-off-by: Nick Yurchenko <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

apply-v1.5 Apply this commit to the v1.5 release branch as well. backported-v1.5 component: agw Access gateway-related issue size/M Denotes a PR that changes 30-99 lines.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants