Browse Source

Merge "Clear skb mark on encapsulating packets" into stable/rocky

changes/22/676922/1
Zuul 1 month ago
parent
commit
b8e9b3198f

+ 1
- 0
neutron/agent/common/ovs_lib.py View File

@@ -503,6 +503,7 @@ class OVSBridge(BaseOVS):
503 503
         options['local_ip'] = local_ip
504 504
         options['in_key'] = 'flow'
505 505
         options['out_key'] = 'flow'
506
+        options['egress_pkt_mark'] = '0'
506 507
         if tunnel_csum:
507 508
             options['csum'] = str(tunnel_csum).lower()
508 509
         if tos:

+ 6
- 2
neutron/tests/unit/agent/common/test_ovs_lib.py View File

@@ -502,7 +502,8 @@ class OVS_Lib_Test(base.BaseTestCase):
502 502
                         "options:remote_ip=" + remote_ip,
503 503
                         "options:local_ip=" + local_ip,
504 504
                         "options:in_key=flow",
505
-                        "options:out_key=flow"])
505
+                        "options:out_key=flow",
506
+                        "options:egress_pkt_mark=0"])
506 507
         # Each element is a tuple of (expected mock call, return_value)
507 508
         expected_calls_and_values = [
508 509
             (self._vsctl_mock(*command), None),
@@ -532,7 +533,8 @@ class OVS_Lib_Test(base.BaseTestCase):
532 533
                         "options:remote_ip=" + remote_ip,
533 534
                         "options:local_ip=" + local_ip,
534 535
                         "options:in_key=flow",
535
-                        "options:out_key=flow"])
536
+                        "options:out_key=flow",
537
+                        "options:egress_pkt_mark=0"])
536 538
         # Each element is a tuple of (expected mock call, return_value)
537 539
         expected_calls_and_values = [
538 540
             (self._vsctl_mock(*command), None),
@@ -566,6 +568,7 @@ class OVS_Lib_Test(base.BaseTestCase):
566 568
                         "options:local_ip=" + local_ip,
567 569
                         "options:in_key=flow",
568 570
                         "options:out_key=flow",
571
+                        "options:egress_pkt_mark=0",
569 572
                         "options:csum=true"])
570 573
         # Each element is a tuple of (expected mock call, return_value)
571 574
         expected_calls_and_values = [
@@ -601,6 +604,7 @@ class OVS_Lib_Test(base.BaseTestCase):
601 604
                         "options:local_ip=" + local_ip,
602 605
                         "options:in_key=flow",
603 606
                         "options:out_key=flow",
607
+                        "options:egress_pkt_mark=0",
604 608
                         "options:tos=" + str(tos)])
605 609
         # Each element is a tuple of (expected mock call, return_value)
606 610
         expected_calls_and_values = [

Loading…
Cancel
Save