Change in vdsm[master]: hooks: ovs: use six.iteritems
phoracek at redhat.com
phoracek at redhat.com
Thu Oct 8 15:15:15 UTC 2015
Petr Horáček has uploaded a new change for review.
Change subject: hooks: ovs: use six.iteritems
......................................................................
hooks: ovs: use six.iteritems
Change-Id: I3d098a3142f61e927e047058424d2bd6f6955145
Signed-off-by: Petr Horáček <phoracek at redhat.com>
---
M vdsm_hooks/ovs/ovs_after_get_caps.py
M vdsm_hooks/ovs/ovs_after_get_stats.py
M vdsm_hooks/ovs/ovs_before_network_setup.py
M vdsm_hooks/ovs/ovs_before_network_setup_ip.py
M vdsm_hooks/ovs/ovs_before_network_setup_mtu.py
M vdsm_hooks/ovs/ovs_before_network_setup_ovs.py
M vdsm_hooks/ovs/ovs_utils.py
7 files changed, 30 insertions(+), 21 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/39/47139/1
diff --git a/vdsm_hooks/ovs/ovs_after_get_caps.py b/vdsm_hooks/ovs/ovs_after_get_caps.py
index 3ffc3e3..bb5e36d 100755
--- a/vdsm_hooks/ovs/ovs_after_get_caps.py
+++ b/vdsm_hooks/ovs/ovs_after_get_caps.py
@@ -18,6 +18,7 @@
# Refer to the README and COPYING files for full details of the license
#
import re
+import six
import sys
import traceback
@@ -70,7 +71,7 @@
ovs_networks_caps = {}
dhcpv4ifaces, dhcpv6ifaces = netinfo._get_dhclient_ifaces()
routes = netinfo._get_routes()
- for network, attrs in running_config.networks.items():
+ for network, attrs in six.iteritems(running_config.networks):
if is_ovs_network(attrs):
interface = network if 'vlan' in attrs else BRIDGE_NAME
net_info = _get_net_info(attrs, interface, dhcpv4ifaces,
@@ -87,7 +88,7 @@
ovs_bridges_caps = {}
dhcpv4ifaces, dhcpv6ifaces = netinfo._get_dhclient_ifaces()
routes = netinfo._get_routes()
- for network, attrs in running_config.networks.items():
+ for network, attrs in six.iteritems(running_config.networks):
if is_ovs_network(attrs):
interface = network if 'vlan' in attrs else BRIDGE_NAME
net_info = _get_net_info(attrs, interface, dhcpv4ifaces,
@@ -104,7 +105,7 @@
ovs_vlans_caps = {}
dhcpv4ifaces, dhcpv6ifaces = netinfo._get_dhclient_ifaces()
routes = netinfo._get_routes()
- for network, attrs in running_config.networks.items():
+ for network, attrs in six.iteritems(running_config.networks):
if is_ovs_network(attrs):
vlan = attrs.get('vlan')
if vlan is not None:
@@ -140,7 +141,7 @@
ovs_bonding_caps = {}
dhcpv4ifaces, dhcpv6ifaces = netinfo._get_dhclient_ifaces()
routes = netinfo._get_routes()
- for bonding, attrs in running_config.bonds.items():
+ for bonding, attrs in six.iteritems(running_config.bonds):
if is_ovs_bond(attrs):
options = get_bond_options(attrs.get('options'), keep_custom=True)
net_info = _get_net_info(attrs, bonding, dhcpv4ifaces,
diff --git a/vdsm_hooks/ovs/ovs_after_get_stats.py b/vdsm_hooks/ovs/ovs_after_get_stats.py
index b902f57..f4c6039 100755
--- a/vdsm_hooks/ovs/ovs_after_get_stats.py
+++ b/vdsm_hooks/ovs/ovs_after_get_stats.py
@@ -18,6 +18,7 @@
# Refer to the README and COPYING files for full details of the license
#
from functools import partial
+import six
import traceback
from vdsm.netconfpersistence import RunningConfig
@@ -38,7 +39,7 @@
ovs_networks_stats = {}
running_config = RunningConfig()
- for network, attrs in running_config.networks.items():
+ for network, attrs in six.iteritems(running_config.networks):
if is_ovs_network(attrs):
vlan = attrs.get('vlan')
iface = attrs.get('nic') or attrs.get('bonding')
diff --git a/vdsm_hooks/ovs/ovs_before_network_setup.py b/vdsm_hooks/ovs/ovs_before_network_setup.py
index 9bc73a5..5c7aa1d 100755
--- a/vdsm_hooks/ovs/ovs_before_network_setup.py
+++ b/vdsm_hooks/ovs/ovs_before_network_setup.py
@@ -19,6 +19,7 @@
#
from copy import deepcopy
from functools import partial
+import six
import sys
import traceback
@@ -54,14 +55,14 @@
non_ovs_nets = {}
ovs_bonds = {}
non_ovs_bonds = {}
- for net, attrs in nets.items():
+ for net, attrs in six.iteritems(nets):
if (('remove' in attrs and net in running_config.networks and
is_ovs_network(running_config.networks[net])) or
is_ovs_network(attrs)):
ovs_nets[net] = attrs
else:
non_ovs_nets[net] = attrs
- for bond, attrs in bonds.items():
+ for bond, attrs in six.iteritems(bonds):
if (('remove' in attrs and bond in running_config.bonds and
is_ovs_bond(running_config.bonds[bond])) or
is_ovs_bond(attrs)):
@@ -80,10 +81,10 @@
libvirt.removeNetwork(net)
destroy_ovs_bridge()
- for net, attrs in running_config.networks.items():
+ for net, attrs in six.iteritems(running_config.networks):
if is_ovs_network(attrs):
running_config.networks.pop(net)
- for bond, attrs in running_config.bonds.items():
+ for bond, attrs in six.iteritems(running_config.bonds):
if is_ovs_bond(attrs):
running_config.bonds.pop(bond)
running_config.save()
diff --git a/vdsm_hooks/ovs/ovs_before_network_setup_ip.py b/vdsm_hooks/ovs/ovs_before_network_setup_ip.py
index 2273cc6..6f8a6fd 100644
--- a/vdsm_hooks/ovs/ovs_before_network_setup_ip.py
+++ b/vdsm_hooks/ovs/ovs_before_network_setup_ip.py
@@ -18,6 +18,7 @@
# Refer to the README and COPYING files for full details of the license
#
from functools import partial
+import six
import sys
from vdsm import ipwrapper, sysctl
@@ -105,7 +106,7 @@
ip_config_to_set = {}
ip_config_to_remove = {}
- for net, attrs in nets.items():
+ for net, attrs in six.iteritems(nets):
if net in init_nets:
init_attrs = init_nets[net]
init_top_dev = net if 'vlan' in init_attrs else BRIDGE_NAME
@@ -123,7 +124,8 @@
log('Remove IP configuration of: %s' % ip_config_to_remove)
log('Set IP configuration: %s' % ip_config_to_set)
- for iface, (ipv4, ipv6) in ip_config_to_remove.iteritems():
+ for iface, (ipv4, ipv6) in six.iteritems(ip_config_to_remove):
_remove_ip_config(iface, ipv4, ipv6)
- for iface, (ipv4, ipv6, blockingdhcp, port) in ip_config_to_set.items():
+ for iface, (ipv4, ipv6, blockingdhcp, port) in six.iteritems(
+ ip_config_to_set):
_set_ip_config(iface, ipv4, ipv6, blockingdhcp, port)
diff --git a/vdsm_hooks/ovs/ovs_before_network_setup_mtu.py b/vdsm_hooks/ovs/ovs_before_network_setup_mtu.py
index ffe2c08..10cc23b 100644
--- a/vdsm_hooks/ovs/ovs_before_network_setup_mtu.py
+++ b/vdsm_hooks/ovs/ovs_before_network_setup_mtu.py
@@ -17,6 +17,8 @@
#
# Refer to the README and COPYING files for full details of the license
#
+import six
+
from vdsm import ipwrapper, netinfo
from ovs_utils import iter_ovs_nets, iter_ovs_bonds
@@ -88,5 +90,5 @@
changes_bonds = _mtus_bonds(running_config)
changes_vlans = _mtus_vlans(running_config)
for mtu_changes in (changes_nics, changes_bonds, changes_vlans):
- for iface, mtu in mtu_changes.iteritems():
+ for iface, mtu in six.iteritems(mtu_changes):
_set_iface_mtu(iface, mtu)
diff --git a/vdsm_hooks/ovs/ovs_before_network_setup_ovs.py b/vdsm_hooks/ovs/ovs_before_network_setup_ovs.py
index 72c1c23..7f3a076 100644
--- a/vdsm_hooks/ovs/ovs_before_network_setup_ovs.py
+++ b/vdsm_hooks/ovs/ovs_before_network_setup_ovs.py
@@ -18,6 +18,7 @@
# Refer to the README and COPYING files for full details of the license
#
from functools import partial
+import six
import sys
from vdsm.netinfo import NetInfo
@@ -52,7 +53,7 @@
def _get_nets_by_nic(running_config):
""" Transform running config into {nic: set(networks)}. """
nets_by_nic = {}
- for net, attrs in running_config.networks.iteritems():
+ for net, attrs in six.iteritems(running_config.networks):
nic = attrs.get('nic')
if nic is not None:
nets_by_nic.setdefault(nic, set()).add(net)
@@ -173,7 +174,7 @@
if vlan is not None and bonding is None and nic is None:
raise Exception('You can not create a nicless/bondless vlan')
- for existing_net, existing_attrs in running_config.networks.items():
+ for existing_net, existing_attrs in six.iteritems(running_config.networks):
if (existing_net != net and
existing_attrs.get('nic') == nic and
existing_attrs.get('bond') == bonding and
@@ -254,14 +255,14 @@
def _handle_setup(nets, bonds, running_config, nets_by_nic):
commands = []
netinfo = NetInfo()
- for bond, attrs in bonds.items():
+ for bond, attrs in six.iteritems(bonds):
if 'remove' not in attrs:
_validate_bond_configuration(attrs, netinfo)
if bond in running_config.bonds:
commands.extend(_edit_ovs_bond(bond, attrs, running_config))
else:
commands.extend(_setup_ovs_bond(bond, attrs, running_config))
- for net, attrs in nets.iteritems():
+ for net, attrs in six.iteritems(nets):
if 'remove' not in attrs:
_validate_net_configuration(net, attrs, running_config, netinfo)
if net in running_config.networks:
@@ -275,11 +276,11 @@
def _handle_removal(nets, bonds, running_config, nets_by_nic):
commands = []
- for net, attrs in nets.iteritems():
+ for net, attrs in six.iteritems(nets):
if 'remove' in attrs:
commands.extend(_remove_ovs_network(net, running_config,
nets_by_nic))
- for bond, attrs in bonds.items():
+ for bond, attrs in six.iteritems(bonds):
if 'remove' in attrs:
commands.extend(['--', 'del-port', BRIDGE_NAME, bond])
running_config.removeBonding(bond)
diff --git a/vdsm_hooks/ovs/ovs_utils.py b/vdsm_hooks/ovs/ovs_utils.py
index 916909c..60112ee 100644
--- a/vdsm_hooks/ovs/ovs_utils.py
+++ b/vdsm_hooks/ovs/ovs_utils.py
@@ -21,6 +21,7 @@
import errno
import os
import pickle
+import six
from hooking import execCmd
import hooking
@@ -90,14 +91,14 @@
def iter_ovs_nets(networks):
""" Yields OVS networks (network, attrs) from networks dictionary. """
- for network, attrs in networks.items():
+ for network, attrs in six.iteritems(networks):
if is_ovs_network(attrs):
yield network, attrs
def iter_ovs_bonds(bondings):
""" Yields OVS bondings (bonding, attrs) from bonds dictionary. """
- for bond, attrs in bondings.items():
+ for bond, attrs in six.iteritems(bondings):
if is_ovs_bond(attrs):
yield bond, attrs
--
To view, visit https://gerrit.ovirt.org/47139
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3d098a3142f61e927e047058424d2bd6f6955145
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček <phoracek at redhat.com>
More information about the vdsm-patches
mailing list