diff --git a/neutron/agent/common/ovs_lib.py b/neutron/agent/common/ovs_lib.py index f9661b41c44..ded56e283af 100644 --- a/neutron/agent/common/ovs_lib.py +++ b/neutron/agent/common/ovs_lib.py @@ -372,24 +372,6 @@ class OVSBridge(BaseOVS): port_name) return ofport - def get_port_external_ids(self, port_name): - """Get the port's assigned ofport, retrying if not yet assigned.""" - port_external_ids = dict() - try: - port_external_ids = self._get_port_val(port_name, "external_ids") - except tenacity.RetryError: - LOG.exception("Timed out retrieving external_ids on port %s.", - port_name) - return port_external_ids - - def get_port_mac(self, port_name): - """Get the port's mac address. - - This is especially useful when the port is not a neutron port. - E.g. networking-sfc needs the MAC address of "patch-tun - """ - return self.db_get_val("Interface", port_name, "mac_in_use") - @_ovsdb_retry def _get_datapath_id(self): return self.db_get_val('Bridge', self.br_name, 'datapath_id') diff --git a/neutron/tests/unit/agent/common/test_ovs_lib.py b/neutron/tests/unit/agent/common/test_ovs_lib.py index b14a20a13de..03465835fe2 100644 --- a/neutron/tests/unit/agent/common/test_ovs_lib.py +++ b/neutron/tests/unit/agent/common/test_ovs_lib.py @@ -526,26 +526,6 @@ class OVS_Lib_Test(base.BaseTestCase): self.assertRaises(tenacity.RetryError, self.br._get_port_val, '1', 'ofport') - def test_get_port_external_ids_retry(self): - external_ids = [["iface-id", "tap99id"], - ["iface-status", "active"], - ["attached-mac", "de:ad:be:ef:13:37"]] - with mock.patch.object( - self.br, 'db_get_val', - side_effect=[[], [], [], [], external_ids]): - self.assertEqual(external_ids, - self.br._get_port_val('1', 'external_ids')) - - def test_get_port_external_ids_retry_fails(self): - # reduce timeout for faster execution - self.br.ovsdb_timeout = 1 - # after 7 calls the retry will timeout and raise - with mock.patch.object( - self.br, 'db_get_val', - side_effect=[[] for _ in range(7)]): - self.assertRaises(tenacity.RetryError, - self.br._get_port_val, '1', 'external_ids') - def test_set_controller_rate_limit(self): with mock.patch.object( self.br, "set_controller_field"