openstack
/
neutron
Code Issues Proposed changes

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

This commit is contained in:
Zuul 2019-08-14 00:14:26 +00:00 committed by Gerrit Code Review
parent cf60191de6 e4b8795c23
commit a6397771e8
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
neutron/agent/common/ovs_lib.py
View File

@ -502,6 +502,7 @@ class OVSBridge(BaseOVS):
options['local_ip'] = local_ip options['local_ip'] = local_ip
options['in_key'] = 'flow' options['in_key'] = 'flow'
options['out_key'] = 'flow' options['out_key'] = 'flow'
options['egress_pkt_mark'] = '0'
if tunnel_csum: if tunnel_csum:
options['csum'] = str(tunnel_csum).lower() options['csum'] = str(tunnel_csum).lower()
if tos: if tos:

8
neutron/tests/unit/agent/common/test_ovs_lib.py
View File

@ -502,7 +502,8 @@ class OVS_Lib_Test(base.BaseTestCase):
"options:remote_ip=" + remote_ip, "options:remote_ip=" + remote_ip,
"options:local_ip=" + local_ip, "options:local_ip=" + local_ip,
"options:in_key=flow", "options:in_key=flow",
"options:out_key=flow"]) "options:out_key=flow",
"options:egress_pkt_mark=0"])
# Each element is a tuple of (expected mock call, return_value) # Each element is a tuple of (expected mock call, return_value)
expected_calls_and_values = [ expected_calls_and_values = [
(self._vsctl_mock(*command), None), (self._vsctl_mock(*command), None),
@ -532,7 +533,8 @@ class OVS_Lib_Test(base.BaseTestCase):
"options:remote_ip=" + remote_ip, "options:remote_ip=" + remote_ip,
"options:local_ip=" + local_ip, "options:local_ip=" + local_ip,
"options:in_key=flow", "options:in_key=flow",
"options:out_key=flow"]) "options:out_key=flow",
"options:egress_pkt_mark=0"])
# Each element is a tuple of (expected mock call, return_value) # Each element is a tuple of (expected mock call, return_value)
expected_calls_and_values = [ expected_calls_and_values = [
(self._vsctl_mock(*command), None), (self._vsctl_mock(*command), None),
@ -566,6 +568,7 @@ class OVS_Lib_Test(base.BaseTestCase):
"options:local_ip=" + local_ip, "options:local_ip=" + local_ip,
"options:in_key=flow", "options:in_key=flow",
"options:out_key=flow", "options:out_key=flow",
"options:egress_pkt_mark=0",
"options:csum=true"]) "options:csum=true"])
# Each element is a tuple of (expected mock call, return_value) # Each element is a tuple of (expected mock call, return_value)
expected_calls_and_values = [ expected_calls_and_values = [
@ -601,6 +604,7 @@ class OVS_Lib_Test(base.BaseTestCase):
"options:local_ip=" + local_ip, "options:local_ip=" + local_ip,
"options:in_key=flow", "options:in_key=flow",
"options:out_key=flow", "options:out_key=flow",
"options:egress_pkt_mark=0",
"options:tos=" + str(tos)]) "options:tos=" + str(tos)])
# Each element is a tuple of (expected mock call, return_value) # Each element is a tuple of (expected mock call, return_value)
expected_calls_and_values = [ expected_calls_and_values = [