From 3b1083b1e4aa35fdca75b17609831cba12292486 Mon Sep 17 00:00:00 2001
From: zhufl <zhu.fanglei@zte.com.cn>
Date: Tue, 13 Aug 2019 11:15:06 +0800
Subject: [PATCH] [Trivial]Remove unused helper get_port_external_ids/mac
get_port_external_ids and get_port_mac are no longer used after
cf37563c8393f964e7f390f13c43070791360cc1, this is to remove them.
Besides, unit testcases test_get_port_external_ids_retry/fails
are added along with the adding of get_port_external_ids in
0a4596aa203a74c99f64f3c53e7945894ffdcdd3, so though they don't
call get_port_external_ids directly, we may remove them as well.
Change-Id: I84633221b916f18ec099080d66f0cd2018731d7c
---
neutron/agent/common/ovs_lib.py | 18 -----------------
.../tests/unit/agent/common/test_ovs_lib.py | 20 -------------------
2 files changed, 38 deletions(-)
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"