diff options
| author | Zuul <zuul@review.opendev.org> | 2023-04-26 04:04:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2023-04-26 04:04:34 +0000 |
| commit | a8fd9465b5edc4de3a5fb5a31de710591390c688 (patch) | |
| tree | f3ef31c033de52376f990d383521795174dc0c8a | |
| parent | 5717202c66aa51f1420b24166d8bf8395a2ff51e (diff) | |
| parent | 5510cdab92d1d3eac080053a51779d34a8a19614 (diff) | |
| download | neutron-a8fd9465b5edc4de3a5fb5a31de710591390c688.tar.gz | |
Merge "[ovn] OVNClient._get_router_ports: Drop unused parameter"
| -rw-r--r-- | neutron/plugins/ml2/drivers/ovn/mech_driver/ovsdb/ovn_client.py | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/neutron/plugins/ml2/drivers/ovn/mech_driver/ovsdb/ovn_client.py b/neutron/plugins/ml2/drivers/ovn/mech_driver/ovsdb/ovn_client.py index 6ae60ebbb3..37898652df 100644 --- a/neutron/plugins/ml2/drivers/ovn/mech_driver/ovsdb/ovn_client.py +++ b/neutron/plugins/ml2/drivers/ovn/mech_driver/ovsdb/ovn_client.py @@ -1329,20 +1329,17 @@ class OVNClient(object): 'device_owner': [const.DEVICE_OWNER_ROUTER_GW], 'device_id': [router_id]}) - def _get_router_ports(self, context, router_id, get_gw_port=False): + def _get_router_ports(self, context, router_id): # _get_router() will raise a RouterNotFound error if there's no router # with the router_id router_db = self._l3_plugin._get_router(context, router_id) - if get_gw_port: - return [p.port for p in router_db.attached_ports] - else: - # When the existing deployment is migrated to OVN - # we may need to consider other port types - DVR_INTERFACE/HA_INTF. - return [p.port for p in router_db.attached_ports - if p.port_type in [const.DEVICE_OWNER_ROUTER_INTF, - const.DEVICE_OWNER_DVR_INTERFACE, - const.DEVICE_OWNER_HA_REPLICATED_INT, - const.DEVICE_OWNER_ROUTER_HA_INTF]] + # When the existing deployment is migrated to OVN + # we may need to consider other port types - DVR_INTERFACE/HA_INTF. + return [p.port for p in router_db.attached_ports + if p.port_type in [const.DEVICE_OWNER_ROUTER_INTF, + const.DEVICE_OWNER_DVR_INTERFACE, + const.DEVICE_OWNER_HA_REPLICATED_INT, + const.DEVICE_OWNER_ROUTER_HA_INTF]] def _get_v4_network_for_router_port(self, context, port): cidr = None |