openstack
/
kuryr-kubernetes
Code Issues Proposed changes

Merge "dict_object.keys() is not required for *in* operator"

This commit is contained in:
Zuul 2018-12-24 10:32:57 +00:00 committed by Gerrit Code Review
parent 6b80b5bfc0 dad16be816
commit 451a8e3037
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kuryr_kubernetes/cni/daemon/service.py
View File

@ -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

4
kuryr_kubernetes/controller/drivers/vif_pool.py
View File

@ -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():

2
kuryr_kubernetes/tests/unit/controller/drivers/test_nested_vlan_vif.py
View File

@ -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)