openstack/python-novaclient
Code Issues Proposed changes

Merge "python3: Compatibility for iteritems differences"

Browse Source
This commit is contained in:
Jenkins 2013-09-17 18:42:19 +00:00 committed by Gerrit Code Review
commit 0af541c727
2 changed files with 4 additions and 2 deletions
novaclient
base.py
v1_1
shell.py

2
novaclient/base.py

@ -236,7 +236,7 @@ class BootingManagerWithFind(ManagerWithFind):
def _parse_block_device_mapping(self, block_device_mapping):
bdm = []
for device_name, mapping in block_device_mapping.iteritems():
for device_name, mapping in six.iteritems(block_device_mapping):
#
# The mapping is in the format:
# <id>:[<type>]:[<size(GB)>]:[<delete_on_terminate>]

4
novaclient/v1_1/shell.py

@ -27,6 +27,8 @@ import os
import sys
import time
import six
from novaclient import exceptions
from novaclient.openstack.common import strutils
from novaclient.openstack.common import timeutils
@ -91,7 +93,7 @@ def _parse_block_device_mapping_v2(args, image):
spec_dict = dict(v.split('=') for v in device_spec.split(','))
bdm_dict = {}
for key, value in spec_dict.iteritems():
for key, value in six.iteritems(spec_dict):
bdm_dict[CLIENT_BDM2_KEYS[key]] = value
# Convert the delete_on_termination to a boolean or set it to true by