From dad16be8169a3a9f29ef2db95f60d51bd4b3611c Mon Sep 17 00:00:00 2001 From: confi-surya Date: Wed, 19 Dec 2018 17:30:21 +0530 Subject: [PATCH] dict_object.keys() is not required for *in* operator cleanup of .keys() from dict_object.keys() *in* operator Change-Id: I311ae5f553df30593287177f9c0ba946e7dcfc50 --- kuryr_kubernetes/cni/daemon/service.py | 2 +- kuryr_kubernetes/controller/drivers/vif_pool.py | 4 ++-- .../tests/unit/controller/drivers/test_nested_vlan_vif.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/kuryr_kubernetes/cni/daemon/service.py b/kuryr_kubernetes/cni/daemon/service.py index 9b53f5b0a..552a0e6c1 100644 --- a/kuryr_kubernetes/cni/daemon/service.py +++ b/kuryr_kubernetes/cni/daemon/service.py @@ -231,7 +231,7 @@ class CNIDaemonWatcherService(cotyledon.Service): ifname, vif_obj in ( self.registry[pod_name]['vifs'].items()) } - for iface in vifs.keys(): + for iface in vifs: if old_vifs[iface].active != vifs[iface].active: pod_dict = self.registry[pod_name] pod_dict['vifs'] = vif_dict diff --git a/kuryr_kubernetes/controller/drivers/vif_pool.py b/kuryr_kubernetes/controller/drivers/vif_pool.py index 555d32bd5..40e7a0da2 100644 --- a/kuryr_kubernetes/controller/drivers/vif_pool.py +++ b/kuryr_kubernetes/controller/drivers/vif_pool.py @@ -413,7 +413,7 @@ class NeutronVIFPool(BaseVIFPool): kuryr_ports = self._get_ports_by_attrs( device_owner=kl_const.DEVICE_OWNER) for port in kuryr_ports: - if port['id'] in self._recyclable_ports.keys(): + if port['id'] in self._recyclable_ports: sg_current[port['id']] = port['security_groups'] for port_id, pool_key in self._recyclable_ports.copy().items(): @@ -595,7 +595,7 @@ class NestedVIFPool(BaseVIFPool): kuryr_subports = self._get_ports_by_attrs( device_owner=['trunk:subport', kl_const.DEVICE_OWNER]) for subport in kuryr_subports: - if subport['id'] in self._recyclable_ports.keys(): + if subport['id'] in self._recyclable_ports: sg_current[subport['id']] = subport['security_groups'] for port_id, pool_key in self._recyclable_ports.copy().items(): diff --git a/kuryr_kubernetes/tests/unit/controller/drivers/test_nested_vlan_vif.py b/kuryr_kubernetes/tests/unit/controller/drivers/test_nested_vlan_vif.py index b4c542944..70f413b19 100644 --- a/kuryr_kubernetes/tests/unit/controller/drivers/test_nested_vlan_vif.py +++ b/kuryr_kubernetes/tests/unit/controller/drivers/test_nested_vlan_vif.py @@ -314,7 +314,7 @@ class TestNestedVlanPodVIFDriver(test_base.TestCase): vlan_id = mock.sentinel.vlan_id vif = mock.Mock() m_driver._port_vlan_mapping = {vif.id: vlan_id} - self.assertTrue(vif.id in m_driver._port_vlan_mapping.keys()) + self.assertTrue(vif.id in m_driver._port_vlan_mapping) neutron.delete_port.side_effect = n_exc.PortNotFoundClient cls.release_vif(m_driver, pod, vif)