Use the neutron-lib constant for PACKET_RATE_LIMIT table number (2)
This patch completes the missing bits from [1]. [1]https://review.opendev.org/c/openstack/neutron/+/865590 Related-Bug: #1938966 Change-Id: Ic38280eafaf500cbea4deae9fe2befa012fad861
This commit is contained in:
parent
0384b3193b
commit
5b64ac9013
|
@ -62,7 +62,7 @@ class OVSIntegrationBridgeTest(ovs_bridge_test_base.OVSBridgeTestBase):
|
||||||
],
|
],
|
||||||
match=ofpp.OFPMatch(),
|
match=ofpp.OFPMatch(),
|
||||||
priority=0,
|
priority=0,
|
||||||
table_id=59),
|
table_id=ovs_constants.PACKET_RATE_LIMIT),
|
||||||
active_bundle=None),
|
active_bundle=None),
|
||||||
call._send_msg(ofpp.OFPFlowMod(dp,
|
call._send_msg(ofpp.OFPFlowMod(dp,
|
||||||
cookie=self.stamp,
|
cookie=self.stamp,
|
||||||
|
@ -74,7 +74,7 @@ class OVSIntegrationBridgeTest(ovs_bridge_test_base.OVSBridgeTestBase):
|
||||||
],
|
],
|
||||||
match=ofpp.OFPMatch(),
|
match=ofpp.OFPMatch(),
|
||||||
priority=3,
|
priority=3,
|
||||||
table_id=60),
|
table_id=ovs_constants.TRANSIENT_TABLE),
|
||||||
active_bundle=None),
|
active_bundle=None),
|
||||||
call._send_msg(ofpp.OFPFlowMod(dp,
|
call._send_msg(ofpp.OFPFlowMod(dp,
|
||||||
cookie=self.stamp,
|
cookie=self.stamp,
|
||||||
|
@ -85,7 +85,7 @@ class OVSIntegrationBridgeTest(ovs_bridge_test_base.OVSBridgeTestBase):
|
||||||
udp_dst=67,
|
udp_dst=67,
|
||||||
udp_src=68),
|
udp_src=68),
|
||||||
priority=101,
|
priority=101,
|
||||||
table_id=60),
|
table_id=ovs_constants.TRANSIENT_TABLE),
|
||||||
active_bundle=None),
|
active_bundle=None),
|
||||||
call._send_msg(ofpp.OFPFlowMod(dp,
|
call._send_msg(ofpp.OFPFlowMod(dp,
|
||||||
cookie=self.stamp,
|
cookie=self.stamp,
|
||||||
|
@ -103,7 +103,7 @@ class OVSIntegrationBridgeTest(ovs_bridge_test_base.OVSBridgeTestBase):
|
||||||
udp_dst=547,
|
udp_dst=547,
|
||||||
udp_src=546),
|
udp_src=546),
|
||||||
priority=101,
|
priority=101,
|
||||||
table_id=60),
|
table_id=ovs_constants.TRANSIENT_TABLE),
|
||||||
active_bundle=None),
|
active_bundle=None),
|
||||||
call._send_msg(ofpp.OFPFlowMod(dp,
|
call._send_msg(ofpp.OFPFlowMod(dp,
|
||||||
cookie=self.stamp,
|
cookie=self.stamp,
|
||||||
|
@ -282,7 +282,7 @@ class OVSIntegrationBridgeTest(ovs_bridge_test_base.OVSBridgeTestBase):
|
||||||
eth_dst=dst_mac,
|
eth_dst=dst_mac,
|
||||||
vlan_vid=vlan_tag | ofp.OFPVID_PRESENT),
|
vlan_vid=vlan_tag | ofp.OFPVID_PRESENT),
|
||||||
priority=20,
|
priority=20,
|
||||||
table_id=60),
|
table_id=ovs_constants.TRANSIENT_TABLE),
|
||||||
active_bundle=None),
|
active_bundle=None),
|
||||||
]
|
]
|
||||||
self.assertEqual(expected, self.mock.mock_calls)
|
self.assertEqual(expected, self.mock.mock_calls)
|
||||||
|
@ -306,7 +306,7 @@ class OVSIntegrationBridgeTest(ovs_bridge_test_base.OVSBridgeTestBase):
|
||||||
call.uninstall_flows(
|
call.uninstall_flows(
|
||||||
strict=True,
|
strict=True,
|
||||||
priority=20,
|
priority=20,
|
||||||
table_id=60,
|
table_id=ovs_constants.TRANSIENT_TABLE,
|
||||||
match=ofpp.OFPMatch(
|
match=ofpp.OFPMatch(
|
||||||
eth_dst=dst_mac,
|
eth_dst=dst_mac,
|
||||||
vlan_vid=vlan_tag | ofp.OFPVID_PRESENT)),
|
vlan_vid=vlan_tag | ofp.OFPVID_PRESENT)),
|
||||||
|
@ -353,7 +353,7 @@ class OVSIntegrationBridgeTest(ovs_bridge_test_base.OVSBridgeTestBase):
|
||||||
eth_dst=dst_mac,
|
eth_dst=dst_mac,
|
||||||
vlan_vid=vlan_tag | ofp.OFPVID_PRESENT),
|
vlan_vid=vlan_tag | ofp.OFPVID_PRESENT),
|
||||||
priority=20,
|
priority=20,
|
||||||
table_id=60),
|
table_id=ovs_constants.TRANSIENT_TABLE),
|
||||||
active_bundle=None),
|
active_bundle=None),
|
||||||
]
|
]
|
||||||
self.assertEqual(expected, self.mock.mock_calls)
|
self.assertEqual(expected, self.mock.mock_calls)
|
||||||
|
@ -396,7 +396,7 @@ class OVSIntegrationBridgeTest(ovs_bridge_test_base.OVSBridgeTestBase):
|
||||||
eth_dst=dst_mac,
|
eth_dst=dst_mac,
|
||||||
vlan_vid=ofp.OFPVID_NONE),
|
vlan_vid=ofp.OFPVID_NONE),
|
||||||
priority=20,
|
priority=20,
|
||||||
table_id=60),
|
table_id=ovs_constants.TRANSIENT_TABLE),
|
||||||
active_bundle=None),
|
active_bundle=None),
|
||||||
]
|
]
|
||||||
self.assertEqual(expected, self.mock.mock_calls)
|
self.assertEqual(expected, self.mock.mock_calls)
|
||||||
|
@ -420,7 +420,7 @@ class OVSIntegrationBridgeTest(ovs_bridge_test_base.OVSBridgeTestBase):
|
||||||
call.uninstall_flows(
|
call.uninstall_flows(
|
||||||
strict=True,
|
strict=True,
|
||||||
priority=20,
|
priority=20,
|
||||||
table_id=60,
|
table_id=ovs_constants.TRANSIENT_TABLE,
|
||||||
match=ofpp.OFPMatch(
|
match=ofpp.OFPMatch(
|
||||||
eth_dst=dst_mac,
|
eth_dst=dst_mac,
|
||||||
vlan_vid=vlan_tag | ofp.OFPVID_PRESENT)),
|
vlan_vid=vlan_tag | ofp.OFPVID_PRESENT)),
|
||||||
|
@ -446,7 +446,7 @@ class OVSIntegrationBridgeTest(ovs_bridge_test_base.OVSBridgeTestBase):
|
||||||
call.uninstall_flows(
|
call.uninstall_flows(
|
||||||
strict=True,
|
strict=True,
|
||||||
priority=20,
|
priority=20,
|
||||||
table_id=60,
|
table_id=ovs_constants.TRANSIENT_TABLE,
|
||||||
match=ofpp.OFPMatch(
|
match=ofpp.OFPMatch(
|
||||||
eth_dst=dst_mac,
|
eth_dst=dst_mac,
|
||||||
vlan_vid=ofp.OFPVID_NONE)),
|
vlan_vid=ofp.OFPVID_NONE)),
|
||||||
|
|
Loading…
Reference in New Issue